lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-03-24 09:48:34 +08:00
Code Issues Projects Releases Wiki Activity

坐标轴字典更新

Browse Source
This commit is contained in:
qianming
2022-04-21 09:30:53 +08:00
parent ea46ccebbe
commit aa8fba3c33
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
report-core/src/main/resources/db/migration/V1.0.17__add_dict_coord.sql
View File

@@ -1,6 +1,7 @@
-- 新增坐标轴字典
INSERT INTO `aj_report`.`gaea_dict`(`dict_name`,`dict_code`,`remark`) SELECT "XY坐标属性","COORD_PROPERTIES","XY坐标属性" FROM DUAL WHERE NOT EXISTS(SELECT `dict_name`,`dict_code`,`remark` FROM `aj_report`.`gaea_dict` WHERE `dict_name`="XY坐标属性" AND `dict_code`="COORD_PROPERTIES" AND `remark`="XY坐标属性");
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`,`item_name`,`item_value`,`locale`) SELECT "COORD_PROPERTIES","数据","series","zh" FROM DUAL WHERE NOT EXISTS(SELECT `dict_code`,`item_name`,`item_value`,`locale` FROM `aj_report`.`gaea_dict_item` WHERE `dict_code`="COORD_PROPERTIES" AND `item_name`="数据" AND `item_value`="series" AND `locale`="zh");
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`,`item_name`,`item_value`,`locale`) SELECT "COORD_PROPERTIES","X轴","xAxis","zh" FROM DUAL WHERE NOT EXISTS(SELECT `dict_code`,`item_name`,`item_value`,`locale` FROM `aj_report`.`gaea_dict_item` WHERE `dict_code`="COORD_PROPERTIES" AND `item_name`="X轴" AND `item_value`="xAxis" AND `locale`="zh");
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`,`item_name`,`item_value`,`locale`) SELECT "COORD_PROPERTIES","Y轴","yAxis","zh" FROM DUAL WHERE NOT EXISTS(SELECT `dict_code`,`item_name`,`item_value`,`locale` FROM `aj_report`.`gaea_dict_item` WHERE `dict_code`="COORD_PROPERTIES" AND `item_name`="Y轴" AND `item_value`="yAxis" AND `locale`="zh");
INSERT INTO `aj_report`.`gaea_dict`(`dict_name`, `dict_code`, `remark`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('XY坐标属性', 'COORD_PROPERTIES', 'XY坐标属性', 'admin', NOW(), 'admin', NOW(), 1);
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('COORD_PROPERTIES', '数据', 'series', NULL, 1, 'zh', NULL, NULL, 'admin', NOW(), 'admin', NOW(), 1);
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('COORD_PROPERTIES', 'X轴', 'xAxis', NULL, 1, 'zh', NULL, NULL, 'admin', NOW(), 'admin', NOW(), 1);
INSERT INTO `aj_report`.`gaea_dict_item`(`dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('COORD_PROPERTIES', 'Y轴', 'yAxis', NULL, 1, 'zh', NULL, NULL, 'admin', NOW(), 'admin', NOW(), 1);

19
report-ui/src/mixins/queryform.js
View File

@@ -109,6 +109,7 @@ export default {
// widget-text 文本框
// widge-table 表格(数据不要转)
// widget-stackchart 堆叠图
// widget-heatmap 热力图
const chartType = params.chartType
if (
chartType == "widget-barchart" ||
@@ -125,7 +126,9 @@ export default {
return this.widgettext(params.chartProperties, data)
} else if (chartType == "widget-stackchart") {
return this.stackChartFn(params.chartProperties, data)
} else {
} else if (chartType == "widget-heatmap") {
return this.heatmapChartFn(params.chartProperties, data)
}else {
return data
}
},
@@ -223,6 +226,20 @@ export default {
}
return ananysicData;
},
// 坐标系数据解析
heatmapChartFn(chartProperties,data){
const ananysicData = {};
const series = [];
//全部字段字典值
const types = Object.values(chartProperties)
//x轴字段、y轴字段名
const xAxisField = Object.keys(chartProperties)[types.indexOf('xAxis')]
const yAxisField = Object.keys(chartProperties)[types.indexOf('yAxis')]
//x轴数值去重，y轴去重
const xAxisList = this.setUnique(data.map(item => item[xAxisField]))
const yAxisList = this.setUnique(data.map(item => item[yAxisField]))
},
setUnique(arr) {
let newArr = [];
arr.forEach(item => {

4
report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-heatmap.js
View File

@@ -645,7 +645,7 @@ export const widgetHeatmap = {
relactiveDom: 'dataType',
chartType: 'widget-heatmap',
relactiveDomValue: 'dynamicData',
dictKey: 'PIE_PROPERTIES',
dictKey: 'COORD_PROPERTIES',
value: '',
},
],
@@ -681,7 +681,7 @@ export const widgetHeatmap = {
name: 'height',
required: false,
placeholder: '该容器在1080px大屏中的高度',
value: 250,
value: 300,
},
],
}