lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-04-13 10:38:34 +08:00
Code Issues Projects Releases Wiki Activity

对比图更新

Browse Source
This commit is contained in:
qianming
2021-09-01 17:12:10 +08:00
parent dd07f598c6
commit cb301a60fb
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-line-compare.js
View File

@@ -197,7 +197,7 @@ export const widgetLineCompare = {
name: 'colorX',
required: false,
placeholder: '',
value: '#fff',
value: '#36c5e7',
},
{
type: 'el-input-number',
@@ -237,7 +237,7 @@ export const widgetLineCompare = {
name: 'lineColorX',
required: false,
placeholder: '',
value: '#fff',
value: '#36c5e7',
},
],
},
@@ -265,7 +265,7 @@ export const widgetLineCompare = {
name: 'nameColorYTop',
required: false,
placeholder: '',
value: '#fff',
value: '#36c5e7',
},
{
type: 'el-input-number',
@@ -297,7 +297,7 @@ export const widgetLineCompare = {
name: 'colorYTop',
required: false,
placeholder: '',
value: '#fff',
value: '#36c5e7',
},
{
type: 'el-input-number',
@@ -329,7 +329,7 @@ export const widgetLineCompare = {
name: 'lineColorYTop',
required: false,
placeholder: '',
value: '#fff',
value: '#36c5e7',
},
{
type: 'el-switch',
@@ -381,7 +381,7 @@ export const widgetLineCompare = {
name: 'nameColorYBottom',
required: false,
placeholder: '',
value: '#fff',
value: '#e68b55',
},
{
type: 'el-input-number',
@@ -413,7 +413,7 @@ export const widgetLineCompare = {
name: 'colorYBottom',
required: false,
placeholder: '',
value: '#fff',
value: '#e68b55',
},
{
type: 'el-input-number',
@@ -445,7 +445,7 @@ export const widgetLineCompare = {
name: 'lineColorYBottom',
required: false,
placeholder: '',
value: '#fff',
value: '#e68b55',
},
{
type: 'el-switch',

5
report-ui/src/views/report/bigscreen/designer/widget/line/widgetLineCompareChart.vue
View File

@@ -639,8 +639,9 @@ export default {
});
},
renderingFn(optionsSetup, val) {
this.options.yAxis[1]['data'] = val.xAxis
if (val.series[0].type == "bar") {
this.options.xAxis[0]['data'] = val.xAxis
this.options.xAxis[1]['data'] = val.xAxis
if (val.series[0].type == "line") {
this.options.series[0]['name'] = val.series[0].name
this.options.series[0]['data'] = val.series[0].data
this.options.series[1]['name'] = val.series[1].name