崇明

src/biz/chongMing/dt.ts

+import { dtTableData } from '../../data/chongMingTable/dtData';
+import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../../dataPackage/inFrontOut';
+import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../../dataPackage/out';
+
+/*崇明地图*/
+
+export function getData(req, res) {
+    let excelData = dtTableData();
+
+    let ret:any = {};
+
+    let dtsjDataInfo;
+    let shsxhzxPackageData = onceYBarChartPackage( excelData['地图数据'], '','');
+    let dtsjData = getOnceYBarChartOut('地图数据', shsxhzxPackageData).chartList;
+    let dtsjPackageData = [];
+    for (let key in dtsjData) {
+        let dtsjInfo = dtsjData[key].dataList;
+        let jd;
+        let wd;
+        let teacherNum;
+        let studentNum;
+        let todayNum;
+        let visitorNum;
+        let Diagnosed;
+        let asymptomatic;
+        let closeContact;
+        let nextCloseContact;
+        dtsjInfo.forEach( info => {
+            let {name, value, unit} = info;
+            if (name == "经度") {
+                jd = value;
+            } else if (name == "纬度") {
+                wd = value;
+            } else {
+                switch (name) {
+                    case '教师总数':
+                        teacherNum = value;
+                    break;
+                    case '学生数':
+                        studentNum = value;
+                    break;
+                    case '当日通行人数':
+                        todayNum = getMap(teacherNum, studentNum);
+                    break;
+                    case '今日访客数':
+                        visitorNum = getMap(0, teacherNum);
+                    break;
+                    case '确诊':
+                        Diagnosed = value;
+                    break;
+                    case '无症状':
+                        asymptomatic = value;
+                    break;
+                    case '密接':
+                        closeContact = value;
+                    break;
+                    case '次密接':
+                        nextCloseContact = value;
+                    break;
+                }
+            }
+            dtsjDataInfo = {
+                schoolName: dtsjData[key].thisChartTitle,
+                longitude: jd,
+                latitude: wd,
+                count: {
+                    teacherNum,
+                    studentNum,
+                    todayNum,
+                    visitorNum,
+                    Diagnosed,
+                    asymptomatic,
+                    closeContact,
+                    nextCloseContact
+                }
+            }
+        })
+        dtsjPackageData.push(dtsjDataInfo);
+    }
+    ret['dtsj'] = {title: '地图数据', mapPosition: dtsjPackageData};
+                    
+    let sycsPackageData = keyValuePackage(excelData['涉疫场所'].dataList);
+    ret['sycs'] = getKeyValueOut('涉疫场所', sycsPackageData);
+                    
+    let wycsPackageData = keyValuePackage(excelData['无疫场所'].dataList);
+    ret['wycs'] = getKeyValueOut('无疫场所', wycsPackageData);
+                     
+    res.send(ret);
+} 
+
+function getMap(min, max) {
+    let rangeNum = max - min;
+    let randNum = Math.random();
+    let num = min + Math.round(randNum * rangeNum);
+    return num;
+}

src/biz/chongMing/map.ts

