Commit ca2c1763 by lixinming

no message

parent bf381fe1
......@@ -21,7 +21,9 @@
// ret["api4"] = getSingleYAndMoreData("各指数成分趋势分析", excelData.各指数成分趋势分析, false, false);
let 绿电指数折线图保留小数数据 = getDataMapDecimalForN(excelData.绿电指数折线图);
ret["api5"] = getChartData("绿电指数折线图", excelData.绿电指数折线图, false, false );
ret["api5"] = getChartData("绿电指数折线图", 绿电指数折线图保留小数数据, false, false );
ret["api5"].yMinValue = 100;
let 充电设施发展监控DataAndUnit = objKeyReplace(excelData.充电设施发展监控);
ret["api6"] = getKeyValue("充电设施发展监控", 充电设施发展监控DataAndUnit.dataMap, 充电设施发展监控DataAndUnit.unitMap, false, false );
......
......@@ -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 );
......
......@@ -278,16 +278,42 @@
"值班管理":{
"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"}
},
};
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 (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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment