no message

logs/error/error.-2024-12-29.log.1

-[2024-12-29T19:13:18.722] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:20:53.877] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:20:55.909] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:20:56.996] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:20:58.072] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:20:59.134] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:00.192] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:18.153] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:19.349] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:20.405] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:21.484] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:22.551] [ERROR] errorLogger - errorInfo =>   undefined |  
-[2024-12-29T19:21:23.605] [ERROR] errorLogger - errorInfo =>   undefined |  

src/biz/gbzscbgjdAq.ts

@@ -11,6 +11,9 @@ export function getData(req, res) {
 
     let ret:any = {};
 
+    let wdsdPackageData = keyValuePackage(excelData['温度湿度数据'].dataList);
+    ret['wdsd'] = getKeyValueOut('温度湿度数据', wdsdPackageData);
+                    
     let AqjdxqPackageData = keyValuePackage(excelData['A区基地详情'].dataList);
     ret['Aqjdxq'] = getKeyValueOut('A区基地详情', AqjdxqPackageData);
 
@@ -34,11 +37,11 @@ export function getData(req, res) {
     let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
     ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
                     
-    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
-    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
+    let zwclPackageData = keyValuePackage(excelData['作物产量'].dataList);
+    ret['zwcl'] = getKeyValueOut('作物产量', zwclPackageData);
 
-    let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList);
-    ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData);
+    let zwyclPackageData = onceYBarChartPackage(excelData['作物月产量情况'], '', '');
+    ret['zwycl'] = getOnceYBarChartOut('作物月产量情况', zwyclPackageData);
                  
     res.send(ret);
 } 
\ No newline at end of file

src/biz/gbzscbgjdBq.ts

@@ -12,6 +12,9 @@ export function getData(req, res) {
 
     let ret:any = {};
 
+    let wdsdPackageData = keyValuePackage(excelData['温度湿度数据'].dataList);
+    ret['wdsd'] = getKeyValueOut('温度湿度数据', wdsdPackageData);
+                    
     let AqjdxqPackageData = keyValuePackage(excelData['B区基地详情'].dataList);
     ret['Aqjdxq'] = getKeyValueOut('B区基地详情', AqjdxqPackageData);
 
@@ -35,11 +38,11 @@ export function getData(req, res) {
     let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
     ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
                     
-    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
-    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
+    let zwclPackageData = keyValuePackage(excelData['作物产量'].dataList);
+    ret['zwcl'] = getKeyValueOut('作物产量', zwclPackageData);
 
-    let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList);
-    ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData);
+    let zwyclPackageData = onceYBarChartPackage(excelData['作物月产量情况'], '', '');
+    ret['zwycl'] = getOnceYBarChartOut('作物月产量情况', zwyclPackageData);
                     
     res.send(ret);
 } 
\ No newline at end of file

src/biz/getData.ts

@@ -339,7 +339,8 @@ export async function getData(req, res) {
     "风力等级": "",
     "湿度": "",
     "降水量": "",
-    "图片": ""
+    "图片": "",
+    "光照": ""
   }
   if (weatherData) {
     let observe = weatherData.body.observe;
@@ -350,7 +351,8 @@ export async function getData(req, res) {
       "风力等级": observe.wind_power,
       "湿度": observe.humidity,
       "降水量": observe.precipitation,
-      "图片": `${systemConfig.imgPath}/天气/${observe.weather}.png`
+      "图片": `${systemConfig.imgPath}/天气/${observe.weather}.png`,
+      "光照": "2000lux"
     }
   }
   ret['weather'] = { title: "天气", dataList: weather };

src/biz/hjszzl.ts

 
 import { systemConfig } from '../config/serverConfig';
 import { hjszzlTableData } from '../data/table/hjszzlData';
+import { separateDataAndUint } from "../dataPackage/tool";
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
 
 /*                            环境数字治理                    */
 
