no message

src/biz/qyehPage.ts

@@ -33,8 +33,8 @@ export function getData(req, res) {
     let 一体化新型电力系统DataAndUnit = objKeyReplace(excelData.一体化新型电力系统);
     ret["api7"] =  getKeyValue("一体化新型电力系统", 一体化新型电力系统DataAndUnit.dataMap, 一体化新型电力系统DataAndUnit.unitMap, false, false );
 
-    let 线路负荷率DataAndUnit = objKeyReplace(excelData.线路负荷率);
-    ret["api8"] =  getKeyValue("线路负荷率", 线路负荷率DataAndUnit.dataMap, 线路负荷率DataAndUnit.unitMap, false, false );
+
+    //ret["api8"]
 
     let 企业客户_一码通识_DataAndUnit = objKeyReplace(excelData.企业客户_一码通识_);
     ret["api9"] =  getKeyValue("企业客户“一码通识”", 企业客户_一码通识_DataAndUnit.dataMap, 企业客户_一码通识_DataAndUnit.unitMap, false, false );
@@ -45,14 +45,14 @@ export function getData(req, res) {
     let 针对性供电服务_随码跟进_DataAndUnit = objKeyReplace(excelData.针对性供电服务_随码跟进_);
     ret["api11"] =  getKeyValue("针对性供电服务“_随码跟进”", 针对性供电服务_随码跟进_DataAndUnit.dataMap, 针对性供电服务_随码跟进_DataAndUnit.unitMap, false, false );
 
-    let 营商业务便利性DataAndUnit = objKeyReplace(excelData.营商业务便利性);
-    ret["api12"] =  getKeyValue("营商业务便利性", 营商业务便利性DataAndUnit.dataMap, 营商业务便利性DataAndUnit.unitMap, false, false );
+    // let 营商业务便利性DataAndUnit = objKeyReplace(excelData.营商业务便利性);
+    // ret["api12"] =  getKeyValue("营商业务便利性", 营商业务便利性DataAndUnit.dataMap, 营商业务便利性DataAndUnit.unitMap, false, false );
 
-    let 供电可靠性DataAndUnit = objKeyReplace(excelData.供电可靠性);
-    ret["api13"] =  getKeyValue("供电可靠性", 供电可靠性DataAndUnit.dataMap, 供电可靠性DataAndUnit.unitMap, false, false );
+    // let 供电可靠性DataAndUnit = objKeyReplace(excelData.供电可靠性);
+    // ret["api13"] =  getKeyValue("供电可靠性", 供电可靠性DataAndUnit.dataMap, 供电可靠性DataAndUnit.unitMap, false, false );
 
-    let 营商业务及时性DataAndUnit = objKeyReplace(excelData.营商业务及时性);
-    ret["api14"] =  getKeyValue("营商业务及时性", 营商业务及时性DataAndUnit.dataMap, 营商业务及时性DataAndUnit.unitMap, false, false );
+    // let 营商业务及时性DataAndUnit = objKeyReplace(excelData.营商业务及时性);
+    // ret["api14"] =  getKeyValue("营商业务及时性", 营商业务及时性DataAndUnit.dataMap, 营商业务及时性DataAndUnit.unitMap, false, false );
 
     // let 业务三地对标DataAndUnit = objKeyReplace(excelData.业务三地对标);
     // ret["api15"] =  getKeyValue("业务三地对标", 业务三地对标DataAndUnit.dataMap, 业务三地对标DataAndUnit.unitMap, false, false );
@@ -78,10 +78,10 @@ export function getData(req, res) {
     }
     ret["api20"] = 地图链接数据;
     
-    for (let key in  excelData.营商业务互动性) {
-        excelData.营商业务互动性[key] = "";
-    }
-    ret["api21"] = getKeyValue("营商业务互动性", excelData.营商业务互动性, false, false,false);
+    // for (let key in  excelData.营商业务互动性) {
+    //     excelData.营商业务互动性[key] = "";
+    // }
+    // ret["api21"] = getKeyValue("营商业务互动性", excelData.营商业务互动性, false, false,false);
 
     ret["api22"] = { title:"图片", data:{
         "img1":"img/qyrh1.png",
@@ -93,7 +93,79 @@ export function getData(req, res) {
     ret["api25"] = getListData("停电停役",excelData.调度日志_停电停役, ["序号","区域","工作内容","日期"],{"序号":"number","区域":"area","工作内容":"info","日期":"time"});
     ret["api26"] = getListData("设备缺陷",excelData.调度日志_设备缺陷, ["序号","区域","工作内容","日期"],{"序号":"number","区域":"area","工作内容":"info","日期":"time"});
     ret["api27"] = getListData("事故异常",excelData.调度日志_事故异常, ["序号","区域","工作内容","日期"],{"序号":"number","区域":"area","工作内容":"info","日期":"time"});
-                        
+    
+    ret["api28"] = 特化营商环境("营商环境", "青浦区", excelData.供电可靠性_青浦区, excelData.营商业务便利性_青浦区, excelData.营商业务及时性_青浦区, excelData.营商业务互动性_青浦区);
+    ret["api29"] = 特化营商环境("营商环境", "嘉善县", excelData.供电可靠性_嘉善县, excelData.营商业务便利性_嘉善县, excelData.营商业务及时性_嘉善县, excelData.营商业务互动性_嘉善县);
+    ret["api30"] = 特化营商环境("营商环境", "吴江区", excelData.供电可靠性_吴江区, excelData.营商业务便利性_吴江区, excelData.营商业务及时性_吴江区, excelData.营商业务互动性_吴江区);
+
+    res.send(ret);
+}
+
+function 特化营商环境(title, subTitle, 供电可靠性, 营商业务便利性, 营商业务及时性, 营商业务互动性) {
+    let data:any = {title, subTitle, dataList:[] };
+
+    let 营商业务便利性DataAndUnit = objKeyReplace(营商业务便利性);
+    let ysywblxData = {title:"营商业务便利性", data:[]};
+    for (let key in 营商业务便利性DataAndUnit.dataMap) {
+        
+        ysywblxData.data.push({
+            key,
+            value:营商业务便利性DataAndUnit.dataMap[key],
+            unit:营商业务便利性DataAndUnit.unitMap[key]
+        });
+    }
+    data.dataList.push(ysywblxData);
+
+
+
+    let 供电可靠性DataAndUnit = objKeyReplace(供电可靠性);
+    let gdkkxData = {title:"供电可靠性", data:[]};
+    for (let key in 供电可靠性DataAndUnit.dataMap) {
+        
+        gdkkxData.data.push({
+            key,
+            value:供电可靠性DataAndUnit.dataMap[key],
+            unit:供电可靠性DataAndUnit.unitMap[key]
+        });
+    }
+    data.dataList.push(gdkkxData);
+
+    let 营商业务及时性DataAndUnit = objKeyReplace(营商业务及时性);
+    let ysywjsxData = {title:"营商业务及时性", data:[]};
+    for (let key in 营商业务及时性DataAndUnit.dataMap) {
+        
+        ysywjsxData.data.push({
+            key,
+            value:营商业务及时性DataAndUnit.dataMap[key],
+            unit:营商业务及时性DataAndUnit.unitMap[key]
+        });
+    }
+    data.dataList.push(ysywjsxData);
+
+    let ysywhdx = {title:"营商业务互动性", data:[]};
+    for (let key in  营商业务互动性) {
+        ysywhdx.data.push({key, value:""});
+    }
+    data.dataList.push(ysywhdx);
+
+    return data;
+}
+
+export function get线路负载率(req, res) {
+    let excelData:any = get区域融合();
+
+    let ret = {};
+    let 线路负荷率数据 = {};
+    let 线路负荷率单位 = {};
+    excelData.线路负荷率.forEach(info => {
+        let {max, min, name} = 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] = "%";
+    });
+    ret["api1"] =  getKeyValue("线路负荷率", 线路负荷率数据, 线路负荷率单位, false, false );
 
     res.send(ret);
 }

src/data/analysisExcelData.ts

@@ -269,7 +269,13 @@
         let bolckDataList = getExcelDataBySheetName('其他数据模板.xlsx', '区域融合');
         let result = {};
         let ofMoreObjList = ["各区受理量对比","各区办结量对比","电网作业风险事件"];
-        let ofObjList = ["地图链接", "营商业务互动性", "一体化电网运行管理","一体化新型电力系统","企业客户_一码通识_","用电状态可_分色识别_","针对性供电服务_随码跟进_","营商业务便利性","供电可靠性","营商业务及时性", "嘉善县", "吴江区", "青浦区"];
+        let ofObjList = [
+            "地图链接", "营商业务互动性", "一体化电网运行管理","一体化新型电力系统","企业客户_一码通识_",
+            "用电状态可_分色识别_","针对性供电服务_随码跟进_","营商业务便利性","供电可靠性","营商业务及时性", "嘉善县", "吴江区", "青浦区",
+            "供电可靠性_青浦区","营商业务便利性_青浦区","营商业务及时性_青浦区", "营商业务互动性_青浦区",
+            "供电可靠性_嘉善县", "营商业务便利性_嘉善县", "营商业务及时性_嘉善县", "营商业务互动性_嘉善县",
+            "供电可靠性_吴江区", "营商业务便利性_吴江区", "营商业务及时性_吴江区", "营商业务互动性_吴江区"
+        ];
         let listDataAnalysisInfo = {
             "工程进度":{
                 "titleList":["工程名称","开始时间","预计完成时间","工程进度"],
@@ -302,7 +308,10 @@
                 "titleList":["序号","区域","工作内容","日期"],
                 "keyValueObj":{"序号":"number","区域":"area","工作内容":"info","日期":"time"}
             },
-
+            "线路负荷率":{
+                "titleList":["数据名称","最大值","最小值"],
+                "keyValueObj":{"数据名称":"name","最大值":"max","最小值":"min"}
+            },
         };
         for (let i = 0; i < bolckDataList.length; i++) {
             let {blockData, blockTitle} = bolckDataList[i];

src/routers/router.ts

@@ -34,6 +34,7 @@ export function setRouter(httpServer){
     httpServer.get('/ptjcnlPage', asyncHandler(ptjcnlPageBiz.getData));
     httpServer.get('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
     httpServer.get('/qyehPage', asyncHandler(qyehPageBiz.getData));
+    httpServer.get('/qyehxlfzlPage', asyncHandler(qyehPageBiz.get线路负载率));
     httpServer.get('/zhnyPage', asyncHandler(zhnyPageBiz.getData));
     httpServer.get('/lsdl_cdssPage', asyncHandler(lsdl_cdssPageBiz.getData));
     httpServer.get('/lsdl_qjnygfPage', asyncHandler(lsdl_qjnygfPageBiz.getData));
@@ -43,6 +44,7 @@ export function setRouter(httpServer){
     httpServer.post('/ptjcnlPage', asyncHandler(ptjcnlPageBiz.getData));
     httpServer.post('/sfqztgkPage', asyncHandler(sfqztgkPageBiz.getData));
     httpServer.post('/qyehPage', asyncHandler(qyehPageBiz.getData));
+    httpServer.post('/qyehxlfzlPage', asyncHandler(qyehPageBiz.get线路负载率));
     httpServer.post('/zhnyPage', asyncHandler(zhnyPageBiz.getData));    
     httpServer.post('/zhdy', asyncHandler(zhdyBiz.getData));
     httpServer.post('/zhdyMsgbox1', asyncHandler(zhdyMsgbox1Biz.getData));

src/util/analysisExcel.ts

@@ -2,6 +2,7 @@
 const fs = require('fs');
 const xlsx = require('node-xlsx');
 const path = require('path');
+const moment = require('moment');
 
 /**
  *   getExcelDataBySheetName 将excel文件解析成数据块数据
@@ -56,9 +57,10 @@ export function analysisExcelDataOfObject(dataList, isJumpTitle?, keyInX?) {
     return result;
 }
 
+
 export function analysisExcelDataTime(dataList, isJumpTitle?, keyInX?) {
-    const moment = require('moment');
-    var time=moment(Date.now()).format('HH');//获取当前时间
+    const HOURS = new Date().getHours() + 1;//获取当前时间
+    
     let result = {};
     if (keyInX) {
         let keyList = dataList[0];
@@ -71,8 +73,7 @@ export function analysisExcelDataTime(dataList, isJumpTitle?, keyInX?) {
         }
     } else {
         let y = isJumpTitle ? 1: 0;
-        let timeNum=parseInt(time)+1;
-        for (; y < timeNum; y++) {
+        for (; y <= HOURS; y++) {
             let childList = dataList[y];
             let key = childList[0];
             let value = childList[1] || null;