Skip to content

S
server
Commit b78cdcbd by chenjinjing
Options

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

# Conflicts:
#	src/biz/qyehPage.ts
#	src/data/analysisExcelData.ts
parents 634ddf3b 618d40a2
Showing with 99 additions and 38 deletions
src/biz/lsdl_cdssPage.ts
......@@ -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 );
......
src/biz/zhdyMsgbox1.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_城市群协同发展 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -20,6 +20,8 @@
let 嘉善县数据DataAndUnit = objKeyReplace(excelData.嘉善县数据);
ret["api5"] = getKeyValue("嘉善县数据", 嘉善县数据DataAndUnit.dataMap, 嘉善县数据DataAndUnit.unitMap, false, false );
ret["api6"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
src/biz/zhdyMsgbox2.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_规上企业生产运行状况 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -17,6 +17,8 @@
ret["api3"] = getKeyValue("规上企业行业分布概览", 规上企业行业分布概览DataAndUnit.dataMap, 规上企业行业分布概览DataAndUnit.unitMap, false, false );
ret["api4"] = getChartData("生产指数趋势分析", excelData.生产指数趋势分析, false, false );
ret["api5"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
src/biz/zhdyMsgbox3.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_经济景气度 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -17,7 +17,9 @@
ret["api3"] = getKeyValue("行业景气指数", 行业景气度DataAndUnit.dataMap, 行业景气度DataAndUnit.unitMap, false, false );
ret["api4"] = getChartData("经济景气指数趋势分析", excelData.经济景气指数趋势分析, false, false );
ret["api5"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
\ No newline at end of file
src/biz/zhdyMsgbox4.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { get智慧电眼_空壳企业监测 } from "../data/analysisExcelData";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_疑似空壳企业监测 } from "../data/analysisExcelData";
export function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_空壳企业监测();
let excelData:any = get智慧电眼_疑似空壳企业监测();
let 基础数据DataAndUnit = objKeyReplace(excelData.基础数据);
ret["api1"] = getKeyValue("基础数据", 基础数据DataAndUnit.dataMap, 基础数据DataAndUnit.unitMap, false, false );
......@@ -19,6 +19,8 @@
ret["api5"] = getChartData("疑似空壳企业空壳率变化趋势", excelData.疑似空壳企业空壳率变化趋势, '%', false );
ret["api6"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
\ No newline at end of file
src/biz/zhdyMsgbox5.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_企业贷中信用评估 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -20,6 +20,8 @@
let 风险企业DataAndUnit = objKeyReplace(excelData.风险企业);
ret["api5"] = getKeyValue("风险企业", 风险企业DataAndUnit.dataMap, false, false, false );
ret["api6"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
......
src/biz/zhdyMsgbox6.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getDecimalForN }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getDecimalForN, getKeyStringValue }from "../util/tools";
import { get智慧电眼_商圈经济活力 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -23,6 +23,8 @@
ret["api10"] = getSingleYAndMoreData("朱家角古镇消费类型分析", checkNumber(excelData.朱家角古镇消费类型分析), false, false);
ret["api11"] = getSingleYAndMoreData("朱家角古镇节假日活力指数分析", checkNumber(excelData.朱家角古镇节假日活力指数分析), false, false);
ret["api12"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
......
src/biz/zhdyMsgbox7.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getKeyStringValue }from "../util/tools";
import { get智慧电眼_重点污染企业生产 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -27,6 +27,8 @@
let 污染企业生产数据ataAndUnit = objKeyReplace(excelData.污染企业生产数据);
ret["api7"] = getKeyValue("污染企业生产数据", 污染企业生产数据ataAndUnit.dataMap, 污染企业生产数据ataAndUnit.unitMap, false, false );
ret["api8"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
\ No newline at end of file
src/biz/zhdyMsgbox8.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace }from "../util/tools";
import { get智慧电眼_行业集中度 } from "../data/analysisExcelData";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, getKeyStringValue }from "../util/tools";
import { get智慧电眼_行业用电分布 } from "../data/analysisExcelData";
export function getData(req, res) {
let ret:any = {};
let excelData:any = get智慧电眼_行业集中度();
let excelData:any = get智慧电眼_行业用电分布();
let 基础数据DataAndUnit = objKeyReplace(excelData.基础数据);
ret["api1"] = getKeyValue("基础数据", 基础数据DataAndUnit.dataMap, false, false, false );
......@@ -16,6 +16,8 @@
ret["api3"] = getSingleYAndMoreData("三地各行业用电量", excelData.三地各行业用电量, false, false);
ret["api4"] = getSingleYAndMoreData("重点行业集中度年度分析（青浦）", excelData.重点行业集中度年度分析_青浦_, false, false);
ret["api5"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
\ No newline at end of file
src/biz/zhdyMsgbox9.ts
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData }from "../util/tools";
import { getChartData, getKeyValue, getListData, getSingleYAndMoreData, getMoreYChartData, objKeyReplace, analysisAddOrRMData, getKeyStringValue }from "../util/tools";
import { get智慧电眼_住宅空置率 } from "../data/analysisExcelData";
export function getData(req, res) {
......@@ -40,6 +40,7 @@
ret["api8"] = getMoreYChartData("典型小区空置户趋势", excelData.典型小区空置户趋势, false, {"用户数":"户","空置率":"%"})
ret["api9"] = getKeyStringValue("范围数据", excelData.范围数据);
res.send(ret);
}
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
......@@ -25,7 +25,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];
......@@ -42,7 +42,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];
......@@ -59,7 +59,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];
......@@ -72,11 +72,11 @@
return result;
}
export function get智慧电眼_空壳企业监测() {
let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_空壳企业监测');
export function get智慧电眼_疑似空壳企业监测() {
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];
......@@ -93,7 +93,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];
......@@ -111,7 +111,7 @@
let result = {};
let ofMoreObjList = ["进博会核心区消费类型分析","进博会核心区节假日活力指数分析", "青浦重点商圈经济活力变化趋势", "青浦重点商圈经济活力指数",
"赵巷区消费类型分析", "赵巷区节假日活力指数分析", "青浦新城消费类型分析", "青浦新城节假日活力指数分析", "朱家角古镇消费类型分析", "朱家角古镇节假日活力指数分析"];
let ofObjList = ["基础数据"];
let ofObjList = ["基础数据","范围数据"];
let listDataAnalysisInfo = {};
for (let i = 0; i < bolckDataList.length; i++) {
let {blockData, blockTitle} = bolckDataList[i];
......@@ -128,7 +128,7 @@
let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_重点污染企业生产');
let result = {};
let ofMoreObjList = ["各污染类型企业生产指数对比","各行业类型污染企业生产指数对比"];
let ofObjList = ["污染企业数据","污染企业生产数据","各镇生产指数","污染类型","污染企业TOP10"];
let ofObjList = ["范围数据","污染企业数据","污染企业生产数据","各镇生产指数","污染类型","污染企业TOP10"];
let listDataAnalysisInfo = {};
for (let i = 0; i < bolckDataList.length; i++) {
let {blockData, blockTitle} = bolckDataList[i];
......@@ -141,11 +141,11 @@
return result;
}
export function get智慧电眼_行业集中度() {
let bolckDataList = getExcelDataBySheetName('智慧电眼数据模板.xlsx', '智慧电眼_行业集中度');
export function get智慧电眼_行业用电分布() {
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];
......@@ -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];
......@@ -282,19 +282,41 @@
"titleList":["名称", "是否到岗"],
"keyValueObj":{"名称":"name", "是否到岗":"state"}
},
"线路负荷率":{
"titleList":["数据名称", "最大值", "最小值"],
"keyValueObj":{"数据名称":"name", "最大值":"maxVal", "最小值":"minVal"}
}
"调度日志_检修计划":{
"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;
......
src/util/tools.ts
......@@ -150,6 +150,22 @@ export function getKeyValue(title, dataMap, unit, total, percent ) {
return data;
}
export function getKeyStringValue(title, dataMap) {
let data = {
title,
subTitle : title,
total : 0,
list : []
};
for (let key in dataMap) {
data.list.push({
key,
value:dataMap[key]
});
}
return data;
}
function getChartMin(num) {
if (num > 0) return 0;
return Math.floor(num);
......
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