no message

.gitignore

@@ -6,3 +6,4 @@
 *test*
 *.log
 *.zip
+*.xlsx
\ No newline at end of file

src/biz/gbzscbgjdAq.ts

@@ -11,44 +11,34 @@ export function getData(req, res) {
 
     let ret:any = {};
                     
-    let zzzwclqkPackageData = onceYBarChartPackage(excelData['种植作物产量情况'], '', '');
-    
-    // 添加全部作物的数据汇总叶菜和根茎类数据
-    let allCropsData = excelData['叶菜类']?.dataList.concat(excelData['根茎类']?.dataList || []);
-    if (allCropsData) {
-        let allCropsPackageData = onceYBarChartPackage(allCropsData, '', '');
-        ret['全部作物'] = getOnceYBarChartOut('全部作物', allCropsPackageData);
-    }
-
-    ret['zzzwclqk'] = getOnceYBarChartOut('种植作物产量情况', zzzwclqkPackageData);
-
-                    
     let AqjdxqPackageData = keyValuePackage(excelData['A区基地详情'].dataList);
     ret['Aqjdxq'] = getKeyValueOut('A区基地详情', AqjdxqPackageData);
 
     let jdfxPackageData = keyValuePackage(excelData['基地分析'].dataList);
     ret['jdfx'] = getKeyValueOut('基地分析', jdfxPackageData);
                     
-    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
-    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
-
-    let cpfxzbPackageData = keyValuePackage(excelData['产品分销占比'].dataList);
-    ret['cpfxzb'] = getKeyValueOut('产品分销占比', cpfxzbPackageData);
-                    
     let zzzwpzTableData = tablePackage(excelData["种植作物品种"].headerList[0], excelData["种植作物品种"].bodyList);
     zzzwpzTableData.titleList.push("图片地址");
-
     let zzzwpz = {dataList:[], titleList:zzzwpzTableData.titleList};
-
     zzzwpzTableData.dataList.forEach(info => {
         let {A} = info;
         let imgUrl = `${systemConfig.imgPath}/${A}.png`;
         info["F"] = imgUrl;
         zzzwpz.dataList.push(info);
     })
-
     ret['zzzwpz'] = getTableOut( '种植作物品种', zzzwpz);
 
+    let yclzzclqkPackageData = onceYBarChartPackage(excelData['叶菜类种植产量情况'], '', '');
+    ret['yclzzclqk'] = getOnceYBarChartOut('叶菜类种植产量情况', yclzzclqkPackageData);
+
+    let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
+    ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
+                    
+    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
+    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
+
+    let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList);
+    ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData);
                  
     res.send(ret);
 } 
\ No newline at end of file

src/biz/gbzscbgjdBq.ts

@@ -12,35 +12,34 @@ export function getData(req, res) {
 
     let ret:any = {};
                     
-    let zzzwclqkPackageData = onceYBarChartPackage( excelData['种植作物产量情况'], '','');
-    ret['zzzwclqk'] = getOnceYBarChartOut('种植作物产量情况', zzzwclqkPackageData);
-                    
-    let BqjdxqPackageData = keyValuePackage(excelData['B区基地详情'].dataList);
-    ret['Bqjdxq'] = getKeyValueOut('B区基地详情', BqjdxqPackageData);
+    let AqjdxqPackageData = keyValuePackage(excelData['B区基地详情'].dataList);
+    ret['Aqjdxq'] = getKeyValueOut('B区基地详情', AqjdxqPackageData);
 
     let jdfxPackageData = keyValuePackage(excelData['基地分析'].dataList);
     ret['jdfx'] = getKeyValueOut('基地分析', jdfxPackageData);
                     
-    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
-    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
-
-    let cpfxzbPackageData = keyValuePackage(excelData['产品分销占比'].dataList);
-    ret['cpfxzb'] = getKeyValueOut('产品分销占比', cpfxzbPackageData);
-                    
     let zzzwpzTableData = tablePackage(excelData["种植作物品种"].headerList[0], excelData["种植作物品种"].bodyList);
-    zzzwpzTableData.titleList.push('图片地址');
-
-    let zzzwpz = {dataList:[],titleList:zzzwpzTableData.titleList};
-
+    zzzwpzTableData.titleList.push("图片地址");
+    let zzzwpz = {dataList:[], titleList:zzzwpzTableData.titleList};
     zzzwpzTableData.dataList.forEach(info => {
-        let {B} = info;
-        let imgUrl = `${systemConfig.imgPath}/${B}.png`;
-        info['F'] = imgUrl;
+        let {A} = info;
+        let imgUrl = `${systemConfig.imgPath}/${A}.png`;
+        info["F"] = imgUrl;
         zzzwpz.dataList.push(info);
-        });
+    })
+    ret['zzzwpz'] = getTableOut( '种植作物品种', zzzwpz);
+
+    let yclzzclqkPackageData = onceYBarChartPackage(excelData['叶菜类种植产量情况'], '', '');
+    ret['yclzzclqk'] = getOnceYBarChartOut('叶菜类种植产量情况', yclzzclqkPackageData);
+
+    let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
+    ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
                     
-    ret['zzzwpz'] = getTableOut( '种植作物品种', zzzwpzTableData);
+    let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList);
+    ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData);
 
+    let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList);
+    ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData);
                     
     res.send(ret);
 } 
\ No newline at end of file

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,10 +25,10 @@ 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 decollatePlanarList = ["种植作物品种"];//适配 表格
     let titltListConfig = {};
 
     let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);