投资管控面板

out/routers/router.js

@@ -11,6 +11,10 @@ const dqfxjdBiz = require("../biz/jszhpt/dqfxjd");
 const gcaqztBiz = require("../biz/jszhpt/gcaqzt");
 const xlBiz = require("../biz/jszhpt/xl");
 const jszhptBiz = require("../biz/jszhpt/jszhptdt");
+//投资管控面板
+const gszsBiz = require("../biz/jszhpt/gszs");
+const tkjsBiz = require("../biz/jszhpt/tkjs");
+const jstjBiz = require("../biz/jszhpt/jstj");
 //整体建设概览
 const jsyyBiz = require("../biz/ztjsgl/jsyy");
 const lcbsjBiz = require("../biz/ztjsgl/lcbsj");
@@ -30,6 +34,10 @@ function setRouter(httpServer) {
     httpServer.get('/zmxfxfb', asyncHandler(zmxfxfbBiz.getData)); //致命性风险分布
     httpServer.get('/dqfxjd', asyncHandler(dqfxjdBiz.getData)); //当前风险节点
     httpServer.get('/gcaqzt', asyncHandler(gcaqztBiz.getData)); //工程安全状态
+    //投资管控指标面板
+    httpServer.get('/gszs', asyncHandler(gszsBiz.getData)); //概算总数
+    httpServer.get('/tkjs', asyncHandler(tkjsBiz.getData)); //投控建设
+    httpServer.get('/jstj', asyncHandler(jstjBiz.getData)); //决算统计
     /**
      * 整体建设概览
      */

out/routers/router.js.map

-{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/routers/router.ts"],"names":[],"mappings":";;;AACA,sDAAqD;AACrD,QAAQ;AACR,8CAA8C;AAC9C,8CAA8C;AAC9C,wDAAwD;AACxD,oDAAoD;AACpD,kDAAkD;AAClD,kDAAkD;AAClD,0CAA0C;AAC1C,oDAAoD;AAEpD,QAAQ;AACR,8CAA8C;AAC9C,gDAAgD;AAChD,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAC9C,+CAA+C;AAE/C,SAAgB,SAAS,CAAC,UAAU;IAChC;;OAEG;IACH,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,WAAW;IAC5E,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;IACvD,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;IAC/D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,SAAS;IACtE,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,QAAQ;IACnE,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,QAAQ;IAEnE;;OAEG;IACH,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,YAAY;IACrE,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,OAAO;IAC9D,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;AAEhE,CAAC;AAvBD,8BAuBC"}
\ No newline at end of file
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/routers/router.ts"],"names":[],"mappings":";;;AACA,sDAAqD;AACrD,QAAQ;AACR,8CAA8C;AAC9C,8CAA8C;AAC9C,wDAAwD;AACxD,oDAAoD;AACpD,kDAAkD;AAClD,kDAAkD;AAClD,0CAA0C;AAC1C,oDAAoD;AACpD,QAAQ;AACR,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAE9C,QAAQ;AACR,8CAA8C;AAC9C,gDAAgD;AAChD,8CAA8C;AAC9C,8CAA8C;AAC9C,8CAA8C;AAC9C,+CAA+C;AAE/C,SAAgB,SAAS,CAAC,UAAU;IAChC;;OAEG;IACH,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,WAAW;IAC5E,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;IACvD,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;IAC/D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,SAAS;IACtE,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,QAAQ;IACnE,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,QAAQ;IAEnE,UAAU;IACV,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM;IAC9D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM;IAC9D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM;IAE9D;;OAEG;IACH,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,YAAY;IACrE,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM;IAC7D,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,OAAO;IAC9D,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA,IAAI;AAEhE,CAAC;AA5BD,8BA4BC"}
\ No newline at end of file

src/biz/jszhpt/dqfxjd.ts

@@ -3,7 +3,7 @@
  * 4月12号
  */
 
-import { dqfxjdTableData } from '../../data/table/jszhpt/dqfxjdData';
+import { dqfxjdTableData } from '../../data/table/jszhpt/jszhptdtData';
 import { keyValuePackage, tablePackage } from '../../dataPackage/inFrontOut';
 
 /*当前风险节点*/

src/biz/jszhpt/gcaqzt.ts

@@ -3,7 +3,7 @@
  * 4月12号
  */
 
-import { gcaqztTableData } from '../../data/table/jszhpt/gcaqztData';
+import { gcaqztTableData } from '../../data/table/jszhpt/jszhptdtData';
 import { tablePackage } from '../../dataPackage/inFrontOut';
 
 /*工程安全状态*/

src/biz/jszhpt/gszs.ts

+/**
+ * 建设指挥平台大屏 投资管控指标面板
+ * 5月23号
+ */
+
+import { gszsTableData } from '../../data/table/jszhpt/tzgkData';
+import { keyValuePackage, stringListPackage } from '../../dataPackage/inFrontOut';
+import { getKeyValueOut, getStringOut } from '../../dataPackage/out';
+
+/*概算总数*/
+export function getData(req, res) {
+    let year = req.query.year; //年份
+    let excelData = gszsTableData();
+
+    let ret:any = {};
+
+    let nfPackageData = stringListPackage(excelData['下拉年份'].dataList);
+    ret['nf'] = getStringOut('下拉年份', nfPackageData);
+
+    let index = 1;
+    for (let key in excelData) {
+        if (key.search(year) > -1) { //匹配年份
+            let gszsPackageData = keyValuePackage(excelData[key].dataList);
+            ret["api" + index] = getKeyValueOut(key, gszsPackageData);
+            index++;
+        }
+    }
+                  
+    res.send(ret);
+}
\ No newline at end of file

src/biz/jszhpt/jstj.ts

+/**
+ * 建设指挥平台大屏 投资管控指标面板
+ * 5月23号
+ */
+
+import { jstjTableData } from '../../data/table/jszhpt/tzgkData';
+import { stringListPackage } from '../../dataPackage/inFrontOut';
+import { getStringOut } from '../../dataPackage/out';
+
+/*决算统计*/
+export function getData(req, res) {
+    let year = req.query.year; //年份
+    let line = req.query.line || "全部"; //线路
+    let excelData = jstjTableData();
+
+    let ret:any = {};
+
+    let nfPackageData = stringListPackage(excelData['下拉年份'].dataList);
+    ret['nf'] = getStringOut('下拉年份', nfPackageData);
+   
+    let tkjsExcelData = {};
+    let index = 1;
+    for (let key in excelData) {
+        if (key.search(year) > -1) { //匹配年份
+            let lineData = excelData[key];
+            lineData.forEach( info => {
+                let {name, data} = info;
+                if (name == line) { //判断线路
+                    tkjsExcelData = info;
+                }
+            })
+            
+            ret["api" + index] = tkjsExcelData;
+            index++;
+        }
+    }
+                    
+    res.send(ret);
+}
+ 
\ No newline at end of file

src/biz/jszhpt/lcbjdwcqk.ts

@@ -3,7 +3,7 @@
  * 4月11号
  */
 
-import { lcbjdwcqkTableData } from '../../data/table/jszhpt/lcbjdwcqkData';
+import { lcbjdwcqkTableData } from '../../data/table/jszhpt/jhjdData';
 import { tablePackage } from '../../dataPackage/inFrontOut';
 import { getTableOut } from '../../dataPackage/out';
 

src/biz/jszhpt/tkjs.ts

+/**
+ * 建设指挥平台大屏 投资管控指标面板
+ * 5月23号
+ */
+
+import { tkjsTableData } from '../../data/table/jszhpt/tzgkData';
+import { onceYBarChartPackage, stringListPackage } from '../../dataPackage/inFrontOut';
+import { getOnceYBarChartOut, getStringOut } from '../../dataPackage/out';
+
+/*投控建设*/
+export function getData(req, res) {
+    let year = req.query.year; //年份
+    let excelData = tkjsTableData();
+
+    let ret:any = {};
+
+    let nfPackageData = stringListPackage(excelData['下拉年份'].dataList);
+    ret['nf'] = getStringOut('下拉年份', nfPackageData);
+    let index = 1;
+    for (let key in excelData) {
+        if (key.search(year) > -1) { //匹配年份
+            let tkjsPackageData = onceYBarChartPackage( excelData[key], '','');
+            ret["api" + index] = getOnceYBarChartOut(key, tkjsPackageData);
+            index ++;
+        }
+    }
+                    
+    res.send(ret);
+}

src/biz/jszhpt/xl.ts

 
-import { xlTableData } from '../../data/table/jszhpt/xlData';
-import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut, getStringOut } from '../../dataPackage/out';
+import { xlTableData } from '../../data/table/jszhpt/jszhptdtData';
+import { getStringOut } from '../../dataPackage/out';
 
-/*线路*/
+/**下拉框线路 */
 
 export function getData(req, res) {
     let excelData = xlTableData();

src/biz/jszhpt/xxjd.ts

@@ -3,7 +3,7 @@
  * 4月12号
  */
 
-import { xxjdTableData } from '../../data/table/jszhpt/xxjdData';
+import { xxjdTableData } from '../../data/table/jszhpt/jhjdData';
 import { tablePackage } from '../../dataPackage/inFrontOut';
 
 /*形象进度*/

src/biz/jszhpt/zmxfxfb.ts

@@ -3,7 +3,7 @@
  * 4月12号
  */
 
-import { zmxfxfbTableData } from '../../data/table/jszhpt/zmxfxfbData';
+import { zmxfxfbTableData } from '../../data/table/jszhpt/jszhptdtData';
 import { tablePackage } from '../../dataPackage/inFrontOut';
 import { getOnceYBarChartOut } from '../../dataPackage/out';
 

src/data/table/jszhpt/dqfxjdData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function dqfxjdTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '当前风险节点');
-
-    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["当前风险指数","风险节点数据"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result; 
-}
\ No newline at end of file

src/data/table/jszhpt/gcaqztData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function gcaqztTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '工程安全状态');
-
-    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["风险期数量", "工程安全状态详细数据"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;  
-}
\ No newline at end of file