+
+
 export function getData(req, res) {
     let excelData = hjszzlTableData();
 
     let ret:any = {};
 
+    /**左侧 */
+    let wdbhPackageData = keyValuePackage(excelData['温度变化'].dataList);
+    ret['wdbh'] = getKeyValueOut('温度变化', wdbhPackageData);
+
+    let sdbhPackageData = keyValuePackage(excelData['湿度变化'].dataList);
+    ret['sdbh'] = getKeyValueOut('湿度变化', sdbhPackageData);
+
+    let jylbhPackageData = keyValuePackage(excelData['降雨量变化'].dataList);
+    ret['jylbh'] = getKeyValueOut('降雨量变化', jylbhPackageData);
+
+    let wdbhqs = getChartData(excelData['温度变化趋势'].dataList);
+    ret['wdbhqs'] = {title:"温度变化趋势", dataList:wdbhqs};
+
+    let sdbhqs = getChartData(excelData['湿度变化趋势'].dataList);
+    ret['sdbhqs'] = {title:"湿度变化趋势", dataList:sdbhqs};
+
+    let jylbhqs = getChartData(excelData['降雨量变化趋势'].dataList);
+    ret['jylbhqs'] = {title:"降雨量变化趋势", dataList:jylbhqs};
+    
+    let gzbhPackageData = keyValuePackage(excelData['光照变化'].dataList);
+    ret['gzbh'] = getKeyValueOut('光照变化', gzbhPackageData);
+    
+    let gzbhqsPackageData = onceYBarChartPackage( excelData['光照变化趋势'], '','');
+    ret['gzbhqs'] = getOnceYBarChartOut('光照变化趋势', gzbhqsPackageData);
+    
+    let trjcPackageData = keyValuePackage(excelData['土壤监测'].dataList);
+    ret['trjc'] = getKeyValueOut('土壤监测', trjcPackageData);
+    
+    let trwdbhqsPackageData = onceYBarChartPackage( excelData['土壤温度变化趋势'], '','');
+    ret['trwdbhqs'] = getOnceYBarChartOut('土壤温度变化趋势', trwdbhqsPackageData);
+    
+    let trsdbhqsPackageData = onceYBarChartPackage( excelData['土壤湿度变化趋势'], '','');
+    ret['trsdbhqs'] = getOnceYBarChartOut('土壤湿度变化趋势', trsdbhqsPackageData);
+    
+    let trPHbhqsPackageData = onceYBarChartPackage( excelData['土壤PH值变化趋势'], '','');
+    ret['trPHbhqs'] = getOnceYBarChartOut('土壤PH值变化趋势', trPHbhqsPackageData);
+    
+    let trddlbhqsPackageData = onceYBarChartPackage( excelData['土壤电导率变化趋势'], '','');
+    ret['trddlbhqs'] = getOnceYBarChartOut('土壤电导率变化趋势', trddlbhqsPackageData);
+    
+    /**中间 */
+    let ztsjPackageData = keyValuePackage(excelData['总体数据'].dataList);
+    ret['ztsj'] = getKeyValueOut('总体数据', ztsjPackageData);
+                    
+    let bhczlPackageData = stringListPackage(excelData["病害虫治理"].dataList);
+    let bhczl = [];
+    for(let i = 0; i < bhczlPackageData.length; i++) {
+        let img = `${systemConfig.imgPath}/${bhczlPackageData[i]}`;
+        bhczl.push(img);
+    }
+    ret['bhczl'] = getStringOut('病害虫治理', bhczl);
+
+    let zlqkPackageData = keyValuePackage(excelData['治理情况'].dataList);
+    ret['zlqk'] = getKeyValueOut('治理情况', zlqkPackageData);
+
+    let chjcdyjPackageData = keyValuePackage(excelData['虫害检测灯预警'].dataList);
+    ret['chjcdyj'] = getKeyValueOut('虫害检测灯预警', chjcdyjPackageData);
+    
+    let sbjcqkwdPackageData = onceYBarChartPackage( excelData['设备监测情况（温度监测）'], '','');
+    ret['sbjcqkwd'] = getOnceYBarChartOut('设备监测情况（温度监测）', sbjcqkwdPackageData);
+    
+    let sbjcqksdPackageData = onceYBarChartPackage( excelData['设备监测情况（湿度监测）'], '','');
+    ret['sbjcqksd'] = getOnceYBarChartOut('设备监测情况（湿度监测）', sbjcqksdPackageData);
+    
+    // let zncqqsPackageData = onceYBarChartPackage( excelData['智能虫情趋势'], '','');
+    // ret['zncqqs'] = getOnceYBarChartOut('智能虫情趋势', zncqqsPackageData);
+
+    let zncqqkTableData = tablePackage(excelData["智能虫情情况"].headerList[0], excelData["智能虫情情况"].bodyList); //20250115
+    ret['zncqqk'] = getTableOut( '智能虫情情况', zncqqkTableData); 
+                    
+    // let zhxyjglPackageData = keyValuePackage(excelData['灾害性应急管理'].dataList);
+    // ret['zhxyjgl'] = getKeyValueOut('灾害性应急管理', zhxyjglPackageData);
+              
+    let zhxyjglTableData = tablePackage(excelData["灾害性应急管理"].headerList[0], excelData["灾害性应急管理"].bodyList);
+    let zhxyjgl = {titleList:zhxyjglTableData.titleList, dataList:[]};
+    zhxyjglTableData.dataList.forEach( info => {
+        let {A,B,C} = info;
+        let imgList = C.split(",");
+        let imgData = [];
+        imgList.forEach( imgName => {
+            let imgUrl = `${systemConfig.imgPath}/防汛防台工作预案/${imgName}`;
+            imgData.push(imgUrl);
+        })
+        zhxyjgl.dataList.push({A,B,C:imgData});
+    })
+    ret['zhxyjgl'] = getTableOut( '灾害性应急管理', zhxyjgl);
+    res.send(ret);
+}
+
+
+
+function getChartData(data) {
+    let qsInfo = {}
+    data.forEach( info => {
+        if (!qsInfo[info.qy]) qsInfo[info.qy] = {};
+        if (!qsInfo[info.qy][info.tl]) qsInfo[info.qy][info.tl] = [];
+        for (let key in info) {
+            if (key != "qy" && key != "tl") {
+                let {dataNum, dataUnit} = separateDataAndUint(info[key]);
+                qsInfo[info.qy][info.tl].push({key, value:dataNum, unit:dataUnit});   
+            }
+        }
+    })
+
+    let result = {};
+    for (let key in qsInfo) {
+        if(!result[key]) result[key] = [];
+        for (let qsKey in qsInfo[key]) {
+            result[key].push({name:qsKey, data:qsInfo[key][qsKey]});
+        }
+    }
+
+    return result;
+}
+
+
+
+
+
+export function getData1(req, res) {
+    let excelData = hjszzlTableData();
+
+    let ret:any = {};
+
     let qwqsPackageData = onceYBarChartPackage( excelData['气温趋势'], '','');
     ret['qwqs'] = getOnceYBarChartOut('气温趋势', qwqsPackageData);
                     

src/biz/nyjqr.ts

 
 import { nyjqrTableData } from '../data/table/nyjqrData';
+import { systemConfig } from '../config/serverConfig';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
 
@@ -10,27 +11,40 @@ export function getData(req, res) {
 
     let ret:any = {};
     
-    let ysqsfxPackageData = onceYBarChartPackage( excelData['运势趋势分析'], '时长','');
-    ret['ysqsfx'] = getOnceYBarChartOut('运势趋势分析', ysqsfxPackageData);
-                    
-    let qyfbPackageData = onceYBarChartPackage( excelData['区域分布'], '','台套');
-    ret['qyfb'] = getOnceYBarChartOut('区域分布', qyfbPackageData);
-                    
-    let nyjqrsjPackageData = keyValuePackage(excelData['农业机器人数据'].dataList);
-    ret['nyjqrsj'] = getKeyValueOut('农业机器人数据', nyjqrsjPackageData);
+    /**左侧 */
+    let jqrzyPackageData = keyValuePackage(excelData['机器人资源'].dataList);
+    ret['jqrzy'] = getKeyValueOut('机器人资源', jqrzyPackageData);
                     
     let jqrlxzbPackageData = keyValuePackage(excelData['机器人类型占比'].dataList);
     ret['jqrlxzb'] = getKeyValueOut('机器人类型占比', jqrlxzbPackageData);
                     
-    let yhztPackageData = keyValuePackage(excelData['运行状态'].dataList);
-    ret['yhzt'] = getKeyValueOut('运行状态', yhztPackageData);
+    let yxztPackageData = keyValuePackage(excelData['运行状态'].dataList);
+    ret['yxzt'] = getKeyValueOut('运行状态', yxztPackageData);
+
+    let yxqsfxPackageData = onceYBarChartPackage( excelData['运势趋势分析'], '时长','');
+    ret['yxqsfx'] = getOnceYBarChartOut('运势趋势分析', yxqsfxPackageData);
+                    
+    let yxjlTableData = tablePackage(excelData["运行记录"].headerList[0], excelData["运行记录"].bodyList);
+    ret['yxjl'] = getTableOut( '运行记录', yxjlTableData);
                     
-    let yhjlTableData = tablePackage(excelData["运行记录"].headerList[0], excelData["运行记录"].bodyList);
-    ret['yhjl'] = getTableOut( '运行记录', yhjlTableData);
+    let qybjPackageData = onceYBarChartPackage( excelData['区域布局'], '','台套');
+    ret['qybj'] = getOnceYBarChartOut('区域布局', qybjPackageData);
 
+    /**中间 */
     let jqrsjfxPackageData = keyValuePackage(excelData['机器人数据分析'].dataList);
     ret['jqrsjfx'] = getKeyValueOut('机器人数据分析', jqrsjfxPackageData);
                     
+    let xjjlTableData = tablePackage(excelData["巡检记录"].headerList[0], excelData["巡检记录"].bodyList);
+    let xjjl = {dataList:[], titleList:xjjlTableData.titleList};
+    xjjlTableData.dataList.forEach(info => {
+        let {F} = info;
+        let imgUrl = `${systemConfig.imgPath}/机器人/${F}`;
+        info["F"] = imgUrl;
+        xjjl.dataList.push(info);
+    })
+    ret['xjjl'] = getTableOut( '巡检记录', xjjl);
+
+    /**右侧 */         
     let znxjPackageData = keyValuePackage(excelData['智能巡检'].dataList);
     ret['znxj'] = getKeyValueOut('智能巡检', znxjPackageData);
 
@@ -43,9 +57,6 @@ export function getData(req, res) {
     let xjqsPackageData = onceYBarChartPackage( excelData['巡检趋势'], '次数','');
     ret['xjqs'] = getOnceYBarChartOut('巡检趋势', xjqsPackageData);
                     
-    let xjjlTableData = tablePackage(excelData["巡检记录"].headerList[0], excelData["巡检记录"].bodyList);
-    ret['xjjl'] = getTableOut( '巡检记录', xjjlTableData);
-                    
     let znjqrclPackageData = keyValuePackage(excelData['智能机器人产量'].dataList);
     ret['znjqrcl'] = getKeyValueOut('智能机器人产量', znjqrclPackageData);
                     

src/biz/yzdqxdnyzl.ts

 
-import { yzdqxdnyzlTableData } from '../data/table/yzdqxdnyzlData';
+import { jscxTableData, yzdqxdnyzlTableData } from '../data/table/yzdqxdnyzlData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
 
@@ -11,15 +11,15 @@ export function getData(req, res) {
     let ret:any = {};
                     
     /**中上 */
-    // let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList);
-    // ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
+    let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList); //20250115
+    ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
            
     /**左屏 */
     let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList);
     ret['zrzy'] = getKeyValueOut('张江镇自然资源', zrzyPackageData);
                     
-    let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList);
-    ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData);
+    // let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList);
+    // ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData);
                     
     // let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
     // ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
