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

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

@@ -160,7 +160,7 @@ function topAreaClick(index) {
     // 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)))
     setData.forEach(el => {
-        if (el.value && el.value != '0' && el.value1!='0') {
+        if (el.value && el.value != '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);
@@ -222,7 +222,7 @@ function getSysWarnList(id, type) {
                 // 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)))
                 setData.forEach(el => {
-                    if (el.value && el.value != '0' && el.value1!='0') {
+                    if (el.value && el.value != '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);
@@ -243,7 +243,7 @@ function getSysWarnList(id, type) {
                 // 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)))
                 setData.forEach(el => {
-                    if (el.value && el.value != '0' && el.value1!='0') {
+                    if (el.value && el.value != '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);

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

@@ -284,7 +284,7 @@ export default defineComponent({
     
           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'&& el.value1 !='0'){
+           if(el.value && el.value!='0'){
             el.nowVal=el.value
             el.ycVal=el.value1
             el.warnVal=JSON.parse(item.readData.expectInfo)['fmin'] ? JSON.parse(item.readData.expectInfo)['fmin'] : ''