src/data/table/jszhpt/jhjdData.ts

@@ -33,4 +33,33 @@ export function qqglTableData() {
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;     
+}
+
+export function xxjdTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('计划进度面板.xlsx', '形象进度');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["形象进度数据","形象进度详细数据","车站详细数据","旁通道详细数据","盾构机详细数据"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+}
+
+export function lcbjdwcqkTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('计划进度面板.xlsx', '里程碑节点完成情况');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["里程碑节点完成情况"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+     
 }
\ No newline at end of file

src/data/table/jszhpt/jszhptdtData.ts

@@ -21,6 +21,48 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
     return result;
 }
 
+export function zmxfxfbTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '致命性风险分布');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["致命性风险分布"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;   
+}
+
+export function dqfxjdTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '当前风险节点');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["当前风险指数","风险节点数据"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result; 
+}
+
+export function gcaqztTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '工程安全状态');
+
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["风险期数量", "工程安全状态详细数据"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;  
+}
+
 export function jszhptdtTableData() {
     let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '地图');
 
@@ -32,6 +74,19 @@ export function jszhptdtTableData() {
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
+   
+}
+
+export function xlTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '线路');
+
+    let keyValueOrTitleList = ["选择线路"];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
 
-        
 }
\ No newline at end of file

src/data/table/jszhpt/lcbjdwcqkData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function lcbjdwcqkTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '里程碑节点完成情况');
-
-    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["里程碑节点完成情况"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;
-
-        
-}
\ No newline at end of file

