no message

src/biz/lsdl_cdssPage.ts

 
-    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getDropMoreData, getDecimalForN }from "../util/tools";
+    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getDropMoreData, getDecimalForN, getDataMapDecimalForN }from "../util/tools";
     import { get绿色电力_充电设施发展监控 } from "../data/analysisExcelData";
     
     export function getData(req, res) {
@@ -20,6 +20,7 @@
     
         // ret["api4"] = getSingleYAndMoreData("各指数成分趋势分析", excelData.各指数成分趋势分析, false, false);
     
+        let 绿电指数折线图保留小数数据 = getDataMapDecimalForN(excelData.绿电指数折线图);
         ret["api5"] = getChartData("绿电指数折线图", excelData.绿电指数折线图, false, false );
     
         let 充电设施发展监控DataAndUnit = objKeyReplace(excelData.充电设施发展监控);
@@ -32,7 +33,7 @@
     
         // ret["api9"] = getChartData("设施安全服务", excelData.设施安全服务, '%', false );
     
-        let 设施安全服务充电桩使用率DataAndUnit = objKeyReplace(excelData.设施安全服务充电桩使用率);
+        // let 设施安全服务充电桩使用率DataAndUnit = objKeyReplace(excelData.设施安全服务充电桩使用率);
         // ret["api10"] =  getKeyValue("设施安全服务充电桩使用率", 设施安全服务充电桩使用率DataAndUnit.dataMap, '%', false, false );
     
         // ret["api11"] = getSingleYAndMoreData("各指数成分趋势分析", excelData.各指数成分趋势分析, false, false);

src/biz/lsdl_qjnygfPage.ts

@@ -32,7 +32,7 @@
     
         ret["api6"] = getChartData("绿电指数折线图", excelData.绿电指数折线图, false, false );
     
-        ret["api7"] = getSingleYAndMoreData("近12个月用电量分析", excelData.近12个月用电量分析, false, 'kwh');
+        ret["api7"] = getSingleYAndMoreData("近12个月电量分析", excelData.近12个月电量分析, false, 'kwh');
     
         ret["api8"] = getSingleYAndMoreData("各指数成分趋势分析", excelData.各指数成分趋势分析, false, false);
     

src/data/analysisExcelData.ts

@@ -208,7 +208,7 @@
     export function get绿色电力_清洁能源光伏接入情况() {
         let bolckDataList = getExcelDataBySheetName('绿色电力数据模板.xlsx', '绿色电力_清洁能源光伏接入情况');
         let result = {};
-        let ofMoreObjList = ["近12个月用电量分析",  "各指数成分趋势分析"];
+        let ofMoreObjList = ["近12个月电量分析",  "各指数成分趋势分析"];
         let ofObjList = ["当期绿电指数","客户总量","各类污染物减排占比","清洁能源光伏接入情况","分布式光伏客户接入变化趋势","绿电指数折线图"];
         let listDataAnalysisInfo = {
             "当期指数分四象限分析":{"titleList":["指数","线损率", "名称"], "keyValueObj":{"指数":'x',"线损率":'y', "名称":"name"} },

src/util/tools.ts

@@ -409,3 +409,18 @@ export function changeDataName(str) {
     }
     return result;
 }
+
+//数据保留两位小数
+export function getDataMapDecimalForN(dataMap, number?) {
+    let tenCount = number ? number : 2;
+    let result = {};
+    for (let key in dataMap) {
+        let value = dataMap[key];
+        if (typeof value == 'string') {
+            let {data } = separateDataAndUint(value);
+            value = parseFloat(data);
+        }
+        result[key] = getDecimalForN(value, tenCount);
+    }
+    return result;
+}
\ No newline at end of file