update

src/views/Exhibition/CIFM/child.vue

@@ -13,7 +13,7 @@
                         <div class="box-lt">
                             <div class="pie">
                                 <span>{{ speed }}</span>
-                                <span>rpm/min</span>
+                                <span>rpm</span>
                             </div>
                         </div>
 
@@ -84,7 +84,7 @@ import { connectWebsocket, closeWebsocket } from "@/utils/websocket"
 import { useRouter, useRoute } from 'vue-router'
 
 let route = useRoute()
-
+let timer = null
 let xData = ref(['订单任务量', '任务完成量'])
 let series = ref([{
     name: '完成量',
@@ -110,7 +110,7 @@ let getImgSrc = computed(() => {
         '床笠裙边机': require('./images/qbj.png'),
         '电脑绗绣机': require('./images/hxj.png'),
         '电脑绣花机': require('./images/xhj.png'),
-        '全自动缝纫机(零等待)': require('./images/ldd.png')
+        '零等待皮革缝纫机': require('./images/ldd.png')
     }
     return imgSrc[name]
 })
@@ -129,9 +129,8 @@ function scatteredLayoutExhibitionDeviceFun() {
                 { key: '机架号', value: device_info['label'] },
                 { key: '工作时长', value: device_info['workTime'] },
             ]
-            console.log(route.params.name,'11111');
             
-            if (name == '床笠裙边机') {
+            if (name == '电脑绗绣机') {
                 device_data.value.push({ key: '花型编号', value: device_info['fileName'] })
             }
             if (device_info['status'] == 2) {
@@ -202,8 +201,9 @@ let unit = {
     '床笠裙边机': '床',
     '电脑绗绣机': 'cm',
     '电脑绣花机': '件',
-    '全自动缝纫机(零等待)': '件'
+    '零等待皮革缝纫机': '件'
 }
+//echarts
 let optionData = reactive({
     backgroundColor: 'transparent',
     legend: {
@@ -251,12 +251,13 @@ function getWebsocket(val) {
 
 
         if (data.type == 'WorkingState') {
-            let { RackNumber, WorkingState, speed } = data.msg
+            let { RackNumber, WorkingState } = data.msg
 
 
-            if (device_data.value[0].value == RackNumber) {
+            if (device_data.value[2].value == RackNumber) {
+                
                 device_data.value[1].value = WorkingState
-                speed.value = speed
+                speed.value = data.msg?.speed
             }
         }
 
@@ -270,12 +271,13 @@ function errWebsocket(val) {
 }
 onMounted(() => {
     scatteredLayoutExhibitionDeviceFun()
-    setInterval(() => {
+    timer = setInterval(() => {
         scatteredLayoutExhibitionDeviceFun()
     }, 60000)
     connectWebsocket(null, null, getWebsocket, errWebsocket)
 })
 onUnmounted(() => {
+    clearInterval(timer)
     closeWebsocket()
 })
 </script>

src/views/Exhibition/CIFM/components/DynamicChart.vue

@@ -24,7 +24,6 @@ const setCharts = () => {
 }
 
 watch(() => prop.optionData, (newVal, oldVal) => {
-    console.log(newVal,'1111111');
     
     charts.setOption(newVal);
 }, { deep: true })

src/views/Exhibition/CIFM/main.vue

@@ -25,7 +25,7 @@
                 </div>
             </div>
             <div class="right">
-                <BorderView :title="'零等待皮革缝纫机'" @click="pushTo('全自动缝纫机(零等待)')">
+                <BorderView :title="'零等待皮革缝纫机'" @click="pushTo('零等待皮革缝纫机')">
                     <ItemCard :data="ldd_data" :imgSrc="imgSrc['ldd']"></ItemCard>
                 </BorderView>
             </div>
@@ -57,7 +57,7 @@ import { connectWebsocket, closeWebsocket } from "@/utils/websocket"
 import {useRouter} from 'vue-router'
 
 let router = useRouter()
-
+let timer = null
 let imgSrc = reactive({
     qbj:require('./images/qbj.png'),
     hxj:require('./images/hxj.png'),
@@ -100,7 +100,7 @@ function scatteredLayoutExhibitionDeviceFun() {
             let qbj = data['床笠裙边机']
             let hxj = data['电脑绗绣机']
             let xhj = data['电脑绣花机']
-            let ldd = data['全自动缝纫机(零等待)']
+            let ldd = data['零等待皮革缝纫机']
             qbj_data.value = [
                 { key: '机架号', value: qbj['label'] },
                 { key: '设备状态', value: qbj['status'] },
@@ -152,13 +152,15 @@ function getWebsocket(val) {
 
 
         if (data.type == 'WorkingState') {
+            
             let { RackNumber, WorkingState } = data.msg
             let index = status_data.value.findIndex((item, index) => {
                 return item['label'] == RackNumber
             })
             
             if (index !== -1) {
-                status_data.value[index].data.value[1].value = WorkingState
+                
+                status_data.value[index].data[1].value = WorkingState
             }
         }
 
@@ -173,10 +175,13 @@ function errWebsocket(val) {
 
 onMounted(() => {
     scatteredLayoutExhibitionDeviceFun()
-    
+    timer = setInterval(() => {
+        scatteredLayoutExhibitionDeviceFun()
+    }, 60000)
     connectWebsocket(null, null, getWebsocket, errWebsocket)
 })
 onUnmounted(() => {
+    clearInterval(timer)
     closeWebsocket()
 })
 </script>