+import { dtTableData } from "../../data/chongMingTable/dtData";
+import { onceYBarChartPackage } from "../../dataPackage/inFrontOut";
+import { getOnceYBarChartOut } from "../../dataPackage/out";
+
+
+function getMap(min, max) {
+    let rangeNum = max - min;
+    let randNum = Math.random();
+    let num = min + Math.round(randNum * rangeNum);
+    return num;
+}
+
+export function getData(req, res) {
+    let excelData = dtTableData();
+
+    let ret:any = {};
+
+    let dtsjDataInfo;
+    let shsxhzxPackageData = onceYBarChartPackage( excelData['地图数据'], '','');
+    let dtsjData = getOnceYBarChartOut('地图数据', shsxhzxPackageData).chartList;
+    let dtsjPackageData = [];
+    for (let key in dtsjData) {
+        let dtsjInfo = dtsjData[key].dataList;
+        let jd;
+        let wd;
+        let teacherNum;
+        let studentNum;
+        let todayNum;
+        let visitorNum;
+        let Diagnosed;
+        let asymptomatic;
+        let closeContact;
+        let nextCloseContact;
+        dtsjInfo.forEach( info => {
+            let {name, value, unit} = info;
+            if (name == "经度") {
+                jd = value;
+            } else if (name == "纬度") {
+                wd = value;
+            } else {
+                switch (name) {
+                    case '教师总数':
+                        teacherNum = value;
+                    break;
+                    case '学生数':
+                        studentNum = value;
+                    break;
+                    case '当日通行人数':
+                        todayNum = getMap(teacherNum, studentNum);
+                    break;
+                    case '今日访客数':
+                        visitorNum = getMap(0, teacherNum);
+                    break;
+                    case '确诊':
+                        Diagnosed = value;
+                    break;
+                    case '无症状':
+                        asymptomatic = value;
+                    break;
+                    case '密接':
+                        closeContact = value;
+                    break;
+                    case '次密接':
+                        nextCloseContact = value;
+                    break;
+                }
+            }
+
+            // todayNum = 
+            dtsjDataInfo = {
+                schoolName: dtsjData[key].thisChartTitle,
+                longitude: jd,
+                latitude: wd,
+                count: {
+                    teacherNum,
+                    studentNum,
+                    todayNum,
+                    visitorNum,
+                    Diagnosed,
+                    asymptomatic,
+                    closeContact,
+                    nextCloseContact
+                }
+            }
+        })
+        
+        dtsjPackageData.push(dtsjDataInfo);
+    }
+    ret['dtsj'] = {title: '地图数据', mapPosition: dtsjPackageData};
+                     
+    res.send(ret);
+} 
\ No newline at end of file

src/biz/chongMing/yqcthyp.ts

+import { yqcthypTableData } from '../../data/chongMingTable/yqcthypData';
+import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../../dataPackage/inFrontOut';
+import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../../dataPackage/out';
+
+/*崇明疫情常态化右屏*/
+
+export function getData(req, res) {
+    let excelData = yqcthypTableData();
+
+    let ret:any = {};
+
+    let jrhsscPackageData = tablePackage(excelData['今日核酸筛查'].headerList[0], excelData["今日核酸筛查"].bodyList);
+    let jrhsscData;
+    let jrhsscInfo = [];
+    for (let key in jrhsscPackageData.dataList) {
+        let {A, B, C} = jrhsscPackageData.dataList[key];
+        jrhsscData = {
+            name: A,
+            value: B,
+            proportion: C
+        }
+        jrhsscInfo.push(jrhsscData);
+    }
+    ret['jrhssc'] = {title: '今日核酸筛查', dataList: jrhsscInfo};
+                    
+    let scslqsPackageData = onceYBarChartPackage( excelData['筛查数量趋势'], '人',''); 
+    ret['scslqs'] = getOnceYBarChartOut('筛查数量趋势', scslqsPackageData);
+                    
+    let xxzbsyxxTableData = tablePackage(excelData["学校周边涉疫信息"].headerList[0], excelData["学校周边涉疫信息"].bodyList);
+    let xxzbsyxxInfo = getTableOut( '学校周边涉疫信息', xxzbsyxxTableData);
+    ret['xxzbsyxx'] = {title:"学校周边涉疫信息", titleList:['信息时间', '涉疫范围', '涉疫人群'], valueList: xxzbsyxxInfo.valueList};
+                    
+    let syqqqkPackageData = keyValuePackage(excelData['涉疫缺勤情况汇总'].dataList);
+    ret['syqqqkhz'] = getKeyValueOut('涉疫缺勤情况汇总', syqqqkPackageData);
+                    
+    let syqqqkTableData = tablePackage(excelData["涉疫缺勤情况"].headerList[0], excelData["涉疫缺勤情况"].bodyList);
+    ret['syqqqk'] = getTableOut( '涉疫缺勤情况', syqqqkTableData);
+                     
+    res.send(ret);
+} 
\ No newline at end of file

src/biz/chongMing/yqcthzj.ts

+import { yqcthzjTableData } from '../../data/chongMingTable/yqcthzjData';
+import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../../dataPackage/inFrontOut';
+import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../../dataPackage/out';
+
+/*崇明疫情常态化中间*/
+
+export function getData(req, res) {
+    let excelData = yqcthzjTableData();
+
+    let ret:any = {};
+
+    let jcsjPackageData = keyValuePackage(excelData['基础数据'].dataList);
+    ret['jcsj'] = getKeyValueOut('基础数据', jcsjPackageData);
+                    
+    let hsjcTableData = keyValuePackage(excelData["核酸检测"].dataList);
+    hsjcTableData.sort(function(a, b) {
+        return b.value - a.value;
+    });
+    ret['hsjc'] = getKeyValueOut( '核酸检测>2天', hsjcTableData);
+                    
+    let kyjcTableData = keyValuePackage(excelData["抗原检测"].dataList);
+    kyjcTableData.sort(function(a, b) {
+        return b.value - a.value;
+    });
+    ret['kyjc'] = getKeyValueOut( '抗原检测>2天', kyjcTableData);
+                    
+    let thrcqsfglPackageData = keyValuePackage( excelData['通行人次趋势（复工率）'].dataList);
+    ret['thrcqsfgl'] = getKeyValueOut('通行人次趋势（复工率）', thrcqsfglPackageData);
+                    
+    let drthrsPackageData = onceYBarChartPackage( excelData['当日通行人数'], '人','');
+    ret['drthrs'] = getOnceYBarChartOut('当日通行人数', drthrsPackageData);
+                     
+    res.send(ret);
+} 
\ No newline at end of file

src/biz/chongMing/yqcthzp.ts

+import { yqcthzpTableData } from '../../data/chongMingTable/yqcthzpData';
+import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../../dataPackage/inFrontOut';
+import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../../dataPackage/out';
+
+/*崇明疫情常态化左屏*/
+
+export function getData(req, res) {
+    let excelData = yqcthzpTableData();
+
+    let ret:any = {};
+
+    let yjsqsPackageData = onceYBarChartPackage( excelData['预警数趋势'], '次','');
+    ret['yjsqs'] = getOnceYBarChartOut('预警数趋势', yjsqsPackageData);
+                    
+    let syqqyyfxPackageData = keyValuePackage(excelData['涉疫缺勤原因分析'].dataList);
+    ret['syqqyyfx'] = getKeyValueOut('涉疫缺勤原因分析', syqqyyfxPackageData);
+                    
+    let yjryzbPackageData = keyValuePackage(excelData['预警人员占比'].dataList);
+    ret['yjryzb'] = getKeyValueOut('预警人员占比', yjryzbPackageData);
+                    
+
+    let szsbPackageData = keyValuePackage(excelData['数字哨兵'].dataList);
+    let zrtbData = [];
+    let szsbData = [];
+    szsbPackageData.forEach( info => {
+        let {key, value, unit} = info;
+        if (key == "昨日同比") {
+            zrtbData.push(info);
+        } else {
+            szsbData.push(info);
+        }
+    })
+
+    // ret['szsb'] = getKeyValueOut('数字哨兵', szsbPackageData);
+    ret['szsb'] = getKeyValueOut('数字哨兵', szsbData);
+    ret['zrtb'] = getKeyValueOut('昨日同比', zrtbData);
+                    
+    let drkqPackageData = keyValuePackage(excelData['当日考勤'].dataList);
+    ret['drkq'] = getKeyValueOut('当日考勤', drkqPackageData);
+                     
+    res.send(ret);
+} 
\ No newline at end of file

src/biz/dt.ts

-
 import { dtTableData } from '../data/table/dtData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -10,8 +9,75 @@ export function getData(req, res) {
 
     let ret:any = {};
 
+    let dtsjDataInfo;
     let shsxhzxPackageData = onceYBarChartPackage( excelData['地图数据'], '','');
-    ret['dtsj'] = getOnceYBarChartOut('地图数据', shsxhzxPackageData);
+    let dtsjData = getOnceYBarChartOut('地图数据', shsxhzxPackageData).chartList;
+    let dtsjPackageData = [];
+    for (let key in dtsjData) {
+        let dtsjInfo = dtsjData[key].dataList;
+        let jd;
+        let wd;
+        let teacherNum;
+        let studentNum;
+        let todayNum;
+        let visitorNum;
+        let Diagnosed;
+        let asymptomatic;
+        let closeContact;
+        let nextCloseContact;
+        dtsjInfo.forEach( info => {
+            let {name, value, unit} = info;
+            if (name == "经度") {
+                jd = value;
+            } else if (name == "纬度") {
+                wd = value;
+            } else {
+                switch (name) {
+                    case '教师总数':
+                        teacherNum = value;
+                    break;
+                    case '学生数':
+                        studentNum = value;
+                    break;
+                    case '当日通行人数':
+                        todayNum = getMap(teacherNum, studentNum);
+                    break;
+                    case '今日访客数':
+                        visitorNum = getMap(0, teacherNum);
+                    break;
+                    case '确诊':
+                        Diagnosed = value;
+                    break;
+                    case '无症状':
+                        asymptomatic = value;
+                    break;
+                    case '密接':
+                        closeContact = value;
+                    break;
+                    case '次密接':
+                        nextCloseContact = value;
+                    break;
+                }
+            }
+            dtsjDataInfo = {
+                schoolName: dtsjData[key].thisChartTitle,
+                longitude: jd,
+                latitude: wd,
+                count: {
+                    teacherNum,
+                    studentNum,
+                    todayNum,
+                    visitorNum,
+                    Diagnosed,
+                    asymptomatic,
+                    closeContact,
+                    nextCloseContact
+                }
+            }
+        })
+        dtsjPackageData.push(dtsjDataInfo);
+    }
+    ret['dtsj'] = {title: '地图数据', mapPosition: dtsjPackageData};
                     
     let sycsPackageData = keyValuePackage(excelData['涉疫场所'].dataList);
     ret['sycs'] = getKeyValueOut('涉疫场所', sycsPackageData);
@@ -20,4 +86,11 @@ export function getData(req, res) {
     ret['wycs'] = getKeyValueOut('无疫场所', wycsPackageData);
                      
     res.send(ret);
-} 
\ No newline at end of file
+} 
+
+function getMap(min, max) {
+    let rangeNum = max - min;
+    let randNum = Math.random();
+    let num = min + Math.round(randNum * rangeNum);
+    return num;
+}

src/biz/map.ts

