Ver código fonte

[Fix 0000] 修复局部风机风机曲线bug

hongrunxia 4 dias atrás
pai
commit
9fd948c0c5

+ 3 - 0
src/components/chart/BarAndLine.vue

@@ -230,6 +230,9 @@
               if (max > propType.ymax || min < propType.ymin) {
                 propType.ymax = digitCount + disLen / 3;
                 propType.ymin = minDigitCount - disLen / 3 > 0 || minDigitCount < 0 ? minDigitCount - disLen / 3 : 0;
+              } else {
+                propType.ymax = digitCount + digitCount / 4;
+                propType.ymin = minDigitCount - digitCount / 4;
               }
             } else {
               propType.ymax = digitCount + disLen / 3;

+ 2 - 2
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -1078,8 +1078,8 @@
         const dataIndex = itemColumn['dataIndex'] as string;
         dataIndexFan1 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan1') : dataIndex.replace('fan', 'fan1');
         dataIndexFan2 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan2') : dataIndex.replace('fan', 'fan2');
-        chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: fanTitles[0] + itemColumn['des'] });
-        chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: fanTitles[1] + itemColumn['des'] });
+        chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: fanTitles[0] + itemColumn['legend'] });
+        chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: fanTitles[1] + itemColumn['legend'] });
       }
     }
   }