From 83cb317e2870f46a7e2f7bc28e3876ab9b5d9679 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 30 Dec 2021 15:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/visual/issue-info.scss | 2 +- src/assets/scss/modules/visual/resibuzz.scss | 7 ++++--- .../modules/visual/basicinfo/basicInfoMain.vue | 6 +++--- .../visual/communityGovern/distributionAnalyze.vue | 3 ++- .../visual/communityGovern/processAnalyze.vue | 3 ++- .../modules/visual/communityGovern/resibuzz.vue | 5 +++-- .../modules/visual/communityGovern/typeAnalyze.vue | 13 +++++-------- .../modules/visual/components/screen-map/index.vue | 6 +++--- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss index 43f77201..e4672951 100644 --- a/src/assets/scss/modules/visual/issue-info.scss +++ b/src/assets/scss/modules/visual/issue-info.scss @@ -74,7 +74,7 @@ display: flex; padding-left: 15px; .info-title-2 { - width: 90px; + width: 100px; flex: 0 0 1; font-size: 14px; } diff --git a/src/assets/scss/modules/visual/resibuzz.scss b/src/assets/scss/modules/visual/resibuzz.scss index 91ff7705..8ea3f5ee 100644 --- a/src/assets/scss/modules/visual/resibuzz.scss +++ b/src/assets/scss/modules/visual/resibuzz.scss @@ -52,9 +52,10 @@ } } .status-select { - position: absolute; - top: 20px; - right: 10px; + margin-left: 10px; + // position: absolute; + // top: 20px; + // right: 10px; } .second-select:last-child { margin-left: 0; diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index 568c453b..e538d41e 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -549,11 +549,11 @@ const vueGis = { //根据组织层级设置缩放级别 setZoom (agencyLevel) { if (agencyLevel === 'district') { - this.zoom = 14 + this.zoom = 12 } else if (agencyLevel === 'street') { - this.zoom = 15 + this.zoom = 13 } else if (agencyLevel === 'community') { - this.zoom = 16 + this.zoom = 14 } }, diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue index 5f5e4c79..88094255 100644 --- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue +++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue @@ -349,8 +349,9 @@ export default { const { data, code, msg } = await requestPost(url, params); if (code === 0) { + debugger this.legendArray = [] - if (data.above) { + if (data.under) { this.under = data.under this.legendArray.push( { diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 8ed41ee2..73236c98 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -424,7 +424,8 @@ export default { loadMap () { if (this.isfirstInit) { //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray - this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) + // this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle, 3000) + this.$refs.map.loadMap(this.agencyInfo, null, null, this.projectList, this.iconUrlArray, this.iconTextStyle) } else { this.$refs.map.refreshMap(null, this.projectList) } diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index e8a7faf1..947c6d02 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -279,6 +279,7 @@ export default { let params = { orgId: this.orgId, orgType: this.orgType, + status: this.status, }; @@ -453,9 +454,9 @@ export default { item.status ? item.status : '', item.createdTime ? item.createdTime : '', item.issueOriginator ? item.issueOriginator : '', - item.voteAccount ? item.voteAccount : 0, + item.voteAccount ? item.voteAccount : '', item.supportCount ? item.supportCount : 0, - item.oppositionCount ? item.oppositionCount : '', + item.oppositionCount ? item.oppositionCount : 0, { type: "operate", list: ["查看"] }, ]; }); diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue index a1b3f1b0..0c17367a 100644 --- a/src/views/modules/visual/communityGovern/typeAnalyze.vue +++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue @@ -2,7 +2,7 @@
- 事件分类分析 + 项目分类分析
@@ -123,10 +123,7 @@ export default { align: "center", width: "5%", }, - { - align: "center", - width: "10%", - }, + { align: "center", width: "10%", @@ -145,7 +142,7 @@ export default { }, { align: "center", - width: "20%", + width: "30%", }, { align: "center", @@ -156,7 +153,7 @@ export default { width: "10%", }, ], - header: ["序号", "项目编号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"], + header: ["序号", "类别", "反映渠道", "所属网格", "状态", "项目标题", "转成项目时间", "操作"], list: [], pageSize: 10, pageNo: 1, @@ -427,7 +424,7 @@ export default { item.statusShow = item.status === 'pending' ? '待处理' : '已结案' return [ { type: "index" }, - item.projectCode ? item.projectCode : '', + // item.projectCode ? item.projectCode : '', item.categoryNames.join(','), item.originShow ? item.originShow : '', item.gridName ? item.gridName : '', diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 0166c8c3..96348b46 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -450,11 +450,11 @@ const vueGis = { //根据组织层级设置缩放级别 setZoom (level) { if (level === 'district') { - this.zoom = 14 + this.zoom = 12 } else if (level === 'street') { - this.zoom = 15 + this.zoom = 13 } else if (level === 'community') { - this.zoom = 16 + this.zoom = 14 } },