Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiViewServer

# Conflicts:
#	src/routers/router.ts

src/biz/jxgljsc.ts

@@ -10,14 +10,13 @@ export function getData(req, res) {
 
     let ret:any = {};
 
-    
-
     let zfqymjqkfxPackageData = keyValuePackage(excelData['在孵企业面积情况分析'].dataList);
     ret['zfqymjqkfx'] = getKeyValueOut('在孵企业面积情况分析', zfqymjqkfxPackageData);
           
     let zfqymjbhqsPackageData = onceYBarChartPackage( excelData['在孵企业面积变化趋势'], '','');
     ret['zfqymjbhqs'] = getOnceYBarChartOut('在孵企业面积变化趋势', zfqymjbhqsPackageData);
     
+                    
     let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
     ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
                     

src/biz/qyfw.ts

@@ -7,7 +7,7 @@ import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut
 /*                            企业服务                    */
 
 export async function getData(req, res) {
-    let dbData = await getEnterprise();
+    // let dbData = await getEnterprise();
     let excelData = qyfwTableData();
 
     let ret:any = {};
@@ -34,6 +34,13 @@ export async function getData(req, res) {
     ret['qyxqdt'] = getKeyValueOut('企业需求动态', qyxqdtPackageData);
                     
     let qyxqdtxxTableData = tablePackage(excelData["企业需求动态详细"].headerList[0], excelData["企业需求动态详细"].bodyList);
+    
+    let itemDataList = []
+    qyxqdtxxTableData.dataList.forEach(info => {
+        info.eId = "xxxx";
+        itemDataList.push(info);
+    });
+    qyxqdtxxTableData.dataList = itemDataList;
     ret['qyxqdtxx'] = getTableOut( '企业需求动态详细', qyxqdtxxTableData);
                     
     let dtTableData = tablePackage(excelData["地图"].headerList[0], excelData["地图"].bodyList);

src/routers/router.ts

@@ -21,16 +21,5 @@ export function setRouter(httpServer){
         
     httpServer.post('/yuyi/viewserver/zhyy', asyncHandler(zhyyBiz.getData));
     
-            
-    //======get
-    6
-    httpServer.get('/yuyi/viewserver/qyszhx', asyncHandler(wmkqyszhxBiz.getData));
-        
-    httpServer.get('/yuyi/viewserver/jxgljsc', asyncHandler(jxgljscBiz.getData));
-        
-    httpServer.get('/yuyi/viewserver/qyfw', asyncHandler(qyfwBiz.getData));
-        
-    httpServer.get('/yuyi/viewserver/zhyy', asyncHandler(zhyyBiz.getData));
-        
 }
     
\ No newline at end of file