lxh 8 months ago
parent
commit
907ef255d5

+ 14 - 3
src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -111,6 +111,7 @@ let cardListTf = reactive<any[]>([])
 let router = useRouter()
 let echartNow = ref<any[]>([])
 let echartYc=reactive<any[]>([])
+let flag=ref(true)
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
@@ -154,8 +155,12 @@ function topAreaClick(index) {
     echartDataFc.aveValue.data.length = 0;
     echartDataFc.xData.length = 0;
     echartYc.length=0
+    flag.value=true
 
-    echartNow.value = JSON.parse(choiceData[index].readData.expectInfo)['list']
+    if(flag.value){
+        echartNow.value = JSON.parse(choiceData[index].readData.expectInfo)['list']
+        flag.value=false
+    }
     echartYc.push({ time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[index].readData.expectInfo)['aveVal'] })
     // let unique = uniqueObjects(echartNow.value, 'time');
     let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
@@ -217,7 +222,10 @@ function getSysWarnList(id, type) {
             choiceData = res.dust;
 
             if (choiceData[activeIndex.value]) {
-                echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
+                if(flag.value){
+                    echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
+                    flag.value=false
+                }              
                 echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
                 // let unique = uniqueObjects(echartNow.value, 'time');
                 let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
@@ -238,7 +246,10 @@ function getSysWarnList(id, type) {
                 maxY.value = formatRoundNum(max1 * 1.5);
             } else {
                 activeIndex.value = 0;
-                echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
+                if(flag.value){
+                    echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
+                    flag.value=false
+                }
                 echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], value1: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
                 // let unique = uniqueObjects(echartNow.value, 'time');
                 let setData = [...echartNow.value,echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))

+ 5 - 2
src/views/vent/monitorManager/deviceMonitor/components/device/modal/dust.modal.vue

@@ -121,6 +121,7 @@ export default defineComponent({
     const dustSwitch = ref(false);
     const echartNow = ref<any[]>([])
     const echartYc=reactive<any[]>([])
+    const flag=ref(true)
 
     const echatsOption = {
       grid: {
@@ -277,8 +278,10 @@ export default defineComponent({
           // })
           // if(list.length > 0) posList.value = list
           // posList.value = item['history'];
-
-          echartNow.value = JSON.parse(item.readData.expectInfo)['list']
+          if(flag.value){
+            echartNow.value = JSON.parse(item.readData.expectInfo)['list']
+            flag.value=false
+          }
           echartYc.push({time:JSON.parse(item.readData.expectInfo)['nowTime'],value:JSON.parse(item.readData.expectInfo)['nowVal'],value1:JSON.parse(item.readData.expectInfo)['aveVal']})
           // let unique=uniqueObjects( echartNow.value, 'time');