diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index efca0060..11f38e17 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -5819,7 +5819,7 @@ const widgetTools = [ }, ], }, - { + /*{ name: '自定义配色', list: [ { @@ -5830,7 +5830,7 @@ const widgetTools = [ value: [{color: '#FF801C'}, {color: '#F5FF46'}, {color: '#00FE65'}, {color: '#00FEFF'}, {color: '#ffa800'}] }, ], - }, + },*/ ], ], data: [ @@ -5869,7 +5869,43 @@ const widgetTools = [ placeholder: 'px', relactiveDom: 'dataType', relactiveDomValue: 'staticData', - value: '[{"value": 1048,"name": "搜索引擎"},{"value": 735, "name": "直接访问"},{"value": 580, "name": "邮件营销"},{"value": 484,"name":"联盟广告"},{"value":300,"name":"视频广告"}]', + value: '[' + + '{"value": 1,"name": "南海诸岛"},' + + '{"value": 524,"name": "北京"},' + + '{"value": 14,"name": "天津"},' + + '{"value": 150,"name": "上海"},' + + '{"value": 75,"name": "重庆"},' + + '{"value": 13,"name": "河北"},' + + '{"value": 83,"name": "河南"},' + + '{"value": 11,"name": "云南"},' + + '{"value": 19,"name": "辽宁"},' + + '{"value": 15,"name": "黑龙江"},' + + '{"value": 69,"name": "湖南"},' + + '{"value": 260,"name": "安徽"},' + + '{"value": 39,"name": "山东"},' + + '{"value": 4, "name": "新疆"},' + + '{"value": 31, "name": "江苏"},' + + '{"value": 104, "name": "浙江"},' + + '{"value": 36, "name": "江西"},' + + '{"value": 1052, "name": "湖北"},' + + '{"value": 33, "name": "广西"},' + + '{"value": 347, "name": "甘肃"},' + + '{"value": 8, "name": "山西"},' + + '{"value": 157,"name":"内蒙古"},' + + '{"value":22,"name":"陕西"}' + + '{"value":4,"name":"吉林"}' + + '{"value":36,"name":"福建"}' + + '{"value":39,"name":"贵州"}' + + '{"value":996,"name":"广东"}' + + '{"value":27,"name":"青海"}' + + '{"value":31,"name":"西藏"}' + + '{"value":46,"name":"四川"}' + + '{"value":16,"name":"宁夏"}' + + '{"value":22,"name":"海南"}' + + '{"value":6,"name":"台湾"}' + + '{"value":2,"name":"香港"}' + + '{"value":9,"name":"澳门"}' + + ']', }, { type: 'dycustComponents', diff --git a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue index af04624c..c184a7ac 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue @@ -375,17 +375,17 @@ export default { height: this.optionsStyle.height + "px", left: this.optionsStyle.left + "px", top: this.optionsStyle.top + "px", - background: this.optionsCollapse.background + background: this.optionsSetup.background }; } }, watch: { value: { handler(val) { -/* this.optionsStyle = val.position; + this.optionsStyle = val.position; this.optionsData = val.data; - this.optionsSetup = val.setup;*/ this.optionsCollapse = val.setup; + this.optionsSetup = val.setup; this.editorOptions(); }, deep: true @@ -393,7 +393,10 @@ export default { }, mounted() { this.optionsStyle = this.value.position; - this.optionsCollapse = this.value.setup; + this.optionsData = this.value.data; + this.optionsCollapse = this.value.setup; + this.optionsSetup = this.value.setup; + this.editorOptions(); }, methods: { // 修改图标options属性