Commit d64c2984 by chenjinjing

no message

parent 6c882284
No preview for this file type
......@@ -64,8 +64,8 @@ export function getData(req, res) {
let jyglqkPackageData = keyValuePackage(excelData['经营管理情况'].dataList);
ret['jyglqk'] = getKeyValueOut('经营管理情况', jyglqkPackageData);
let jyglqkqstPackageData = keyValuePackage( excelData['农业生产产值趋势图'].dataList);
ret['jyglqkqst'] = getKeyValueOut('农业生产产值趋势图', jyglqkqstPackageData);
let jyglqkqstPackageData = onceYBarChartPackage( excelData['农业生产产值趋势图'], '','');
ret['jyglqkqst'] = getOnceYBarChartOut('农业生产产值趋势图', jyglqkqstPackageData);
res.send(ret);
}
\ No newline at end of file
......@@ -26,11 +26,11 @@ export function yzdqxdnyzlTableData() {
let blockDataList = onceSheetBecomeOfblockData('zjny.xlsx', '现代农业走廊');
let keyValueOrTitleList = ["张江镇自然资源","水资源利用率","企业情况","总体数据分布","专业员工类型","从业人员情况","产业结构","产业主体结构",
"重点项目建设","项目分析","专家服务","技术创新引进情况","创新技术基础数据","引进技术基础数据","经营管理情况","农业生产产值趋势图"];//适配 饼图 键值以及需要多个key的
"重点项目建设","项目分析","专家服务","技术创新引进情况","创新技术基础数据","引进技术基础数据","经营管理情况"];//适配 饼图 键值以及需要多个key的
let barChartList = ["技术创新趋势","引进技术创新趋势"]; //适配 柱状图 折线图
let barChartList = ["技术创新趋势","引进技术创新趋势","农业生产产值趋势图"]; //适配 柱状图 折线图
let stringList = [];
let decollatePlanarList =[];//适配 表格
let decollatePlanarList = [];//适配 表格
let titltListConfig = {};
let result = packageDataProcess(blockDataList, titltListConfig, keyValueOrTitleList, barChartList, stringList, decollatePlanarList);
......
......@@ -46,7 +46,8 @@ export function planarArrForObjectList(planarArr, titleIndex = 0, titleList = []
function changeChineseTitleIntoEnglish(titles) {
let result = [];
titles.forEach(chineseStr => {
result.push(pyfl(chineseStr).toLowerCase());
let str = chineseStr.toString();
result.push(pyfl(str).toLowerCase());
});
return result;
}
......
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