From c76b993d93bbe43e4bd9f10a34a5a292760fdfcc Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 13 Sep 2023 08:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E4=BC=9A=E5=A4=A7=E5=B1=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MicroExhibition/components/BarChart.vue   |  6 ++++-
 .../MicroExhibition/components/DevCard.vue    | 13 ++++------
 src/views/MicroExhibition/index.vue           | 25 +++----------------
 3 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/src/views/MicroExhibition/components/BarChart.vue b/src/views/MicroExhibition/components/BarChart.vue
index addb49d..f502161 100644
--- a/src/views/MicroExhibition/components/BarChart.vue
+++ b/src/views/MicroExhibition/components/BarChart.vue
@@ -28,7 +28,11 @@ const setCharts = () => {
         // },
         backgroundColor: '#0E0E0E',
         legend: {
-            data: ['计划完成','实际完成']
+            data: ['计划完成','实际完成'],
+        },
+        grid:{
+            left:'40',
+            right:'0',
         },
         color:['#2FC5D4','#FEDA81'],
         xAxis: {
diff --git a/src/views/MicroExhibition/components/DevCard.vue b/src/views/MicroExhibition/components/DevCard.vue
index ae05ad3..816e005 100644
--- a/src/views/MicroExhibition/components/DevCard.vue
+++ b/src/views/MicroExhibition/components/DevCard.vue
@@ -51,18 +51,15 @@ const status_color = {
     flex-direction: row;
 }
 
-.dev-left,
-.dev-right {
-    width: 50%;
+.dev-left {
+    width: 45%;
     height: 100%;
     box-sizing: border-box;
 }
-
-.dev-right {
-    width: 60%;
-}
-
 .dev-right {
+    width: 55%;
+    height: 100%;
+    box-sizing: border-box;
     display: flex;
     flex-direction: column;
     justify-content: space-around;
diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue
index fc550b0..badd4ac 100644
--- a/src/views/MicroExhibition/index.vue
+++ b/src/views/MicroExhibition/index.vue
@@ -169,33 +169,11 @@ function getWebsocket(val) {
 
 
         if (data.type == 'StateChart') {
-            throttle(getTopDeviceData, 1000)
             store.setDevnum(data.msg)
         }
         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);
@@ -209,6 +187,9 @@ function errWebsocket(val) {
 onMounted(() => {
     getTopDeviceData()
     getCismaListData()
+    timer = setInterval(()=>{
+        getTopDeviceData()
+    },5000)
     connectWebsocket(null, null, getWebsocket, errWebsocket)
     document.getElementById('app').style.backgroundColor = '#0E0E0E'
 })