+import { dtTableData } from "../data/table/dtData";
+import { onceYBarChartPackage } from "../dataPackage/inFrontOut";
+import { getOnceYBarChartOut } from "../dataPackage/out";
+
+
+function getMap(min, max) {
+    let rangeNum = max - min;
+    let randNum = Math.random();
+    let num = min + Math.round(randNum * rangeNum);
+    return num;
+}
+
+export function getData(req, res) {
+    let excelData = dtTableData();
+
+    let ret:any = {};
+
+    let dtsjDataInfo;
+    let shsxhzxPackageData = onceYBarChartPackage( excelData['地图数据'], '','');
+    let dtsjData = getOnceYBarChartOut('地图数据', shsxhzxPackageData).chartList;
+    let dtsjPackageData = [];
+    for (let key in dtsjData) {
+        let dtsjInfo = dtsjData[key].dataList;
+        let jd;
+        let wd;
+        let teacherNum;
+        let studentNum;
+        let todayNum;
+        let visitorNum;
+        let Diagnosed;
+        let asymptomatic;
+        let closeContact;
+        let nextCloseContact;
+        dtsjInfo.forEach( info => {
+            let {name, value, unit} = info;
+            if (name == "经度") {
+                jd = value;
+            } else if (name == "纬度") {
+                wd = value;
+            } else {
+                switch (name) {
+                    case '教师总数':
+                        teacherNum = value;
+                    break;
+                    case '学生数':
+                        studentNum = value;
+                    break;
+                    case '当日通行人数':
+                        todayNum = getMap(teacherNum, studentNum);
+                    break;
+                    case '今日访客数':
+                        visitorNum = getMap(0, teacherNum);
+                    break;
+                    case '确诊':
+                        Diagnosed = value;
+                    break;
+                    case '无症状':
+                        asymptomatic = value;
+                    break;
+                    case '密接':
+                        closeContact = value;
+                    break;
+                    case '次密接':
+                        nextCloseContact = value;
+                    break;
+                }
+            }
+
+            // todayNum = 
+            dtsjDataInfo = {
+                schoolName: dtsjData[key].thisChartTitle,
+                longitude: jd,
+                latitude: wd,
+                count: {
+                    teacherNum,
+                    studentNum,
+                    todayNum,
+                    visitorNum,
+                    Diagnosed,
+                    asymptomatic,
+                    closeContact,
+                    nextCloseContact
+                }
+            }
+        })
+        
+        dtsjPackageData.push(dtsjDataInfo);
+    }
+    ret['dtsj'] = {title: '地图数据', mapPosition: dtsjPackageData};
+    
+                     
+    res.send(ret);
+} 
\ No newline at end of file

src/biz/yqcthyp.ts

-
 import { yqcthypTableData } from '../data/table/yqcthypData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -10,14 +9,26 @@ export function getData(req, res) {
 
     let ret:any = {};
 
-    let jrhsscPackageData = keyValuePackage(excelData['今日核酸筛查'].dataList);
-    ret['jrhssc'] = getKeyValueOut('今日核酸筛查', jrhsscPackageData);
+    let jrhsscPackageData = tablePackage(excelData['今日核酸筛查'].headerList[0], excelData["今日核酸筛查"].bodyList);
+    let jrhsscData;
+    let jrhsscInfo = [];
+    for (let key in jrhsscPackageData.dataList) {
+        let {A, B, C} = jrhsscPackageData.dataList[key];
+        jrhsscData = {
+            name: A,
+            value: B,
+            proportion: C
+        }
+        jrhsscInfo.push(jrhsscData);
+    }
+    ret['jrhssc'] = {title: '今日核酸筛查', dataList: jrhsscInfo};
                     
     let scslqsPackageData = onceYBarChartPackage( excelData['筛查数量趋势'], '人',''); 
     ret['scslqs'] = getOnceYBarChartOut('筛查数量趋势', scslqsPackageData);
                     
     let xxzbsyxxTableData = tablePackage(excelData["学校周边涉疫信息"].headerList[0], excelData["学校周边涉疫信息"].bodyList);
-    ret['xxzbsyxx'] = getTableOut( '学校周边涉疫信息', xxzbsyxxTableData);
+    let xxzbsyxxInfo = getTableOut( '学校周边涉疫信息', xxzbsyxxTableData);
+    ret['xxzbsyxx'] = {title:"学校周边涉疫信息", titleList:['信息时间', '涉疫范围', '涉疫人群'], valueList: xxzbsyxxInfo.valueList};
                     
     let syqqqkPackageData = keyValuePackage(excelData['涉疫缺勤情况汇总'].dataList);
     ret['syqqqkhz'] = getKeyValueOut('涉疫缺勤情况汇总', syqqqkPackageData);

src/biz/yqcthzj.ts

-
 import { yqcthzjTableData } from '../data/table/yqcthzjData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -17,13 +16,13 @@ export function getData(req, res) {
     hsjcTableData.sort(function(a, b) {
         return b.value - a.value;
     });
