no message

src/biz/cyszhgl.ts

@@ -11,12 +11,6 @@ export function getData(req, res) {
     let ret:any = {};
 
 
-    let keyValueOrTitleList = ["风险类型占比","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["苗情检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图 
-    let stringList = [];
-    let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息", "安全管理"];//适配 表格
-    let titltListConfig = {};
-
     // let mqjcPackageData = onceYBarChartPackage( excelData['苗情检测'], '成熟度','');
     // ret['mqjc'] = getOnceYBarChartOut('苗情检测', mqjcPackageData);
     let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList);
@@ -32,8 +26,8 @@ export function getData(req, res) {
     let trpsyqkPackageData = onceYBarChartPackage( excelData['投入品使用情况'], '','');
     ret['trpsyqk'] = getOnceYBarChartOut('投入品使用情况', trpsyqkPackageData);
 
-    let lsfkwzsyqkPackageData = onceYBarChartPackage( excelData['绿色防控物资使用情况'], '','');
-    ret['lsfkwzsyqk'] = getOnceYBarChartOut('绿色防控物资使用情况', lsfkwzsyqkPackageData);
+    let lsfkwzsyqkPackageData = doubleYBarCharPackage( excelData['绿色防控物资使用情况'], "亩次", '使用量','亩次');
+    ret['lsfkwzsyqk'] = getDoubleYBarChartOut('绿色防控物资使用情况', lsfkwzsyqkPackageData);
 
     let fxyjPackageData = keyValuePackage(excelData['风险预警'].dataList);
     ret['fxyj'] = getKeyValueOut('风险预警', fxyjPackageData);
@@ -44,14 +38,39 @@ export function getData(req, res) {
     let yjxqgdTableData = tablePackage(excelData["预警详情工单"].headerList[0], excelData["预警详情工单"].bodyList);
     ret['yjxqgd'] = getTableOut( '预警详情工单', yjxqgdTableData);
 
+    let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList);
+    ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData);
 
+    let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
+    ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
 
-    //===
+    let scxyfxPackageData = onceYBarChartPackage(excelData['蔬菜效益分析'],  '日统计', '' );
+    ret['scxyfx'] = getOnceYBarChartOut('蔬菜效益分析', scxyfxPackageData);
 
+    let yyxyfxPackageData = onceYBarChartPackage(excelData['渔业效益分析'], '日统计', '' );
+    ret['yyxyfx'] = getOnceYBarChartOut('渔业效益分析', yyxyfxPackageData);
+    
+    let xyfxPackageData = onceYBarChartPackage(excelData['效益分析'], '元', '' );
+    ret['xyfx'] = getOnceYBarChartOut('效益分析', xyfxPackageData);
+    
+    let cyxlphPackageData = keyValuePackage(excelData['产业销量排行'].dataList);
+    ret['cyxlph'] = getKeyValueOut('产业销量排行', cyxlphPackageData);
+
+    let cpsyxxTableData = tablePackage(excelData["产品溯源信息"].headerList[0], excelData["产品溯源信息"].bodyList);
+    ret['cpsyxx'] = getTableOut( '产品溯源信息', cpsyxxTableData);
+
+    let aqglTableData = keyValuePackage(excelData["安全管理"].dataList);
+    ret['aqgl'] = getKeyValueOut( '安全管理', aqglTableData);
+
+    let ncpaqzljcPackageData = onceYBarChartPackage(excelData['农产品安全质量检测'], '日统计', '' );
+    ret['ncpaqzljc'] = getOnceYBarChartOut('农产品安全质量检测', ncpaqzljcPackageData);
+
+                    
+    let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList);
+    let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList);
+    ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData));
 
    
-    let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
-    ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
                     
     // let zztrpsyqsfxPackageData = onceYBarChartPackage( excelData['种子投入品使用趋势分析'], '斤','');
     // ret['zztrpsyqsfx'] = getOnceYBarChartOut('种子投入品使用趋势分析', zztrpsyqsfxPackageData);
@@ -65,11 +84,6 @@ export function getData(req, res) {
     // let nytrpsyqsfxPackageData = onceYBarChartPackage( excelData['农药投入品使用趋势分析'], '斤','');
     // ret['nytrpsyqsfx'] = getOnceYBarChartOut('农药投入品使用趋势分析', nytrpsyqsfxPackageData);
                     
-    let scxyfxPackageData = doubleYBarCharPackage(excelData['蔬菜效益分析'], [], '吨', '万元' );
-    ret['scxyfx'] = getDoubleYBarChartOut('蔬菜效益分析', scxyfxPackageData);
-
-    let yyxyfxPackageData = doubleYBarCharPackage(excelData['渔业效益分析'], [], '吨', '万元' );
-    ret['yyxyfx'] = getDoubleYBarChartOut('渔业效益分析', yyxyfxPackageData);
     
     
 
@@ -93,18 +107,10 @@ export function getData(req, res) {
                     
     
                     
-                    
-    let cyxlphPackageData = keyValuePackage(excelData['产业销量排行'].dataList);
-    ret['cyxlph'] = getKeyValueOut('产业销量排行', cyxlphPackageData);
-                    
     // let cpsyxxPackageData = keyValuePackage(excelData['产品溯源信息'].dataList);
     // ret['cpsyxx'] = getKeyValueOut('产品溯源信息', cpsyxxPackageData);
 
-    let cpsyxxTableData = tablePackage(excelData["产品溯源信息"].headerList[0], excelData["产品溯源信息"].bodyList);
-    ret['cpsyxx'] = getTableOut( '产品溯源信息', cpsyxxTableData);
     
-    let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList);
-    ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData);
 
     
                     
@@ -118,14 +124,14 @@ export function getData(req, res) {
     //     znggTableData[ntwz] = info;
     // })
 
-    // let znggTableData = {};
-    // excelData["智能灌溉"].dataList.forEach( info => {
-    //     let {ntwz, trsd, ggsj, ggjgsj, sfxygg, imageSrc} = info;
-    //     info["img"] = imageSrc || '图片地址';
-    //     znggTableData[ntwz] = info;
-    // })
+    let znggTableData = {};
+    excelData["智能灌溉"].dataList.forEach( info => {
+        let {ntwz, trsd, ggsj, ggjgsj, sfxygg, imageSrc} = info;
+        info["img"] = imageSrc || '图片地址';
+        znggTableData[ntwz] = info;
+    })
 
-    // ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
+    ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
                      
     res.send(ret);
 }

src/data/table/cyszhglData.ts

@@ -32,10 +32,10 @@ export function cyszhglTableData() {
     // let decollatePlanarList =["预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
     // let titltListConfig = {};
 
-    let keyValueOrTitleList = ["风险类型占比","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["苗情检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["风险类型占比", "安全管理","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理", "智能灌溉", "智能灌溉分析"];//适配 饼图 键值以及需要多个key的
+    let barChartList = ["苗情检测","农产品安全质量检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图 
     let stringList = [];
-    let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息", "安全管理"];//适配 表格
+    let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
     let titltListConfig = {};