From 688e44ea8986d132c9e63fb55c0c377a2d363ae1 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 20 May 2022 16:16:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/shijianchulifenxi.scss | 6 +-- .../modules/shequzhili/event/cpts/add.vue | 6 +-- .../event/cpts/process-form-project.vue | 2 +- .../shijianchuli/event-info.vue | 34 ++++++++++------- .../communityGovern/shijianchuli/pieOption.js | 4 +- .../shijianchuli/shijianchulifenxi.vue | 38 ++++++++----------- 6 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss index 82d5cb58..bd965572 100644 --- a/src/assets/scss/modules/visual/shijianchulifenxi.scss +++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss @@ -14,14 +14,14 @@ height: calc(100vh - 230px); .l_top { - height: 385px; + height: 355px; display: flex; align-items: center; } .l_bottom { - height: calc(100vh - 230px - 385px); + height: calc(100vh - 200px - 355px); margin-top: 20px; } } @@ -112,7 +112,7 @@ text-align: center; position: relative; width: 500px; - height: 385px; + height: 355px; box-sizing: border-box; } diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 0bced147..c1e3a2c8 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -412,9 +412,9 @@ export default { this.getCategoryList() this.initMap() - this.formData = { - ...this.formDataTemp - } + // this.formData = { + // ...this.formDataTemp + // } }, methods: { diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index ff08b830..1f3d602c 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -333,7 +333,7 @@ export default { this.getMyDepartmentList(); this.getAssistanceUnitList(); this.getTagList() - this.formData = { ...this.formDataTemp } + // this.formData = { ...this.formDataTemp } if (this.eventId) { this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData)); } else { diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index 30a67021..c8df5c96 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -24,25 +24,31 @@
事件内容： -
-
{{ eventInfo.eventContent || "--"}}
-
- -
+ {{ eventInfo.eventContent }} +
+ +
+ 图片： +
+ +
-
+ +
音频： -
+
- +
反映渠道： diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js index 1a64a0e0..4bca2b2f 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js +++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js @@ -1,10 +1,10 @@ export function pieOption (_charts) { -const center= ['50%', '200px'] +const center= ['50%', '170px'] return { title: { text: '0', - top: 170, + top: 140, left: 'center', textStyle: { width: '100%', diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 778d568f..de37ee5e 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -294,18 +294,18 @@ export default { //获取服务器数据 await this.getProjectTotal() await this.getLineChart() - await this.getTable() + this.dataLoading = false - this.assignData() + // this.assignData() }, methods: { async getApiData () { + await this.getProjectTotal() await this.getLineChart() - await this.getTable(); this.assignData() @@ -332,19 +332,20 @@ export default { } if (index !== '0') { await this.getApiData() - this.assignPieChart() + // this.assignPieChart() } }, assignData () { + this.getPie() this.getLine() }, handleSelectChange (value) { - console.log(value) + this.queryStartTime = value[0] + " 00:00:00" this.queryEndTime = value[1] + " 23:59:59" this.getApiData(); @@ -565,6 +566,7 @@ export default { }, getPie () { + if (this.pieInitState) { this.assignPieChart() } else { @@ -588,7 +590,7 @@ export default { this.pieOption.title.text = this.projectTotal - this.clickPie(maxIndex) + this.clickPie() let fun = function (params) { _that.clickPie(params.dataIndex) @@ -598,10 +600,13 @@ export default { }, clickPie (seriesIndex) { + if (seriesIndex === 0) { this.processStatus = 'closed_case' - } else { + } else if (seriesIndex === 1) { this.processStatus = 'processing' + } else { + this.processStatus = '' } this.pieData.forEach((element, index) => { @@ -643,28 +648,15 @@ export default { handleChangeAgency () { let obj = this.$refs["myCascader"].getCheckedNodes()[0].data if (obj) { - this.orgId = obj.level === 'grid' ? 'grid' : 'agency' - this.orgId = obj.this.orgId = orgArray[0] + this.orgType = obj.level === 'grid' ? 'grid' : 'agency' + this.orgId = obj.agencyId } else { this.orgId = '' this.orgType = '' } - // let orgArray = [] - // let key = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' - // if (key) { - // debugger - // orgArray = key.split('-') - // this.orgId = orgArray[0] - // this.orgType = orgArray[1] === 'grid' ? 'grid' : 'agency' - // } else { - // this.orgId = '' - // this.orgType = '' - // } - this.getApiData() - }, //初始化时间 @@ -707,7 +699,7 @@ export default { this.userId = id; }, userId () { - this.getApiData(); + // this.getApiData(); window.scrollTo(0, 0); }, }, From 2f72ae383f6e3b22dc21b886abdae145a3d75e8f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 20 May 2022 16:18:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/event/cpts/event-info.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 0bfd349a..25aa1db3 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -81,11 +81,11 @@
回复人：
-
{{ item.publicReply }}
+
{{ item.departmentName }}
回复内容：
-
{{ item.departmentName }}
+
{{ item.publicReply }}
@@ -93,11 +93,11 @@
回复人：
-
{{ item.publicReply }}
+
{{ item.departmentName }}
回复内容：
-
{{ item.departmentName }}
+
{{ item.publicReply }}
@@ -147,11 +147,11 @@
回复人：
-
{{ item.publicReply }}
+
{{ item.departmentName }}
回复内容：
-
{{ item.departmentName }}
+
{{ item.publicReply }}