no message

src/biz/lsdl_cdssPage.ts

 
-    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getDropMoreData }from "../util/tools";
+    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getDropMoreData, getDecimalForN }from "../util/tools";
     import { get绿色电力_充电设施发展监控 } from "../data/analysisExcelData";
     
     export function getData(req, res) {
@@ -14,9 +14,9 @@
         let 当期绿电指数DataAndUnit = objKeyReplace(特化数据);
         ret["api1"] =  getKeyValue("当期绿电指数", 当期绿电指数DataAndUnit.dataMap, 当期绿电指数DataAndUnit.unitMap, false, false );
         
-        ret["api2"] = getMoreYChartData("同比趋势分析", excelData.同比趋势分析, false, {"绿电指数":"单位","同比增长":"%"})
+        ret["api2"] = getMoreYChartData("同比趋势分析", checkNumber(excelData.同比趋势分析), false, {"绿电指数":"单位","同比增长":"%"})
     
-        ret["api3"] = getMoreYChartData("环比趋势分析", excelData.环比趋势分析, false, {"绿电指数":"单位","同比增长":"%"})
+        ret["api3"] = getMoreYChartData("环比趋势分析", checkNumber(excelData.环比趋势分析), false, {"绿电指数":"单位","同比增长":"%"})
     
         // ret["api4"] = getSingleYAndMoreData("各指数成分趋势分析", excelData.各指数成分趋势分析, false, false);
     
@@ -52,3 +52,18 @@
         res.send(ret);
     }
     
+    //特化  小数保留两位
+    function checkNumber(data) {
+        let result = {};
+
+        for (let key in data) {
+            result[key] = {};
+            let info = data[key];
+            for (let subKey in info) {
+                let value = info[subKey] ? getDecimalForN(parseFloat(info[subKey]), 2) : 0;
+                result[key][subKey] = value;
+            }
+        }
+
+        return result;
+    }
\ No newline at end of file

src/biz/lsdl_qjnygfPage.ts

@@ -34,14 +34,24 @@
         // ret["api9"] = getMoreYChartData("同比趋势分析", excelData.同比趋势分析, false, {"绿电指数":"单位","同比增长":"%"});
     
         // ret["api10"] = getMoreYChartData("环比趋势分析", excelData.环比趋势分析, false, {"绿电指数":"单位","同比增长":"%"});
+       
         const 指标数据 = [];
         excelData.当期指数分四象限分析指标.forEach(info => {
             let checkInfo:any = objKeyReplace(info);
             指标数据.push(checkInfo.dataMap.x, checkInfo.dataMap.y);
         });
 
-        ret["api11"]  = getDropMoreData(excelData.当期指数分四象限分析, "当期指数分四象限分析", "当期指数分四象限分析",指标数据);
+        let 当期指数分四象限分析数据 = [];
+        for (let key in excelData.当期指数分四象限分析) {
+            let {x, y, name} = excelData.当期指数分四象限分析[key];
+            let info = {x, y:Math.floor(parseFloat(y) * 10000 )/100 , name};
+            当期指数分四象限分析数据.push(info);
+        }
+        
+        ret["api11"] = getDropMoreData(当期指数分四象限分析数据, "当期指数分四象限分析", "当期指数分四象限分析", 指标数据);
     
         res.send(ret);
     }
 
+    
+    
\ No newline at end of file

src/biz/zhdyMsgbox8.ts

@@ -19,4 +19,3 @@
     
         res.send(ret);
     }
\ No newline at end of file
-    
\ No newline at end of file

src/biz/zhnyPage.ts

@@ -33,16 +33,11 @@
     
         ret["api11"] = getSingleYAndMoreData("行业分类用户（青浦区）", excelData.行业分类用户_青浦区_, false, '户');
     
-        //todo 以下数据要加入到表格中 怎么加入有待商议
-        const 地图文字 = ["综合能效服务", "多能供应服务", "清洁能源服务", "新兴用能服务", "智慧用能服务", "能源交易服务"];
-        ret["api12"] = getStringMoreData("综合能源智能匹配", 地图文字);
+        ret["api12"] = getStringMoreData("综合能源智能匹配", excelData.综合能源智能匹配);
 
-        const 青浦区综合能效服务项目案例字符 = ["这里放青浦区综合能效服务项目的案例介绍以及系統配置和系統成果，这星放青浦区综合能效服务项目的案例介绍以及系统配置和系統成果，这里放青浦区综合能效服务项目的案例介紹以及系統配置和系統成果。"];
-        ret["api13"] = getStringMoreData("青浦区综合能效服务项目案例", 青浦区综合能效服务项目案例字符);
+        ret["api13"] = getStringMoreData("青浦区综合能效服务项目案例", excelData.青浦区综合能效服务项目案例);
 
-        const 系统配置 = ["电力系统", "采暖系统", "制冷系统"];
-        ret["api14"] = getStringMoreData("系统配置", 系统配置);
+        ret["api14"] = getStringMoreData("系统配置", excelData.系统配置);
 
         res.send(ret);
     }
\ No newline at end of file
-     
\ No newline at end of file

src/data/analysisExcelData.ts

@@ -296,8 +296,9 @@
         let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '综合能源');
         let result = {};
         let ofMoreObjList = ["用户类型_青浦区_","行业分类用户_青浦区_"];
-        let ofObjList = ["青浦区综合能效服务项目案例字符","潜力用户概览","综合能源智能匹配","项目覆盖范围","系统效果","储能用户月分析_青浦区_","储能用户季度分析_青浦区_","储能用户年分析_青浦区_"];
+        let ofObjList = ["潜力用户概览","综合能源智能匹配","项目覆盖范围","系统效果","储能用户月分析_青浦区_","储能用户季度分析_青浦区_","储能用户年分析_青浦区_"];
         let listDataAnalysisInfo = {"服务方案热度排名":{"titleList":["排名","方案名称","热度"],"keyValueObj":{"排名":"rank","方案名称":"name","热度":"info"}},"服务方案收益排名":{"titleList":["排名","方案名称","收益"],"keyValueObj":{"排名":"rank","方案名称":"name","收益":"info"}}};
+        let ofStringList = ["青浦区综合能效服务项目案例", "综合能源智能匹配", "系统配置"];
         for (let i = 0; i < bolckDataList.length; i++) {
             let {blockData, blockTitle} = bolckDataList[i];
            
@@ -305,6 +306,7 @@
             if (ofMoreObjList.indexOf(changeName) > -1)  result[changeName] = analysisExcelDataOfMoreObject(blockData, false);
             if (ofObjList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfObject(blockData, true, false);
             if (listDataAnalysisInfo[changeName]) result[changeName] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[blockTitle].keyValueObj, false);
+            if (ofStringList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfStringList(blockData);
         }
         
         return result;

src/util/tools.ts

@@ -308,9 +308,9 @@ export function getDropMoreData(dataList, title, subTitle, cutApartXAndY?) {
 
     dataList.forEach(info => {
         let {x, y} = info;
-        let thisDropXInfo = separateDataAndUint(x);
+        let thisDropXInfo = separateDataAndUint(`${x}`);
         let thisDropX = parseFloat(thisDropXInfo.data);
-        let thisDropYInfo = separateDataAndUint(y);
+        let thisDropYInfo = separateDataAndUint(`${y}`);
         let thisDropY = parseFloat(thisDropYInfo.data);
 
         data.xMax = Math.max(thisDropX, data.xMax);