From e205530df2d0e45248bcdeeabee090ad26e33080 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 30 九月 2024 09:20:27 +0800
Subject: [PATCH] ll

---
 admin/src/views/platform/LogisticsRecord/waybill.vue   |    2 +-
 screen/src/views/PlatformCall.vue                      |   37 ++++++++++++++++++++++++-------------
 admin/src/components/business/OperaPlatformWindow.vue  |    1 +
 admin/src/views/platform/LogisticsRecord/leaveAuth.vue |    2 +-
 admin/src/views/platform/platform.vue                  |    4 ++--
 admin/.env.development                                 |    4 ++--
 6 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/admin/.env.development b/admin/.env.development
index 4ee55cf..2bd8abf 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -2,6 +2,6 @@
 NODE_ENV = 'development'
 
 VUE_APP_API_URL  = 'http://localhost:10010'
-VUE_APP_API_URL  = 'http://192.168.0.103:10010'
-# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
+# VUE_APP_API_URL  = 'http://192.168.0.103:10010'
+VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
 s
\ No newline at end of file
diff --git a/admin/src/components/business/OperaPlatformWindow.vue b/admin/src/components/business/OperaPlatformWindow.vue
index c03564e..b9ebeec 100644
--- a/admin/src/components/business/OperaPlatformWindow.vue
+++ b/admin/src/components/business/OperaPlatformWindow.vue
@@ -63,6 +63,7 @@
         ledIds: null,
         broadcastIds: null,
         name: '',
+        code: '',
         groupId: '',
         startTime: '',
         endTime: '',
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 9fdf219..5bfab7f 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -152,7 +152,7 @@
       platformJobPage({
         model: {
           ...filters,
-          queryStatus: '6,9,10',
+          queryStatus: '6,9,10,2,3,4',
           beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
           beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
         },
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 2084078..9018c0d 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -31,7 +31,7 @@
           <span v-if="scope.row.type == '4'">甯傚叕鍙稿鍗忚溅鍗歌揣</span>
         </template>
       </el-table-column>
-      <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="ioCreatedate" label="鍒涘缓鏃堕棿" min-width="150" show-overflow-tooltip />
       <el-table-column prop="name" label="浣滀笟鐘舵��" min-width="100" show-overflow-tooltip>
         <template v-slot="scope">
           <span>{{ statusMap[scope.row.status] }}</span>
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index 5f097ce..a9e3979 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -63,8 +63,8 @@
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.operaPlatformWindow.open('缂栬緫鏈堝彴淇℃伅琛�', row)" icon="el-icon-edit"
               v-permissions="['business:platform:update']">缂栬緫</el-button>
-            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
-              v-permissions="['business:platform:delete']">鍒犻櫎</el-button>
+            <!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+              v-permissions="['business:platform:delete']">鍒犻櫎</el-button> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue
index bca3c16..cc73a73 100644
--- a/screen/src/views/PlatformCall.vue
+++ b/screen/src/views/PlatformCall.vue
@@ -6,6 +6,7 @@
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
+const qrcode = ref('')
 const contentList = ref([])
 const contentTempList = ref([])
 const page = ref(1)
@@ -31,28 +32,35 @@
     if (res.data && res.data.waitWorkList) {
       callList.value = res.data.waitWorkList
     }
+    qrcode.value = res.data.qrCode
+    initQrcode()
     clearInterval(timerCall.value)
     setInitCall()
   })
 }
-initData()
-// setInterval(() => {
-//   initData()
-// }, 60 * 1000)
 
 const frequencyFn = (length) => {
-  if(length <= 16){ // 2
+  if (length <= 16) { // 2
     return 30 * 1000
-  }else if(length <= 24 ){ // 3
+  } else if (length <= 24) { // 3
     return 20 * 1000
-  }else if( length <= 32 ){// 4
+  } else if (length <= 32) {// 4
     return 15 * 1000
-  }else if( length <= 48 ){// 6
+  } else if (length <= 48) {// 6
     return 10 * 1000
-  }else if( length <= 60 ){// 10
+  } else if (length <= 60) {// 10
     return 6 * 1000
-  }else{
+  } else {
     return 4 * 1000
+  }
+}
+const frequencyCallFn = (length) => {
+  if (length <= 10) { // 2
+    return 6 * 1000
+  } else if (length <= 20) { // 3
+    return 3 * 1000
+  } else {
+    return 2 * 1000
   }
 }
 const setInitContent = () => {
@@ -83,18 +91,21 @@
         pageCall.value++
       }
       activeCall.value = callList.value[pageCall.value]
-    }, 6 * 1000)
+    }, frequencyCallFn(callList.value.length))
   }
 }
 
 onMounted(() => {
-  initQrcode()
+  initData()
+  setInterval(() => {
+    initData()
+  }, 60 * 1000)
 })
 
 const initQrcode = () => {
   var qr = new UQRCode()
   // 璁剧疆浜岀淮鐮佸唴瀹�
-  qr.data = "https://uqrcode.cn/doc"
+  qr.data = qrcode.value
   qr.size = 254
   // 璋冪敤鍒朵綔浜岀淮鐮佹柟娉�
   qr.make()

--
Gitblit v1.9.3