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

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

+[2024-12-29T14:49:47.788] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T14:53:13.297] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T14:54:45.694] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:52:56.243] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:52:57.316] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:52:58.382] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:52:59.437] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:53:00.498] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:53:01.555] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T15:54:09.962] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T16:15:52.352] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T16:16:08.512] [ERROR] errorLogger - errorInfo =>   undefined |  
+[2024-12-29T16:17:42.266] [ERROR] errorLogger - errorInfo =>   undefined |  

src/biz/cyszhgl.ts

 
+import { systemConfig } from '../config/serverConfig';
 import { cyszhglTableData } from '../data/table/cyszhglData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -10,15 +11,11 @@ export function getData(req, res) {
 
     let ret:any = {};
 
-
-    // let mqjcPackageData = onceYBarChartPackage( excelData['苗情检测'], '成熟度','');
-    // ret['mqjc'] = getOnceYBarChartOut('苗情检测', mqjcPackageData);
     let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList);
     ret['sfjdgl'] = getKeyValueOut('示范基地概览', sfjdglPackageData);
 
     let rzqyqkTableData = tablePackage(excelData["入驻企业情况"].headerList[0], excelData["入驻企业情况"].bodyList);
     ret['rzqyqk'] = getTableOut( '入驻企业情况', rzqyqkTableData);
-    
 
     let sfdtrpsyjlPackageData = keyValuePackage(excelData['示范地投入品使用记录'].dataList);
     ret['sfdtrpsyjl'] = getKeyValueOut('示范地投入品使用记录', sfdtrpsyjlPackageData);
@@ -70,64 +67,10 @@ export function getData(req, res) {
     let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList);
     ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData));
 
-   
-                    
-    // let zztrpsyqsfxPackageData = onceYBarChartPackage( excelData['种子投入品使用趋势分析'], '斤','');
-    // ret['zztrpsyqsfx'] = getOnceYBarChartOut('种子投入品使用趋势分析', zztrpsyqsfxPackageData);
-                    
-    // let zmtrpsyqsfxPackageData = onceYBarChartPackage( excelData['种苗投入品使用趋势分析'], '斤','');
-    // ret['zmtrpsyqsfx'] = getOnceYBarChartOut('种苗投入品使用趋势分析', zmtrpsyqsfxPackageData);
-                    
-    // let fltrpsyqsfxPackageData = onceYBarChartPackage( excelData['肥料投入品使用趋势分析'], '斤','');
-    // ret['fltrpsyqsfx'] = getOnceYBarChartOut('肥料投入品使用趋势分析', fltrpsyqsfxPackageData);
-                    
-    // let nytrpsyqsfxPackageData = onceYBarChartPackage( excelData['农药投入品使用趋势分析'], '斤','');
-    // ret['nytrpsyqsfx'] = getOnceYBarChartOut('农药投入品使用趋势分析', nytrpsyqsfxPackageData);
-                    
-    
-    
-
-    
-    // let zzzlTableData = tablePackage(excelData["种植种类"].headerList[0], excelData["种植种类"].bodyList);
-    // ret['zzzl'] = getTableOut( '种植种类', zzzlTableData);
-  
-
-                    
-    // let zzzlPackageData = keyValuePackage(excelData['种植种类'].dataList);
-    // ret['zzzl'] = getKeyValueOut('种植种类', zzzlPackageData);
-
-    // let zzfbPackageData = keyValuePackage(excelData['种植分布'].dataList);
-    // ret['zzfb'] = getKeyValueOut('种植分布', zzfbPackageData);
-    
-   
-    
-    // let zzfbTableData = tablePackage(excelData["种植分布"].headerList[0], excelData["种植分布"].bodyList);
-    // ret['zzfb'] = getTableOut( '种植分布', zzfbTableData);
-                    
-                    
-    
-                    
-    // let cpsyxxPackageData = keyValuePackage(excelData['产品溯源信息'].dataList);
-    // ret['cpsyxx'] = getKeyValueOut('产品溯源信息', cpsyxxPackageData);
-
-    
-
-    
-                    
-    // let znggTableData = onceYBarChartPackage( excelData['智能灌溉'], '','');
-    // ret['zngg'] = getOnceYBarChartOut('智能灌溉', znggTableData);
-    // let znggTableData = tablePackage(excelData["智能灌溉"].headerList[0], excelData["智能灌溉"].bodyList);
-    // let znggTableData = {};
-    // excelData["智能灌溉"].dataList.forEach( info => {
-    //     let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
-    //     info["img"] =
-    //     znggTableData[ntwz] = info;
-    // })
-
     let znggTableData = {};
     excelData["智能灌溉"].dataList.forEach( info => {
-        let {ntwz, trsd, ggsj, ggjgsj, sfxygg, imageSrc} = info;
-        info["img"] = imageSrc || '图片地址';
+        let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
+        info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
         znggTableData[ntwz] = info;
     })
 

src/biz/getData.ts

@@ -131,7 +131,7 @@ let guangfuData = {
         {
           key: "电力烟尘",
           value: "0.032克/千瓦时",
-        },
+        }
       ],
       chartData: [
       ],