no message

src/biz/zhdyMsgbox6.ts

@@ -13,8 +13,8 @@
         ret["api2"] = getSingleYAndMoreData("进博会核心区消费类型分析", checkNumber(excelData.进博会核心区消费类型分析), false, false);
         ret["api3"] = getSingleYAndMoreData("进博会核心区节假日活力指数分析", checkNumber(excelData.进博会核心区节假日活力指数分析), false, false);
         
-        ret["api4"] = getSingleYAndMoreData("青浦重点商圈经济活力指数", excelData.青浦重点商圈经济活力指数, false, false);
-        ret["api5"] = getMoreYChartData("青浦重点商圈经济活力变化趋势", excelData.青浦重点商圈经济活力变化趋势, false, false);
+        ret["api4"] = getMoreYChartData("青浦重点商圈经济活力指数", excelData.青浦重点商圈经济活力指数, false, false);
+        ret["api5"] = getSingleYAndMoreData("青浦重点商圈经济活力变化趋势", excelData.青浦重点商圈经济活力变化趋势, false, false);
 
         ret["api6"] = getSingleYAndMoreData("赵巷区消费类型分析", checkNumber(excelData.赵巷区消费类型分析), false, false);
         ret["api7"] = getSingleYAndMoreData("赵巷区节假日活力指数分析", checkNumber(excelData.赵巷区节假日活力指数分析), false, false);

src/util/tools.ts

@@ -183,6 +183,7 @@ export function getChartData(title, dataMap, unit, percent ) {
     }
     data.yMinValue = getChartMin(data.yMinValue);
     data.yStepValue = getChartStepNumber(Math.ceil((data.yMaxValue - data.yMinValue) / count));
+    data.yMaxValue =  Math.ceil(data.yMaxValue);
 
     return data;
 }
@@ -219,13 +220,13 @@ export function getMoreYChartData(title, dataMap, percent, unit ) {
             thisCount += 1;
         }
 
-        onceData.yStepValue = getChartStepNumber(Math.ceil(onceData.yMaxValue - onceData.yMinValue) / thisCount );
+        onceData.yStepValue = getChartStepNumber(Math.ceil( (onceData.yMaxValue - onceData.yMinValue) / thisCount) );
 
         let thisUnit;
         if (percent) {
             thisUnit = "%";
             onceData.yMaxValue = 100;
-            onceData.yStepValue = Math.ceil(100 - onceData.yMinValue ) / onceData.total;
+            onceData.yStepValue = Math.ceil( (100 - onceData.yMinValue) / onceData.total ) ;
         }
         else if (typeof unit == 'object') {
             thisUnit = unit[subDataName] || "";
@@ -240,7 +241,7 @@ export function getMoreYChartData(title, dataMap, percent, unit ) {
         }
         
         onceData.total = getDecimalForN( onceData.total, 1);
-
+        onceData.yMaxValue = Math.ceil(onceData.yMaxValue);
         onceData.yMinValue = getChartMin(onceData.yMinValue);
 
         data.dataList.push(onceData);
@@ -294,7 +295,7 @@ export function getSingleYAndMoreData(title, dataMap, percent, unit) {
     }
 
     data.yMinValue = getChartMin(data.yMinValue);
-
+    data.yMaxValue = Math.ceil(data.yMaxValue);
     data.yStepValue = getChartStepNumber( Math.ceil((data.yMaxValue - data.yMinValue) / maxCount));
 
     return data;