-    ret['hsjc'] = getKeyValueOut( '核酸检测', hsjcTableData);
+    ret['hsjc'] = getKeyValueOut( '核酸检测>2天', hsjcTableData);
                     
     let kyjcTableData = keyValuePackage(excelData["抗原检测"].dataList);
     kyjcTableData.sort(function(a, b) {
         return b.value - a.value;
     });
-    ret['kyjc'] = getKeyValueOut( '抗原检测', kyjcTableData);
+    ret['kyjc'] = getKeyValueOut( '抗原检测>2天', kyjcTableData);
                     
     let thrcqsfglPackageData = keyValuePackage( excelData['通行人次趋势（复工率）'].dataList);
     ret['thrcqsfgl'] = getKeyValueOut('通行人次趋势（复工率）', thrcqsfglPackageData);

src/biz/yqcthzp.ts

-
 import { yqcthzpTableData } from '../data/table/yqcthzpData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -19,8 +18,22 @@ export function getData(req, res) {
     let yjryzbPackageData = keyValuePackage(excelData['预警人员占比'].dataList);
     ret['yjryzb'] = getKeyValueOut('预警人员占比', yjryzbPackageData);
                     
+
     let szsbPackageData = keyValuePackage(excelData['数字哨兵'].dataList);
-    ret['szsb'] = getKeyValueOut('数字哨兵', szsbPackageData);
+    let zrtbData = [];
+    let szsbData = [];
+    szsbPackageData.forEach( info => {
+        let {key, value, unit} = info;
+        if (key == "昨日同比") {
+            zrtbData.push(info);
+        } else {
+            szsbData.push(info);
+        }
+    })
+
+    // ret['szsb'] = getKeyValueOut('数字哨兵', szsbPackageData);
+    ret['szsb'] = getKeyValueOut('数字哨兵', szsbData);
+    ret['zrtb'] = getKeyValueOut('昨日同比', zrtbData);
                     
     let drkqPackageData = keyValuePackage(excelData['当日考勤'].dataList);
     ret['drkq'] = getKeyValueOut('当日考勤', drkqPackageData);

src/config/mapConfig.ts

