no message

serverConfig.xml

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

src/biz/yzdqxdnyzl.ts

@@ -10,21 +10,33 @@ export function getData(req, res) {
 
     let ret:any = {};
                     
+    /**中上 */
+    let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList);
+    ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
+           
+    /**左屏 */
+    let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList);
+    ret['zrzy'] = getKeyValueOut('张江镇自然资源', zrzyPackageData);
+                    
     let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList);
     ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData);
                     
-    let zrzyPackageData = keyValuePackage(excelData['自然资源'].dataList);
-    ret['zrzy'] = getKeyValueOut('自然资源', zrzyPackageData);
-                    
     let qyqkPackageData = keyValuePackage(excelData['企业情况'].dataList);
     ret['qyqk'] = getKeyValueOut('企业情况', qyqkPackageData);
                     
+    let zyyglxPackageData = keyValuePackage(excelData['专业员工类型'].dataList);
+    ret['zyyglx'] = getKeyValueOut('专业员工类型', zyyglxPackageData);
+                    
+    let cyryqkPackageData = keyValuePackage(excelData['从业人员情况'].dataList);
+    ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData);
+                    
     let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
     ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
                     
     let cyztjgPackageData = keyValuePackage(excelData['产业主体结构'].dataList);
     ret['cyztjg'] = getKeyValueOut('产业主体结构', cyztjgPackageData);
 
+    /**右屏 */
     let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList);
     ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData);
 
@@ -34,32 +46,26 @@ export function getData(req, res) {
     let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList);
     ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData);
 
+    let jsyjqkPackageData = keyValuePackage(excelData['技术创新引进情况'].dataList);
+    ret['jsyjqk'] = getKeyValueOut('技术创新引进情况', jsyjqkPackageData);
+                    
     let cxjsjcsjPackageData = keyValuePackage(excelData['创新技术基础数据'].dataList);
     ret['cxjsjcsj'] = getKeyValueOut('创新技术基础数据', cxjsjcsjPackageData);
 
+    let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '','');
+    ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData);
+
     let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList);
     ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData);
     
-    let jsyjqkPackageData = keyValuePackage(excelData['技术创新引进情况'].dataList);
-    ret['jsyjqk'] = getKeyValueOut('技术创新引进情况', jsyjqkPackageData);
-
-    let jscxqsPackageData = onceYBarChartPackage( excelData['创新技术创新趋势'], '','');
-    ret['jscxqs'] = getOnceYBarChartOut('创新技术创新趋势', jscxqsPackageData);
-    
     let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '','');
     ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData);
 
-    let jyglqkqstPackageData = keyValuePackage( excelData['经营管理情况趋势图'].dataList);
-    ret['jyglqkqst'] = getKeyValueOut('经营管理情况趋势图', jyglqkqstPackageData);
-
     let jyglqkPackageData = keyValuePackage(excelData['经营管理情况'].dataList);
     ret['jyglqk'] = getKeyValueOut('经营管理情况', jyglqkPackageData);
                     
-    let zyyglxPackageData = keyValuePackage(excelData['专业员工类型'].dataList);
-    ret['zyyglx'] = getKeyValueOut('专业员工类型', zyyglxPackageData);
-                    
-    let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList);
-    ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
+    let jyglqkqstPackageData = keyValuePackage( excelData['农业生产产值趋势图'].dataList);
+    ret['jyglqkqst'] = getKeyValueOut('农业生产产值趋势图', jyglqkqstPackageData);
                      
     res.send(ret);
 } 
\ No newline at end of file

src/data/table/yzdqxdnyzlData.ts

@@ -25,9 +25,10 @@ export function yzdqxdnyzlTableData() {
     
     let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊');
 
-    let keyValueOrTitleList = ["水资源利用率","自然资源","企业情况","产业结构","产业主体结构","重点项目建设","专家服务","技术创新引进情况","引进技术基础数据","创新技术基础数据",
-        "经营管理情况","经营管理情况趋势图","专业员工类型","总体数据分布","项目分析"];//适配 饼图 键值以及需要多个key的
-    let barChartList = ["创新技术创新趋势","引进技术创新趋势"]; //适配 柱状图 折线图 
+    let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构",
+    "重点项目建设","项目分析","专家服务","技术创新引进情况","创新技术基础数据","引进技术基础数据","经营管理情况","农业生产产值趋势图"];//适配 饼图 键值以及需要多个key的
+
+    let barChartList = ["技术创新趋势","引进技术创新趋势"]; //适配 柱状图 折线图 
     let stringList = [];
     let decollatePlanarList =[];//适配 表格
     let titltListConfig = {};