src/data/table/jszhpt/xlData.ts → src/data/table/jszhpt/tzgkData.ts

@@ -21,17 +21,45 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
     return result;
 }
 
-export function xlTableData() {
-    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '线路');
+export function gszsTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('投资管控面板.xlsx', '概算总数');
 
-    let keyValueOrTitleList = ["选择线路"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = ["下拉年份", "2021总线路", "2022总线路", "2023总线路", "2021各线路概算金额", "2022各线路概算金额", "2023各线路概算金额"];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList =[];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;     
+}
+
+export function tkjsTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('投资管控面板.xlsx', '投控建设');
+
+    let keyValueOrTitleList = ["下拉年份"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["2021投控建设", "2022投控建设"]; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
+}
+
+export function jstjTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('投资管控面板.xlsx', '决算统计');
+
+    let keyValueOrTitleList = ["下拉年份"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["2021合同数据", "2022合同数据", "2021合同决算统计", "2022合同决算统计", "2021业务系统数", "2022业务系统数"]; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
 
-        
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
+     
 }
\ No newline at end of file

src/data/table/jszhpt/xxjdData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-// export function xxjdTableData() {
-    
-//     let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '形象进度');
-
-//     let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-//     let barChartList = []; //适配 柱状图 折线图 
-//     let stringList = [];
-//     let decollatePlanarList =["形象进度数据","形象进度详细数据"];//适配 表格
-//     let titltListConfig = {};
-
-//     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-//     return result;
-// }
-
-export function xxjdTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('计划进度面板.xlsx', '形象进度');
-
-    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["形象进度数据","形象进度详细数据","车站详细数据","旁通道详细数据","盾构机详细数据"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;
-}
\ No newline at end of file