+//地图数据
+export let mapConfig = {
+    "华东理工大学附属中学":{ "longitude":121.431012 ,"latitude":31.138081},
+    "上海师大附中附属龙华中学":{ "longitude":121.452426 ,"latitude":31.180947},
+    "上海师范大学第三附属实验学校":{ "longitude":121.444537 ,"latitude":31.169353},
+    "上海市第二初级中学":{ "longitude":121.462466 ,"latitude":31.214336},
+    "上海市第四中学":{ "longitude":121.453638 ,"latitude":31.201331},
+    "上海市第五十四中学":{ "longitude":121.455449 ,"latitude":31.217009},
+    "上海市汾阳中学":{ "longitude":121.44284 ,"latitude":31.156681},
+    "上海市康健外国语实验中学":{ "longitude":121.419219 ,"latitude":31.158849},
+    "上海市零陵中学":{ "longitude":121.46278 ,"latitude":31.195428},
+    "上海市龙苑中学":{ "longitude":121.460552 ,"latitude":31.164014},
+    "上海市梅园中学":{ "longitude":121.424656 ,"latitude":31.143515},
+    "上海市南洋模范初级中学":{ "longitude":121.444038 ,"latitude":31.207825},
+    "上海市南洋模范中学":{ "longitude":121.458153 ,"latitude":31.19652},
+    "上海市田林第二中学":{ "longitude":121.429872 ,"latitude":31.17637},
+    "上海市田林第三中学":{ "longitude":121.435879 ,"latitude":31.179475},
+    "上海市田林中学":{ "longitude":121.425923 ,"latitude":31.180693},
+    "上海市位育初级中学":{ "longitude":121.463159 ,"latitude":31.217626},
+    "上海市位育实验学校":{ "longitude":121.459923 ,"latitude":31.22411},
+    "上海市位育中学":{ "longitude":121.449483 ,"latitude":31.126463},
+    "上海市西南位育中学":{ "longitude":121.46697 ,"latitude":31.198692},
+    "上海市徐汇区教育学院附属实验中学":{ "longitude":121.439103 ,"latitude":31.144026},
+    "上海市徐汇位育体校":{ "longitude":121.450366 ,"latitude":31.12441},
+    "上海市徐汇中学":{ "longitude":121.442375 ,"latitude":31.198522},
+    "上海市园南中学":{ "longitude":121.451493 ,"latitude":31.148636},
+    "上海市长桥中学":{ "longitude":121.445308 ,"latitude":31.136858},
+    "上海市中国中学":{ "longitude":121.43528 ,"latitude":31.166687},
+    "上海市南洋中学":{ "longitude":121.471763 ,"latitude":31.197966},
+    "上海市紫阳中学":{ "longitude":121.461532 ,"latitude":31.118971},
+    "上海市紫竹园中学":{ "longitude":121.456158 ,"latitude":31.140253},
+    "上海民办南模中学":{ "longitude":121.451753 ,"latitude":31.183082},
+    "上海民办位育中学":{ "longitude":121.465347 ,"latitude":31.158512},
+    "上海市民办华育中学":{ "longitude":121.460367 ,"latitude":31.123042},
+    "上海市民办西南高级中学":{ "longitude":121.434047 ,"latitude":31.203812},
+    "上海市世界外国语中学":{ "longitude":121.421516 ,"latitude":31.15624},
+    "上海市宛平中学":{ "longitude":121.449462 ,"latitude":31.197761},
+    "上海市西南模范中学":{ "longitude":121.440894 ,"latitude":31.153432},
+    "上海市徐汇区董恒甫高级中学":{ "longitude":121.440956 ,"latitude":31.190114},
+    "国有资产管理中心":{ "longitude":121.443263 ,"latitude":31.194619},
+    "基建站":{ "longitude":121.441748 ,"latitude":31.189767},
+    "上海市第二中学（永康校区）":{ "longitude":121.461697 ,"latitude":31.21658},
+    "上海市龙漕中学":{ "longitude":121.448314 ,"latitude":31.178365},
+    "上海市上海中学":{ "longitude":121.44287 ,"latitude":31.14595},
+    "上海市世界外国语中学（国际部）":{ "longitude":121.418848 ,"latitude":31.151506},
+    "上海市徐汇区教育局会计管理中心":{ "longitude":121.423631 ,"latitude":31.140615},
+    "上海市徐汇区教育学院":{ "longitude":121.46111 ,"latitude":31.193146},
+    "上海市徐汇区青少年活动中心":{ "longitude":121.441005 ,"latitude":31.181439},
+    "上海市徐汇区学前教育指导中心":{ "longitude":121.470114 ,"latitude":31.200187},
+    "上海市徐汇区学校事务管理中心":{ "longitude":121.463535 ,"latitude":31.215031},
+    "上海市徐汇区业余大学":{ "longitude":121.467948 ,"latitude":31.202233},
+    "徐汇区教育局人才服务中心（分校） ":{ "longitude":121.443879 ,"latitude":31.166153},
+    "徐汇区特殊教育指导中心":{ "longitude":121.45991 ,"latitude":31.22343}
+}
+
+
+export let schoolMap = [
+    {
+        "schoolName": "华东理工大学附属中学",
+        "longitude":121.431012 ,
+        "latitude":31.138081,
+    }
+]
\ No newline at end of file