@@ -40,11 +40,11 @@ export function getData(req, res) {
     ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData);
 
     /**右屏 */
-    let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList);
-    ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData);
+    // let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList);
+    // ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData);
 
-    let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList);
-    ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData);
+    // let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList);
+    // ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData);
                     
     // let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList);
     // ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData);
@@ -58,8 +58,8 @@ export function getData(req, res) {
     let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '','');
     ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData);
 
-    // let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList);
-    // ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData);
+    let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList);
+    ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData);
     
     let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '','');
     ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData);
@@ -70,5 +70,37 @@ export function getData(req, res) {
     let jyglqkqstPackageData = onceYBarChartPackage( excelData['农业生产产值趋势图'], '','');
     ret['jyglqkqst'] = getOnceYBarChartOut('农业生产产值趋势图', jyglqkqstPackageData);
 
+    let zlqdTableData = tablePackage(excelData["专利清单"].headerList[0], excelData["专利清单"].bodyList); //20250115
+    ret['zlqd'] = getTableOut( '专利清单', zlqdTableData);                 
+
     res.send(ret);
 }
+
+
+export function getJscxPop(req, res) {
+    let excelData = jscxTableData();
+    
+    let ret:any = {};
+
+    let jscxTable = excelData["技术创新列表"].dataList;
+    let jscxData = {};
+    jscxTable.forEach( info => {
+        let {sj, jsmc, jslx} = info;
+        if(!jscxData[sj]) jscxData[sj] = [];
+        jscxData[sj].push({jsmc, jslx})
+    })
+
+    let jscxList = [];
+    for (let key in jscxData) {
+        jscxList.push({
+            time:key, 
+            count:jscxData[key].length, 
+            dataList:jscxData[key]
+        });
+    }
+    ret['pop'] = {title:"技术创新", dataList:jscxList};
+
+    res.send(ret);
+}
+
+

