diff --git a/report-ui/src/utils/screenMixins.js b/report-ui/src/utils/screenMixins.js index 271b3fe5..4343341d 100644 --- a/report-ui/src/utils/screenMixins.js +++ b/report-ui/src/utils/screenMixins.js @@ -185,6 +185,7 @@ const mixin = { }; screenData.widgets.forEach((widget) => { widget.value.setup.widgetId = widget.value.widgetId; + widget.value.setup.widgetCode = widget.type }); const { code, data } = await insertDashboard(screenData); if (code == "200") return this.$message.success("保存成功!"); @@ -332,4 +333,4 @@ const mixin = { } } -export default mixin \ No newline at end of file +export default mixin diff --git a/report-ui/src/views/bigscreenDesigner/designer/index.vue b/report-ui/src/views/bigscreenDesigner/designer/index.vue index ca754a4e..4aa964b0 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/index.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/index.vue @@ -508,7 +508,6 @@ export default { this.currentWidgetTotal = this.widgets.length; // 当前操作面板上有多少各组件 }, dragEnd() { - this.dragWidgetCode = ""; /** * 40@remarks 新增组件到操作面板后,右边的配置有更新,但是当前选中的组件没更新,导致配置错乱的bug; * 由于拖动组件拖到非操作面板上是不会添加组件,还需判断是否添加组件到操作面板上; @@ -524,6 +523,7 @@ export default { const uuid = Number(Math.random().toString().substr(2)).toString(36); this.widgets[this.currentWidgetTotal].value.widgetId = uuid; this.layerWidget[this.currentWidgetTotal].widgetId = uuid; + this.widgets[this.currentWidgetTotal].value.widgetCode = this.dragWidgetCode; const index = this.widgets.length - 1; this.layerClick(index); // 选中当前新增的组件 this.grade = false; // 去除网格线 diff --git a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js index bfb3c926..4f03bc4f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js +++ b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js @@ -27,6 +27,11 @@ export const lickageParamsConfig = [ code: 'widget-barchart', paramsKey: ['name', 'value'] }, + { + name: '柱图-渐变色', + code: 'widget-gradient-color-barchart', + paramsKey: ['name', 'value'] + }, // …… { name: '折线图', @@ -70,6 +75,7 @@ export const originWidgetLinkageLogic = function (self, isActiveClick = false, b self.$refs.myVChart.chart.on('click', function (params) { self.allComponentLinkage[self.widgetIndex].linkageArr.forEach(item => { console.log(`bus_${item.originId}_${item.targetId}`, ' -联动逻辑点击-发送消息', params) + console.log(self.value) let message = {} const widgetConfigTemp = getOneConfigByCode(self.value.widgetCode) console.log('widgetConfigTemp', widgetConfigTemp) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js index e6639603..97173a84 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js @@ -558,6 +558,18 @@ export const widgetGradientBarchart = { }, ], }, + { + name: '组件联动', + list: [ + { + type: 'componentLinkage', + label: '', + name: 'componentLinkage', + required: false, + value: [] + } + ] + } ], ], // 数据 diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue index 88a378f4..142b0a61 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetGradientColorBarchart.vue @@ -1,10 +1,14 @@