no message

src/biz/zhyy.ts

@@ -5,6 +5,7 @@ import { getZhyy } from '../data/db/zhyy';
 import { zhyyTableData } from '../data/table/zhyyData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
+import { getChart } from '../data/db/out';
 
 /*                            智慧运营                    */
 
@@ -14,107 +15,83 @@ export async function getData(req, res) {
 
     let ret: any = {};
 
-    let yqgkPackageData = keyValuePackage(dbData['园区概况'].dataList);
-    ret['yqgk'] = getKeyValueOut('园区概况', yqgkPackageData);
-
-    let zfqysjPackageData = keyValuePackage(dbData['在孵企业数据'].dataList);
-    ret['zfqysj'] = getKeyValueOut('在孵企业数据', zfqysjPackageData);
-
-    let rzqybhqsPackageData = onceYBarChartPackage(dbData['入驻企业变化趋势'], '', '');
-    ret['rzqybhqs'] = getOnceYBarChartOut('入驻企业变化趋势', rzqybhqsPackageData);
-
-    let rzqyhylxPackageData = keyValuePackage(dbData['入驻企业行业类型'].dataList);
-    ret['rzqyhylx'] = getKeyValueOut('入驻企业行业类型', rzqyhylxPackageData);
-
-    let fhyyPackageData = keyValuePackage(dbData['孵化运营'].dataList);
-    ret['fhyy'] = getKeyValueOut('孵化运营', fhyyPackageData);
-
-    let fhmjbhqsPackageData = onceYBarChartPackage(dbData['孵化面积变化趋势'], '', '');
-    ret['fhmjbhqs'] = getOnceYBarChartOut('孵化面积变化趋势', fhmjbhqsPackageData);
-
-    // let zfqybhqsPackageData = onceYBarChartPackage( excelData['在孵企业变化趋势'], '','');
-    let zfqybhqsPackageData = onceYBarChartPackage(dbData["在孵企业变化趋势"], '', '');
-    ret['zfqybhqs'] = getOnceYBarChartOut('在孵企业变化趋势', zfqybhqsPackageData);
-
-    // let byqybhqsPackageData = onceYBarChartPackage( excelData['毕业企业变化趋势'], '','');
-    let byqybhqsPackageData = onceYBarChartPackage(dbData["毕业企业变化趋势"], '', '');
-    ret['byqybhqs'] = getOnceYBarChartOut('毕业企业变化趋势', byqybhqsPackageData);
-
-    let rzqyPackageData = onceYBarChartPackage(dbData['融资企业变化趋势'], '', '');
-    ret['rzqy'] = getOnceYBarChartOut('融资企业变化趋势', rzqyPackageData);
-
-    let ryzzPackageData = keyValuePackage(dbData['荣誉资质'].dataList);
-    ret['ryzz'] = getKeyValueOut('荣誉资质', ryzzPackageData);
-
-    // let ryzztp = dbData["荣誉资质图片"];
-    // // let ryzztpList = [];
-    // // for (let i = 0; i < ryzztp.length; i++) {
-    // //     ryzztpList.push(`${systemConfig.imgPath}/${ryzztp[i][0]}`);//systemConfig.imgFileUrl = imgFileUrl[0];
-    // // }
-    // ret['ryzztp'] = { title: "荣誉资质图片", dataList: ryzztp };
-
-    let zhyyhzsjPackageData = keyValuePackage(dbData['智慧运营汇总数据'].dataList);
-    ret['zhyyhzsj'] = getKeyValueOut('智慧运营汇总数据', zhyyhzsjPackageData);
-
     let dtTableData = tablePackage(excelData["地图"].headerList[0], excelData["地图"].bodyList);
-    let dt = { dataList: [], titleList: dtTableData.titleList };
+    let dt = {}
+    let dtDetails = 
     dtTableData.dataList.forEach(info => {
-        let { D } = info;
+        let { A, D } = info;
+        let loudongDetails = tablePackage(excelData[A].headerList[0], excelData[A].bodyList);
         let imgUrl = `${systemConfig.imgPath}/${D}`;
         info["D"] = imgUrl;
-        dt.dataList.push(info);
-    })
-    ret['dt'] = getTableOut('地图', dt);
-
-    // let jyfxPackageData = keyValuePackage(excelData['就业分析'].dataList);
-    // ret['jyfx'] = getKeyValueOut('就业分析', jyfxPackageData);
-    let jyfxPackageData = keyValuePackage(dbData['就业分析'].dataList);
-    ret['jyfx'] = getKeyValueOut('就业分析', jyfxPackageData);
-
-    let jdjyrsqsfxPackageData = onceYBarChartPackage(dbData['年度就业人数趋势分析'], '', '');
-    ret['jdjyrsqsfx'] = getOnceYBarChartOut('年度就业人数趋势分析', jdjyrsqsfxPackageData);
-
-    let cygmfxPackageData = keyValuePackage(excelData['产业规模分析'].dataList);
-    ret['cygmfx'] = getKeyValueOut('产业规模分析', cygmfxPackageData);
-
-    let zfqyyszbPackageData = keyValuePackage(dbData['在孵企业营收占比'].dataList);
-    ret['zfqyyszb'] = getKeyValueOut('在孵企业营收占比', zfqyyszbPackageData);
-
-    let qyfwPackageData = keyValuePackage(dbData['企业服务'].dataList);
-    ret['qyfw'] = getKeyValueOut('企业服务', qyfwPackageData);
-
-    let qyfwlxPackageData = keyValuePackage(dbData['企业服务类型'].dataList);
-    ret['qyfwlx'] = getKeyValueOut('企业服务类型', qyfwlxPackageData);
-
-    let fwzlTableData = tablePackage(excelData["服务质量"].headerList[0], excelData["服务质量"].bodyList);//todo111
-    ret['fwzl'] = getTableOut('服务质量', fwzlTableData);
-
-    let yysrqsPackageData = onceYBarChartPackage(excelData['运营收入趋势'], '', '');
-    ret['yysrqs'] = getOnceYBarChartOut('运营收入趋势', yysrqsPackageData);
-
-    let cyzcPackageData = keyValuePackage(excelData['产业政策'].dataList);
-    ret['cyzc'] = getKeyValueOut('产业政策', cyzcPackageData);
-
-    let cyzcxxPackageData = keyValuePackage(excelData['产业政策详细'].dataList);
-    ret['cyzcxx'] = getKeyValueOut('产业政策详细', cyzcxxPackageData);
-
-    let yqhdPackageData = keyValuePackage(excelData['园区活动'].dataList);
-    let yqhd = [];
-    yqhdPackageData.forEach(info => {
-        let { key, value } = info;
-        info.value = `${systemConfig.imgPath}/${value}`;
-        yqhd.push(info);
-    })
-    ret['yqhd'] = getKeyValueOut('园区活动', yqhd);
-
-    let yqxwPackageData = keyValuePackage(excelData['园区新闻'].dataList);
-    let yqxw = [];
-    yqxwPackageData.forEach(info => {
-        let { key, value } = info;
-        info.value = `${systemConfig.imgPath}/${value}`;
-        yqxw.push(info);
-    })
-    ret['yqxw'] = getKeyValueOut('园区新闻', yqxw);
+        if (!dt[A]) dt[A] = {dataList:[], tableData:[]};
+        Object.keys(info).forEach((key, index) => {
+            dt[A].dataList.push({key:dtTableData.titleList[index], value:info[key]});
+        })
+        dt[A].tableData = getTableOut("表格数据", loudongDetails);
+    });
+
+    ret['dt'] = {title:"地图", dataList:dt};
+
+    let fhqgk = keyValuePackage(dbData['孵化器概况']);
+    ret['fhqgk'] = getKeyValueOut('孵化器概况', fhqgk);
+    
+    let zfqymjzb = keyValuePackage(dbData['在孵企业面积占比']);
+    ret['zfqymjzb'] = getKeyValueOut('在孵企业面积占比', zfqymjzb);
+
+    let zfqy = keyValuePackage(dbData['孵化运营'].count);
+    ret['zfqy'] = getKeyValueOut('在孵企业', zfqy);
+
+    let fhyy = keyValuePackage(dbData['孵化运营'].dataList);
+    ret['fhyy'] = getKeyValueOut('孵化运营', fhyy);
+    
+    let byqk = keyValuePackage(dbData['毕业情况']);
+    ret['byqk'] = getKeyValueOut('毕业情况', byqk);
+    
+    let yytg = getChart(dbData['运营推广']);
+    ret['yytg'] = {title:"运营推广", dataList:yytg};
+
+    ret['nrzqy'] = {title:"拟入驻企业", dataList:dbData["拟入驻企业"]};
+
+    let hzsj = keyValuePackage(dbData['汇总数据']);
+    ret['hzsj'] = getKeyValueOut('汇总数据', hzsj);
+    
+    let bnxzjy = keyValuePackage(dbData['本年新增就业']);
+    ret['bnxzjy'] = getKeyValueOut('本年新增就业', bnxzjy);
+    
+    let rfqyjyrsph = keyValuePackage(dbData['入孵企业就业人数排行']);
+    ret['rfqyjyrsph'] = getKeyValueOut('入孵企业就业人数排行', rfqyjyrsph);
+    
+    let xlqkfx = keyValuePackage(dbData['学历情况分析']);
+    ret['xlqkfx'] = getKeyValueOut('学历情况分析', xlqkfx);
+    
+    let byxzgm = keyValuePackage(dbData['本月新增规模']);
+    ret['byxzgm'] = getKeyValueOut('本月新增规模', byxzgm);
+    
+    let rfqyjygmfx = keyValuePackage(dbData['入孵企业经营规模分析']);
+    ret['rfqyjygmfx'] = getKeyValueOut('入孵企业经营规模分析', rfqyjygmfx);
+    
+    let qyfwsq = keyValuePackage(dbData['企业服务申请']);
+    ret['qyfwsq'] = getKeyValueOut('企业服务申请', qyfwsq);
+    
+    let qysqfwlx = keyValuePackage(dbData['企业申请服务类型']);
+    ret['qysqfwlx'] = getKeyValueOut('企业申请服务类型', qysqfwlx);
+    
+    let fhqfwjl = keyValuePackage(dbData['孵化器服务记录']);
+    ret['fhqfwjl'] = getKeyValueOut('孵化器服务记录', fhqfwjl);
+
+    let fwjl = tablePackage(dbData["服务记录"].headerList[0], dbData["服务记录"].bodyList);
+    ret['fwjl'] = getTableOut('服务记录', fwjl);
+    
+    let qymyd = keyValuePackage(dbData['企业满意度']);
+    ret['qymyd'] = getKeyValueOut('企业满意度', qymyd);
+    
+    let fwcg = keyValuePackage(dbData['服务成果']);
+    ret['fwcg'] = getKeyValueOut('服务成果', fwcg);
+    
+    let zcsd = keyValuePackage(dbData['政策速递']);
+    ret['zcsd'] = getKeyValueOut('政策速递', zcsd);
+
+    ret['zcsdxq'] = {title:"政策速递详情", dataList:dbData["政策速递详情"]};
 
     res.send(ret);
 } 
\ No newline at end of file

src/data/table/zhyyData.ts

@@ -25,10 +25,10 @@ export function zhyyTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('yuyiServer.xlsx', '智慧运营');
 
-    let keyValueOrTitleList = ["园区概况","在孵企业数据","入驻企业行业类型","孵化运营","荣誉资质","智慧运营汇总数据","就业分析","产业规模分析","在孵企业营收占比","企业服务","企业服务类型","产业政策","产业政策详细","园区活动","园区新闻"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["入驻企业变化趋势","孵化面积变化趋势","在孵企业变化趋势","毕业企业变化趋势","融资企业变化趋势","季度就业人数趋势分析","运营收入趋势"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["地图","服务质量"];//适配 表格
+    let decollatePlanarList =["地图", "一号楼", "三号楼", "四号楼"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);