no message

src/biz/cyszhgl.ts

@@ -38,9 +38,6 @@ export function getData(req, res) {
     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);
 
@@ -75,6 +72,16 @@ export function getData(req, res) {
     })
 
     ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
+
+    let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '','');
+    ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData);
+    // let gglqsfxPackageData = {};
+    // excelData["灌溉量趋势分析"].forEach( info => {
+    //     let itemChart = onceYBarChartPackage( [info], '','');
+    //     gglqsfxPackageData[info.name] = getOnceYBarChartOut('投入品使用情况', itemChart);
+    // })
+
+    // ret['gglqsfx'] = {title:"灌溉量趋势分析", dataList:gglqsfxPackageData};
                      
     res.send(ret);
 }
@@ -82,8 +89,8 @@ export function getData(req, res) {
 /**
  * 种植种类/种植分布
  */
-export async function zzzl(req, res) {
-    let {type} = req.body;
+export function zzzl(req, res) {
+    let {type} = req.query;
     let excelData = cyszhglTableData();
     let ret:any = {};
 
@@ -102,13 +109,14 @@ export async function zzzl(req, res) {
     // ret['zzzl'] = getTableOut( '种植种类', zzzlTableData);
     let keyMap = config[type] || {};
     let zzzlTableDataList = [];
-    zzzlAllTableData.valueList.forEach(subList => {
-        let name = subList[0]
+    zzzlAllTableData.dataList.forEach(item => {
+        let name = item["A"]
         if (keyMap[name]) {
             zzzlTableDataList.push({
                 key:name,
-                value:subList[1] || "0株",
-                rate:subList[2] || "0%"
+                value:item["B"] || "0株",
+                rate:item["C"] || "0%",
+                img:`${systemConfig.imgPath}/蔬菜保供基地/${name}.png`
             });
         }
     });