src/data/table/jszhpt/zmxfxfbData.ts

-
-import { planarArrDecollateForIndex, planarArrDeconstruct, planarArrForObjectList } from "../../../dataPackage/planaryArrayAnalysis";
-import { onceSheetBecomeOfblockData } from "../../../util/analysisExcel";
-
-function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList) {
-    let result = {};
-
-    for (let i = 0; i < blockDataList.length; i++) {
-        let {blockData, blockTitle} = blockDataList[i];
-        if (keyValueOrTitleList.indexOf(blockTitle) > -1) {
-            let titleList = titltListConfig[blockTitle] || [];
-            result[blockTitle] = planarArrForObjectList(blockData, 0, titleList);
-        }
-        else if (barChartList.indexOf(blockTitle) > -1) {
-            result[blockTitle] = planarArrDeconstruct(blockData);
-        }
-        else if (stringList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrForObjectList(blockData);
-        else if (decollatePlanarList.indexOf(blockTitle) > -1) result[blockTitle] = planarArrDecollateForIndex(blockData);
-    }
-
-    return result;
-}
-
-export function zmxfxfbTableData() {
-    
-    let blockDataList = onceSheetBecomeOfblockData('建设指挥平台.xlsx', '致命性风险分布');
-
-    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
-    let barChartList = []; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["致命性风险分布"];//适配 表格
-    let titltListConfig = {};
-
-    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
-    return result;   
-}
\ No newline at end of file

src/routers/router.ts

@@ -9,6 +9,10 @@ import * as dqfxjdBiz from '../biz/jszhpt/dqfxjd';
 import * as gcaqztBiz from '../biz/jszhpt/gcaqzt';
 import * as xlBiz from '../biz/jszhpt/xl';
 import * as jszhptBiz from '../biz/jszhpt/jszhptdt';
+//投资管控面板
+import * as gszsBiz from '../biz/jszhpt/gszs';
+import * as tkjsBiz from '../biz/jszhpt/tkjs';
+import * as jstjBiz from '../biz/jszhpt/jstj';
 
 //整体建设概览
 import * as jsyyBiz from '../biz/ztjsgl/jsyy';
@@ -31,6 +35,11 @@ export function setRouter(httpServer){
     httpServer.get('/dqfxjd', asyncHandler(dqfxjdBiz.getData));//当前风险节点
     httpServer.get('/gcaqzt', asyncHandler(gcaqztBiz.getData));//工程安全状态
 
+    //投资管控指标面板
+    httpServer.get('/gszs', asyncHandler(gszsBiz.getData)); //概算总数
+    httpServer.get('/tkjs', asyncHandler(tkjsBiz.getData)); //投控建设
+    httpServer.get('/jstj', asyncHandler(jstjBiz.getData)); //决算统计
+
     /**
      * 整体建设概览
      */