展会大屏修改

src/store/module/MicroExhibition.ts

@@ -127,10 +127,10 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
     },
     changestatus(data) {
       let map = {
-        '1171512':'zuoyi',
         '1170304': 'zuoyi',
         '1171902': 'zuoyi',
         '10201557': 'zuoyi',        
+        '1171701': 'zuoyi',
         '116023#': 'tuoxie',
         '104019420': 'banfang',
         '104019428': 'banfang',
@@ -138,15 +138,16 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         '10404393': 'banfang',
         '10410207': 'banfang',
         '10102109': 'fengzhong',
-        'RP2011001':'fengzhong',
+        'RP2011001#': 'fengzhong',
         'RP2011157': 'fengzhong',
-        'RPO00000OLS':'fengzhong',
         '10102154': 'fengzhong',
         '1050910': 'caijian',
         '1190269': 'caijian',
+        '1021629': 'fengzhong',
       }
       let { RackNumber, WorkingState } = data
-      let key = map[RackNumber]
+      let key = map[RackNumber];
+      if (this[key] && this[key].hasOwnProperty('value')) {
         this[key].value.forEach((item) => {
           let index = item.findIndex((item2) => {
             return item2 == RackNumber
@@ -157,6 +158,7 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         })
 
       }
+    }
 
   },
 });

src/views/MicroExhibition/components/ringChart.vue

@@ -19,7 +19,10 @@ let { t } = useI18n();
 let ringRef = ref();
 let ringChart = null;
 const prop = defineProps({
-    data: []
+    data: {
+        type: Array,
+        default: []
+    }
 })
 const init = () => {
     ringChart = proxy.$echarts.init(ringRef.value, 'dark')

src/views/MicroExhibition/index.vue

@@ -122,6 +122,7 @@ let ringData = computed(() => {
         { name: '待机', value: store.devnum.wait },
     ]
 })
+let timer = null
 let dev_caijian_title = ['设备名称', '设备编码', '稼动率', '状态']
 let dev_tuoxie_title = ['设备编码', '稼动率', '状态']
 let dev_value = [
@@ -159,6 +160,27 @@ function getWebsocket(val){
         if (data.type == 'WorkingState') {
             store.changestatus(data.msg)
         }
+        //   if(data.type=='CISMA_chart'){  
+        //     let obj = JSON.parse(data.msg.replace(/'/g,'"'))
+        //     console.log(obj);
+
+        //     for(let key in obj){
+        //         console.log(key,obj[key]);
+
+        //         if (key == "版房设备") {
+        //             store.setbanfang(obj[key])
+        //         } else if(key == "裁剪设备") {
+        //             store.setcaijian(obj[key])
+        //         } else if(key == "缝中设备") {                
+        //             store.setfengzhong(obj[key])
+        //         } else if(key == "拖鞋自动生产线") {
+        //             store.settuoxie(obj[key])
+        //         } else if(key == "座椅面套生产线") {
+        //             store.setzuoyi(obj[key])
+        //         }
+
+        //     }
+        //   }
 
     } catch (err) {
         console.log(err);
@@ -172,11 +194,15 @@ function getWebsocket(val){
 onMounted(() => {
     getTopDeviceData()
     getCismaListData()
+    timer = setInterval(() => {
+        getTopDeviceData()
+    }, 10000)
     connectWebsocket(null, null, getWebsocket, errWebsocket)
     document.getElementById('app').style.backgroundColor = '#0E0E0E'
 })
 
 onUnmounted(() => {
+    clearInterval(timer)
     document.getElementById('app').style.backgroundColor = '#100c2a'
 })
 </script>
@@ -377,4 +403,5 @@ h2 {
     border-top: 92px solid #0E1D2F;
     border-left: 109px solid transparent;
     border-right: 110px solid transparent;
-}</style>
+}
+</style>