预警管控粉尘监测修改-提交

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

@@ -104,14 +104,14 @@ let gridV = reactive({
     top: '12%',
     left: '1%',
     bottom: '5%',
-    right: '2%',
+    right: '5%',
     containLabel: true,
 })
 let cardListTf = reactive<any[]>([])
 let router = useRouter()
 let echartNow = ref<any[]>([])
-let echartYc=reactive<any[]>([])
-let flag=ref(true)
+let echartYc = reactive<any[]>([])
+let flag = ref(true)
 
 // https获取监测数据
 let timer: null | NodeJS.Timeout = null;
@@ -124,7 +124,7 @@ function getMonitor(deviceID, flag?) {
             }
             getMonitor(deviceID);
         },
-        flag ? 0 : 1000
+        flag ? 0 : 3000
     );
 }
 //返回首页
@@ -137,16 +137,6 @@ function cardClick(ind, item) {
     clearTimeout(timer);
     getMonitor(item.deviceID, true);
 }
-// function uniqueObjects(arr, key) {
-//     const unique = arr.map((e) => e[key])
-//         // 存储每个属性值
-//         .map((e, i, final) => final.indexOf(e) === i && i)
-//         // 移除重复值的索引
-//         .filter((e) => arr[e])
-//         // 映射到对应的对象
-//         .map((e) => arr[e]);
-//     return unique;
-// }
 //顶部区域选项切换
 function topAreaClick(index) {
     activeIndex.value = index;
@@ -154,29 +144,22 @@ function topAreaClick(index) {
     echartDataFc.minData.data.length = 0;
     echartDataFc.aveValue.data.length = 0;
     echartDataFc.xData.length = 0;
-    echartYc.length=0
-    flag.value=true
-
-    if(flag.value){
+    echartYc.length = 0
+    flag.value = true
+    if (flag.value) {
         echartNow.value = JSON.parse(choiceData[index].readData.expectInfo)['list']
-        flag.value=false
+        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)))
+    echartYc.push({ time: JSON.parse(choiceData[index].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[index].readData.expectInfo)['nowVal'], })
+    let setData = [...echartNow.value, ...echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
     setData.forEach(el => {
         if (el.value && el.value != '0') {
             echartDataFc.xData.push(el.time);
             echartDataFc.maxData.data.push(el.value);
-            echartDataFc.minData.data.push(el.value1);
+            echartDataFc.minData.data.push(JSON.parse(choiceData[index].readData.expectInfo)['aveVal']);
             echartDataFc.aveValue.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] ? JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['fmin'] : 0);
         }
     })
-
-    // choiceData[index].history.forEach((el) => {
-    //     echartDataFc.maxData.data.push(el.dustval);
-    //     echartDataFc.xData.push(el.time);
-    // });
 }
 function formatRoundNum(num) {
     let interger = Math.ceil(num);
@@ -204,10 +187,7 @@ function getSysWarnList(id, type) {
     sysWarn({ sysid: id, type: type }).then((res) => {
         // listData.common = res;
         topAreaList.length = 0;
-        echartDataFc.maxData.data.length = 0;
-        echartDataFc.minData.data.length = 0;
-        echartDataFc.aveValue.data.length = 0;
-        echartDataFc.xData.length = 0;
+
         if (JSON.stringify(res) != '{}') {
             res.dust.forEach((el) => {
                 topAreaList.push({
@@ -223,51 +203,48 @@ function getSysWarnList(id, type) {
             choiceData = res.dust;
 
             if (choiceData[activeIndex.value]) {
-                if(flag.value){
+                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)))
+                    flag.value = false
+                }
+                echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], })
+                let setData = [...echartNow.value, ...echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                echartDataFc.maxData.data.length = 0;
+                echartDataFc.minData.data.length = 0;
+                echartDataFc.aveValue.data.length = 0;
+                echartDataFc.xData.length = 0;
                 setData.forEach(el => {
                     if (el.value && el.value != '0') {
                         echartDataFc.xData.push(el.time);
                         echartDataFc.maxData.data.push(el.value);
-                        echartDataFc.minData.data.push(el.value1);
+                        echartDataFc.minData.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal']);
                         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) => {
-                //     echartDataFc.maxData.data.push(el.dustval);
-                //     echartDataFc.xData.push(el.time);
-                // });
                 let max1 = echartDataFc.maxData.data.reduce((acr, cur) => {
                     return acr > cur ? acr : cur;
                 });
                 maxY.value = formatRoundNum(max1 * 1.5);
             } else {
                 activeIndex.value = 0;
-                if(flag.value){
+                if (flag.value) {
                     echartNow.value = JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['list']
-                    flag.value=false
+                    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)))
+                echartYc.push({ time: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowTime'], value: JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['nowVal'], })
+                let setData = [...echartNow.value, ...echartYc].sort((a, b) => Date.parse(new Date(a.time)) - Date.parse(new Date(b.time)))
+                echartDataFc.maxData.data.length = 0;
+                echartDataFc.minData.data.length = 0;
+                echartDataFc.aveValue.data.length = 0;
+                echartDataFc.xData.length = 0;
                 setData.forEach(el => {
                     if (el.value && el.value != '0') {
                         echartDataFc.xData.push(el.time);
                         echartDataFc.maxData.data.push(el.value);
-                        echartDataFc.minData.data.push(el.value1);
+                        echartDataFc.minData.data.push(JSON.parse(choiceData[activeIndex.value].readData.expectInfo)['aveVal']);
                         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) => {
-                //     echartDataFc.maxData.data.push(el.dustval);
-                //     echartDataFc.xData.push(el.time);
-                // });
                 let max1 = echartDataFc.maxData.data.reduce((acr, cur) => {
                     return acr > cur ? acr : cur;
                 });

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

@@ -250,17 +250,6 @@ export default defineComponent({
         setModalProps({ loading: false, confirmLoading: false });
       }, 300);
     }
-    // function uniqueObjects(arr, key) {
-    //   const unique = arr.map((e) => e[key])
-    //     // 存储每个属性值
-    //     .map((e, i, final) => final.indexOf(e) === i && i)
-    //     // 移除重复值的索引
-    //     .filter((e) => arr[e])
-    //     // 映射到对应的对象
-    //     .map((e) => arr[e]);
-    //   return unique;
-    // }
-
     watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
       deviceList.value = newDataSource as any[];
       // if (newActiveID != oldActiveID) {