Merge branch 'master' of http://123.207.147.179:8888/changsanjiao/server

src/biz/zhdy.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, 'inData', false );
     
         res.send(ret);
     }

src/biz/zhdyMsgbox9.ts

@@ -30,7 +30,7 @@
         let 空置用户电量数据DataAndUnit = objKeyReplace(空置用户电量特化基础数据 );
         ret["api3"] =  getKeyValue("空置用户电量数据", 空置用户电量数据DataAndUnit.dataMap, 空置用户电量数据DataAndUnit.unitMap, false, false );
     
-        ret["api4"] = getChartData("每月空置户趋势", excelData.每月空置户趋势, 'inData', false );
+        ret["api4"] = getChartData("青浦区住房空置率趋势", excelData.青浦区住房空置率趋势, 'inData', false );
     
         ret["api5"] = getMoreYChartData("重点区域住房空置率", excelData.重点区域住房空置率, false, {"用户数":"户","空置率":"%"})
     

src/biz/zhnyPage.ts

@@ -7,8 +7,8 @@
 
         let excelData:any = get综合能源();
     
-        let 潜力用户概览DataAndUnit = objKeyReplace(excelData.潜力用户概览);
-        ret["api1"] =  getKeyValue("潜力用户概览", 潜力用户概览DataAndUnit.dataMap, 潜力用户概览DataAndUnit.unitMap, false, false );
+        //let 潜力用户概览DataAndUnit = objKeyReplace(excelData.潜力用户概览);
+        //ret["api1"] =  getKeyValue("潜力用户概览", 潜力用户概览DataAndUnit.dataMap, 潜力用户概览DataAndUnit.unitMap, false, false );
     
         let 综合能源智能匹配DataAndUnit = objKeyReplace(excelData.综合能源智能匹配);
         ret["api2"] =  getKeyValue("综合能源智能匹配", 综合能源智能匹配DataAndUnit.dataMap, 综合能源智能匹配DataAndUnit.unitMap, false, false );

src/data/analysisExcelData.ts

@@ -162,7 +162,7 @@
         let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_住宅空置率');
         let result = {};
         let ofMoreObjList = ["重点区域住房空置率","典型小区住房空置率","重点区域空置户趋势","典型小区空置户趋势"];
-        let ofObjList = ["空置户数据","住房空置率数据","空置用户电量数据","每月空置户趋势"];
+        let ofObjList = ["空置户数据","住房空置率数据","空置用户电量数据","青浦区住房空置率趋势"];
         let listDataAnalysisInfo = {};
         for (let i = 0; i < bolckDataList.length; i++) {
             let {blockData, blockTitle} = bolckDataList[i];