src/data/table/cyszhglData.ts

@@ -22,26 +22,30 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
 }
 
 export function cyszhglTableData() {
-    
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '产业数字化管理');
 
-    // let keyValueOrTitleList = ["智能灌溉","风险类型占比","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业"];//适配 饼图 键值以及需要多个key的
-    // let barChartList = ["苗情检测","种子投入品使用趋势分析","种苗投入品使用趋势分析","肥料投入品使用趋势分析","农药投入品使用趋势分析",
-    //     "蔬菜效益分析","渔业效益分析","灌溉量趋势分析"]; //适配 柱状图 折线图 
-    // let stringList = [];
-    // let decollatePlanarList =["预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
-    // let titltListConfig = {};
-
-    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);
     return result;
+}
+
 
+export function zzqkTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '种植情况');
 
+    let keyValueOrTitleList = ["种植种类基本情况", "种植作物", "农资情况"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["肥料用药情况", "农事操作", "作物产量（今年）", "作物产量（去年）", "作物销售"]; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList =[];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
 }
+

src/data/table/gbzscbgjdAq.ts

@@ -25,8 +25,8 @@ export function gbzscbgjdAqTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地A区');
 
-    let keyValueOrTitleList = ["A区基地详情","基地分析","产品溯源","产品销售情况占比"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["A区基地详情","基地分析","作物产量", "温度湿度数据"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况","作物月产量情况"]; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList = ["种植作物品种"];//适配 表格
     let titltListConfig = {};

src/data/table/gbzscbgjdBq.ts

@@ -25,8 +25,8 @@ export function gbzscbgjdBqTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地B区');
 
-    let keyValueOrTitleList = ["B区基地详情","基地分析","产品溯源","产品销售情况占比"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["B区基地详情","基地分析","作物产量", "温度湿度数据"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况","作物月产量情况"]; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList = ["种植作物品种"];//适配 表格
     let titltListConfig = {};

src/data/table/hjszzlData.ts

@@ -21,10 +21,28 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
     return result;
 }
 
+
 export function hjszzlTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
 
+    let keyValueOrTitleList = ["温度变化", "湿度变化", "降雨量变化", "温度变化趋势", "湿度变化趋势", "降雨量变化趋势", "光照变化", "土壤监测", 
+    "总体数据", "病害虫治理", "治理情况", "虫害检测灯预警"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["光照变化趋势", "土壤温度变化趋势", "土壤湿度变化趋势", "土壤PH值变化趋势", "土壤电导率变化趋势", "设备监测情况（温度监测）", 
+    "设备监测情况（湿度监测）"]; //适配 柱状图 折线图 //
+    let stringList = [];
+    let decollatePlanarList =["灾害性应急管理", "智能虫情情况"];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result; 
+}
+
+
+export function hjszzlTableData1() {
+    
+    let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
+
     let keyValueOrTitleList = ["土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的
     let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 //
     let stringList = [];
@@ -33,6 +51,4 @@ export function hjszzlTableData() {
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result; 
-
-        
 }
\ No newline at end of file

src/data/table/jdaqglData.ts

@@ -25,11 +25,14 @@ export function jdaqglTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '基地安全管理');
 
-    let keyValueOrTitleList = ["设备类型占比","设备数量","设备状态情况","消防设备","消防设备状态","基地安全管理数据分析","天气数据","设备运行监测","警告次数",
-        "紧急程度","预警处置","预警处置率"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["近七天设备在线情况","告警趋势"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["设备数量","设备类型占比","设备状态情况","消防基础数据", "总体数据", "火灾爆炸", "触电事故", "人身伤害"];//适配 饼图 键值以及需要多个key的
+    // let keyValueOrTitleList = ["设备类型占比","设备数量","设备状态情况","消防设备","消防设备状态","基地安全管理数据分析","天气数据","设备运行监测","警告次数",
+    //     "紧急程度","预警处置","预警处置率"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["近七天设备在线情况"]; //适配 柱状图 折线图 
+    // let barChartList = ["近七天设备在线情况","告警趋势"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["正常状态列表","维护中状态列表","故障状态列表","预警处置表","重点区域监控"];//适配 表格
+    let decollatePlanarList =["重点区域监控", "消防演练/培训情况"];//适配 表格
+    // let decollatePlanarList =["正常状态列表","维护中状态列表","故障状态列表","预警处置表","重点区域监控"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);

src/data/table/nyjqrData.ts

@@ -25,8 +25,8 @@ export function nyjqrTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '农业机器人');
 
-    let keyValueOrTitleList = ["机器人类型占比","机器人资源","运行状态","农业机器人数据","智能巡检","巡检完成情况","智能机器人产量","机器人类型占比","机器人数据分析"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["运势趋势分析","区域分布","巡检设备类型","巡检趋势","近半年产量趋势"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["机器人类型占比","机器人资源","运行状态","智能巡检","巡检完成情况","智能机器人产量","机器人类型占比","机器人数据分析"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["运势趋势分析","区域布局","巡检设备类型","巡检趋势","近半年产量趋势"]; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList =["运行记录","巡检记录"];//适配 表格
     let titltListConfig = {};

src/data/table/yzdqxdnyzlData.ts

@@ -22,7 +22,6 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
 }
 
 export function yzdqxdnyzlTableData() {
-    
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊');
 
     let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构",
@@ -31,11 +30,26 @@ export function yzdqxdnyzlTableData() {
 
     let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList = [];//适配 表格
+    let decollatePlanarList = ["专利清单"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
     return result;
+}
+
 
+export function jscxTableData() {
+    let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '技术创新');
 
+    let keyValueOrTitleList = ["技术创新列表"];//适配 饼图 键值以及需要多个key的
+
+    let barChartList = []; //适配 柱状图 折线图 
+    let stringList = [];
+    let decollatePlanarList = [];//适配 表格
+    let titltListConfig = {};
+
+    let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
+    return result;
 }
+
+

src/routers/router.ts

@@ -28,24 +28,19 @@ export function setRouter(httpServer){
     httpServer.get('/data', asyncHandler(leftBiz.getData));
     httpServer.get('/right', asyncHandler(leftBiz.getRight));
 
-    //机器人
-    httpServer.get('/jiqiren/left', asyncHandler(jiQiRenBiz.getLeft));
-    httpServer.get('/jiqiren/top', asyncHandler(jiQiRenBiz.getTop));
-    httpServer.get('/jiqiren/right', asyncHandler(jiQiRenBiz.getRight));
-
     //======post
     httpServer.post('/weather', asyncHandler(leftBiz.getData));
     httpServer.get('/weather', asyncHandler(leftBiz.getData));
 
     httpServer.post('/cyszhgl', asyncHandler(cyszhglBiz.getData));
-    httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
-    httpServer.post('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
+    httpServer.post('/zzqk', asyncHandler(cyszhglBiz.zzqk));
+    // httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
+    // httpServer.post('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
         
     httpServer.post('/gfny', asyncHandler(gfnyBiz.getData));
 
-    httpServer.post('/sdt1hgfb', asyncHandler(sdt1hgfbBiz.getData));
-
     httpServer.post('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData));
+    httpServer.post('/jscxpop', asyncHandler(yzdqxdnyzlBiz.getJscxPop));
         
     httpServer.post('/hjszzl', asyncHandler(hjszzlBiz.getData));
         
@@ -60,14 +55,14 @@ export function setRouter(httpServer){
     //======get
     
     httpServer.get('/cyszhgl', asyncHandler(cyszhglBiz.getData));
-    httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
-    httpServer.get('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
+    httpServer.get('/zzqk', asyncHandler(cyszhglBiz.zzqk));
+    // httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
+    // httpServer.get('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
         
     httpServer.get('/gfny', asyncHandler(gfnyBiz.getData));
 
-    httpServer.get('/sdt1hgfb', asyncHandler(sdt1hgfbBiz.getData));
-
     httpServer.get('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData));
+    httpServer.get('/jscxpop', asyncHandler(yzdqxdnyzlBiz.getJscxPop));
         
     httpServer.get('/hjszzl', asyncHandler(hjszzlBiz.getData));