no message

src/biz/construct/plannedprogress.ts

@@ -6,28 +6,33 @@
 import { getDqtdTableData, getQqzzTableData, xxjdTableData } from "../../data/table/constructData";
 import { tablePackage } from "../../dataPackage/inFrontOut";
 
+
+function change(titleList, dataList) {
+    let data = [];
+    dataList.forEach(subList => {
+        let onceData:any = {};
+        subList.forEach( (item, index)=> {
+            let key = titleList[index];
+            onceData[key] = item;
+        } );
+        data.push(onceData);
+    });
+    return data;
+}
+
 /**前期管理 */
 export async function getProphase(req, res) {
     let line = req.query.line || "全部";
     let type = req.query.type || "专项规划";
 
-    let excelData = getQqzzTableData();
+    let tableData = getQqzzTableData();
+    let dataList =  tableData["前期管理数据"].bodyList;
 
-    let result:any = {};
+    let data = change(["line","year","a3","a4","a5","a6","a7","a8","a9","a10","a11", 'a12', 'a13', 'a14'], tableData["前期管理数据"].bodyList );
 
-    /**
-     * "线":{
-     *      yearCount:0, 
-     *      data:{
-     *          "单体规划建设方案":{
-     *              plan:0,
-     *              complete:0
-     *          }
-     *         
-     *      } 
-     * }
-     */
-    let dataMap = {"undefined":{
+    /** dataMap结构{ "线":{ yearCount:0, data:{ "单体规划建设方案":{ plan:0, complete:0 } } } } */
+    let dataMap = {};
+    const DefaultData ={
         total:0,
         data:{
             "单体规划建设方案":{plan:0, complete:0},
@@ -35,32 +40,32 @@ export async function getProphase(req, res) {
             "单体建设工程规划许可证":{plan:0, complete:0},
             "单体施工许可证":{plan:0, complete:0}
         }
-    }}; 
+    };
 
-    let conf = {
+    const Conf = {
         "单体规划建设方案":[4,5], 
         "单体建设用地规划许可证":[6,7],
         "单体建设工程规划许可证":[8,9],
         "单体施工许可证":[10,11]
     };
 
-    excelData["前期管理数据"].bodyList.forEach(subList => {
-        let dataLine = subList[0];
-        let dataYear = subList[1];
-        if (!dataMap[dataLine]) dataMap[dataLine] = {data:{} };
+    dataList.forEach(item => {
+        let dataLine = item.line;
+
+        if (!dataMap[dataLine]) dataMap[dataLine] = {data:{}, total:0 };
         dataMap[dataLine]["total"] = subList[2];
 
         
-        for (let name in conf) {
-            let plan = subList[conf[name][0]];
-            let complete = subList[conf[name][1]];
+        for (let name in Conf) {
+            let plan = subList[Conf[name][0]];
+            let complete = subList[Conf[name][1]];
             if (!dataMap[dataLine]["data"][name]) dataMap[dataLine]["data"][name] = {plan:0, complete:0};
             dataMap[dataLine]["data"][name]["plan"] += plan;
             dataMap[dataLine]["data"][name]["complete"] += complete;
         }
-
     });
 
+    let result:any = {};
     result["completionStatus"] = {
         "total":0,
         "complete":0,//完成 
@@ -100,7 +105,7 @@ export async function getProphase(req, res) {
         result["scheduleList"] = scheduleList;
 
     } else {
-        let onceLineData = dataMap[line] || dataMap["undefined"];
+        let onceLineData = dataMap[line] || DefaultData;
         result["completionStatus"].total = onceLineData.total;
         let complete = 0;
         let scheduleList = [];

src/dataPackage/inFrontOut.ts

@@ -153,7 +153,7 @@ export function doubleYBarCharPackage(data, rightNameList, inLeftYUnit, inRightY
 
 /**
  * tablePackage 获得 getTableOut 需要的数据
- * @titleList ["","","",""]
+ * @param titleList ["","","",""]
  * @param data [[a,b,c],[a,b,c],[a,b,c],[a,b,c]]
  * @returns {titleList:[], dataList:[{a,b,c},{a,b,c},{a,b,c}] }
  */