Skip to content

Z
zjntServer
Commit aa7bd934 by chenjinjing
Options

no message

parent de620a0c
Showing with 614 additions and 184 deletions
img/蔬菜保供基地/辣椒.png
img/蔬菜保供基地/辣椒.png

15.8 KB | W: | H:

img/蔬菜保供基地/辣椒.png

15.7 KB | W: | H:

img/蔬菜保供基地/辣椒.png
img/蔬菜保供基地/辣椒.png
img/蔬菜保供基地/辣椒.png
img/蔬菜保供基地/辣椒.png
  • 2-up
  • Swipe
  • Onion skin
img/蔬菜保供基地/青菜.png
img/蔬菜保供基地/青菜.png

20 KB | W: | H:

img/蔬菜保供基地/青菜.png

15.9 KB | W: | H:

img/蔬菜保供基地/青菜.png
img/蔬菜保供基地/青菜.png
img/蔬菜保供基地/青菜.png
img/蔬菜保供基地/青菜.png
  • 2-up
  • Swipe
  • Onion skin
logs/error/error.-2024-12-29.log.1 deleted 100644 → 0
[2024-12-29T19:13:18.722] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:20:53.877] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:20:55.909] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:20:56.996] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:20:58.072] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:20:59.134] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:00.192] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:18.153] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:19.349] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:20.405] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:21.484] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:22.551] [ERROR] errorLogger - errorInfo => undefined |
[2024-12-29T19:21:23.605] [ERROR] errorLogger - errorInfo => undefined |
res/zjny.xlsx
No preview for this file type
src/biz/cyszhgl.ts
import { systemConfig } from '../config/serverConfig'; import { systemConfig } from '../config/serverConfig';
import { cyszhglTableData } from '../data/table/cyszhglData'; import { cyszhglTableData, zzqkTableData } from '../data/table/cyszhglData';
import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut'; import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out'; import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
...@@ -11,73 +11,137 @@ export function getData(req, res) { ...@@ -11,73 +11,137 @@ export function getData(req, res) {
let ret:any = {}; let ret:any = {};
let ztsjPackageData = keyValuePackage(excelData['总体数据'].dataList);
ret['ztsj'] = getKeyValueOut('总体数据', ztsjPackageData);
let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList); let sfjdglPackageData = keyValuePackage(excelData['示范基地概览'].dataList);
ret['sfjdgl'] = getKeyValueOut('示范基地概览', sfjdglPackageData); ret['sfjdgl'] = getKeyValueOut('示范基地概览', sfjdglPackageData);
let lychxjdzmjPackageData = keyValuePackage(excelData['绿叶菜核心基地总面积'].dataList); let lychxjdzmjPackageData = keyValuePackage(excelData['绿叶菜核心基地总面积'].dataList);
ret['lychxjdzmj'] = getKeyValueOut('绿叶菜核心基地面积', lychxjdzmjPackageData); ret['lychxjdzmj'] = getKeyValueOut('绿叶菜核心基地面积', lychxjdzmjPackageData);
let rzqyqkTableData = tablePackage(excelData["入驻企业情况"].headerList[0], excelData["入驻企业情况"].bodyList); let rzqyqkPackageData = keyValuePackage(excelData['入驻企业情况'].dataList);
ret['rzqyqk'] = getTableOut( '入驻企业情况', rzqyqkTableData); ret['rzqyqk'] = getKeyValueOut('入驻企业情况', rzqyqkPackageData);
let yclzzqkPackageData = keyValuePackage(excelData['叶菜类种植情况'].dataList);
let yclzzqk = [];
yclzzqkPackageData.forEach( info => {
let {key, value, unit} = info;
let imgUrl = `${systemConfig.imgPath}/蔬菜保供基地/${info.key}.png`;
yclzzqk.push({key, value, unit, img:imgUrl});
})
ret['yclzzqk'] = {title:'叶菜类种植情况', dataList:yclzzqk};
let qglzzqkPackageData = keyValuePackage(excelData['茄果类种植情况'].dataList);
let qglzzqk = [];
qglzzqkPackageData.forEach( info => {
let {key, value, unit} = info;
let imgUrl = `${systemConfig.imgPath}/蔬菜保供基地/${info.key}.png`;
qglzzqk.push({key, value, unit, img:imgUrl});
})
ret['qglzzqk'] = {title:'茄果类种植情况', dataList:qglzzqk};
let hhlzzqkPackageData = keyValuePackage(excelData['花卉类种植情况'].dataList);
let hhlzzqk = [];
hhlzzqkPackageData.forEach( info => {
let {key, value, unit} = info;
let imgUrl = `${systemConfig.imgPath}/蔬菜保供基地/${info.key}.png`;
hhlzzqk.push({key, value, unit, img:imgUrl});
})
ret['hhlzzqk'] = {title:'花卉类种植情况', dataList:hhlzzqk};
let sfdtrpsyjlPackageData = keyValuePackage(excelData['示范地投入品使用记录'].dataList); let sfdtrpsyjlPackageData = keyValuePackage(excelData['示范地投入品使用记录'].dataList);
ret['sfdtrpsyjl'] = getKeyValueOut('示范地投入品使用记录', sfdtrpsyjlPackageData); ret['sfdtrpsyjl'] = getKeyValueOut('示范地投入品使用记录', sfdtrpsyjlPackageData);
let yclclczPackageData = doubleYBarCharPackage( excelData['叶菜类产量产值变化趋势'], "", '','');
ret['yclclcz'] = getDoubleYBarChartOut('叶菜类产量产值变化趋势', yclclczPackageData);
let qglclczPackageData = doubleYBarCharPackage( excelData['茄果类产量产值变化趋势'], "", '','');
ret['qglclcz'] = getDoubleYBarChartOut('茄果类产量产值变化趋势', qglclczPackageData);
let lslclczPackageData = doubleYBarCharPackage( excelData['粮食类产量产值变化趋势'], "", '','');
ret['lslclcz'] = getDoubleYBarChartOut('粮食类产量产值变化趋势', lslclczPackageData);
let hhlclczPackageData = doubleYBarCharPackage( excelData['花卉类产量产值变化趋势'], "", '','');
ret['hhlclcz'] = getDoubleYBarChartOut('花卉类产量产值变化趋势', hhlclczPackageData);
let sclclczPackageData = doubleYBarCharPackage( excelData['水产类产量产值变化趋势'], "", '','');
ret['sclclcz'] = getDoubleYBarChartOut('水产类产量产值变化趋势', sclclczPackageData);
let trpsyqkPackageData = onceYBarChartPackage( excelData['投入品使用情况'], '',''); let trpsyqkPackageData = onceYBarChartPackage( excelData['投入品使用情况'], '','');
ret['trpsyqk'] = getOnceYBarChartOut('投入品使用情况', trpsyqkPackageData); ret['trpsyqk'] = getOnceYBarChartOut('投入品使用情况', trpsyqkPackageData);
let lsfkwzsyqkPackageData = doubleYBarCharPackage( excelData['绿色防控物资使用情况'], "亩次", '使用量','亩次'); let trpsyqkyjlPackageData = keyValuePackage(excelData['投入品使用情况预警值'].dataList);
ret['lsfkwzsyqk'] = getDoubleYBarChartOut('绿色防控物资使用情况', lsfkwzsyqkPackageData); ret['trpsyqkyjl'] = getKeyValueOut('投入品使用情况预警值', trpsyqkyjlPackageData);
let fxyjPackageData = keyValuePackage(excelData['风险预警'].dataList);
ret['fxyj'] = getKeyValueOut('风险预警', fxyjPackageData);
let fxlxzbPackageData = keyValuePackage(excelData['风险类型占比'].dataList);
ret['fxlxzb'] = getKeyValueOut('风险类型占比', fxlxzbPackageData);
let yjxqgdTableData = tablePackage(excelData["预警详情工单"].headerList[0], excelData["预警详情工单"].bodyList);
ret['yjxqgd'] = getTableOut( '预警详情工单', yjxqgdTableData);
let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList);
ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData);
let znggTableData = {};
excelData["智能灌溉"].dataList.forEach( info => {
let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
znggTableData[ntwz] = info;
})
ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
let gglqsfxPackageData = onceYBarChartPackage( excelData['灌溉量趋势分析'], '',''); // let sfdtrpsyjlPackageData = keyValuePackage(excelData['示范地投入品使用记录'].dataList);
ret['gglqsfx'] = getOnceYBarChartOut('灌溉量趋势分析', gglqsfxPackageData); // ret['sfdtrpsyjl'] = getKeyValueOut('示范地投入品使用记录', sfdtrpsyjlPackageData);
let scxyfxPackageData = onceYBarChartPackage(excelData['蔬菜效益分析'], '日统计', '' ); // let trpsyqkPackageData = onceYBarChartPackage( excelData['投入品使用情况'], '','');
ret['scxyfx'] = getOnceYBarChartOut('蔬菜效益分析', scxyfxPackageData); // ret['trpsyqk'] = getOnceYBarChartOut('投入品使用情况', trpsyqkPackageData);
let yyxyfxPackageData = onceYBarChartPackage(excelData['渔业效益分析'], '日统计', '' ); // let lsfkwzsyqkPackageData = doubleYBarCharPackage( excelData['绿色防控物资使用情况'], "亩次", '使用量','亩次');
ret['yyxyfx'] = getOnceYBarChartOut('渔业效益分析', yyxyfxPackageData); // ret['lsfkwzsyqk'] = getDoubleYBarChartOut('绿色防控物资使用情况', lsfkwzsyqkPackageData);
// let fxyjPackageData = keyValuePackage(excelData['风险预警'].dataList);
// ret['fxyj'] = getKeyValueOut('风险预警', fxyjPackageData);
// let fxlxzbPackageData = keyValuePackage(excelData['风险类型占比'].dataList);
// ret['fxlxzb'] = getKeyValueOut('风险类型占比', fxlxzbPackageData);
// let yjxqgdTableData = tablePackage(excelData["预警详情工单"].headerList[0], excelData["预警详情工单"].bodyList);
// ret['yjxqgd'] = getTableOut( '预警详情工单', yjxqgdTableData);
// let znggfxPackageData = keyValuePackage(excelData['智能灌溉分析'].dataList);
// ret['znggfx'] = getKeyValueOut('智能灌溉分析', znggfxPackageData);
// let znggTableData = {};
// excelData["智能灌溉"].dataList.forEach( info => {
// let {ntwz, trsd, ggsj, ggjgsj, sfxygg} = info;
// info["img"] = `${systemConfig.imgPath}/监控/${ntwz}.png`;
// znggTableData[ntwz] = info;
// })
// ret['zngg'] = {title:'智能灌溉', dataList:znggTableData};
// 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['效益分析'], '元', '' ); // let xyfxPackageData = onceYBarChartPackage(excelData['效益分析'], '元', '' );
ret['xyfx'] = getOnceYBarChartOut('效益分析', xyfxPackageData); // ret['xyfx'] = getOnceYBarChartOut('效益分析', xyfxPackageData);
let cyxlphPackageData = keyValuePackage(excelData['产业销量排行'].dataList); // let cyxlphPackageData = keyValuePackage(excelData['产业销量排行'].dataList);
ret['cyxlph'] = getKeyValueOut('产业销量排行', cyxlphPackageData); // ret['cyxlph'] = getKeyValueOut('产业销量排行', cyxlphPackageData);
let cpsyxxTableData = tablePackage(excelData["产品溯源信息"].headerList[0], excelData["产品溯源信息"].bodyList); // let cpsyxxTableData = tablePackage(excelData["产品溯源信息"].headerList[0], excelData["产品溯源信息"].bodyList);
ret['cpsyxx'] = getTableOut( '产品溯源信息', cpsyxxTableData); // ret['cpsyxx'] = getTableOut( '产品溯源信息', cpsyxxTableData);
let aqglTableData = keyValuePackage(excelData["安全管理"].dataList); // let aqglTableData = keyValuePackage(excelData["安全管理"].dataList);
ret['aqgl'] = getKeyValueOut( '安全管理', aqglTableData); // ret['aqgl'] = getKeyValueOut( '安全管理', aqglTableData);
let ncpaqzljcPackageData = onceYBarChartPackage(excelData['农产品安全质量检测'], '日统计', '' ); // let ncpaqzljcPackageData = onceYBarChartPackage(excelData['农产品安全质量检测'], '日统计', '' );
ret['ncpaqzljc'] = getOnceYBarChartOut('农产品安全质量检测', ncpaqzljcPackageData); // ret['ncpaqzljc'] = getOnceYBarChartOut('农产品安全质量检测', ncpaqzljcPackageData);
let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList); // let szcyPackageData = keyValuePackage(excelData['数字产业'].dataList);
let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList); // let szhglPackageData = keyValuePackage(excelData['数字化管理'].dataList);
ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData)); // ret['szcy'] = getKeyValueOut('数字产业', szcyPackageData.concat(szhglPackageData));
// let gglqsfxPackageData = {}; // let gglqsfxPackageData = {};
// excelData["灌溉量趋势分析"].forEach( info => { // excelData["灌溉量趋势分析"].forEach( info => {
// let itemChart = onceYBarChartPackage( [info], '',''); // let itemChart = onceYBarChartPackage( [info], '','');
...@@ -156,3 +220,93 @@ export function zzfb(req, res) { ...@@ -156,3 +220,93 @@ export function zzfb(req, res) {
} }
/**
* 种植情况弹窗
* @param req
* @param res
*/
export function zzqk(req, res) {
let type = req.body.type || "全部"; //表格暂时无法切换下拉数据
let ret:any = {};
let excelData = zzqkTableData();
let zzzljbqkPackageData = keyValuePackage(excelData['种植种类基本情况'].dataList);
ret['zzzljbqk'] = getKeyValueOut('种植种类基本情况', zzzljbqkPackageData);
let zzzwPackageData = keyValuePackage(excelData['种植作物'].dataList);
ret['zzzw'] = getKeyValueOut('种植作物', zzzwPackageData);
let nzqkPackageData = keyValuePackage(excelData['农资情况'].dataList);
ret['nzqk'] = getKeyValueOut('农资情况', nzqkPackageData);
let flyyqkPackageData = onceYBarChartPackage(excelData['肥料用药情况'], '', '' );
ret['flyyqk'] = getOnceYBarChartOut('肥料用药情况', flyyqkPackageData);
let nscz = excelData['农事操作'];
let allnscz = getAllChart(excelData['农事操作']);
nscz.unshift(allnscz);
let nsczPackageData = onceYBarChartPackage(nscz, '', '' );
ret['nscz'] = getOnceYBarChartOut('农事操作', nsczPackageData);
let zwcljn = excelData['作物产量（今年）'];
let allzwcljn = getAllChart(excelData['作物产量（今年）']);
zwcljn.unshift(allzwcljn);
let zwcljnPackageData = onceYBarChartPackage(zwcljn, '', '' );
ret['zwcljn'] = getOnceYBarChartOut('作物产量（今年）', zwcljnPackageData);
let zwclqn = excelData['作物产量（去年）'];
let allzwclqn = getAllChart(excelData['作物产量（去年）']);
zwclqn.unshift(allzwclqn);
let zwclqnPackageData = onceYBarChartPackage(zwclqn, '', '' );
ret['zwclqn'] = getOnceYBarChartOut('作物产量（去年）', zwclqnPackageData);
let thisYear = 0;
let lastYear = 0;
ret['zwcljn'].chartList.forEach( info => {
let {thisChartTitle, total} = info;
if (thisChartTitle == type) thisYear = total;
})
ret['zwclqn'].chartList.forEach( info => {
let {thisChartTitle, total} = info;
if (thisChartTitle == type) lastYear = total;
})
let tongbi = (((thisYear - lastYear) / lastYear) * 100 / 100).toFixed(2) + "%";
ret["zwcltb"] = {title:"作物产量同比", dataList:tongbi};
let zwxs = excelData['作物销售'];
let allzwxs = getAllChart(excelData['作物销售']);
zwxs.unshift(allzwxs);
let zwxsPackageData = onceYBarChartPackage(zwxs, '', '' );
ret['zwxs'] = getOnceYBarChartOut('作物销售', zwxsPackageData);
res.send(ret);
}
function getAllChart(data) {
let allInfo = {"1月":0, "2月":0, "3月":0, "4月":0, "5月":0, "6月":0, "7月":0, "8月":0, "9月":0, "10月":0, "11月":0, "12月":0};
data.forEach( info => {
let {name, data} = info;
for (let all in allInfo) {
for (let month in data) {
let {key, value} = data[month];
if (all == key) {
allInfo[key] += parseInt(value);
}
}
}
})
let allData = {name:"全部", data:[]};
for (let key in allInfo) {
allData.data.push({key, value:allInfo[key]});
}
return allData;
}
src/biz/gbzscbgjdAq.ts
...@@ -10,6 +10,9 @@ export function getData(req, res) { ...@@ -10,6 +10,9 @@ export function getData(req, res) {
let excelData = gbzscbgjdAqTableData(); let excelData = gbzscbgjdAqTableData();
let ret:any = {}; let ret:any = {};
let wdsdPackageData = keyValuePackage(excelData['温度湿度数据'].dataList);
ret['wdsd'] = getKeyValueOut('温度湿度数据', wdsdPackageData);
let AqjdxqPackageData = keyValuePackage(excelData['A区基地详情'].dataList); let AqjdxqPackageData = keyValuePackage(excelData['A区基地详情'].dataList);
ret['Aqjdxq'] = getKeyValueOut('A区基地详情', AqjdxqPackageData); ret['Aqjdxq'] = getKeyValueOut('A区基地详情', AqjdxqPackageData);
...@@ -34,11 +37,11 @@ export function getData(req, res) { ...@@ -34,11 +37,11 @@ export function getData(req, res) {
let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', ''); let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData); ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList); let zwclPackageData = keyValuePackage(excelData['作物产量'].dataList);
ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData); ret['zwcl'] = getKeyValueOut('作物产量', zwclPackageData);
let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList); let zwyclPackageData = onceYBarChartPackage(excelData['作物月产量情况'], '', '');
ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData); ret['zwycl'] = getOnceYBarChartOut('作物月产量情况', zwyclPackageData);
res.send(ret); res.send(ret);
} }
\ No newline at end of file
src/biz/gbzscbgjdBq.ts
...@@ -11,6 +11,9 @@ export function getData(req, res) { ...@@ -11,6 +11,9 @@ export function getData(req, res) {
let excelData = gbzscbgjdBqTableData(); let excelData = gbzscbgjdBqTableData();
let ret:any = {}; let ret:any = {};
let wdsdPackageData = keyValuePackage(excelData['温度湿度数据'].dataList);
ret['wdsd'] = getKeyValueOut('温度湿度数据', wdsdPackageData);
let AqjdxqPackageData = keyValuePackage(excelData['B区基地详情'].dataList); let AqjdxqPackageData = keyValuePackage(excelData['B区基地详情'].dataList);
ret['Aqjdxq'] = getKeyValueOut('B区基地详情', AqjdxqPackageData); ret['Aqjdxq'] = getKeyValueOut('B区基地详情', AqjdxqPackageData);
...@@ -35,11 +38,11 @@ export function getData(req, res) { ...@@ -35,11 +38,11 @@ export function getData(req, res) {
let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', ''); let qglzzclqkPackageData = onceYBarChartPackage(excelData['茄果类种植产量情况'], '', '');
ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData); ret['qglzzclqk'] = getOnceYBarChartOut('茄果类种植产量情况', qglzzclqkPackageData);
let cpsyPackageData = keyValuePackage(excelData['产品溯源'].dataList); let zwclPackageData = keyValuePackage(excelData['作物产量'].dataList);
ret['cpsy'] = getKeyValueOut('产品溯源', cpsyPackageData); ret['zwcl'] = getKeyValueOut('作物产量', zwclPackageData);
let cpfxzbPackageData = keyValuePackage(excelData['产品销售情况占比'].dataList); let zwyclPackageData = onceYBarChartPackage(excelData['作物月产量情况'], '', '');
ret['cpfxzb'] = getKeyValueOut('产品销售情况占比', cpfxzbPackageData); ret['zwycl'] = getOnceYBarChartOut('作物月产量情况', zwyclPackageData);
res.send(ret); res.send(ret);
} }
\ No newline at end of file
src/biz/getData.ts
...@@ -339,7 +339,8 @@ export async function getData(req, res) { ...@@ -339,7 +339,8 @@ export async function getData(req, res) {
"风力等级": "", "风力等级": "",
"湿度": "", "湿度": "",
"降水量": "", "降水量": "",
"图片": "" "图片": "",
"光照": ""
} }
if (weatherData) { if (weatherData) {
let observe = weatherData.body.observe; let observe = weatherData.body.observe;
...@@ -350,7 +351,8 @@ export async function getData(req, res) { ...@@ -350,7 +351,8 @@ export async function getData(req, res) {
"风力等级": observe.wind_power, "风力等级": observe.wind_power,
"湿度": observe.humidity, "湿度": observe.humidity,
"降水量": observe.precipitation, "降水量": observe.precipitation,
"图片": `${systemConfig.imgPath}/天气/${observe.weather}.png` "图片": `${systemConfig.imgPath}/天气/${observe.weather}.png`,
"光照": "2000lux"
} }
} }
ret['weather'] = { title: "天气", dataList: weather }; ret['weather'] = { title: "天气", dataList: weather };
......
src/biz/hjszzl.ts
import { systemConfig } from '../config/serverConfig'; import { systemConfig } from '../config/serverConfig';
import { hjszzlTableData } from '../data/table/hjszzlData'; import { hjszzlTableData } from '../data/table/hjszzlData';
import { separateDataAndUint } from "../dataPackage/tool";
import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut'; import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut';
import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out'; import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
/* 环境数字治理 */ /* 环境数字治理 */
export function getData(req, res) { export function getData(req, res) {
let excelData = hjszzlTableData(); let excelData = hjszzlTableData();
let ret:any = {}; let ret:any = {};
/**左侧 */
let wdbhPackageData = keyValuePackage(excelData['温度变化'].dataList);
ret['wdbh'] = getKeyValueOut('温度变化', wdbhPackageData);
let sdbhPackageData = keyValuePackage(excelData['湿度变化'].dataList);
ret['sdbh'] = getKeyValueOut('湿度变化', sdbhPackageData);
let jylbhPackageData = keyValuePackage(excelData['降雨量变化'].dataList);
ret['jylbh'] = getKeyValueOut('降雨量变化', jylbhPackageData);
let wdbhqs = getChartData(excelData['温度变化趋势'].dataList);
ret['wdbhqs'] = {title:"温度变化趋势", dataList:wdbhqs};
let sdbhqs = getChartData(excelData['湿度变化趋势'].dataList);
ret['sdbhqs'] = {title:"湿度变化趋势", dataList:sdbhqs};
let jylbhqs = getChartData(excelData['降雨量变化趋势'].dataList);
ret['jylbhqs'] = {title:"降雨量变化趋势", dataList:jylbhqs};
let gzbhPackageData = keyValuePackage(excelData['光照变化'].dataList);
ret['gzbh'] = getKeyValueOut('光照变化', gzbhPackageData);
let gzbhqsPackageData = onceYBarChartPackage( excelData['光照变化趋势'], '','');
ret['gzbhqs'] = getOnceYBarChartOut('光照变化趋势', gzbhqsPackageData);
let trjcPackageData = keyValuePackage(excelData['土壤监测'].dataList);
ret['trjc'] = getKeyValueOut('土壤监测', trjcPackageData);
let trwdbhqsPackageData = onceYBarChartPackage( excelData['土壤温度变化趋势'], '','');
ret['trwdbhqs'] = getOnceYBarChartOut('土壤温度变化趋势', trwdbhqsPackageData);
let trsdbhqsPackageData = onceYBarChartPackage( excelData['土壤湿度变化趋势'], '','');
ret['trsdbhqs'] = getOnceYBarChartOut('土壤湿度变化趋势', trsdbhqsPackageData);
let trPHbhqsPackageData = onceYBarChartPackage( excelData['土壤PH值变化趋势'], '','');
ret['trPHbhqs'] = getOnceYBarChartOut('土壤PH值变化趋势', trPHbhqsPackageData);
let trddlbhqsPackageData = onceYBarChartPackage( excelData['土壤电导率变化趋势'], '','');
ret['trddlbhqs'] = getOnceYBarChartOut('土壤电导率变化趋势', trddlbhqsPackageData);
/**中间 */
let ztsjPackageData = keyValuePackage(excelData['总体数据'].dataList);
ret['ztsj'] = getKeyValueOut('总体数据', ztsjPackageData);
let bhczlPackageData = stringListPackage(excelData["病害虫治理"].dataList);
let bhczl = [];
for(let i = 0; i < bhczlPackageData.length; i++) {
let img = `${systemConfig.imgPath}/${bhczlPackageData[i]}`;
bhczl.push(img);
}
ret['bhczl'] = getStringOut('病害虫治理', bhczl);
let zlqkPackageData = keyValuePackage(excelData['治理情况'].dataList);
ret['zlqk'] = getKeyValueOut('治理情况', zlqkPackageData);
let chjcdyjPackageData = keyValuePackage(excelData['虫害检测灯预警'].dataList);
ret['chjcdyj'] = getKeyValueOut('虫害检测灯预警', chjcdyjPackageData);
let sbjcqkwdPackageData = onceYBarChartPackage( excelData['设备监测情况（温度监测）'], '','');
ret['sbjcqkwd'] = getOnceYBarChartOut('设备监测情况（温度监测）', sbjcqkwdPackageData);
let sbjcqksdPackageData = onceYBarChartPackage( excelData['设备监测情况（湿度监测）'], '','');
ret['sbjcqksd'] = getOnceYBarChartOut('设备监测情况（湿度监测）', sbjcqksdPackageData);
// let zncqqsPackageData = onceYBarChartPackage( excelData['智能虫情趋势'], '','');
// ret['zncqqs'] = getOnceYBarChartOut('智能虫情趋势', zncqqsPackageData);
let zncqqkTableData = tablePackage(excelData["智能虫情情况"].headerList[0], excelData["智能虫情情况"].bodyList); //20250115
ret['zncqqk'] = getTableOut( '智能虫情情况', zncqqkTableData);
// let zhxyjglPackageData = keyValuePackage(excelData['灾害性应急管理'].dataList);
// ret['zhxyjgl'] = getKeyValueOut('灾害性应急管理', zhxyjglPackageData);
let zhxyjglTableData = tablePackage(excelData["灾害性应急管理"].headerList[0], excelData["灾害性应急管理"].bodyList);
let zhxyjgl = {titleList:zhxyjglTableData.titleList, dataList:[]};
zhxyjglTableData.dataList.forEach( info => {
let {A,B,C} = info;
let imgList = C.split(",");
let imgData = [];
imgList.forEach( imgName => {
let imgUrl = `${systemConfig.imgPath}/防汛防台工作预案/${imgName}`;
imgData.push(imgUrl);
})
zhxyjgl.dataList.push({A,B,C:imgData});
})
ret['zhxyjgl'] = getTableOut( '灾害性应急管理', zhxyjgl);
res.send(ret);
}
function getChartData(data) {
let qsInfo = {}
data.forEach( info => {
if (!qsInfo[info.qy]) qsInfo[info.qy] = {};
if (!qsInfo[info.qy][info.tl]) qsInfo[info.qy][info.tl] = [];
for (let key in info) {
if (key != "qy" && key != "tl") {
let {dataNum, dataUnit} = separateDataAndUint(info[key]);
qsInfo[info.qy][info.tl].push({key, value:dataNum, unit:dataUnit});
}
}
})
let result = {};
for (let key in qsInfo) {
if(!result[key]) result[key] = [];
for (let qsKey in qsInfo[key]) {
result[key].push({name:qsKey, data:qsInfo[key][qsKey]});
}
}
return result;
}
export function getData1(req, res) {
let excelData = hjszzlTableData();
let ret:any = {};
let qwqsPackageData = onceYBarChartPackage( excelData['气温趋势'], '',''); let qwqsPackageData = onceYBarChartPackage( excelData['气温趋势'], '','');
ret['qwqs'] = getOnceYBarChartOut('气温趋势', qwqsPackageData); ret['qwqs'] = getOnceYBarChartOut('气温趋势', qwqsPackageData);
......
src/biz/jdaqgl.ts
import { systemConfig } from '../config/serverConfig'; import { systemConfig } from '../config/serverConfig';
import { jdaqglTableData } from '../data/table/jdaqglData'; import { jdaqglTableData } from '../data/table/jdaqglData';
import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut'; import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, stringListPackage, tablePackage } from '../dataPackage/inFrontOut';
import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out'; import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getStringOut, getTableOut } from '../dataPackage/out';
/* 基地安全管理 */ /* 基地安全管理 */
...@@ -10,57 +10,141 @@ export function getData(req, res) { ...@@ -10,57 +10,141 @@ export function getData(req, res) {
let excelData = jdaqglTableData(); let excelData = jdaqglTableData();
let ret:any = {}; let ret:any = {};
let sbslPackageData = keyValuePackage(excelData['设备数量'].dataList);
ret['sbsl'] = getKeyValueOut('设备数量', sbslPackageData);
let sblxzbPackageData = keyValuePackage(excelData['设备类型占比'].dataList);
ret['sblxzb'] = getKeyValueOut('设备类型占比', sblxzbPackageData);
let sbztqkPackageData = keyValuePackage(excelData['设备状态情况'].dataList);
ret['sbztqk'] = getKeyValueOut('设备状态情况', sbztqkPackageData);
let jqtsbzxqkPackageData = onceYBarChartPackage( excelData['近七天设备在线情况'], '',''); let jqtsbzxqkPackageData = onceYBarChartPackage( excelData['近七天设备在线情况'], '','');
ret['jqtsbzxqk'] = getOnceYBarChartOut('近七天设备在线情况', jqtsbzxqkPackageData); ret['jqtsbzxqk'] = getOnceYBarChartOut('近七天设备在线情况', jqtsbzxqkPackageData);
let sblxzbPackageData = keyValuePackage(excelData['设备类型占比'].dataList); let xfjcsjPackageData = keyValuePackage(excelData['消防基础数据'].dataList);
ret['sblxzb'] = getKeyValueOut('设备类型占比', sblxzbPackageData); ret['xfjcsj'] = getKeyValueOut('消防基础数据', xfjcsjPackageData);
let xfylpxqkTableData = tablePackage(excelData["消防演练/培训情况"].headerList[0], excelData["消防演练/培训情况"].bodyList);
ret['xfylpxqk'] = getTableOut( '消防演练/培训情况', xfylpxqkTableData);
let ztsjPackageData = keyValuePackage(excelData['总体数据'].dataList);
ret['ztsj'] = getKeyValueOut('总体数据', ztsjPackageData);
let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
let zdqyjkData = {titleList:zdqyjkTableData.titleList, dataList:[]};
zdqyjkTableData.dataList.forEach( info => {
let {A, B, C, D, E, F} = info;
// let imgUrl = `rtsp://admin:a1357924680@${C}:554/Streaming/Channels/101?transportmode=multicast`;
let imgUrl = `${systemConfig.imgPath}/监控/${C}.png`;
zdqyjkData.dataList.push({A, B, C:imgUrl, D, E, F});
})
ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkData);
let hzbzPackageData = stringListPackage(excelData["火灾爆炸"].dataList);
let hzbz = [];
for(let i = 0; i < hzbzPackageData.length; i++) {
let img = `${systemConfig.imgPath}/应急预案/火灾/${hzbzPackageData[i]}`;
hzbz.push(img);
}
ret['hzbz'] = getStringOut('火灾爆炸', hzbz);
let cdsgPackageData = stringListPackage(excelData["触电事故"].dataList);
let cdsg = [];
for(let i = 0; i < cdsgPackageData.length; i++) {
let img = `${systemConfig.imgPath}/应急预案/电力/${cdsgPackageData[i]}`;
cdsg.push(img);
}
ret['cdsg'] = getStringOut('触电事故', cdsg);
let rsshPackageData = stringListPackage(excelData["人身伤害"].dataList);
let rssh = [];
for(let i = 0; i < rsshPackageData.length; i++) {
let img = `${systemConfig.imgPath}/应急预案/人身安全/${rsshPackageData[i]}`;
rssh.push(img);
}
ret['rssh'] = getStringOut('人身伤害', rssh);
res.send(ret);
}
/**代码备份 */
export function getData1(req, res) {
let excelData = jdaqglTableData();
let ret:any = {};
let sbslPackageData = keyValuePackage(excelData['设备数量'].dataList); let sbslPackageData = keyValuePackage(excelData['设备数量'].dataList);
ret['sbsl'] = getKeyValueOut('设备数量', sbslPackageData); ret['sbsl'] = getKeyValueOut('设备数量', sbslPackageData);
let sblxzbPackageData = keyValuePackage(excelData['设备类型占比'].dataList);
ret['sblxzb'] = getKeyValueOut('设备类型占比', sblxzbPackageData);
let sbztqkPackageData = keyValuePackage(excelData['设备状态情况'].dataList); let sbztqkPackageData = keyValuePackage(excelData['设备状态情况'].dataList);
ret['sbztqk'] = getKeyValueOut('设备状态情况', sbztqkPackageData); ret['sbztqk'] = getKeyValueOut('设备状态情况', sbztqkPackageData);
let jqtsbzxqkPackageData = onceYBarChartPackage( excelData['近七天设备在线情况'], '','');
ret['jqtsbzxqk'] = getOnceYBarChartOut('近七天设备在线情况', jqtsbzxqkPackageData);
let xfjcsjPackageData = keyValuePackage(excelData['消防基础数据'].dataList);
ret['xfjcsj'] = getKeyValueOut('消防基础数据', xfjcsjPackageData);
let xfylpxqkTableData = tablePackage(excelData["消防演练/培训情况"].headerList[0], excelData["消防演练/培训情况"].bodyList);
ret['xfylpxqk'] = getTableOut( '消防演练/培训情况', xfylpxqkTableData);
let xfsbPackageData = keyValuePackage(excelData['消防设备'].dataList); let ztsjPackageData = keyValuePackage(excelData['总体数据'].dataList);
ret['xfsb'] = getKeyValueOut('消防设备', xfsbPackageData); ret['ztsj'] = getKeyValueOut('总体数据', ztsjPackageData);
let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
let zdqyjkData = {titleList:zdqyjkTableData.titleList, dataList:[]};
zdqyjkTableData.dataList.forEach( info => {
let {A, B, C, D, E, F} = info;
let imgUrl = `${systemConfig.imgPath}/监控/${C}`;
zdqyjkData.dataList.push({A, B, C:imgUrl, D, E, F});
})
ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkData);
// let xfsbPackageData = keyValuePackage(excelData['消防设备'].dataList);
// ret['xfsb'] = getKeyValueOut('消防设备', xfsbPackageData);
let xfsbztPackageData = keyValuePackage(excelData['消防设备状态'].dataList); // let xfsbztPackageData = keyValuePackage(excelData['消防设备状态'].dataList);
ret['xfsbzt'] = getKeyValueOut('消防设备状态', xfsbztPackageData); // ret['xfsbzt'] = getKeyValueOut('消防设备状态', xfsbztPackageData);
let jdaqglsjfxPackageData = keyValuePackage(excelData['基地安全管理数据分析'].dataList); // let jdaqglsjfxPackageData = keyValuePackage(excelData['基地安全管理数据分析'].dataList);
ret['jdaqglsjfx'] = getKeyValueOut('基地安全管理数据分析', jdaqglsjfxPackageData); // ret['jdaqglsjfx'] = getKeyValueOut('基地安全管理数据分析', jdaqglsjfxPackageData);
let zcztlbTableData = tablePackage(excelData["正常状态列表"].headerList[0], excelData["正常状态列表"].bodyList); // let zcztlbTableData = tablePackage(excelData["正常状态列表"].headerList[0], excelData["正常状态列表"].bodyList);
ret['zcztlb'] = getTableOut( '正常状态列表', zcztlbTableData); // ret['zcztlb'] = getTableOut( '正常状态列表', zcztlbTableData);
let whzztlbTableData = tablePackage(excelData["维护中状态列表"].headerList[0], excelData["维护中状态列表"].bodyList); // let whzztlbTableData = tablePackage(excelData["维护中状态列表"].headerList[0], excelData["维护中状态列表"].bodyList);
ret['whzztlb'] = getTableOut( '维护中状态列表', whzztlbTableData); // ret['whzztlb'] = getTableOut( '维护中状态列表', whzztlbTableData);
let gzztlbTableData = tablePackage(excelData["故障状态列表"].headerList[0], excelData["故障状态列表"].bodyList); // let gzztlbTableData = tablePackage(excelData["故障状态列表"].headerList[0], excelData["故障状态列表"].bodyList);
ret['gzztlb'] = getTableOut( '故障状态列表', gzztlbTableData); // ret['gzztlb'] = getTableOut( '故障状态列表', gzztlbTableData);
// let tqsjPackageData = keyValuePackage(excelData['天气数据'].dataList); // let tqsjPackageData = keyValuePackage(excelData['天气数据'].dataList);
// ret['tqsj'] = getKeyValueOut('天气数据', tqsjPackageData); // ret['tqsj'] = getKeyValueOut('天气数据', tqsjPackageData);
let sbyhjcPackageData = keyValuePackage(excelData['设备运行监测'].dataList); // let sbyhjcPackageData = keyValuePackage(excelData['设备运行监测'].dataList);
ret['sbyhjc'] = getKeyValueOut('设备运行监测', sbyhjcPackageData); // ret['sbyhjc'] = getKeyValueOut('设备运行监测', sbyhjcPackageData);
let jgcsPackageData = keyValuePackage(excelData['警告次数'].dataList); // let jgcsPackageData = keyValuePackage(excelData['警告次数'].dataList);
ret['jgcs'] = getKeyValueOut('警告次数', jgcsPackageData); // ret['jgcs'] = getKeyValueOut('警告次数', jgcsPackageData);
let jjcdPackageData = keyValuePackage(excelData['紧急程度'].dataList); // let jjcdPackageData = keyValuePackage(excelData['紧急程度'].dataList);
ret['jjcd'] = getKeyValueOut('紧急程度', jjcdPackageData); // ret['jjcd'] = getKeyValueOut('紧急程度', jjcdPackageData);
let gjqsPackageData = onceYBarChartPackage( excelData['告警趋势'], '个',''); // let gjqsPackageData = onceYBarChartPackage( excelData['告警趋势'], '个','');
ret['gjqs'] = getOnceYBarChartOut('告警趋势', gjqsPackageData); // ret['gjqs'] = getOnceYBarChartOut('告警趋势', gjqsPackageData);
let yjczPackageData = keyValuePackage(excelData['预警处置'].dataList); // let yjczPackageData = keyValuePackage(excelData['预警处置'].dataList);
ret['yjcz'] = getKeyValueOut('预警处置', yjczPackageData); // ret['yjcz'] = getKeyValueOut('预警处置', yjczPackageData);
let yjczlPackageData = keyValuePackage(excelData['预警处置率'].dataList); // let yjczlPackageData = keyValuePackage(excelData['预警处置率'].dataList);
ret['yjczl'] = getKeyValueOut('预警处置率', yjczlPackageData); // ret['yjczl'] = getKeyValueOut('预警处置率', yjczlPackageData);
// let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList); // let zdqyjkPackageData = keyValuePackage(excelData['重点区域监控'].dataList);
// ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData); // ret['zdqyjk'] = getKeyValueOut('重点区域监控', zdqyjkPackageData);
...@@ -69,24 +153,20 @@ export function getData(req, res) { ...@@ -69,24 +153,20 @@ export function getData(req, res) {
// rtsp://admin:a1357924680@192.168.8.194:554/Streaming/Channels/101?transportmode=multicast // rtsp://admin:a1357924680@192.168.8.194:554/Streaming/Channels/101?transportmode=multicast
// rtsp://admin:a1357924680@192.168.8.105:554/Streaming/Channels/101?transportmode=multicast // rtsp://admin:a1357924680@192.168.8.105:554/Streaming/Channels/101?transportmode=multicast
// rtsp://admin:a1357924680@192.168.8.153:554/Streaming/Channels/101?transportmode=multicast // rtsp://admin:a1357924680@192.168.8.153:554/Streaming/Channels/101?transportmode=multicast
let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
let zdqyjkData = {titleList:zdqyjkTableData.titleList, dataList:[]}; // let zdqyjkTableData = tablePackage(excelData["重点区域监控"].headerList[0], excelData["重点区域监控"].bodyList);
zdqyjkTableData.dataList.forEach( info => { // let zdqyjkData = {titleList:zdqyjkTableData.titleList, dataList:[]};
let {A, B, C, D, E, F} = info; // zdqyjkTableData.dataList.forEach( info => {
let imgUrl = `${systemConfig.imgPath}/监控/${C}`; // let {A, B, C, D, E, F} = info;
zdqyjkData.dataList.push({A, B, C:imgUrl, D, E, F}); // let imgUrl = `${systemConfig.imgPath}/监控/${C}`;
}) // zdqyjkData.dataList.push({A, B, C:imgUrl, D, E, F});
ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkData);
// 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}; // ret['zdqyjk'] = getTableOut( '重点区域监控', zdqyjkData);
let yjczbTableData = tablePackage(excelData["预警处置表"].headerList[0], excelData["预警处置表"].bodyList); // let yjczbTableData = tablePackage(excelData["预警处置表"].headerList[0], excelData["预警处置表"].bodyList);
ret['yjczb'] = getTableOut( '预警处置表', yjczbTableData); // ret['yjczb'] = getTableOut( '预警处置表', yjczbTableData);
res.send(ret); res.send(ret);
} }
\ No newline at end of file
src/biz/nyjqr.ts
import { nyjqrTableData } from '../data/table/nyjqrData'; import { nyjqrTableData } from '../data/table/nyjqrData';
import { systemConfig } from '../config/serverConfig';
import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut'; import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out'; import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
...@@ -9,31 +10,44 @@ export function getData(req, res) { ...@@ -9,31 +10,44 @@ export function getData(req, res) {
let excelData = nyjqrTableData(); let excelData = nyjqrTableData();
let ret:any = {}; let ret:any = {};
let ysqsfxPackageData = onceYBarChartPackage( excelData['运势趋势分析'], '时长',''); /**左侧 */
ret['ysqsfx'] = getOnceYBarChartOut('运势趋势分析', ysqsfxPackageData); let jqrzyPackageData = keyValuePackage(excelData['机器人资源'].dataList);
ret['jqrzy'] = getKeyValueOut('机器人资源', jqrzyPackageData);
let qyfbPackageData = onceYBarChartPackage( excelData['区域分布'], '','台套');
ret['qyfb'] = getOnceYBarChartOut('区域分布', qyfbPackageData);
let nyjqrsjPackageData = keyValuePackage(excelData['农业机器人数据'].dataList);
ret['nyjqrsj'] = getKeyValueOut('农业机器人数据', nyjqrsjPackageData);
let jqrlxzbPackageData = keyValuePackage(excelData['机器人类型占比'].dataList); let jqrlxzbPackageData = keyValuePackage(excelData['机器人类型占比'].dataList);
ret['jqrlxzb'] = getKeyValueOut('机器人类型占比', jqrlxzbPackageData); ret['jqrlxzb'] = getKeyValueOut('机器人类型占比', jqrlxzbPackageData);
let yhztPackageData = keyValuePackage(excelData['运行状态'].dataList); let yxztPackageData = keyValuePackage(excelData['运行状态'].dataList);
ret['yhzt'] = getKeyValueOut('运行状态', yhztPackageData); ret['yxzt'] = getKeyValueOut('运行状态', yxztPackageData);
let yxqsfxPackageData = onceYBarChartPackage( excelData['运势趋势分析'], '时长','');
ret['yxqsfx'] = getOnceYBarChartOut('运势趋势分析', yxqsfxPackageData);
let yhjlTableData = tablePackage(excelData["运行记录"].headerList[0], excelData["运行记录"].bodyList); let yxjlTableData = tablePackage(excelData["运行记录"].headerList[0], excelData["运行记录"].bodyList);
ret['yhjl'] = getTableOut( '运行记录', yhjlTableData); ret['yxjl'] = getTableOut( '运行记录', yxjlTableData);
let qybjPackageData = onceYBarChartPackage( excelData['区域布局'], '','台套');
ret['qybj'] = getOnceYBarChartOut('区域布局', qybjPackageData);
/**中间 */
let jqrsjfxPackageData = keyValuePackage(excelData['机器人数据分析'].dataList); let jqrsjfxPackageData = keyValuePackage(excelData['机器人数据分析'].dataList);
ret['jqrsjfx'] = getKeyValueOut('机器人数据分析', jqrsjfxPackageData); ret['jqrsjfx'] = getKeyValueOut('机器人数据分析', jqrsjfxPackageData);
let xjjlTableData = tablePackage(excelData["巡检记录"].headerList[0], excelData["巡检记录"].bodyList);
let xjjl = {dataList:[], titleList:xjjlTableData.titleList};
xjjlTableData.dataList.forEach(info => {
let {F} = info;
let imgUrl = `${systemConfig.imgPath}/机器人/${F}`;
info["F"] = imgUrl;
xjjl.dataList.push(info);
})
ret['xjjl'] = getTableOut( '巡检记录', xjjl);
/**右侧 */
let znxjPackageData = keyValuePackage(excelData['智能巡检'].dataList); let znxjPackageData = keyValuePackage(excelData['智能巡检'].dataList);
ret['znxj'] = getKeyValueOut('智能巡检', znxjPackageData); ret['znxj'] = getKeyValueOut('智能巡检', znxjPackageData);
let xjsblxPackageData = onceYBarChartPackage( excelData['巡检设备类型'], '次数',''); let xjsblxPackageData = onceYBarChartPackage( excelData['巡检设备类型'], '次数','');
ret['xjsblx'] = getOnceYBarChartOut('巡检设备类型', xjsblxPackageData); ret['xjsblx'] = getOnceYBarChartOut('巡检设备类型', xjsblxPackageData);
...@@ -43,9 +57,6 @@ export function getData(req, res) { ...@@ -43,9 +57,6 @@ export function getData(req, res) {
let xjqsPackageData = onceYBarChartPackage( excelData['巡检趋势'], '次数',''); let xjqsPackageData = onceYBarChartPackage( excelData['巡检趋势'], '次数','');
ret['xjqs'] = getOnceYBarChartOut('巡检趋势', xjqsPackageData); ret['xjqs'] = getOnceYBarChartOut('巡检趋势', xjqsPackageData);
let xjjlTableData = tablePackage(excelData["巡检记录"].headerList[0], excelData["巡检记录"].bodyList);
ret['xjjl'] = getTableOut( '巡检记录', xjjlTableData);
let znjqrclPackageData = keyValuePackage(excelData['智能机器人产量'].dataList); let znjqrclPackageData = keyValuePackage(excelData['智能机器人产量'].dataList);
ret['znjqrcl'] = getKeyValueOut('智能机器人产量', znjqrclPackageData); ret['znjqrcl'] = getKeyValueOut('智能机器人产量', znjqrclPackageData);
......
src/biz/yzdqxdnyzl.ts
import { yzdqxdnyzlTableData } from '../data/table/yzdqxdnyzlData'; import { jscxTableData, yzdqxdnyzlTableData } from '../data/table/yzdqxdnyzlData';
import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut'; import { doubleYBarCharPackage, keyValuePackage, onceYBarChartPackage, rankPackage, tablePackage } from '../dataPackage/inFrontOut';
import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out'; import { getDoubleYBarChartOut, getKeyValueOut, getOnceYBarChartOut, getTableOut } from '../dataPackage/out';
...@@ -11,15 +11,15 @@ export function getData(req, res) { ...@@ -11,15 +11,15 @@ export function getData(req, res) {
let ret:any = {}; let ret:any = {};
/**中上 */ /**中上 */
// let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList); let ztsjfbPackageData = keyValuePackage(excelData['总体数据分布'].dataList); //20250115
// ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData); ret['ztsjfb'] = getKeyValueOut('总体数据分布', ztsjfbPackageData);
/**左屏 */ /**左屏 */
let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList); let zrzyPackageData = keyValuePackage(excelData['张江镇自然资源'].dataList);
ret['zrzy'] = getKeyValueOut('张江镇自然资源', zrzyPackageData); ret['zrzy'] = getKeyValueOut('张江镇自然资源', zrzyPackageData);
let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList); // let szylylPackageData = keyValuePackage(excelData['水资源利用率'].dataList);
ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData); // ret['szylyl'] = getKeyValueOut('水资源利用率', szylylPackageData);
// let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList); // let cyjgPackageData = keyValuePackage(excelData['产业结构'].dataList);
// ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData); // ret['cyjg'] = getKeyValueOut('产业结构', cyjgPackageData);
...@@ -40,11 +40,11 @@ export function getData(req, res) { ...@@ -40,11 +40,11 @@ export function getData(req, res) {
ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData); ret['cyryqk'] = getKeyValueOut('从业人员情况', cyryqkPackageData);
/**右屏 */ /**右屏 */
let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList); // let zdxmjsPackageData = keyValuePackage(excelData['重点项目建设'].dataList);
ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData); // ret['zdxmjs'] = getKeyValueOut('重点项目建设', zdxmjsPackageData);
let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList); // let xmfxPackageData = keyValuePackage(excelData['项目分析'].dataList);
ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData); // ret['xmfx'] = getKeyValueOut('项目分析', xmfxPackageData);
// let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList); // let zjfwPackageData = keyValuePackage(excelData['专家服务'].dataList);
// ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData); // ret['zjfw'] = getKeyValueOut('专家服务', zjfwPackageData);
...@@ -58,8 +58,8 @@ export function getData(req, res) { ...@@ -58,8 +58,8 @@ export function getData(req, res) {
let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '',''); let jscxqsPackageData = onceYBarChartPackage( excelData['技术创新趋势'], '','');
ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData); ret['jscxqs'] = getOnceYBarChartOut('技术创新趋势', jscxqsPackageData);
// let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList); let yjjsyjqkPackageData = keyValuePackage(excelData['引进技术基础数据'].dataList);
// ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData); ret['yjjsyjqk'] = getKeyValueOut('引进技术基础数据', yjjsyjqkPackageData);
let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '',''); let yjjscxqsPackageData = onceYBarChartPackage( excelData['引进技术创新趋势'], '','');
ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData); ret['yjjscxqs'] = getOnceYBarChartOut('引进技术创新趋势', yjjscxqsPackageData);
...@@ -69,6 +69,38 @@ export function getData(req, res) { ...@@ -69,6 +69,38 @@ export function getData(req, res) {
let jyglqkqstPackageData = onceYBarChartPackage( excelData['农业生产产值趋势图'], '',''); let jyglqkqstPackageData = onceYBarChartPackage( excelData['农业生产产值趋势图'], '','');
ret['jyglqkqst'] = getOnceYBarChartOut('农业生产产值趋势图', jyglqkqstPackageData); ret['jyglqkqst'] = getOnceYBarChartOut('农业生产产值趋势图', jyglqkqstPackageData);
let zlqdTableData = tablePackage(excelData["专利清单"].headerList[0], excelData["专利清单"].bodyList); //20250115
ret['zlqd'] = getTableOut( '专利清单', zlqdTableData);
res.send(ret);
}
export function getJscxPop(req, res) {
let excelData = jscxTableData();
let ret:any = {};
let jscxTable = excelData["技术创新列表"].dataList;
let jscxData = {};
jscxTable.forEach( info => {
let {sj, jsmc, jslx} = info;
if(!jscxData[sj]) jscxData[sj] = [];
jscxData[sj].push({jsmc, jslx})
})
let jscxList = [];
for (let key in jscxData) {
jscxList.push({
time:key,
count:jscxData[key].length,
dataList:jscxData[key]
});
}
ret['pop'] = {title:"技术创新", dataList:jscxList};
res.send(ret); res.send(ret);
} }
\ No newline at end of file
src/data/table/cyszhglData.ts
...@@ -22,26 +22,30 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, ...@@ -22,26 +22,30 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
} }
export function cyszhglTableData() { export function cyszhglTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '产业数字化管理'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '产业数字化管理');
// let keyValueOrTitleList = ["智能灌溉","风险类型占比","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["示范基地概览", "总体数据", "入驻企业情况", "绿叶菜核心基地总面积", "叶菜类种植情况", "茄果类种植情况", "花卉类种植情况",
// let barChartList = ["苗情检测","种子投入品使用趋势分析","种苗投入品使用趋势分析","肥料投入品使用趋势分析","农药投入品使用趋势分析", "示范地投入品使用记录", "投入品使用情况预警值"];//适配 饼图 键值以及需要多个key的
// "蔬菜效益分析","渔业效益分析","灌溉量趋势分析"]; //适配 柱状图 折线图 let barChartList = ["叶菜类产量产值变化趋势", "茄果类产量产值变化趋势", "粮食类产量产值变化趋势", "花卉类产量产值变化趋势", "水产类产量产值变化趋势", "投入品使用情况"]; //适配 柱状图 折线图
// let stringList = [];
// let decollatePlanarList =["预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格
// let titltListConfig = {};
let keyValueOrTitleList = ["风险类型占比", "安全管理","示范基地概览","示范地投入品使用记录","风险预警","产业销量排行","数字产业", "数字化管理", "智能灌溉", "智能灌溉分析",
"绿叶菜核心基地总面积"];//适配 饼图 键值以及需要多个key的
let barChartList = ["苗情检测","农产品安全质量检测","蔬菜效益分析","渔业效益分析","灌溉量趋势分析", "投入品使用情况", "绿色防控物资使用情况", "溉量趋势分析", "效益分析"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList =["入驻企业情况", "预警详情工单","种植种类", "种植分布","产品溯源信息"];//适配 表格 let decollatePlanarList =[];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result;
}
export function zzqkTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '种植情况');
let keyValueOrTitleList = ["种植种类基本情况", "种植作物", "农资情况"];//适配 饼图 键值以及需要多个key的
let barChartList = ["肥料用药情况", "农事操作", "作物产量（今年）", "作物产量（去年）", "作物销售"]; //适配 柱状图 折线图
let stringList = [];
let decollatePlanarList =[];//适配 表格
let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList); let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result; return result;
}
}
\ No newline at end of file
src/data/table/gbzscbgjdAq.ts
...@@ -25,8 +25,8 @@ export function gbzscbgjdAqTableData() { ...@@ -25,8 +25,8 @@ export function gbzscbgjdAqTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地A区'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地A区');
let keyValueOrTitleList = ["A区基地详情","基地分析","产品溯源","产品销售情况占比"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["A区基地详情","基地分析","作物产量", "温度湿度数据"];//适配 饼图 键值以及需要多个key的
let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况"]; //适配 柱状图 折线图 let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况","作物月产量情况"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList = ["种植作物品种"];//适配 表格 let decollatePlanarList = ["种植作物品种"];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
......
src/data/table/gbzscbgjdBq.ts
...@@ -25,8 +25,8 @@ export function gbzscbgjdBqTableData() { ...@@ -25,8 +25,8 @@ export function gbzscbgjdBqTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地B区'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '高标准蔬菜保供基地B区');
let keyValueOrTitleList = ["B区基地详情","基地分析","产品溯源","产品销售情况占比"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["B区基地详情","基地分析","作物产量", "温度湿度数据"];//适配 饼图 键值以及需要多个key的
let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况"]; //适配 柱状图 折线图 let barChartList = ["叶菜类种植产量情况", "茄果类种植产量情况","作物月产量情况"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList = ["种植作物品种"];//适配 表格 let decollatePlanarList = ["种植作物品种"];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
......
src/data/table/hjszzlData.ts
...@@ -21,10 +21,28 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, ...@@ -21,10 +21,28 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
return result; return result;
} }
export function hjszzlTableData() { export function hjszzlTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
let keyValueOrTitleList = ["温度变化", "湿度变化", "降雨量变化", "温度变化趋势", "湿度变化趋势", "降雨量变化趋势", "光照变化", "土壤监测",
"总体数据", "病害虫治理", "治理情况", "虫害检测灯预警"];//适配 饼图 键值以及需要多个key的
let barChartList = ["光照变化趋势", "土壤温度变化趋势", "土壤湿度变化趋势", "土壤PH值变化趋势", "土壤电导率变化趋势", "设备监测情况（温度监测）",
"设备监测情况（湿度监测）"]; //适配 柱状图 折线图 //
let stringList = [];
let decollatePlanarList =["灾害性应急管理", "智能虫情情况"];//适配 表格
let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result;
}
export function hjszzlTableData1() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '环境数字治理');
let keyValueOrTitleList = ["土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["土壤检测","水质检测","环境基础分析","治理情况","灾害性应急管理", "病害虫治理", "虫害检测灯预警", "气象灾害列表"];//适配 饼图 键值以及需要多个key的
let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 // let barChartList = ["气温趋势","土壤微量元素监测","浊度趋势变化","温度趋势变化","PH值趋势变化",,"NH3-N趋势变化","溶解氧趋势变化","虫害治理成效"]; //适配 柱状图 折线图 //
let stringList = []; let stringList = [];
...@@ -32,7 +50,5 @@ export function hjszzlTableData() { ...@@ -32,7 +50,5 @@ export function hjszzlTableData() {
let titltListConfig = {}; let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList); let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result; return result;
} }
\ No newline at end of file
src/data/table/jdaqglData.ts
...@@ -25,11 +25,14 @@ export function jdaqglTableData() { ...@@ -25,11 +25,14 @@ export function jdaqglTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '基地安全管理'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '基地安全管理');
let keyValueOrTitleList = ["设备类型占比","设备数量","设备状态情况","消防设备","消防设备状态","基地安全管理数据分析","天气数据","设备运行监测","警告次数", let keyValueOrTitleList = ["设备数量","设备类型占比","设备状态情况","消防基础数据", "总体数据", "火灾爆炸", "触电事故", "人身伤害"];//适配 饼图 键值以及需要多个key的
"紧急程度","预警处置","预警处置率"];//适配 饼图 键值以及需要多个key的 // let keyValueOrTitleList = ["设备类型占比","设备数量","设备状态情况","消防设备","消防设备状态","基地安全管理数据分析","天气数据","设备运行监测","警告次数",
let barChartList = ["近七天设备在线情况","告警趋势"]; //适配 柱状图 折线图 // "紧急程度","预警处置","预警处置率"];//适配 饼图 键值以及需要多个key的
let barChartList = ["近七天设备在线情况"]; //适配 柱状图 折线图
// let barChartList = ["近七天设备在线情况","告警趋势"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList =["正常状态列表","维护中状态列表","故障状态列表","预警处置表","重点区域监控"];//适配 表格 let decollatePlanarList =["重点区域监控", "消防演练/培训情况"];//适配 表格
// let decollatePlanarList =["正常状态列表","维护中状态列表","故障状态列表","预警处置表","重点区域监控"];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList); let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
......
src/data/table/nyjqrData.ts
...@@ -25,8 +25,8 @@ export function nyjqrTableData() { ...@@ -25,8 +25,8 @@ export function nyjqrTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '农业机器人'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '农业机器人');
let keyValueOrTitleList = ["机器人类型占比","机器人资源","运行状态","农业机器人数据","智能巡检","巡检完成情况","智能机器人产量","机器人类型占比","机器人数据分析"];//适配 饼图 键值以及需要多个key的 let keyValueOrTitleList = ["机器人类型占比","机器人资源","运行状态","智能巡检","巡检完成情况","智能机器人产量","机器人类型占比","机器人数据分析"];//适配 饼图 键值以及需要多个key的
let barChartList = ["运势趋势分析","区域分布","巡检设备类型","巡检趋势","近半年产量趋势"]; //适配 柱状图 折线图 let barChartList = ["运势趋势分析","区域布局","巡检设备类型","巡检趋势","近半年产量趋势"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList =["运行记录","巡检记录"];//适配 表格 let decollatePlanarList =["运行记录","巡检记录"];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
......
src/data/table/yzdqxdnyzlData.ts
...@@ -22,7 +22,6 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, ...@@ -22,7 +22,6 @@ function packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList,
} }
export function yzdqxdnyzlTableData() { export function yzdqxdnyzlTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊'); let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊');
let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构", let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构",
...@@ -31,11 +30,26 @@ export function yzdqxdnyzlTableData() { ...@@ -31,11 +30,26 @@ export function yzdqxdnyzlTableData() {
let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图 let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图
let stringList = []; let stringList = [];
let decollatePlanarList = ["专利清单"];//适配 表格
let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result;
}
export function jscxTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '技术创新');
let keyValueOrTitleList = ["技术创新列表"];//适配 饼图 键值以及需要多个key的
let barChartList = []; //适配 柱状图 折线图
let stringList = [];
let decollatePlanarList = [];//适配 表格 let decollatePlanarList = [];//适配 表格
let titltListConfig = {}; let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList); let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
return result; return result;
}
}
\ No newline at end of file
src/routers/router.ts
...@@ -28,24 +28,19 @@ export function setRouter(httpServer){ ...@@ -28,24 +28,19 @@ export function setRouter(httpServer){
httpServer.get('/data', asyncHandler(leftBiz.getData)); httpServer.get('/data', asyncHandler(leftBiz.getData));
httpServer.get('/right', asyncHandler(leftBiz.getRight)); httpServer.get('/right', asyncHandler(leftBiz.getRight));
//机器人
httpServer.get('/jiqiren/left', asyncHandler(jiQiRenBiz.getLeft));
httpServer.get('/jiqiren/top', asyncHandler(jiQiRenBiz.getTop));
httpServer.get('/jiqiren/right', asyncHandler(jiQiRenBiz.getRight));
//======post //======post
httpServer.post('/weather', asyncHandler(leftBiz.getData)); httpServer.post('/weather', asyncHandler(leftBiz.getData));
httpServer.get('/weather', asyncHandler(leftBiz.getData)); httpServer.get('/weather', asyncHandler(leftBiz.getData));
httpServer.post('/cyszhgl', asyncHandler(cyszhglBiz.getData)); httpServer.post('/cyszhgl', asyncHandler(cyszhglBiz.getData));
httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl)); httpServer.post('/zzqk', asyncHandler(cyszhglBiz.zzqk));
httpServer.post('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb)); // httpServer.post('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
// httpServer.post('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
httpServer.post('/gfny', asyncHandler(gfnyBiz.getData)); httpServer.post('/gfny', asyncHandler(gfnyBiz.getData));
httpServer.post('/sdt1hgfb', asyncHandler(sdt1hgfbBiz.getData));
httpServer.post('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData)); httpServer.post('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData));
httpServer.post('/jscxpop', asyncHandler(yzdqxdnyzlBiz.getJscxPop));
httpServer.post('/hjszzl', asyncHandler(hjszzlBiz.getData)); httpServer.post('/hjszzl', asyncHandler(hjszzlBiz.getData));
...@@ -60,14 +55,14 @@ export function setRouter(httpServer){ ...@@ -60,14 +55,14 @@ export function setRouter(httpServer){
//======get //======get
httpServer.get('/cyszhgl', asyncHandler(cyszhglBiz.getData)); httpServer.get('/cyszhgl', asyncHandler(cyszhglBiz.getData));
httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl)); httpServer.get('/zzqk', asyncHandler(cyszhglBiz.zzqk));
httpServer.get('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb)); // httpServer.get('/cyszhgl/zzzl', asyncHandler(cyszhglBiz.zzzl));
// httpServer.get('/cyszhgl/zzfb', asyncHandler(cyszhglBiz.zzfb));
httpServer.get('/gfny', asyncHandler(gfnyBiz.getData)); httpServer.get('/gfny', asyncHandler(gfnyBiz.getData));
httpServer.get('/sdt1hgfb', asyncHandler(sdt1hgfbBiz.getData));
httpServer.get('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData)); httpServer.get('/yzdqxdnyzl', asyncHandler(yzdqxdnyzlBiz.getData));
httpServer.get('/jscxpop', asyncHandler(yzdqxdnyzlBiz.getJscxPop));
httpServer.get('/hjszzl', asyncHandler(hjszzlBiz.getData)); httpServer.get('/hjszzl', asyncHandler(hjszzlBiz.getData));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment