no message

src/biz/lsdl_qjnygfPage.ts

@@ -14,19 +14,25 @@
         let 当期绿电指数DataAndUnit = objKeyReplace(特化数据);
         ret["api1"] =  getKeyValue("当期绿电指数", 当期绿电指数DataAndUnit.dataMap, 当期绿电指数DataAndUnit.unitMap, false, false );
     
-        let 客户总量DataAndUnit = objKeyReplace(excelData.客户总量);
-        ret["api2"] =  getKeyValue("客户总量", 客户总量DataAndUnit.dataMap, 客户总量DataAndUnit.unitMap, false, false );
+        // let 客户总量DataAndUnit = objKeyReplace(excelData.客户总量);
+        // ret["api2"] =  getKeyValue("客户总量", 客户总量DataAndUnit.dataMap, 客户总量DataAndUnit.unitMap, false, false );
     
         let 各类污染物减排占比DataAndUnit = objKeyReplace(excelData.各类污染物减排占比);
         ret["api3"] =  getKeyValue("各类污染物减排占比", 各类污染物减排占比DataAndUnit.dataMap, 各类污染物减排占比DataAndUnit.unitMap, true, false );
     
-        let 清洁能源光伏接入情况DataAndUnit = objKeyReplace(excelData.清洁能源光伏接入情况);
-        let 清洁能源光伏接入情况数据 = {};
-        for (let key in 清洁能源光伏接入情况DataAndUnit.dataMap) {
-            let value = Math.ceil(清洁能源光伏接入情况DataAndUnit.dataMap[key] * 100)/100;
-            清洁能源光伏接入情况数据[key] = value;
-        } 
-        ret["api4"] =  getKeyValue("清洁能源光伏接入情况", 清洁能源光伏接入情况数据, 清洁能源光伏接入情况DataAndUnit.unitMap, false, false );
+        // let 清洁能源光伏接入情况DataAndUnit = objKeyReplace(excelData.清洁能源光伏接入情况);
+        // let 清洁能源光伏接入情况数据 = {};
+        // for (let key in 清洁能源光伏接入情况DataAndUnit.dataMap) {
+        //     let value = Math.ceil(清洁能源光伏接入情况DataAndUnit.dataMap[key] * 100)/100;
+        //     清洁能源光伏接入情况数据[key] = value;
+        // }
+        // getKeyValue("清洁能源光伏接入情况", 清洁能源光伏接入情况数据, 清洁能源光伏接入情况DataAndUnit.unitMap, false, false );
+        const 分布式光伏客户DataAndUnit = objKeyReplace(excelData.分布式光伏客户);
+        const 总发电量DataAndUnit = objKeyReplace(excelData.总发电量);
+        const 装机容量DataAndUnit = objKeyReplace(excelData.装机容量);
+        
+        ret["api4"] = 特化清洁能源接入情况("清洁能源光伏接入情况", 分布式光伏客户DataAndUnit, 总发电量DataAndUnit, 装机容量DataAndUnit );
+        
     
         ret["api5"] = getChartData("分布式光伏客户接入变化趋势", excelData.分布式光伏客户接入变化趋势, '户', false );
     
@@ -39,7 +45,7 @@
         // ret["api9"] = getMoreYChartData("同比趋势分析", excelData.同比趋势分析, false, {"绿电指数":"单位","同比增长":"%"});
     
         // ret["api10"] = getMoreYChartData("环比趋势分析", excelData.环比趋势分析, false, {"绿电指数":"单位","同比增长":"%"});
-       
+
         const 指标数据 = [];
         excelData.当期指数分四象限分析指标.forEach(info => {
             let checkInfo:any = objKeyReplace(info);
@@ -54,9 +60,54 @@
         }
         
         ret["api11"] = getDropMoreData(当期指数分四象限分析数据, "当期指数分四象限分析", "当期指数分四象限分析", 指标数据);
+
+
+        // ret["api12"] = getKeyValue("分布式光伏客户", 分布式光伏客户DataAndUnit.dataMap, 分布式光伏客户DataAndUnit.unitMap, false, false);
+        // ret["api13"] = getKeyValue("总发电量", 总发电量DataAndUnit.dataMap, 总发电量DataAndUnit.unitMap, false, false);
+        // ret["api14"] = getKeyValue("装机容量", 装机容量DataAndUnit.dataMap, 装机容量DataAndUnit.unitMap, false, false);
     
         res.send(ret);
     }
 
+    function 特化清洁能源接入情况(title, 分布式光伏客户DataAndUnit, 总发电量DataAndUnit, 装机容量DataAndUnit,) {
+        let result = {
+            title, 
+            subTitle : title,
+            total : 0,
+            list : []
+        };
+        let 分布式光伏客户Unit = 分布式光伏客户DataAndUnit.unitMap;
+        let 分布式光伏客户Data = 分布式光伏客户DataAndUnit.dataMap;
+        result.list.push({
+            key:"分布式光伏客户", 
+            value:分布式光伏客户Data["分布式光伏客户"], 
+            unit:分布式光伏客户Unit["分布式光伏客户"], 
+            rateName:"非居民占比", 
+            rate:分布式光伏客户Data["非居民占比"]
+        });
+
+        let 总发电量Unit = 总发电量DataAndUnit.unitMap;
+        let 总发电量Data = 总发电量DataAndUnit.dataMap;
+        result.list.push({
+            key:"总发电量", 
+            value:总发电量Data["总发电量"], 
+            unit:总发电量Unit["总发电量"], 
+            rateName:"非居民占比", 
+            rate:总发电量Data["非居民占比"]
+        });
+
+        let 装机容量Unit = 装机容量DataAndUnit.unitMap;
+        let 装机容量Data = 装机容量DataAndUnit.dataMap;
+        result.list.push({
+            key:"装机容量", 
+            value:装机容量Data["装机容量"], 
+            unit:装机容量Unit["装机容量"], 
+            rateName:"非居民占比", 
+            rate:装机容量Data["非居民占比"]
+        });
+
+        return result;
+    }
+
     
     
\ No newline at end of file

src/biz/qyehPage.ts

@@ -18,7 +18,7 @@ export function getData(req, res) {
     // ret["api2"] = getSingleYAndMoreData("各区办结量对比", excelData.各区办结量对比, false, '次');
 
     let 一体化电网运行管理DataAndUnit = objKeyReplace(excelData.一体化电网运行管理);
-    ret["api3"] = getKeyValue("一体化电网运行管理", 一体化电网运行管理DataAndUnit.dataMap, 一体化电网运行管理DataAndUnit.unitMap, false, false );
+    ret["api3"] = getKeyValue("一体化电网运行管理", 一体化电网运行管理DataAndUnit.dataMap, 一体化电网运行管理DataAndUnit.unitMap, true, false );
     ret["api3"].list.forEach(info => {
         info.value = 特化一体化电网运行管理(info.value);
     });
@@ -100,13 +100,13 @@ export function getData(req, res) {
 
 
      let _码上办_实时监测DataAndUnit = objKeyReplace(excelData._码上办_实时监测);
-    ret["api31"] =  getKeyValue("“码上办”实时监测", _码上办_实时监测DataAndUnit.dataMap, _码上办_实时监测DataAndUnit.unitMap, false, false );
+    ret["api31"] =  getKeyValue("“码上办”实时监测", _码上办_实时监测DataAndUnit.dataMap, _码上办_实时监测DataAndUnit.unitMap, true, false );
 
     let _码上办_监测结果DataAndUnit = objKeyReplace(excelData._码上办_监测结果);
-    ret["api32"] =  getKeyValue("“码上办”监测结果", _码上办_监测结果DataAndUnit.dataMap, _码上办_监测结果DataAndUnit.unitMap, false, false );
+    ret["api32"] =  getChartData("“码上办”监测结果", _码上办_监测结果DataAndUnit.dataMap, "户", false );
 
-    let _码上办_经济成效DataAndUnit = objKeyReplace(excelData._码上办_经济成效);
-    ret["api33"] =  getKeyValue("“码上办”经济成效", _码上办_经济成效DataAndUnit.dataMap, _码上办_经济成效DataAndUnit.unitMap, false, false );
+    let _码上办_政策提示DataAndUnit = objKeyReplace(excelData._码上办_政策提示);
+    ret["api33"] =  getKeyValue("“码上办”政策提示", _码上办_政策提示DataAndUnit.dataMap, _码上办_政策提示DataAndUnit.unitMap, false, false );
 
     res.send(ret);
 }
@@ -167,15 +167,27 @@ export function get线路负载率(req, res) {
     let ret = {};
     let 线路负荷率数据 = {};
     let 线路负荷率单位 = {};
+    let 最大额定容量数据 = {};
+    let 最大额度容量单位 = {};
     excelData.线路负荷率.forEach(info => {
-        let {max, min, name} = info;
+        let {max, min, name, maxNum} = info;
         let maxData = parseFloat(max.replace(/[\u4E00-\u9FA5a-zA-Z]+/,""));
         let minData=  parseFloat(min.replace(/[\u4E00-\u9FA5a-zA-Z]+/,""));
         let value =  Math.ceil( ((Math.random() * (maxData - minData) ) + minData ) * 100 ) / 100;
         线路负荷率数据[name] = value;
         线路负荷率单位[name] = "%";
+        let maxNumData = parseFloat(maxNum.replace(/[\u4E00-\u9FA5a-zA-Z]+/,""));
+        最大额定容量数据[name] = maxNumData;
+        最大额度容量单位[name] = 'MW'
     });
-    ret["api1"] =  getKeyValue("线路负荷率", 线路负荷率数据, 线路负荷率单位, false, false );
+    let keyValueData =  getKeyValue("线路负荷率", 线路负荷率数据, 线路负荷率单位, false, false );
+
+    keyValueData.list.forEach( info => {
+        info["max"] = 最大额定容量数据[info.key];
+        info["maxUnit"] = 最大额度容量单位[info.key];
+    });
+    ret["api1"] = keyValueData;
+
 
     res.send(ret);
 }

src/biz/sfqztgkPage.ts

 
-    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getStringMoreData }from "../util/tools";
+    import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getStringMoreData, getKeyStringValue }from "../util/tools";
     import { get示范区总体概况 } from "../data/analysisExcelData";
     
     export function getData(req, res) {
@@ -8,6 +8,7 @@
         let excelData:any = get示范区总体概况();
     
         let 常住人口_万人_DataAndUnit = objKeyReplace(excelData.常住人口_万人_);
+        
         ret["api1"] =  getKeyValue("常住人口（万人）", 常住人口_万人_DataAndUnit.dataMap, 常住人口_万人_DataAndUnit.unitMap, true, false );
     
         let 地区生产总值_亿元_DataAndUnit = objKeyReplace(excelData.地区生产总值_亿元_);
@@ -17,7 +18,17 @@
         ret["api3"] =  getKeyValue("示范区面积（平方公里）", 示范区面积_平方公里_DataAndUnit.dataMap, 示范区面积_平方公里_DataAndUnit.unitMap, true, false );
     
         let 基础数据DataAndUnit = objKeyReplace(excelData.基础数据);
-        ret["api4"] =  getKeyValue("基础数据", 基础数据DataAndUnit.dataMap, 基础数据DataAndUnit.unitMap, false, false );
+        let 特化基础数据Map = {"电力客户数":excelData.电力客户数,
+        "装接容量":excelData.装接容量,
+        "全社会用电量":excelData.全社会用电量,
+        "分布式电源发电量":excelData.分布式电源发电量,
+        "最大负荷":excelData.最大负荷,
+        "电网基建投资":excelData.电网基建投资,
+        "绿电指数":excelData.绿电指数,
+        "碳排放":excelData.碳排放};
+        let 基础键值数据 = getKeyValue("基础数据", 基础数据DataAndUnit.dataMap, 基础数据DataAndUnit.unitMap, false, false );
+        ret["api4"] = 特化基础数据(基础键值数据, 特化基础数据Map);
+       
     
         ret["api5"] = getListData("电力先行成果",excelData.电力先行成果,["时间","内容"],{"时间":"time","内容":"info"});
     
@@ -29,8 +40,30 @@
         for (let key in excelData.先行启动区) {
             先行启动区数据.push(excelData.先行启动区[key]);
         }
+
         ret["api8"] = getStringMoreData("先行启动区", 先行启动区数据);
-    
+
+        ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
+
         res.send(ret);
     }
-    
+    
\ No newline at end of file
+    function 特化基础数据(data, checkMap) {
+        
+        data.list.forEach(info => {
+            let {key} = info;
+
+            let addInfo = checkMap[key];
+            if (addInfo) {
+                let list = [];
+                let {dataMap} = objKeyReplace(addInfo);
+                for (let subKey in dataMap) {
+                    list.push({ key:subKey, value:dataMap[subKey] });
+                }
+                info.list = list;
+
+            }
+
+        });
+        return data;
+    }
\ No newline at end of file

src/biz/sjly.ts

+//数据来源
+
+import { get数据来源 } from "../data/analysisExcelData";
+import { getStringMoreData } from "../util/tools";
+
+export function getData(req, res) {
+    let ret:any = {}; 
+    let excelData:any = get数据来源();
+    
+    ret["api1"] = {title:"数据来源", data:excelData.数据来源}
+    res.send(ret);
+}
\ No newline at end of file

src/biz/zhdyMsgbox1.ts

@@ -14,6 +14,9 @@
         ret["api2"] =  getKeyValue("吴江区数据", 吴江区数据DataAndUnit.dataMap, 吴江区数据DataAndUnit.unitMap, false, false );
     
         ret["api3"] = getChartData("长三角示范区一体化协同发展指数趋势",excelData.长三角示范区一体化协同发展指数趋势, false, false);
+        ret["api3"].yMaxValue = 120;
+        ret["api3"].yStepValue = 5;
+        ret["api3"].yMinValue = 80;
 
         let 青浦区数据DataAndUnit = objKeyReplace(excelData.青浦区数据);
         ret["api4"] =  getKeyValue("青浦区数据", 青浦区数据DataAndUnit.dataMap, 青浦区数据DataAndUnit.unitMap, false, false );

src/biz/zhdyMsgbox2.ts

@@ -14,9 +14,12 @@
         ret["api2"] =  getKeyValue("行业生产指数", 行业生产指数DataAndUnit.dataMap, 行业生产指数DataAndUnit.unitMap, false, false );
     
         let 规上企业行业分布概览DataAndUnit = objKeyReplace(excelData.规上企业行业分布概览);
-        ret["api3"] =  getKeyValue("规上企业行业分布概览", 规上企业行业分布概览DataAndUnit.dataMap, 规上企业行业分布概览DataAndUnit.unitMap, false, false );
+        ret["api3"] =  getKeyValue("规上企业行业分布概览", 规上企业行业分布概览DataAndUnit.dataMap, 规上企业行业分布概览DataAndUnit.unitMap, true, false );
     
         ret["api4"] = getChartData("生产指数趋势分析", excelData.生产指数趋势分析, false, false );
+        ret["api4"].yMinValue = 40;
+        ret["api4"].yMaxValue = 160;
+        ret["api4"].yStepValue = 40;
 
         ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
     

src/biz/zhdyMsgbox3.ts

@@ -17,6 +17,9 @@
         ret["api3"] =  getKeyValue("行业景气指数", 行业景气度DataAndUnit.dataMap, 行业景气度DataAndUnit.unitMap, false, false );
     
         ret["api4"] = getChartData("经济景气指数趋势分析", excelData.经济景气指数趋势分析, false, false );
+        ret["api4"].yMinValue = 40;
+        ret["api4"].yMaxValue = 160;
+        ret["api4"].yStepValue = 40;
         
         ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
 

src/biz/zhdyMsgbox4.ts

@@ -13,14 +13,32 @@
         let 不同容量疑似空壳企业分布DataAndUnit = objKeyReplace(excelData.不同容量疑似空壳企业分布);
         ret["api2"] =  getKeyValue("不同容量疑似空壳企业分布", 不同容量疑似空壳企业分布DataAndUnit.dataMap, 不同容量疑似空壳企业分布DataAndUnit.unitMap, false, false );
     
-        ret["api3"] = getChartData("行业疑似空壳企业分布", excelData.行业疑似空壳企业分布, '户', false );
-    
+
+        let 非房地产 = {};
+        let 房地产占比 = {"非房地产":0, "房地产":0};
+        let 分离数据 = objKeyReplace(excelData.行业疑似空壳企业分布);
+        for (let key in 分离数据.dataMap) {
+            let value = 分离数据.dataMap[key];
+            if (key != "房地产") {
+                非房地产[key] = `${value}${分离数据.unitMap[key] || '' }`;
+                房地产占比["非房地产"] +=  value;
+            } else {
+                房地产占比["房地产"] += value;
+            }
+        }
+        ret["api3"] = getChartData("非房地产", 非房地产, '户', false );
+
         ret["api4"] = getChartData("疑似空壳企业数变化趋势", excelData.疑似空壳企业数变化趋势, '户', false );
     
         ret["api5"] = getChartData("疑似空壳企业空壳率变化趋势", excelData.疑似空壳企业空壳率变化趋势, '%', false );
+
+
+        ret["api6"] = getKeyValue("行业疑似空壳企业分布", 房地产占比, "户", false, false);
     
         ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
 
+
+
         res.send(ret);
     }
     
\ No newline at end of file

src/biz/zhdyMsgbox5.ts

@@ -8,7 +8,7 @@
         let excelData:any = get智慧电眼_企业贷中信用评估();
     
         let 各信用等级企业分布情况DataAndUnit = objKeyReplace(excelData.各信用等级企业分布情况);
-        ret["api1"] =  getKeyValue("各信用等级企业分布情况", 各信用等级企业分布情况DataAndUnit.dataMap, 各信用等级企业分布情况DataAndUnit.unitMap, false, false );
+        ret["api1"] =  getKeyValue("各信用等级企业分布情况", 各信用等级企业分布情况DataAndUnit.dataMap, 各信用等级企业分布情况DataAndUnit.unitMap, true, false );
     
         ret["api2"] = getSingleYAndMoreData("每月企业信用变化趋势", excelData.每月企业信用变化趋势, false, '户');
     
@@ -24,10 +24,3 @@
         
         res.send(ret);
     }
-    
-    function updateName(data) {
-        let result = {};
-        for (let key in data) {
-            
-        }
-    }
\ No newline at end of file

src/biz/zhdyMsgbox8.ts

@@ -10,12 +10,15 @@
         let 基础数据DataAndUnit = objKeyReplace(excelData.基础数据);
         ret["api1"] =  getKeyValue("基础数据", 基础数据DataAndUnit.dataMap, false, false, false );
     
-        let 行业用电分布DataAndUnit = objKeyReplace(excelData.行业用电分布);
-        ret["api2"] =  getKeyValue("行业分布", 行业用电分布DataAndUnit.dataMap, 行业用电分布DataAndUnit.unitMap, false, false );
+        let 示范区行业用电分布DataAndUnit = objKeyReplace(excelData.示范区行业用电分布);
+        ret["api2"] =  getKeyValue("示范区行业用电分布", 示范区行业用电分布DataAndUnit.dataMap, 示范区行业用电分布DataAndUnit.unitMap, true, false );
 
         ret["api3"] =  getSingleYAndMoreData("三地各行业用电量", excelData.三地各行业用电量, false, false);
     
         ret["api4"] = getSingleYAndMoreData("重点行业集中度年度分析（青浦）", excelData.重点行业集中度年度分析_青浦_, false, false);
+        ret["api4"].yMinValue = 40;
+        ret["api4"].yMaxValue = 100;
+        ret["api4"].yStepValue = 20;
 
         ret["apiarea"] = getKeyStringValue("范围数据", excelData.范围数据);
         

src/biz/zhnyPage.ts

@@ -19,11 +19,12 @@
         let 系统效果DataAndUnit = objKeyReplace(excelData.系统效果);
         ret["api4"] =  getKeyValue("系统效果", 系统效果DataAndUnit.dataMap, 系统效果DataAndUnit.unitMap, false, false );
     
-        ret["api5"] = getChartData("储能用户月分析（青浦区）", excelData.储能用户月分析_青浦区_, false, false );
+        //10-27日 晚上十一点 李旭要求加个单位
+        ret["api5"] = getChartData("储能用户月分析（青浦区）", excelData.储能用户月分析_青浦区_, "户", false );
     
-        ret["api6"] = getChartData("储能用户季度分析（青浦区）", excelData.储能用户季度分析_青浦区_, false, false );
+        ret["api6"] = getChartData("储能用户季度分析（青浦区）", excelData.储能用户季度分析_青浦区_,  "户", false );
     
-        ret["api7"] = getChartData("储能用户年分析（青浦区）", excelData.储能用户年分析_青浦区_, false, false );
+        ret["api7"] = getChartData("储能用户年分析（青浦区）", excelData.储能用户年分析_青浦区_,  "户", false );
     
         ret["api8"] = getListData("服务方案热度排名",excelData.服务方案热度排名,["排名","方案名称","热度"],{"排名":"rank","方案名称":"name","热度":"info"});
     
@@ -31,7 +32,8 @@
     
         ret["api10"] = getSingleYAndMoreData("用户类型（青浦区）", excelData.用户类型_青浦区_, false, '户');
     
-        ret["api11"] = getSingleYAndMoreData("行业分类用户（青浦区）", excelData.行业分类用户_青浦区_, false, '户');
+        //10-27日 晚上十一点 李旭要求 行业分类用户（青浦区） 改为 产业类型（青浦区）  excel没有改
+        ret["api11"] = getSingleYAndMoreData("产业类型（青浦区）", excelData.行业分类用户_青浦区_, false, '户');
     
         ret["api12"] = getStringMoreData("综合能源智能匹配文本", excelData.综合能源智能匹配文本);
 
@@ -39,5 +41,16 @@
 
         ret["api14"] = getStringMoreData("系统配置", excelData.系统配置);
 
+            
+        ret["api15"] = { title:"图片", data:["img/zhny1.png","img/zhny2.png","img/zhny3.png"]};
+
+        ret["api16"] = {title:"综合能源图片", data:[
+            "img/zhnxfw.png",
+            "img/dngyfw.png",
+            "img/qjnyfw.png",
+            "img/xxynfw.png",
+            "img/nyjyfw.png",
+        ]};
+
         res.send(ret);
     }

src/data/analysisExcelData.ts

 
-    import * as path from "path";
-    import * as fs from "fs";
-    import { BizError } from "../util/bizError";
-    import { limitEnteNameString, changeDataName } from "../util/tools";
-    import { getExcelDataBySheetName, analysisExcelDataOfObject, analysisExcelDataOfMoreObject, analysisExcelDataOfList, analysisExcelDataOfStringList, analysisExcelDataTime } from "../util/analysisExcel";
-    export function get智慧电眼首页() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼首页');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["基础数据"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+import * as path from "path";
+import * as fs from "fs";
+import { BizError } from "../util/bizError";
+import { limitEnteNameString, changeDataName } from "../util/tools";
+import { getExcelDataBySheetName, analysisExcelDataOfObject, analysisExcelDataOfMoreObject, analysisExcelDataOfList, analysisExcelDataOfStringList, analysisExcelDataTime } from "../util/analysisExcel";
+export function get智慧电眼首页() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼首页');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["基础数据"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_城市群协同发展() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_城市群协同发展');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["基础数据","吴江区数据", "范围数据", "青浦区数据", "嘉善县数据", "长三角示范区一体化协同发展指数趋势"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_城市群协同发展() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_城市群协同发展');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["基础数据","吴江区数据", "范围数据", "青浦区数据", "嘉善县数据", "长三角示范区一体化协同发展指数趋势"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_规上企业生产运行状况() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_规上企业生产运行状况');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["基础数据", "范围数据","行业生产指数","规上企业行业分布概览","生产指数趋势分析"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_规上企业生产运行状况() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_规上企业生产运行状况');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["基础数据", "范围数据","行业生产指数","规上企业行业分布概览","生产指数趋势分析"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_经济景气度() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_经济景气度');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["基础数据", "范围数据","重点区域景气指数_青浦_","行业景气指数","经济景气指数趋势分析"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_经济景气度() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_经济景气度');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["基础数据", "范围数据","重点区域景气指数_青浦_","行业景气指数","经济景气指数趋势分析"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_疑似空壳企业监测() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_疑似空壳企业监测');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["基础数据","范围数据","不同容量疑似空壳企业分布","行业疑似空壳企业分布","疑似空壳企业数变化趋势","疑似空壳企业空壳率变化趋势"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_疑似空壳企业监测() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_疑似空壳企业监测');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["基础数据","范围数据","不同容量疑似空壳企业分布","行业疑似空壳企业分布","疑似空壳企业数变化趋势","疑似空壳企业空壳率变化趋势"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_企业贷中信用评估() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_企业贷中信用评估');
-        let result = {};
-        let ofMoreObjList = ["每月企业信用变化趋势","行业信用分布对比"];
-        let ofObjList = ["各信用等级企业分布情况", "范围数据","优质信用企业","风险企业"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_企业贷中信用评估() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_企业贷中信用评估');
+    let result = {};
+    let ofMoreObjList = ["每月企业信用变化趋势","行业信用分布对比"];
+    let ofObjList = ["各信用等级企业分布情况", "范围数据","优质信用企业","风险企业"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_商圈经济活力() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_商圈经济活力');
-        let result = {};
-        let ofMoreObjList = ["进博会核心区消费类型分析","进博会核心区节假日活力指数分析", "青浦重点商圈经济活力变化趋势", "青浦重点商圈经济活力指数",
-        "赵巷区消费类型分析", "赵巷区节假日活力指数分析", "青浦新城消费类型分析", "青浦新城节假日活力指数分析", "朱家角古镇消费类型分析", "朱家角古镇节假日活力指数分析"];
-        let ofObjList = ["基础数据","范围数据"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_商圈经济活力() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_商圈经济活力');
+    let result = {};
+    let ofMoreObjList = ["进博会核心区消费类型分析","进博会核心区节假日活力指数分析", "青浦重点商圈经济活力变化趋势", "青浦重点商圈经济活力指数",
+    "赵巷区消费类型分析", "赵巷区节假日活力指数分析", "青浦新城消费类型分析", "青浦新城节假日活力指数分析", "朱家角古镇消费类型分析", "朱家角古镇节假日活力指数分析"];
+    let ofObjList = ["基础数据","范围数据"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_重点污染企业生产() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_重点污染企业生产');
-        let result = {};
-        let ofMoreObjList = ["各污染类型企业生产指数对比","各行业类型污染企业生产指数对比"];
-        let ofObjList = ["范围数据","污染企业数据","污染企业生产数据","各镇生产指数","污染类型","污染企业TOP10"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_重点污染企业生产() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_重点污染企业生产');
+    let result = {};
+    let ofMoreObjList = ["各污染类型企业生产指数对比","各行业类型污染企业生产指数对比"];
+    let ofObjList = ["范围数据","污染企业数据","污染企业生产数据","各镇生产指数","污染类型","污染企业TOP10"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_行业用电分布() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_行业用电分布');
-        let result = {};
-        let ofMoreObjList = ["重点行业集中度年度分析_青浦_", "三地各行业用电量"];
-        let ofObjList = ["基础数据","行业用电分布","范围数据"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_行业用电分布() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_行业用电分布');
+    let result = {};
+    let ofMoreObjList = ["重点行业集中度年度分析_青浦_", "三地各行业用电量"];
+    let ofObjList = ["基础数据","示范区行业用电分布","范围数据"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get智慧电眼_住宅空置率() {
-        let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_住宅空置率');
-        let result = {};
-        let ofMoreObjList = ["重点区域住房空置率","典型小区住房空置率","重点区域空置户趋势","典型小区空置户趋势"];
-        let ofObjList = ["空置户数据","住房空置率数据","空置用户电量数据","青浦区住房空置率趋势","范围数据"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    
+    return result;
+}
+export function get智慧电眼_住宅空置率() {
+    let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_住宅空置率');
+    let result = {};
+    let ofMoreObjList = ["重点区域住房空置率","典型小区住房空置率","重点区域空置户趋势","典型小区空置户趋势"];
+    let ofObjList = ["空置户数据","住房空置率数据","空置用户电量数据","青浦区住房空置率趋势","范围数据"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
+    
+    return result;
+}
 
-    //--{"工程进度":{"titleList":["工程名称","开始时间","预计完成时间","工程进度"],"keyValueObj":{"工程名称":"name","开始时间":"startTime","预计完成时间":"endTime","工程进度":"rate"}},"调度日志":{"titleList":["状态","序号","时间","申请人","所属区域","管理单位","业务分类"],"keyValueObj":{"状态":"state","序号":"number","时间":"time","申请人":"name","所属区域":"area","管理单位":"department","业务分类":"type"}}};
-    export function get绿色电力_充电设施发展监控() {
-        let bolckDataList = getExcelDataBySheetName('绿色电力数据模板.xlsx', '绿色电力_充电设施发展监控');
-        let result = {};
-        let ofMoreObjList = ["同比趋势分析","环比趋势分析","各指数成分趋势分析","同比趋势分析","环比趋势分析"];
-        let ofObjList = ["每月服务车次","当期绿电指数","绿电指数折线图","充电设施发展监控","服务车次","设施安全服务","设施安全服务充电桩使用率"];
-        let listDataAnalysisInfo = {
-            "绿电指数与经济指数相关分析_2017_2020_":{"titleList":["指数","金额(亿元)"], "keyValueObj":{"指数":'x',"金额(亿元)":'y'} },
-            "上海市空气质量AQI优良率":{"titleList":["绿电指数","优良率"], "keyValueObj":{"绿电指数":'x',"优良率":'y'} },
-            "青浦区PM2.5月均浓度":{"titleList":["绿电指数","PM2.5浓度"], "keyValueObj":{"绿电指数":'x',"PM2.5浓度":'y'} },
-            "绿电指数与经济指数相关分析均值":{"titleList":["指数","金额(亿元)"], "keyValueObj":{"指数":'x',"金额(亿元)":'y'} },
-            "上海市空气质量AQI优良率均值":{"titleList":["绿电指数","优良率"], "keyValueObj":{"绿电指数":'x',"优良率":'y'} },
-            "青浦区PM2.5月均浓度均值":{"titleList":["绿电指数","PM2.5浓度"], "keyValueObj":{"绿电指数":'x',"PM2.5浓度":'y'} }
-        };
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            if (ofMoreObjList.indexOf(changeName) > -1)  result[changeName] = analysisExcelDataOfMoreObject(blockData, false);
-            if (ofObjList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfObject(blockData, true, false);
-            if (listDataAnalysisInfo[changeName]) {
-                if ("青浦区PM2.5月均浓度" == blockTitle) result["青浦区PM2_5月均浓度"] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
-                if ("青浦区PM2.5月均浓度均值" == blockTitle) result["青浦区PM2_5月均浓度均值"] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
-                else result[changeName] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
-            }
-        }
+//--{"工程进度":{"titleList":["工程名称","开始时间","预计完成时间","工程进度"],"keyValueObj":{"工程名称":"name","开始时间":"startTime","预计完成时间":"endTime","工程进度":"rate"}},"调度日志":{"titleList":["状态","序号","时间","申请人","所属区域","管理单位","业务分类"],"keyValueObj":{"状态":"state","序号":"number","时间":"time","申请人":"name","所属区域":"area","管理单位":"department","业务分类":"type"}}};
+export function get绿色电力_充电设施发展监控() {
+    let bolckDataList = getExcelDataBySheetName('绿色电力数据模板.xlsx', '绿色电力_充电设施发展监控');
+    let result = {};
+    let ofMoreObjList = ["同比趋势分析","环比趋势分析","各指数成分趋势分析","同比趋势分析","环比趋势分析"];
+    let ofObjList = ["每月服务车次","当期绿电指数","绿电指数折线图","充电设施发展监控","服务车次","设施安全服务","设施安全服务充电桩使用率"];
+    let listDataAnalysisInfo = {
+        "绿电指数与经济指数相关分析_2017_2020_":{"titleList":["指数","金额(亿元)"], "keyValueObj":{"指数":'x',"金额(亿元)":'y'} },
+        "上海市空气质量AQI优良率":{"titleList":["绿电指数","优良率"], "keyValueObj":{"绿电指数":'x',"优良率":'y'} },
+        "青浦区PM2.5月均浓度":{"titleList":["绿电指数","PM2.5浓度"], "keyValueObj":{"绿电指数":'x',"PM2.5浓度":'y'} },
+        "绿电指数与经济指数相关分析均值":{"titleList":["指数","金额(亿元)"], "keyValueObj":{"指数":'x',"金额(亿元)":'y'} },
+        "上海市空气质量AQI优良率均值":{"titleList":["绿电指数","优良率"], "keyValueObj":{"绿电指数":'x',"优良率":'y'} },
+        "青浦区PM2.5月均浓度均值":{"titleList":["绿电指数","PM2.5浓度"], "keyValueObj":{"绿电指数":'x',"PM2.5浓度":'y'} }
+    };
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        if (ofMoreObjList.indexOf(changeName) > -1)  result[changeName] = analysisExcelDataOfMoreObject(blockData, false);
+        if (ofObjList.indexOf(changeName) > -1) result[changeName] = analysisExcelDataOfObject(blockData, true, false);
+        if (listDataAnalysisInfo[changeName]) {
+            if ("青浦区PM2.5月均浓度" == blockTitle) result["青浦区PM2_5月均浓度"] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
+            if ("青浦区PM2.5月均浓度均值" == blockTitle) result["青浦区PM2_5月均浓度均值"] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
+            else result[changeName] = analysisExcelDataOfList(blockData, listDataAnalysisInfo[changeName].keyValueObj, false);
+        }
     }
-    export function get绿色电力_清洁能源光伏接入情况() {
-        let bolckDataList = getExcelDataBySheetName('绿色电力数据模板.xlsx', '绿色电力_清洁能源光伏接入情况');
-        let result = {};
-        let ofMoreObjList = ["近12个月电量分析",  "各指数成分趋势分析"];
-        let ofObjList = ["当期绿电指数","客户总量","各类污染物减排占比","清洁能源光伏接入情况","分布式光伏客户接入变化趋势","绿电指数折线图"];
-        let listDataAnalysisInfo = {
-            "当期指数分四象限分析":{"titleList":["指数","线损率", "名称"], "keyValueObj":{"指数":'x',"线损率":'y', "名称":"name"} },
-            "当期指数分四象限分析指标":{"titleList":["指数","线损率"], "keyValueObj":{"指数":'x',"线损率":'y'} },
-        };
+    
+    return result;
+}
+export function get绿色电力_清洁能源光伏接入情况() {
+    let bolckDataList = getExcelDataBySheetName('绿色电力数据模板.xlsx', '绿色电力_清洁能源光伏接入情况');
+    let result = {};
+    let ofMoreObjList = ["近12个月电量分析",  "各指数成分趋势分析"];
+    let ofObjList = ["当期绿电指数","客户总量","各类污染物减排占比","清洁能源光伏接入情况","分布式光伏客户接入变化趋势","绿电指数折线图", "分布式光伏客户", "总发电量", "装机容量"];
+    let listDataAnalysisInfo = {
+        "当期指数分四象限分析":{"titleList":["指数","线损率", "名称"], "keyValueObj":{"指数":'x',"线损率":'y', "名称":"name"} },
+        "当期指数分四象限分析指标":{"titleList":["指数","线损率"], "keyValueObj":{"指数":'x',"线损率":'y'} },
+    };
 
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get平台基础能力() {
-        let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '智慧数据赋能');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["虚拟机资源管理","IT资源管理"];
-        let ofStringList = ["数据服务能力", "数据采集", "数据业务能力图片"];
-        let ofTimeObj=["CPU使用情况"];
-        let listDataAnalysisInfo = {};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-            if (ofTimeObj.indexOf(changeName) > -1) result[changeName] = analysisExcelDataTime(blockData, true, false);
-
-        }
+    
+    return result;
+}
+export function get平台基础能力() {
+    let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '智慧数据赋能');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["虚拟机资源管理","IT资源管理"];
+    let ofStringList = ["数据服务能力", "数据采集", "数据业务能力图片"];
+    let ofTimeObj=["CPU使用情况"];
+    let listDataAnalysisInfo = {};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
+        
+        let changeName = changeDataName(blockTitle);
+        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);
+        if (ofTimeObj.indexOf(changeName) > -1) result[changeName] = analysisExcelDataTime(blockData, true, false);
 
-        return result;
     }
-    export function get示范区总体概况() {
-        let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '示范区总体概况');
-        let result = {};
-        let ofMoreObjList = [];
-        let ofObjList = ["常住人口_万人_","地区生产总值_亿元_","示范区面积_平方公里_","基础数据", "先行启动区"];
-        let listDataAnalysisInfo = {"电力先行成果":{"titleList":["时间","内容"],"keyValueObj":{"时间":"time","内容":"info"}},"一体化大事件":{"titleList":["时间","内容"],"keyValueObj":{"时间":"time","内容":"info"}},"变电站数量":{"titleList":["电站标准","青浦区","吴江区","嘉善县"],"keyValueObj":{"电站标准":"standard","青浦区":"qpq","吴江区":"wjq","嘉善县":"jsq"}}};
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
-        }
+
+    return result;
+}
+export function get示范区总体概况() {
+    let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '示范区总体概况');
+    let result = {};
+    let ofMoreObjList = [];
+    let ofObjList = ["范围数据","常住人口_万人_","地区生产总值_亿元_","示范区面积_平方公里_","基础数据", "先行启动区",  "电力客户数", "装接容量", "全社会用电量", "分布式电源发电量", "最大负荷", "电网基建投资", "碳排放"];
+    let listDataAnalysisInfo = {"电力先行成果":{"titleList":["时间","内容"],"keyValueObj":{"时间":"time","内容":"info"}},"一体化大事件":{"titleList":["时间","内容"],"keyValueObj":{"时间":"time","内容":"info"}},"变电站数量":{"titleList":["电站标准","青浦区","吴江区","嘉善县"],"keyValueObj":{"电站标准":"standard","青浦区":"qpq","吴江区":"wjq","嘉善县":"jsq"}}};
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
+        let changeName = changeDataName(blockTitle);
+        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);
     }
-    export function get区域融合() {
-        let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '区域融合');
-        let result = {};
-        let ofMoreObjList = ["各区受理量对比","各区办结量对比","电网作业风险事件"];
-        let ofObjList = [
-            "地图链接", "营商业务互动性", "一体化电网运行管理","一体化新型电力系统","_码上办_实时监测",
-            "_码上办_监测结果","_码上办_经济成效","营商业务便利性","供电可靠性","营商业务及时性", "嘉善县", "吴江区", "青浦区",
-            "供电可靠性_青浦区","营商业务便利性_青浦区","营商业务及时性_青浦区", "营商业务互动性_青浦区",
-            "供电可靠性_嘉善县", "营商业务便利性_嘉善县", "营商业务及时性_嘉善县", "营商业务互动性_嘉善县",
-            "供电可靠性_吴江区", "营商业务便利性_吴江区", "营商业务及时性_吴江区", "营商业务互动性_吴江区"
-        ];
-        let listDataAnalysisInfo = {
-            "工程进度":{
-                "titleList":["工程名称","开始时间","预计完成时间","工程进度"],
-                "keyValueObj":{"工程名称":"name","开始时间":"startTime","预计完成时间":"endTime","工程进度":"rate"}},
-            "调度日志":{
-                "titleList":["状态","序号","时间","申请人","所属区域","管理单位","业务分类"],
-                "keyValueObj":{"状态":"state","序号":"number","时间":"time","申请人":"name","所属区域":"area","管理单位":"department","业务分类":"type"}
-            },
-            "值班管理":{
-                "titleList":["名称", "是否到岗"],
-                "keyValueObj":{"名称":"name", "是否到岗":"state"}
-            },
-            "调度日志_检修计划":{
-                "titleList":["序号","区域","工作内容","日期"],
-                "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
-            },
-            "调度日志_故障抢修":{
-                "titleList":["序号","区域","工作内容","日期"],
-                "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
-            },
-            "调度日志_停电停役":{
-                "titleList":["序号","区域","工作内容","日期"],
-                "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
-            },
-            "调度日志_设备缺陷":{
-                "titleList":["序号","区域","工作内容","日期"],
-                "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
-            },
-            "调度日志_事故异常":{
-                "titleList":["序号","区域","工作内容","日期"],
-                "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
-            },
-            "线路负荷率":{
-                "titleList":["数据名称","最大值","最小值"],
-                "keyValueObj":{"数据名称":"name","最大值":"max","最小值":"min"}
-            },
-        };
-        for (let i = 0; i < bolckDataList.length; i++) {
-            let {blockData, blockTitle} = bolckDataList[i];
-           
-            let changeName = changeDataName(blockTitle);
-            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[changeName].keyValueObj, false);
-            }
-        }
+    
+    return result;
+}
+export function get区域融合() {
+    let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '区域融合');
+    let result = {};
+    let ofMoreObjList = ["各区受理量对比","各区办结量对比","电网作业风险事件"];
+    let ofObjList = [
+        "地图链接", "营商业务互动性", "一体化电网运行管理","一体化新型电力系统","_码上办_实时监测",
+        "_码上办_监测结果","_码上办_政策提示","营商业务便利性","供电可靠性","营商业务及时性", "嘉善县", "吴江区", "青浦区",
+        "供电可靠性_青浦区","营商业务便利性_青浦区","营商业务及时性_青浦区", "营商业务互动性_青浦区",
+        "供电可靠性_嘉善县", "营商业务便利性_嘉善县", "营商业务及时性_嘉善县", "营商业务互动性_嘉善县",
+        "供电可靠性_吴江区", "营商业务便利性_吴江区", "营商业务及时性_吴江区", "营商业务互动性_吴江区"
+    ];
+    let listDataAnalysisInfo = {
+        "工程进度":{
+            "titleList":["工程名称","开始时间","预计完成时间","工程进度"],
+            "keyValueObj":{"工程名称":"name","开始时间":"startTime","预计完成时间":"endTime","工程进度":"rate"}},
+        "调度日志":{
+            "titleList":["状态","序号","时间","申请人","所属区域","管理单位","业务分类"],
+            "keyValueObj":{"状态":"state","序号":"number","时间":"time","申请人":"name","所属区域":"area","管理单位":"department","业务分类":"type"}
+        },
+        "值班管理":{
+            "titleList":["名称", "是否到岗"],
+            "keyValueObj":{"名称":"name", "是否到岗":"state"}
+        },
+        "调度日志_检修计划":{
+            "titleList":["序号","区域","工作内容","日期"],
+            "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
+        },
+        "调度日志_故障抢修":{
+            "titleList":["序号","区域","工作内容","日期"],
+            "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
+        },
+        "调度日志_停电停役":{
+            "titleList":["序号","区域","工作内容","日期"],
+            "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
+        },
+        "调度日志_设备缺陷":{
+            "titleList":["序号","区域","工作内容","日期"],
+            "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
+        },
+        "调度日志_事故异常":{
+            "titleList":["序号","区域","工作内容","日期"],
+            "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
+        },
+        "线路负荷率":{
+            "titleList":["数据名称","最大值","最小值","最大额定容量"],
+            "keyValueObj":{"数据名称":"name","最大值":"max","最小值":"min","最大额定容量":"maxNum"}
+        },
+    };
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
         
-        return result;
-    }
-    export function get综合能源() {
-        let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '综合能源');
-        let result = {};
-        let ofMoreObjList = ["用户类型_青浦区_","行业分类用户_青浦区_"];
-        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];
-           
-            let changeName = changeDataName(blockTitle);
-            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);
+        let changeName = changeDataName(blockTitle);
+        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[changeName].keyValueObj, false);
+        }
+    }
+    
+    return result;
+}
+export function get综合能源() {
+    let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '综合能源');
+    let result = {};
+    let ofMoreObjList = ["用户类型_青浦区_","行业分类用户_青浦区_"];
+    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];
         
