Parcourir la source

Merge branch 'master' into zhijiang

anxiaoxia il y a 2 ans
Parent
commit
026035bd97

+ 3 - 3
src/pages/Environment/components/chartModal/TdbRHchart.jsx

@@ -43,12 +43,12 @@ export default ({ data }) => {
     },
     yAxis: {
       RH: {
-        max: Math.ceil(minMaxRH.maxRH),
+        max: Math.ceil(minMaxRH.maxRH) + 1,
         min: Math.floor(minMaxRH.minRH),
         // tickCount: 5,
       },
       Tdb: {
-        max: Math.ceil(minMaxTdb.maxTdb),
+        max: Math.ceil(minMaxTdb.maxTdb) + 1,
         min: Math.floor(minMaxTdb.minTdb),
         // tickCount: 5,
       },
@@ -57,7 +57,7 @@ export default ({ data }) => {
       formatter: (item) => {
         return {
           name: 'RH' in item ? '湿度' : '温度',
-          value: 'RH' in item ? `${item.RH ? item.RH : '--'}%` : `${item.Tdb ? item.Tdb : '--'}°C`,
+          value: 'RH' in item ? `${item.RH}%` : `${item.Tdb}°C`,
         };
       },
     },

+ 2 - 2
src/pages/Environment/components/chartModal/lineChart.jsx

@@ -69,10 +69,10 @@ export default ({ paramObj, spaceId }) => {
           key = objId;
         }
         arr.forEach((itemArr) => {
-          let scales = null;
+          let scales = '--';
           if (itemArr[1] == '-9999') {
             scalesCheckArr.push(itemArr[1]);
-            scales = null;
+            scales = '--';
           } else {
             scales = Number(itemArr[1].toFixed(paramObj.pointNum));
           }