src/data/chongMingTable/dtData.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 dtTableData() {
+    
+    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/chongMingTable/yqcthypData.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 yqcthypTableData() {
+    
+    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/chongMingTable/yqcthzjData.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 yqcthzjTableData() {
+    
+    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/chongMingTable/yqcthzpData.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 yqcthzpTableData() {
+    
+    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/yqcthypData.ts

@@ -25,10 +25,10 @@ export function yqcthypTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('徐汇数据模板.xlsx', '疫情常态化右屏');
 
-    let keyValueOrTitleList = ["今日核酸筛查","涉疫缺勤情况汇总"];//适配 饼图 键值以及需要多个key的
+    let keyValueOrTitleList = ["涉疫缺勤情况汇总"];//适配 饼图 键值以及需要多个key的
     let barChartList = ["筛查数量趋势"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["学校周边涉疫信息","涉疫缺勤情况"];//适配 表格
+    let decollatePlanarList =["今日核酸筛查","学校周边涉疫信息","涉疫缺勤情况"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);

src/main.ts

@@ -7,9 +7,7 @@ async function lanuch() {
     await initConfig();
     // initInterfaceData();
     httpServer.createServer( port );
-
     console.log('This indicates that the server is started successfully.');
 }
-
 lanuch();
 console.log("lanuch");
\ No newline at end of file

src/routers/router.ts

-
 import * as asyncHandler from 'express-async-handler'
-
 import * as yqcthzpBiz from '../biz/yqcthzp';
-        
 import * as yqcthzjBiz from '../biz/yqcthzj';
-        
 import * as dtBiz from '../biz/dt';
-        
 import * as yqcthypBiz from '../biz/yqcthyp';
+import * as mapBiz from '../biz/map';
+import * as cm_yqcthzpBiz from '../biz/chongMing/yqcthzp';
+import * as cm_yqcthzjBiz from '../biz/chongMing/yqcthzj';
+import * as cm_dtBiz from '../biz/chongMing/dt';
+import * as cm_yqcthypBiz from '../biz/chongMing/yqcthyp';
+import * as cm_mapBiz from '../biz/chongMing/map';
         
 export function setRouter(httpServer){
 
     //======post
-    
     httpServer.post('/yqcthzp', asyncHandler(yqcthzpBiz.getData));
-        
     httpServer.post('/yqcthzj', asyncHandler(yqcthzjBiz.getData));
-        
     httpServer.post('/dt', asyncHandler(dtBiz.getData));
-        
     httpServer.post('/yqcthyp', asyncHandler(yqcthypBiz.getData));
+    httpServer.post('/map', asyncHandler(mapBiz.getData));
         
             
     //======get
-    
     httpServer.get('/yqcthzp', asyncHandler(yqcthzpBiz.getData));
-        
     httpServer.get('/yqcthzj', asyncHandler(yqcthzjBiz.getData));
-        
     httpServer.get('/dt', asyncHandler(dtBiz.getData));
-        
     httpServer.get('/yqcthyp', asyncHandler(yqcthypBiz.getData));
+    httpServer.get('/map', asyncHandler(mapBiz.getData));
+
+
+    //======崇明post
+    httpServer.post('/cm_yqcthzp', asyncHandler(cm_yqcthzpBiz.getData));
+    httpServer.post('/cm_yqcthzj', asyncHandler(cm_yqcthzjBiz.getData));
+    httpServer.post('/cm_dt', asyncHandler(cm_dtBiz.getData));
+    httpServer.post('/cm_yqcthyp', asyncHandler(cm_yqcthypBiz.getData));
+    httpServer.post('/cm_map', asyncHandler(cm_mapBiz.getData));
         
+            
+    //======崇明get
+    httpServer.get('/cm_yqcthzp', asyncHandler(cm_yqcthzpBiz.getData));
+    httpServer.get('/cm_yqcthzj', asyncHandler(cm_yqcthzjBiz.getData));
+    httpServer.get('/cm_dt', asyncHandler(cm_dtBiz.getData));
+    httpServer.get('/cm_yqcthyp', asyncHandler(cm_yqcthypBiz.getData));
+    httpServer.get('/cm_map', asyncHandler(cm_mapBiz.getData));
 }
     
\ No newline at end of file