lxh пре 8 месеци
родитељ
комит
53c84066eb

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

@@ -165,12 +165,12 @@ function topAreaClick(index) {
     setData.forEach(el => {
         if (el.value && el.value != '0') {
             if (el.id == '1') {
-                echartDataFc.maxData.data.push(0);
+                // 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.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);
             }
         }
@@ -236,12 +236,12 @@ function getSysWarnList(id, type) {
                 setData.forEach(el => {
                     if (el.value && el.value != '0') {
                         if (el.id == '1') {
-                            echartDataFc.maxData.data.push(0);
+                            // 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.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);
                         }
                     }
@@ -266,13 +266,13 @@ function getSysWarnList(id, type) {
                 setData.forEach(el => {
                     if (el.value && el.value != '0') {
                         if (el.id == '1') {
-                            echartDataFc.maxData.data.push(0);
+                            // 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.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);
                         }
                     }

+ 2 - 2
src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -220,8 +220,8 @@ function cardClick(ind, item) {
         currentLoad.value = '';
         getMonitor(item.deviceID, true);
     } else {
-        // clearTimeout(timer);
-        // activeIndex1.value = ind;
+        clearTimeout(timer);
+        activeIndex1.value = ind;
         tableLists.value = menuList1.info[ind].list
     }
 

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

@@ -290,12 +290,12 @@ export default defineComponent({
           setData.forEach(el=>{
            if(el.value && el.value!='0'){
            if(el.id=='1'){
-            el.nowVal=''
+            // el.nowVal=''
             el.ycVal=el.value
             el.warnVal=JSON.parse(item.readData.expectInfo)['fmin'] ? JSON.parse(item.readData.expectInfo)['fmin'] : ''
            }else {
             el.nowVal=el.value
-            el.ycVal=''
+            // el.ycVal=''
             el.warnVal=JSON.parse(item.readData.expectInfo)['fmin'] ? JSON.parse(item.readData.expectInfo)['fmin'] : ''
            }
            }