From 210315cd7972c71533034ae8855d71a7961700e3 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 7 Jun 2022 14:32:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/duoyuanfenxi.scss | 2 +- .../duoyuanfuwu/duoyuanfuwufenxi.vue | 27 +++++++++------ .../communityGovern/duoyuanfuwu/pieOption.js | 2 +- .../shijianchuli/shijianchulifenxi.vue | 1 - .../shijianfenlei/pieOption.js | 8 ++--- .../shijianfenlei/shijianfenleifenxi.vue | 34 ++++++++++++------- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/src/assets/scss/modules/visual/duoyuanfenxi.scss b/src/assets/scss/modules/visual/duoyuanfenxi.scss index 222a39cd..12032815 100644 --- a/src/assets/scss/modules/visual/duoyuanfenxi.scss +++ b/src/assets/scss/modules/visual/duoyuanfenxi.scss @@ -76,7 +76,7 @@ position: relative; height: 100%; .tb { - height: calc(100% - 50px); + height: calc(100% - 40px); overflow-y: auto; @include scrollBar; /deep/ .table-status { diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 54da7f0f..35de4c92 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -149,7 +149,7 @@ export default { ], header: ['序号', '组织列表', '操作'], list: [], - pageSize: 10, + pageSize: 5, pageNo: 1, total: 0, categoryCode: '' @@ -216,7 +216,7 @@ export default { name: item.categoryName, code: item.categoryCode, color: item.color, // colorArray[index] - selected: index == 0 ? true : false + selected: false } this.pieData.push(ob) }) @@ -302,14 +302,21 @@ export default { this.clickPie() // this.clickPie(maxIndex) let fun = function (params) { - _that.clickPie(params.dataIndex) + _that.clickPie(params) } this.$refs.pieChart.handleClick(fun) }, - clickPie (seriesIndex) { + clickPie (params) { + let dataIndex = params ? params.dataIndex : null + let componentIndex = params ? params.componentIndex : null + if (componentIndex === 2) { // 点击中心 + dataIndex = -1 + this.categoryCode = '' + this.$refs.pieChart.clear() + } this.pieData.forEach((element, index) => { - if (index === seriesIndex) { + if (index === dataIndex) { element.label = { show: true, } @@ -320,9 +327,6 @@ export default { } } this.categoryCode = element.code - this.demand.pageNo = 1 - this.getTable() - this.getMapData() } else { element.label = { show: false, @@ -339,6 +343,9 @@ export default { this.pieOption.series[1].data = this.pieData // this.$refs.pieChart.hideLoading() this.$refs.pieChart.setOption(this.pieOption) + this.demand.pageNo = 1 + this.getTable() + this.getMapData() }, toUserInfo (uid) { @@ -738,11 +745,11 @@ export default { .map-tips { width: 100%; display: flex; - // justify-content: center; + justify-content: center; align-items: center; flex-wrap: wrap; box-sizing: border-box; - padding: 6px 0 0 100px; + // padding: 6px 0 0 100px; // padding-top: 10px; // padding-bottom: 10px; diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js index 15d6e966..ae6ffd8c 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js @@ -74,7 +74,7 @@ export function pieOption (_charts) { avoidLabelOverlap: false, // top: top + '%', // height: '80%', - // selectedMode: 'single', + selectedMode: 'single', left: 'center', width: 480, label: { diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index b92b9e1c..88e94cb0 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -636,7 +636,6 @@ export default { }; element.selected = !element.selected - isSelected = element.selected } else { diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js index aef4afae..942be5dc 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js +++ b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js @@ -1,10 +1,10 @@ export function pieOption (_charts) { - const center= ['50%', '120px'] + const center= ['50%', '140px'] return { title: { text: '0', - top: 95, + top: 115, left: 'center', textStyle: { width: '100%', @@ -94,7 +94,7 @@ export function pieOption (_charts) { padding: [0, 6, 0, 6] }, a: { - fontSize: 25, + fontSize: 18, color: '#fff', padding: [0, 6, 6, 6] }, @@ -110,7 +110,7 @@ export function pieOption (_charts) { labelLine: { show: false, smooth: 0.2, - length: 40, + length: 20, length2: 0, maxSurfaceAngle: 80 }, diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 2516ca07..f3af070c 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -508,16 +508,22 @@ export default { this.clickPie() // this.clickPie(maxIndex) let fun = function (params) { - _that.clickPie(params.dataIndex) + _that.clickPie(params) } this.$refs.pieChart.handleClick(fun) }, - clickPie (seriesIndex) { - let isSelected = false + clickPie (params) { + let dataIndex = params ? params.dataIndex : null + let componentIndex = params ? params.componentIndex : null + if (componentIndex === 2) { // 点击中心 + dataIndex = -1 + this.categoryCode = '' + this.$refs.pieChart.clear() + } this.pieData.forEach((element, index) => { - if (index === seriesIndex) { + if (index === dataIndex) { element.label = { show: true, } @@ -529,12 +535,6 @@ export default { } this.categoryCode = element.categoryCode element.selected = !element.selected - isSelected = element.selected - // if (isSelected) { - // this.categoryCode = element.categoryCode - // } else { - // this.categoryCode = '' - // } } else { element.label = { show: false, @@ -600,15 +600,23 @@ export default { this.clickGridPie() // this.clickGridPie(maxIndex) let fun = function (params) { - _that.clickGridPie(params.dataIndex) + _that.clickGridPie(params) } this.$refs.gridPieChart.handleClick(fun) }, - clickGridPie (seriesIndex) { + clickGridPie (params) { + let dataIndex = params ? params.dataIndex : null + let componentIndex = params ? params.componentIndex : null + if (componentIndex === 2) { // 点击中心 + dataIndex = -1 + this.tableOrgId = '' + this.tableOrgType = '' + this.$refs.gridPieChart.clear() + } this.gridPieData.forEach((element, index) => { - if (index === seriesIndex) { + if (index === dataIndex) { element.label = { show: true, } From d983e5fc7df43a8bf8ef48e5d3ac9bfe6115a108 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 7 Jun 2022 14:37:16 +0800 Subject: [PATCH 2/3] 111 --- .../visual/communityGovern/shijianchuli/shijianchulifenxi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 88e94cb0..301a60a9 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -635,7 +635,7 @@ export default { } }; - element.selected = !element.selected + // element.selected = !element.selected } else { From 9235a43f4fdb42a7507686eb8bb2408f185103ee Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 8 Jun 2022 11:05:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/event/cpts/add.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 3bc96785..b53caf48 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -312,6 +312,7 @@ export default { //地图相关 keyWords: '', + isFirst: true,//地图是否首次加载，首次加载不给地址赋值 //图片相关 oss/file/uploadvariedfile dialogImageUrl: 'oss/file/uploadvariedfile', @@ -620,7 +621,7 @@ export default { this.handleMoveCenter() }) this.handleMoveCenter() - this.convert() + // this.convert() }, setMarker (lat, lng) { @@ -699,8 +700,14 @@ export default { geocoder .getAddress({ location: location }) // 将给定的坐标位置转换为地址 .then((result) => { - this.formData.address = result.result.address - // 显示搜索到的地址 + + if (!this.isFirst) {//再次查询时再赋值 + this.formData.address = result.result.address + } + + if (this.isFirst) { + this.isFirst = false + } }); },