粉尘修改更新

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -110,7 +110,6 @@ let gridV = reactive({
 let cardListTf = reactive<any[]>([])
 let router = useRouter()
 let echartNow = ref<any[]>([])
-let echartYc = reactive<any[]>([])
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
@@ -153,26 +152,16 @@ function topAreaClick(index) {
     echartDataFc.minData.data.length = 0;
     echartDataFc.aveValue.data.length = 0;
     echartDataFc.xData.length = 0;
-    echartYc.length = 0
 
     echartNow.value = JSON.parse(choiceData[index].readData.expectInfo)['list']
-    echartNow.value.push({ time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'] })
-    echartYc.push({ id: '1', time: JSON.parse(choiceData[index].readData.expectInfo)['aveTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['aveVal'] })
-    let unique1 = uniqueObjects(echartYc, 'time');
+    echartNow.value.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 = [...unique, ...unique1].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+    let setData = [...unique].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
     setData.forEach(el => {
-        if (el.value && el.value != '0') {
-            if (el.id == '1') {
-                // echartDataFc.maxData.data.push(0);
-                echartDataFc.minData.data.push(el.value);
-                echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-            } else {
-                echartDataFc.maxData.data.push(el.value);
-                // echartDataFc.minData.data.push(0);
-                echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-            }
+        if (el.value && el.value != '0' && el.value1!='0') {
+            echartDataFc.maxData.data.push(el.value);
+            echartDataFc.minData.data.push(el.value1);
+            echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
         }
     })
 
@@ -227,23 +216,14 @@ function getSysWarnList(id, type) {
 
             if (choiceData[activeIndex.value]) {
                 echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
-                echartNow.value.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'] })
-                echartYc.push({ id: '1', time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
-                let unique1 = uniqueObjects(echartYc, 'time');
+                echartNow.value.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 = [...unique, ...unique1].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                let setData = [...unique].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
                 setData.forEach(el => {
-                    if (el.value && el.value != '0') {
-                        if (el.id == '1') {
-                            // echartDataFc.maxData.data.push(0);
-                            echartDataFc.minData.data.push(el.value);
-                            echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-                        } else {
-                            echartDataFc.maxData.data.push(el.value);
-                            // echartDataFc.minData.data.push(0);
-                            echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-                        }
+                    if (el.value && el.value != '0' && el.value1!='0') {
+                        echartDataFc.maxData.data.push(el.value);
+                        echartDataFc.minData.data.push(el.value1);
+                        echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
                     }
                 })
                 // choiceData[activeIndex.value].history.forEach((el) => {
@@ -257,24 +237,14 @@ function getSysWarnList(id, type) {
             } else {
                 activeIndex.value = 0;
                 echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
-                echartNow.value.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'] })
-                echartYc.push({ id: '1', time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal'] })
-                let unique1 = uniqueObjects(echartYc, 'time');
+                echartNow.value.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 = [...unique, ...unique1].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                let setData = [...unique].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
                 setData.forEach(el => {
-                    if (el.value && el.value != '0') {
-                        if (el.id == '1') {
-                            // echartDataFc.maxData.data.push(0);
-                            echartDataFc.minData.data.push(el.value);
-                            echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-
-                        } else {
-                            echartDataFc.maxData.data.push(el.value);
-                            // echartDataFc.minData.data.push(0);
-                            echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
-                        }
+                    if (el.value && el.value != '0' && el.value1!='0') {
+                        echartDataFc.maxData.data.push(el.value);
+                        echartDataFc.minData.data.push(el.value1);
+                        echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
                     }
                 })
 

src/views/vent/monitorManager/deviceMonitor/components/device/modal/dust.modal.vue

@@ -103,7 +103,6 @@ import BarAndLine from '/@/components/chart/BarAndLine.vue';
 import { SvgIcon } from '/@/components/Icon';
 import { Decoration7 as DvDecoration7, ScrollBoard as DvScrollBoard } from '@kjgl77/datav-vue3';
 import dayjs from 'dayjs';
-import { array } from 'vue-types';
 
 export default defineComponent({
   components: { BasicModal, BarAndLine, SvgIcon, DvScrollBoard, DvDecoration7 },
@@ -120,7 +119,6 @@ export default defineComponent({
     const posList = ref<any[]>([]);
     const dustMonitor = shallowRef({});
     const dustSwitch = ref(false);
-    const echartYc = reactive<any[]>([])
     const echartNow = ref<any[]>([])
 
     const echatsOption = {
@@ -280,25 +278,16 @@ export default defineComponent({
           // posList.value = item['history'];
 
           echartNow.value = JSON.parse(item.readData.expectInfo)['list']
-          echartNow.value.push({time:JSON.parse(item.readData.expectInfo)['nowTime'],value:JSON.parse(item.readData.expectInfo)['nowVal']})
-
-          echartYc.push({ id: '1', time: JSON.parse(item.readData.expectInfo)['aveTime'], value: JSON.parse(item.readData.expectInfo)['aveVal'] })
-          let unique1 = uniqueObjects(echartYc, 'time');
+          echartNow.value.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');
     
-          let setData = [ ...unique,...unique1].sort((a,b)=>Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+          let setData = [ ...unique].sort((a,b)=>Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
           setData.forEach(el=>{
-           if(el.value && el.value!='0'){
-           if(el.id=='1'){
-            // el.nowVal=''
-            el.ycVal=el.value
-            el.warnVal=JSON.parse(item.readData.expectInfo)['fmin'] ? JSON.parse(item.readData.expectInfo)['fmin'] : ''
-           }else {
+           if(el.value && el.value!='0'&& el.value1 !='0'){
             el.nowVal=el.value
-            // el.ycVal=''
+            el.ycVal=el.value1
             el.warnVal=JSON.parse(item.readData.expectInfo)['fmin'] ? JSON.parse(item.readData.expectInfo)['fmin'] : ''
            }
-           }
           })
           posList.value = setData
           dustMonitor.value = item.readData;