no message

package.json

 {
-  "name": "gameserver",
+  "name": "gaoqiao",
   "version": "1.0.0",
   "description": "",
   "main": "main.ts",
@@ -7,7 +7,7 @@
     "@alicloud/sms-sdk": "^1.1.6",
     "@types/node": "^10.12.18",
     "compression": "^1.7.4",
-    "express": "^4.17.1",
+    "express": "^4.18.2",
     "express-async-handler": "^1.1.4",
     "express-history-api-fallback": "^2.2.1",
     "formidable": "^1.2.1",
@@ -17,6 +17,7 @@
     "mongoose": "^6.2.3",
     "node-xlsx": "^0.16.1",
     "nodemailer": "^6.1.1",
+    "pkg": "^5.8.0",
     "pyfl": "^1.1.4",
     "request": "^2.88.0",
     "svg-captcha": "^1.3.12",
@@ -27,5 +28,15 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "bin": "./out/main.js",
+  "pkg": {
+    "scripts": "out/**/*.js",
+    "assets": [
+      "public/**/*",
+      "res/**/*",
+      "images/**/*"
+    ],
+    "outputPath": "dist"
+  }
 }

res/users

+~'pv`wIlvq'?^~'ijblkLa'?'dahlk')'ura'?'dahlk')'qjn`k'?'<5=`dd<32==2<c13465422g1g=57=g33'x)~'ijblkLa'?'p4')'ura'?'476')'qjn`k'?'=1<`a652=3647f`70737a77gf2`c`03d'xXx
\ No newline at end of file

serverConfig.xml

 <config>
-    <port>9097</port>
+    <port>9098</port>
 </config>
\ No newline at end of file

src/biz/admin.ts

+import { getUserConfig, updateUserConfFile } from "../config/users";
+import crypto = require('crypto');
+import fs = require('fs');
+import path = require('path');
+
+//登录
+export async function login(req, res) {
+    let {loginId, pwd} = req.body;
+
+    let userConf = getUserConfig(loginId);
+    if (!userConf || userConf.pwd != pwd) {
+        res.send({msg:"账号或密码错误"});
+        return;
+    }
+
+    userConf.token = createToken(loginId, pwd);
+
+    updateUserConfFile();
+
+    res.send({token:userConf.token});
+}
+
+
+function createToken(loginId, pwd) {
+    return crypto.createHash('md5').update(loginId+pwd+Math.random()+Date.now()).digest("hex")
+}

src/biz/cjw.ts

-import { get村居委弹窗 } from "../data/table/jcsjData";
-import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
-import { getKeyValueOut, getStringOut, getTableOut } from "../dataPackage/out";
+import { cjwPopTableData, cjwTableData } from "../data/table/jcsjData";
+import { cjwExcelData, popExcelData } from "../main";
 