-        return result;
-    }
+        let changeName = changeDataName(blockTitle);
+        if (ofMoreObjList.indexOf(changeName) > -1)  result[changeName] = analysisExcelDataOfMoreObject(blockData, false);
\ No newline at end of file
+        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;
+}
+
+export function get数据来源() {
+    let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '数据来源弹框');
+    let result = {};
+    let ofStringList = ["数据来源"];
+    for (let i = 0; i < bolckDataList.length; i++) {
+        let {blockData, blockTitle} = bolckDataList[i];
+         result[blockTitle] = analysisExcelDataOfStringList(blockData);
+    }
+    
+    return result;
+}
\ No newline at end of file

src/routers/router.ts

@@ -19,6 +19,8 @@ import * as zhnyPageBiz from '../biz/zhnyPage';
 import * as lsdl_cdssPageBiz from '../biz/lsdl_cdssPage';
 import * as lsdl_qjnygfPageBiz from '../biz/lsdl_qjnygfPage';
 
+import * as sjlyBiz from '../biz/sjly'
+
 export function setRouter(httpServer){
         
     httpServer.get('/zhdy', asyncHandler(zhdyBiz.getData));
@@ -38,7 +40,9 @@ export function setRouter(httpServer){
     httpServer.get('/zhnyPage', asyncHandler(zhnyPageBiz.getData));
     httpServer.get('/lsdl_cdssPage', asyncHandler(lsdl_cdssPageBiz.getData));
     httpServer.get('/lsdl_qjnygfPage', asyncHandler(lsdl_qjnygfPageBiz.getData));
+    httpServer.get('/sjly', asyncHandler(sjlyBiz.getData));
         
+    httpServer.post('/sjly', asyncHandler(sjlyBiz.getData));   
     httpServer.post('/lsdl_cdssPage', asyncHandler(lsdl_cdssPageBiz.getData));
     httpServer.post('/lsdl_qjnygfPage', asyncHandler(lsdl_qjnygfPageBiz.getData));
     httpServer.post('/ptjcnlPage', asyncHandler(ptjcnlPageBiz.getData));

src/util/tools.ts

@@ -328,6 +328,12 @@ function getChartStepNumber(number) {
 }
 
 //字符模板
+/**
+ * 
+ * @param title 
+ * @param valueList 
+ * @returns 
+ */
 export function getStringMoreData(title, valueList) {
     let result = { title, data:{} };
     valueList.forEach( (info, index) => {
@@ -440,4 +446,4 @@ export function getDataMapDecimalForN(dataMap, number?) {
         result[key] = getDecimalForN(value, tenCount);
     }
     return result;
-}
+}
\ No newline at end of file