项目整合

serverConfig.xml

 <config>
-    <port>40029</port>
+    <port>40028</port>
     <imgPath>http://192.168.0.189:40028</imgPath>
     <token>73n6124cv7rq614c572x80jma7mj3yhs</token>
     <userName>1</userName>

src/biz/cyszhgl.ts

@@ -12,6 +12,9 @@ export function getData(req, res) {
 
     let mqjcPackageData = onceYBarChartPackage( excelData['苗情检测'], '成熟度','');
     ret['mqjc'] = getOnceYBarChartOut('苗情检测', mqjcPackageData);
+
+    let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
+    ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
                     
     let zztrpsyqsfxPackageData = onceYBarChartPackage( excelData['种子投入品使用趋势分析'], '斤','');
     ret['zztrpsyqsfx'] = getOnceYBarChartOut('种子投入品使用趋势分析', zztrpsyqsfxPackageData);

src/biz/jdaqgl.ts

 
+import { systemConfig } from '../config/serverConfig';
 import { jdaqglTableData } from '../data/table/jdaqglData';
 import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
 import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
@@ -45,6 +46,9 @@ export function getData(req, res) {
                     
     let sbyhjcPackageData = keyValuePackage(excelData['设备运行监测'].dataList);
     ret['sbyhjc'] = getKeyValueOut('设备运行监测', sbyhjcPackageData);
+
+    let jgcsPackageData = keyValuePackage(excelData['警告次数'].dataList);
+    ret['jgcs'] = getKeyValueOut('警告次数', jgcsPackageData);
                     
     let jjcdPackageData = keyValuePackage(excelData['紧急程度'].dataList);
     ret['jjcd'] = getKeyValueOut('紧急程度', jjcdPackageData);
@@ -58,8 +62,17 @@ export function getData(req, res) {
     let yjczlPackageData = keyValuePackage(excelData['预警处置率'].dataList);
     ret['yjczl'] = getKeyValueOut('预警处置率', yjczlPackageData);
                     
-    let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList);
-    ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData);
+    // let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList);
+    // ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData);
+    let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
+    ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkTableData);
+    // let zdqyjkData = [];
+    // zdqyjkPackageData.forEach( info => {
+    //     let {key, value} = info;
+    //     let imgUrl = `${systemConfig.imgPath}/${key}.png`;
+    //     zdqyjkData.push({key, value, imgUrl});
+    // })
+    // ret['zdqyjk'] = {title:"重点区域监控", dataList:zdqyjkData};
                     
     let yjczbTableData = tablePackage(excelData["预警处置表"].headerList[0], excelData["预警处置表"].bodyList);
     ret['yjczb'] = getTableOut( '预警处置表', yjczbTableData);

src/data/table/cyszhglData.ts

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

src/data/table/hjszzlData.ts

@@ -25,8 +25,8 @@ export function hjszzlTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
 
-    let keyValueOrTitleList = ["天气检测","土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化","NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 //
+    let keyValueOrTitleList = ["天气检测","土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 //
     let stringList = [];
     let decollatePlanarList =["天气检测表"];//适配 表格
     let titltListConfig = {};

src/data/table/jdaqglData.ts

@@ -25,10 +25,11 @@ export function jdaqglTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.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);