+// 村居委
 export function getData(req, res) {
+    // let popExcelData = cjwPopTableData();
+    // let cjwExcelData = cjwTableData();
     let name = req.query.name;
-    let excelData = get村居委弹窗(name);
-
-    let ret:any = {};
     
-    let fcsjPackageData = keyValuePackage(excelData['浮窗数据'].dataList);
-    ret['fcsj'] = getKeyValueOut('浮窗数据', fcsjPackageData);
+    let ret:any = {};
 
-    let jbxxDataList = keyValuePackage(excelData['基本信息'].dataList);
-    let imgPackageData = [];
-    let jbxxPackageData = [];
-    jbxxDataList.forEach (info => {
-        let {key, value, unit} = info;
-        if (key == "图片") imgPackageData.push(info);
-        else jbxxPackageData.push(info);
-    })
+    let cjwPopBodyList = popExcelData['村居委详细数据'].bodyList;
+    let cjwPopHeaderList = popExcelData['村居委详细数据'].headerList[0];
 
-    ret['tp'] = getStringOut('图片', imgPackageData);
-    ret['jbxx'] = getKeyValueOut('基本信息', jbxxPackageData);
+    let cjwPopDataList = [];
+    for (let i = 0; i < cjwPopBodyList.length; i++) {
+        let a = {};
+        for (let x = 0; x < cjwPopBodyList[i].length; x++) {
+            a[cjwPopHeaderList[x]] = cjwPopBodyList[i][x];
+        }
+        cjwPopDataList.push(a);
+    }
 
-    let fwzyPackageData = keyValuePackage(excelData['服务资源'].dataList);
-    ret['fwzy'] = getKeyValueOut('服务资源', fwzyPackageData);
+    for (let i = 0; i < cjwPopDataList.length; i++) {
+        let cjwInfo = cjwPopDataList[i];
+        //浮窗数据
+        let fcsjPackageData = [];
+        //基本信息
+        let jbxxPackageData = [];
+        //图片
+        let imgPackageData = [];
+        //服务资源
+        let fwzyPackageData = [];
 
-    let dldxlTableData = tablePackage(excelData['大龄低学历人员'].headerList[0], excelData['大龄低学历人员'].bodyList);
-    ret['dldxlry'] = getTableOut('大龄低学历人员', dldxlTableData);
+        for (let key in cjwInfo) {
+            if (name == cjwInfo.名称) {
+            switch (key) {
+                case "就业年龄段户籍人口":
+                case "无业人员":
+                case "失业人员": 
+                    fcsjPackageData.push({name: key, value: cjwInfo[key], unit: ""});
+                    break;
+                case "实有人口":
+                case "户籍人口":
+                case "外来人口":
+                case "失业人员":
+                case "无业人员":
+                    jbxxPackageData.push({name: key, value: cjwInfo[key], unit: ""});
+                    break;
+                case "图片":
+                    imgPackageData.push({name: key, value: cjwInfo[key], unit: ""});
+                    break;
+                case "家门口服务站":
+                case "就业保障员":
+                case "移动终端":
+                    fwzyPackageData.push({name: key, value: cjwInfo[key], unit: ""});
+                    break;
+            }
+            // let fcsjPackageData = {name: key, value: cjwDataList[key], unit: ""};
+            ret['fcsj'] = {title: '浮窗数据', dataList: fcsjPackageData};
+            ret['tp'] = {title: '图片', dataList: imgPackageData};
+            ret['jbxx'] = {title: '基本信息', dataList: jbxxPackageData};
+            ret['fwzy'] = {title: '服务资源', dataList: fwzyPackageData};
+            }
+            
+        }
+    }
 
-    let jyknryTableData = tablePackage(excelData['就业困难人员'].headerList[0], excelData['就业困难人员'].bodyList);
-    ret['jyknry'] = getTableOut('就业困难人员', jyknryTableData);
-    
-    let tysbTableData = tablePackage(excelData['退役士兵'].headerList[0], excelData['退役士兵'].bodyList);
-    ret['tysb'] = getTableOut('退役士兵', tysbTableData);
-    
-    let yjbysTableData = tablePackage(excelData['应届毕业生'].headerList[0], excelData['应届毕业生'].bodyList);
-    ret['yjbys'] = getTableOut('应届毕业生', yjbysTableData);
-    
-    let cqsyryTableData = tablePackage(excelData['长期失业人员'].headerList[0], excelData['长期失业人员'].bodyList);
-    ret['cqsyry'] = getTableOut('长期失业人员', cqsyryTableData);
-    
-    let zdryTableData = tablePackage(excelData['征地人员'].headerList[0], excelData['征地人员'].bodyList);
-    ret['zdry'] = getTableOut('征地人员', zdryTableData);
+    let cjwBodyList = cjwExcelData['村居委表格详细信息'].bodyList;
+    let cjwHeaderList = cjwExcelData['村居委表格详细信息'].headerList[0];
+    let cjwDataList = [];
+    for (let i = 0; i < cjwBodyList.length; i++) {
+        let a = {};
+        for (let x = 0; x < cjwBodyList[i].length; x++) {
+            a[cjwHeaderList[x]] = cjwBodyList[i][x];
+        }
+        cjwDataList.push(a);
+    }
+
+    let titleList = [];
+    //大龄低学历人员
+    let dldxlTableData = [];
+    //就业困难人员
+    let jyknryTableData = [];
+    //退役士兵
+    let tysbTableData = [];
+    //应届毕业生
+    let yjbysTableData = [];
+    //长期失业人员
+    let cqsyryTableData = [];
+    //征地人员
+    let zdryTableData = [];
+
+    let dldxl = 1;
+    let jykn = 1;
+    let tysb = 1;
+    let yjbys = 1;
+    let cqsyry = 1;
+    let zdry = 1;
+    for(let i = 0; i < cjwDataList.length; i++) {
+        let cjwInfo = cjwDataList[i];
+        let card = cjwInfo.身份证号.slice(0, 14) + "****";
+        let type = cjwInfo.类型;
+        if (name == cjwInfo.名称) {
+            switch (type) {
+                case "大龄低学历人员":
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    dldxlTableData.push([dldxl, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    dldxl ++;
+                break;
+                case "就业困难人员": 
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    jyknryTableData.push([jykn, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    jykn ++;
+                break;
+                case "退役士兵": 
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    tysbTableData.push([tysb, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    tysb ++;
+                break;
+                case "应届毕业生": 
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    yjbysTableData.push([yjbys, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    yjbys ++;
+                break;
+                case "启航人员": 
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    cqsyryTableData.push([cqsyry, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    cqsyry ++;
+                break;
+                case "领金人员": 
+                    titleList = ["序号", "姓名", "性别", "身份证号", "年龄", "学历", "户籍", "目前情况", "服务次数"];
+                    zdryTableData.push([zdry, cjwInfo.姓名, cjwInfo.性别, card, cjwInfo.年龄, cjwInfo.学历, cjwInfo.户籍, cjwInfo.目前情况, cjwInfo.服务次数]);
+                    zdry ++;
+                break;
+            }
+        }
+    }
+    let cjwxxTableData = [];
+    if (JSON.stringify(dldxlTableData) != '[]') {
+        cjwxxTableData.push({name: '大龄低学历人员', titleList, dataList: dldxlTableData});
+    } 
+    if (JSON.stringify(jyknryTableData) != '[]') {
+        cjwxxTableData.push({name: '就业困难人员', titleList, dataList: jyknryTableData});
+    } 
+    if (JSON.stringify(tysbTableData) != '[]') {
+        cjwxxTableData.push({name: '退役士兵', titleList, dataList: tysbTableData});
+    } 
+    if (JSON.stringify(yjbysTableData) != '[]') {
+        cjwxxTableData.push({name: '应届毕业生', titleList, dataList: yjbysTableData});
+    } 
+    if (JSON.stringify(cqsyryTableData) != '[]') {
+        cjwxxTableData.push({name: '启航人员', titleList, dataList: cqsyryTableData});
+    } 
+    if (JSON.stringify(zdryTableData) != '[]') {
+        cjwxxTableData.push({name: '领金人员', titleList, dataList: zdryTableData});
+    }
+
+    ret['xxsj'] = {title: '表格详细数据', valueList: cjwxxTableData};
 
+    console.log("村居委");
     res.send(ret);
 }
\ No newline at end of file

src/biz/excel.ts

+
+import path = require('path');
+import fs = require("fs");
+import xlsx = require('node-xlsx');
+import formidable = require('formidable');
+import { BizError } from '../util/bizError';
+
+//基础数据上传
+export async function jcsjExcelUp(req, res) {
+    upExcel(req, '基础数据.xlsx');
+    res.send({success: true});
+}
+
+// 整体数据上传
+export async function ztsjExcelUp(req, res) {
+    upExcel(req, '整体数据.xlsx');
+    res.send({success: true});
+}
+
+
+function upExcel(req, name) {
+    // let data = req.body;
+    let form = new formidable.IncomingForm();
+    let fileUrl = path.join(__dirname, `../../res/`);
+    form.uploadDir = fileUrl;
+    form.keepExtensions = true;
+    form.on('end', () => {
+        console.log(name + " up end");
+    })
+    return new Promise((resolve, reject) => {
+        form.parse(req, async (err, fields, files) => {
+            if (err) reject(err);
+            let newPath = path.join(fileUrl, name);
+            fs.rename(files.file.path, newPath, (err) => {
+                if (err) throw new BizError("改名失败" + err);
+                else resolve(files);
+            })
+        })
+    })
+}
+
+//下载excel
+export async function downloadFile(req, res) {
+    let {fileName} = req.query;
+
+    let filePath = path.join(__dirname, "../../res/"+fileName+'.xlsx');
+    let stats = fs.existsSync(filePath);
+
+    if (!stats) throw new Error("文件不存在");
+    console.log(filePath)
+    
+    res.sendfile(filePath);
+}

src/biz/jcsj.ts

 
-import { jcsjTableData } from '../data/table/jcsjData';
-import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
-import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
+import { gqTableData, jcsjTableData } from '../data/table/jcsjData';
+import { keyValuePackage, onceYBarChartPackage, tablePackage, stringListPackage } from '../dataPackage/inFrontOut';
+import { getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
 import { separateDataAndUint } from '../dataPackage/tool';
+import { excelData, jcsjExcelData } from '../main';
 
-/*                            基础数据                    */
+/*基础数据*/
 
 export function getData(req, res) {
-    let excelData = jcsjTableData();
-
+    // let jcsjExcelData = jcsjTableData();
+    // let excelData = gqTableData();
     let ret:any = {};
 
     let zssjPackageData = keyValuePackage(excelData['左上数据'].dataList);
@@ -20,12 +21,6 @@ export function getData(req, res) {
     let nnblPackageData = keyValuePackage(excelData['男女比例'].dataList);
     ret['nnbl'] = getKeyValueOut('男女比例', nnblPackageData);
                     
-    let swylxblPackageData = keyValuePackage(excelData['失无业类型比例'].dataList);
-    ret['swylxbl'] = getKeyValueOut('失无业类型比例', swylxblPackageData);
-                    
-    let swyryfxPackageData = keyValuePackage(excelData['失无业人员分析'].dataList);
-    ret['swyryfx'] = getKeyValueOut('失无业人员分析', swyryfxPackageData);
-                    
     let zdrynnblsjPackageData = onceYBarChartPackage( excelData['重点人员男女比例数据'], '','');
     ret['zdrynnblsj'] = getOnceYBarChartOut('重点人员男女比例数据', zdrynnblsjPackageData);
                     
@@ -35,18 +30,21 @@ export function getData(req, res) {
     let sqztjylPackageData = keyValuePackage(excelData['社区总体就业率'].dataList);
     ret['sqztjyl'] = getKeyValueOut('社区总体就业率', sqztjylPackageData);
                     
-    let sqztjylxqTableData = tablePackage(excelData['社区总体就业率详情'].headerList[0], excelData['社区总体就业率详情'].bodyList);
+    let sqztjylxqTableData = tablePackage(jcsjExcelData['社区总体就业率详情'].headerList[0], jcsjExcelData['社区总体就业率详情'].bodyList);
     let sqztjylxqDataList = sqztjylxqTableData.dataList;
     sqztjylxqTableData.titleList.push('是否红色')
+    let 失业人员;
     sqztjylxqDataList.forEach(info => {
+        if (info.A == "城镇登记失业人数") 失业人员 = info.C;
         let checkStr = info.B;
         let str = checkStr.substring(0, 1);
-        let {dataNum, dataUnit} = separateDataAndUint(checkStr.substring(1, checkStr.length));
+        let {dataNum} = separateDataAndUint(checkStr.substring(1, checkStr.length));
         let type = ``;
-        if ( str == ">" ) type = `${info.C}>${dataNum}`;
-        else if (str == "<") type = `${info.C}<${dataNum}`;
+        let infoNum = info.C;
+        if ( str == ">" ) type = `${infoNum}>${dataNum}`;
+        else if (str == "<") type = `${infoNum}<${dataNum}`;
         else if (str == "=") {
-            type = `${separateDataAndUint(info.C).dataNum}==${dataNum}`;
+            type = `${separateDataAndUint(infoNum).dataNum}==${dataNum}`;
         }
         else {
             type = '';
@@ -54,7 +52,33 @@ export function getData(req, res) {
         info.isRed = !eval(type);
     })
     ret['sqztjylxq'] = getTableOut('社区总体就业率详情', sqztjylxqTableData);
+            
+    let 无业人员;
+    let swylxbl = keyValuePackage(excelData['失无业类型比例'].dataList);
+    swylxbl.push({key: '失业人员', value: 失业人员, unit: '人'})
+    let 失无业类型详细 = ["无业人员", "失业人员", "当前积极求职"];
+    let swylxblPackageData = [];
+    失无业类型详细.forEach( name => {
+        swylxbl.forEach( info => {
+            if (info.key == "无业人员") 无业人员 = info.value;
+            if (info.key == name) swylxblPackageData.push(info);
+        })
+    })
+    ret['swylxbl'] = getKeyValueOut('失无业类型比例', swylxblPackageData);
                     
+    let swyryfx = keyValuePackage(excelData['失无业人员分析'].dataList);
+    let 失无业总人口数 = parseInt(失业人员) + parseInt(无业人员);
+    swyryfx.push({key: "失无业总人口数", value: 失无业总人口数, unit: "人"});
+    let 失无业人员分析 = ["失无业总人口数", "近期失业新增", "近期就业新增"];
+    let swyryfxPackageData = [];
+    失无业人员分析.forEach( name => {
+        swyryfx.forEach ( info => {
+            if (info.key == name) swyryfxPackageData.push(info);
+        })
+    })
+
+    ret['swyryfx'] = getKeyValueOut('失无业人员分析', swyryfxPackageData);
+
     let cyfwPackageData = keyValuePackage(excelData['创业服务'].dataList);
     ret['cyfw'] = getKeyValueOut('创业服务', cyfwPackageData);
                     
@@ -64,23 +88,27 @@ export function getData(req, res) {
     let jpfwTableData = tablePackage(excelData['技培服务'].headerList[0], excelData['技培服务'].bodyList);
     ret['jpfw'] = getTableOut('技培服务', jpfwTableData);
 
-    let cjyjsPackageData = keyValuePackage(excelData['创就业集市'].dataList);
-    ret['cjyjs'] = getKeyValueOut('创就业集市', cjyjsPackageData);
+    let tsfwPackageData = keyValuePackage(excelData['特色服务'].dataList);
+    ret['tsfw'] = getKeyValueOut('特色服务', tsfwPackageData);
+
+    let cjyjsPackageData = stringListPackage(excelData['创就业集市'].dataList);
+    ret['cjyjs'] = getStringOut('创就业集市', cjyjsPackageData);
 
-    let cyxtPackageData = keyValuePackage(excelData['创业学堂'].dataList);
-    ret['cyxt'] = getKeyValueOut('创业学堂', cyxtPackageData);
+    let cyxtPackageData = stringListPackage(excelData['创业学堂'].dataList);
+    ret['cyxt'] = getStringOut('创业学堂', cyxtPackageData);
 
-    let hzfhqPackageData = keyValuePackage(excelData['合作孵化器'].dataList);
-    ret['hzfhq'] = getKeyValueOut('合作孵化器', hzfhqPackageData);
+    let fhxmTableData = tablePackage(excelData['孵化项目'].headerList[0], excelData['孵化项目'].bodyList);
+    ret['fhxm'] = getTableOut('孵化项目', fhxmTableData);
 
-    let cyfyPackageData = keyValuePackage(excelData['创业法苑'].dataList);
-    ret['cyfy'] = getKeyValueOut('创业法苑', cyfyPackageData);
+    let cyfyPackageData = stringListPackage(excelData['乐业法苑'].dataList);
+    ret['cyfy'] = getStringOut('乐业法苑', cyfyPackageData);
 
-    let HRjylmPackageData = keyValuePackage(excelData['HR就业联盟'].dataList);
-    ret['HRjylm'] = getKeyValueOut('HR就业联盟', HRjylmPackageData);
+    let HRjylmPackageData = stringListPackage(excelData['HR就业联盟'].dataList);
+    ret['HRjylm'] = getStringOut('HR就业联盟', HRjylmPackageData);
 
-    let cyzjlbPackageData = keyValuePackage(excelData['创业者俱乐部'].dataList);
-    ret['cyzjlb'] = getKeyValueOut('创业者俱乐部', cyzjlbPackageData);
-                     
+    let cyzjlbPackageData = stringListPackage(excelData['创业者俱乐部'].dataList);
+    ret['cyzjlb'] = getStringOut('创业者俱乐部', cyzjlbPackageData);
+    
+    console.log("基础数据");
     res.send(ret);
 } 
\ No newline at end of file

src/biz/map.ts

-import { cjwTableData, zdqyTableData } from "../data/table/jcsjData";
-import { onceYBarChartPackage, tablePackage } from "../dataPackage/inFrontOut";
-import { getOnceYBarChartOut, getTableOut } from "../dataPackage/out";
+import { cjwPopTableData, mapTableData } from "../data/table/jcsjData";
+import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
+import { getKeyValueOut } from "../dataPackage/out";
+import { mapExcelData, cjwPopExcelData } from "../main";
 
+// 地图
 export function getData(req, res) {
-    let cjwExcelData = cjwTableData();   //村居委地图数据
-    let zdqyExcelData = zdqyTableData();    //重点企业地图数据
+    // let mapExcelData = mapTableData();
+    // let cjwPopExcelData = cjwPopTableData();
 
     let ret:any = {};
 
-    let cjwDataList = cjwExcelData['村居委数据'].dataList;
-    let cjwMap = {title: "村居委地图", dataList: cjwDataList};
+    let cjwPopBodyList = cjwPopExcelData['村居委详细数据'].bodyList;
+    let cjwPopHeaderList = cjwPopExcelData['村居委详细数据'].headerList[0];
 
-    ret["cjw"] = cjwMap;
+    let cjwPopDataList = [];
+    for (let i = 0; i < cjwPopBodyList.length; i++) {
+        let a = {};
+        for (let x = 0; x < cjwPopBodyList[i].length; x++) {
+            a[cjwPopHeaderList[x]] = cjwPopBodyList[i][x];
+        }
+        cjwPopDataList.push(a);
+    }
 
-    let zdqyDataList = zdqyExcelData['重点合作企业数据'].dataList;
-    let zdqyMap = {title: "重点企业地图", dataList: zdqyDataList};
+    let fcsjDataList = [];
+    for (let i = 0; i < cjwPopDataList.length; i++) {
+        let cjwInfo = cjwPopDataList[i];
 
-    ret["zdqy"] = zdqyMap;
+        //浮窗数据
+        let fcsjPackageData = [];
+        let cjwName;
+        for (let key in cjwInfo) {
+            cjwName = cjwInfo.名称;
+            switch (key) {
+                case "就业年龄段户籍人口":
+                case "无业人员":
+                case "失业人员": 
+                    fcsjPackageData.push({name: key, value: cjwInfo[key], unit: ""});
+                    break;
+            }
+        }
+        fcsjDataList.push({cjwName, dataList: fcsjPackageData});
+    }
 
+    let mapData = tablePackage(mapExcelData['地图'].headerList[0], mapExcelData['地图'].bodyList);
+
+    let mapDataList = mapData.dataList;
+    let dtDataList = [];
+
+    mapDataList.forEach(info => {
+        let {A, B, C, D} = info;
+        if (D == "村居委") {
+            fcsjDataList.forEach ( fcsjInfo => {
+                let {cjwName, dataList} = fcsjInfo;
+                if (cjwName == A) dtDataList.push({name: A, x: B, y: C, type: D, fcsj: dataList});
+            })
+        }
+        else {
+            dtDataList.push({name: A, x: B, y: C, type: D, fcsj: A});
+        }
+    })
+
+    let dtPackageData = {title: "地图", dataList: dtDataList};
+    ret["dt"] = dtPackageData;
+
+    let gglPackageData = keyValuePackage(mapExcelData["公告栏"].dataList);
+    ret['ggl'] = getKeyValueOut('公告栏', gglPackageData);
+
+    console.log("地图");
     res.send(ret);
 }
\ No newline at end of file

src/biz/policy.ts

+
+
+// 政策文件
\ No newline at end of file

src/biz/zdqy.ts

-import { get重点企业弹窗 } from "../data/table/jcsjData";
-import { keyValuePackage, tablePackage } from "../dataPackage/inFrontOut";
-import { getKeyValueOut, getStringOut, getTableOut } from "../dataPackage/out";
+import { zdhzqyPopTableData, zdhzqyTableData } from "../data/table/jcsjData";
+import { tablePackage } from "../dataPackage/inFrontOut";
+import { getTableOut } from "../dataPackage/out";
+import { zdqyExcelData, zdqyPopExcelData } from "../main";
 
+// 重点企业
 export function getData(req, res) {
+    // let zdqyPopExcelData = zdhzqyPopTableData();
+    // let zdqyExcelData = zdhzqyTableData();
+
     let name = req.query.name;
-    let excelData = get重点企业弹窗(name);
 
     let ret:any = {};
 
-    let jbxxDataList = keyValuePackage(excelData['基础数据'].dataList);
+    let zdqyTableData = tablePackage(zdqyPopExcelData['重点合作企业详细数据'].headerList[0], zdqyPopExcelData['重点合作企业详细数据'].bodyList);
+
+    let zdqyDataList = zdqyTableData.dataList;
+
     let imgPackageData = [];
     let jbxxPackageData = [];
-    jbxxDataList.forEach (info => {
-        let {key, value, unit} = info;
-        if (key == "图片") imgPackageData.push(info);
-        else jbxxPackageData.push(info);
+    zdqyDataList.forEach( info => {
+        let {A, B, C} = info;
+        if (name == A) {
+            imgPackageData.push({key: "图片", value: C});
+
+            jbxxPackageData.push({name: "企业简介", value: B});
+        }
+        
     })
 
-    ret['tp'] = getStringOut('图片', imgPackageData);
-    ret['jcsj'] = getKeyValueOut('基础数据', jbxxPackageData);
+    ret['tp'] = {title: '图片', dataList: imgPackageData};
+    ret['jcsj'] = {title: '基础数据', dataList: jbxxPackageData};
+
+    let zpxxTableData = tablePackage(zdqyExcelData['招聘信息'].headerList[0], zdqyExcelData['招聘信息'].bodyList);
+    let zpxxDataList = zpxxTableData.dataList;
+    let zpxxPackageData = [];
+    let titleList = [];
+    zpxxDataList.forEach( info => {
+        let {A, B, C, D, E} = info;
+        if (name == A) {
+            titleList = ['招聘职位', '办公地点', '工作经验', '学历要求']
+            zpxxPackageData.push({job: B, site: C, experience: D, education: E});
+        }
+    })
 
-    let zpxxTableData = tablePackage(excelData['招聘信息'].headerList[0], excelData['招聘信息'].bodyList);
-    ret['zpxx'] = getTableOut('招聘信息', zpxxTableData);
+    ret['zpxx'] = getTableOut('招聘信息', {titleList, dataList: zpxxPackageData});
 
+    console.log(name + "重点企业");
     res.send(ret);
 }
\ No newline at end of file

src/config/users.ts

+import path = require('path');
+import fs = require('fs');
+
+let userMap = {};
+let filePath = path.join(__dirname, "../../res/users");
+let userList = [];
+export function initUserConfig() {
+    let stats = fs.existsSync(filePath);
+
+    if (!stats) fs.writeFileSync(filePath, encode(JSON.stringify({userList:[{loginId:"admin", pwd:"admin"}]})));
+    
+    let str = fs.readFileSync(filePath).toString();
+
+    userList = JSON.parse(decode(str)).userList;
+    for (let user of userList) {
+        userMap[user.loginId] = user;
+    }
+}
+
+export function getUserConfig(loginId) {
+    return userMap[loginId];
+}
+
+export function getUserMap() {
+    return userMap;
+}
+
+export function setUserMap(userList) {
+    let map = {admin:userMap["admin"]};
+    
+    for (let user of userList) {
+        map[user.loginId] = user;
+    }
+
+    userMap = map;
+}
+
+function encode(str) {
+    let encodeStr = "";
+    for (let i = 0; i < str.length; i++) {
+        encodeStr += String.fromCharCode(str.charCodeAt(i) ^ 5)
+    }
+
+    return encodeStr;
+}
+
+function decode(str) {
+    let decodeStr = "";
+    for (let i = 0; i < str.length; i++) {
+        decodeStr += String.fromCharCode(str.charCodeAt(i) ^ 5)
+    }
+
+    return decodeStr;
+}
+
+export function updateUserConfFile() {
+    fs.writeFileSync(filePath, encode(JSON.stringify({userList:Object.values(userMap)})))
+}
\ No newline at end of file

src/data/table/jcsjData.ts

@@ -23,68 +23,93 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
 
 export function jcsjTableData() {
     
-    let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '基础数据');
+    let blockDataList = onceSheetBecomeOfblockData('基础数据.xlsx', '基础数据');
 
-    let keyValueOrTitleList = ["左上数据","劳动年龄段人口概况","男女比例","失无业类型比例","失无业人员分析","服务资源","社区总体就业率","创业服务","就业服务", "创就业集市", "创业学堂", "合作孵化器", "创业法苑", "HR就业联盟", "创业者俱乐部"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =["社区总体就业率详情"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;    
+}
+
+export function gqTableData() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('整体数据.xlsx', '基础数据');
+
+    let keyValueOrTitleList = ["左上数据","劳动年龄段人口概况","男女比例","失无业类型比例","失无业人员分析","服务资源","社区总体就业率","创业服务","就业服务", "特色服务", "创就业集市", "创业学堂", "乐业法苑", "HR就业联盟", "创业者俱乐部"];//适配 饼图 键值以及需要多个key的
     let barChartList = ["重点人员男女比例数据"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["社区总体就业率详情","技培服务"];//适配 表格
+    let decollatePlanarList =["技培服务", "孵化项目"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;    
 }
 
+export function mapTableData() {
+    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 cjwTableData() {
-    let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '地图村居委数据');
+    let blockDataList = onceSheetBecomeOfblockData('整体数据.xlsx', '村居委表格数据');
 
     let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
-    let stringList = ["村居委数据"];
-    let decollatePlanarList =[];//适配 表格
+    let stringList = [];
+    let decollatePlanarList =["村居委表格详细信息"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
 }
 
-export function zdqyTableData() {
-    let blockDataList = onceSheetBecomeOfblockData('高桥.xlsx', '地图重点合作企业数据');
+export function cjwPopTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('整体数据.xlsx', '村居委弹窗数据');
 
     let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
-    let stringList = ["重点合作企业数据"];
-    let decollatePlanarList =[];//适配 表格
+    let stringList = [];
+    let decollatePlanarList =["村居委详细数据"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
 }
 
-export function get村居委弹窗(name) {
-    let 村居委弹窗数据 = excelBecomeOfBlockData("村居委弹窗.xlsx");
-    let dataList = 村居委弹窗数据[name];
+export function zdhzqyTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('整体数据.xlsx', '重点合作企业表格数据');
 
-    let keyValueOrTitleList = ["浮窗数据", "基本信息", "服务资源"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["大龄低学历人员", "就业困难人员", "退役士兵", "应届毕业生", "长期失业人员", "征地人员"];//适配 表格
+    let decollatePlanarList =["招聘信息"];//适配 表格
     let titltListConfig = {};
 
-    let result = packageDataProcess(dataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
 }
 
-export function get重点企业弹窗(name) {
-    let 重点企业弹窗数据 = excelBecomeOfBlockData("重点企业弹窗.xlsx");
-    let dataList = 重点企业弹窗数据[name];
+export function zdhzqyPopTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('整体数据.xlsx', '重点合作企业弹窗数据');
 
-    let keyValueOrTitleList = ["基础数据"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = [];//适配 饼图 键值以及需要多个key的
     let barChartList = []; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["招聘信息"];//适配 表格
+    let decollatePlanarList =["重点合作企业详细数据"];//适配 表格
     let titltListConfig = {};
 
-    let result = packageDataProcess(dataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
-}
+}
\ No newline at end of file

src/main.ts

@@ -2,18 +2,25 @@
 import { initInterfaceData } from "./data/interface/cronJob";
 import { httpServer } from "./net/http_server";
 import { initConfig, port } from "./config/serverConfig";
+import { initUserConfig } from "./config/users";
+import { cjwPopTableData, cjwTableData, gqTableData, jcsjTableData, mapTableData, zdhzqyPopTableData, zdhzqyTableData } from "./data/table/jcsjData";
+
+export let zdqyPopExcelData = zdhzqyPopTableData();
+export let zdqyExcelData = zdhzqyTableData();
+export let mapExcelData = mapTableData();
+export let cjwPopExcelData = cjwPopTableData();
+export let jcsjExcelData = jcsjTableData();
+export let excelData = gqTableData();
+export let popExcelData = cjwPopTableData();
+export let cjwExcelData = cjwTableData();
 
 async function lanuch() {
-    test();
+    initUserConfig();
     await initConfig();
-    // initInterfaceData();
+    
     httpServer.createServer( port );
 
     console.log('This indicates that the server is started successfully.');
 }
 
-function test() {
-
-}
-
 lanuch();

src/net/http_server.ts

@@ -26,6 +26,7 @@ export class httpServer {
         }
     });
 
+    httpServer.use(express.static('img') );
     httpServer.use(express.static('public') );
 
     httpServer.use(bodyParser.json({limit:"10kb"}));

src/routers/router.ts

-
 import * as asyncHandler from 'express-async-handler'
 
 import * as jcsjBiz from '../biz/jcsj';
 import * as mapBiz from '../biz/map';
 import * as cjwBiz from '../biz/cjw';
 import * as zdqyBiz from '../biz/zdqy';
+import * as excelBiz from '../biz/excel';
+import * as loginBiz from '../biz/admin';
         
 export function setRouter(httpServer){
     httpServer.post('/jcsj', asyncHandler(jcsjBiz.getData));
-    
     httpServer.get('/jcsj', asyncHandler(jcsjBiz.getData));
 
     httpServer.post('/map', asyncHandler(mapBiz.getData));
-    
     httpServer.get('/map', asyncHandler(mapBiz.getData));
 
     httpServer.post('/cjw', asyncHandler(cjwBiz.getData));
-    
     httpServer.get('/cjw', asyncHandler(cjwBiz.getData));
 
     httpServer.post('/zdqy', asyncHandler(zdqyBiz.getData));
-    
     httpServer.get('/zdqy', asyncHandler(zdqyBiz.getData));
         
+    httpServer.post('/api/login', asyncHandler(loginBiz.login));
+    httpServer.post('/api/jcsjup', asyncHandler(excelBiz.jcsjExcelUp));
+    httpServer.post('/api/ztsjup', asyncHandler(excelBiz.ztsjExcelUp));
+
+    httpServer.post('/api/download', asyncHandler(excelBiz.downloadFile));
+    httpServer.get('/api/download', asyncHandler(excelBiz.downloadFile));
 }
     
\ No newline at end of file