From adafb47b09ddc287f7b539504770dade2445606d Mon Sep 17 00:00:00 2001 From: qianming Date: Wed, 21 Jul 2021 19:38:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/report/bigscreen/designer/tools.js | 85 +++++++++---------- .../widget/map/widgetAirBubbleMap.vue | 33 ++++++- 2 files changed, 71 insertions(+), 47 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index a2b3e695..6a8dab45 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -5908,13 +5908,13 @@ const widgetTools = [ { name: '地图块颜色', list: [ - { +/* { type: 'vue-color', label: '0%处颜色', name: 'font0PreColor', required: false, placeholder: '', - value: '' + value: '#073684' }, { type: 'vue-color', @@ -5922,15 +5922,15 @@ const widgetTools = [ name: 'font100PreColor', required: false, placeholder: '', - value: '' - }, + value: '#061E3D' + },*/ { type: 'vue-color', - label: '高亮颜色', + label: '高亮渐变色', name: 'fontHighlightColor', required: false, placeholder: '', - value: '' + value: '#2B91B7' }, ], }, @@ -5984,43 +5984,42 @@ const widgetTools = [ placeholder: 'px', relactiveDom: 'dataType', relactiveDomValue: 'staticData', - 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":"澳门"}' + - ']', + value: [ + {"name":"南海诸岛","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}], }, { 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 3763b0d4..fdd2517e 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 @@ -406,6 +406,7 @@ export default { this.setOptionDataValue(); this.setOptionsData(); this.setOptionAirSize(); + this.setOptionMapBlocak(); }, // 标题设置 setOptionsTitle() { @@ -439,7 +440,7 @@ export default { }; label['normal'] = normal; }, - setOptionDataValue(){ + setOptionDataValue() { const optionsSetup = this.optionsSetup; const label = this.options.series[1]['label']; const normal = { @@ -454,13 +455,34 @@ export default { cnNum: { fontSize: optionsSetup.fontDataSize, color: optionsSetup.fontDataColor, - fontWeight:optionsSetup.fontDataWeight, + fontWeight: optionsSetup.fontDataWeight, } } }; label['normal'] = normal; }, - setOptionAirSize(){ + setOptionMapBlocak() { + const optionsSetup = this.optionsSetup; + const itemStyle = this.options.series[0]['itemStyle']; + //鼠标放置颜色加深 + const emphasis = { + areaColor: { + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, + color: '#073684' // 0% 处的颜色 + }, { + offset: 1, + color: optionsSetup.fontHighlightColor // 100% 处的颜色 + }], + }, + }; + itemStyle['emphasis'] = emphasis; + }, + setOptionAirSize() { minSize4Pin = this.optionsSetup.fontAirSize }, //数据解析 @@ -474,7 +496,10 @@ export default { ); }, staticDataFn(val) { - + const serise1 = this.options.series[1]; + serise1['data'] = convertData(val) + const serise = this.options.series[0]; + serise['data'] = val }, dynamicDataFn(val, refreshTime) { if (!val) return;