From d4e5321ccc237b55efd164c14e64da7317424405 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 15 Dec 2021 10:56:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/elegant/index.vue | 24 +++---- src/views/modules/visual/measure/service.vue | 62 ++++++++++++++++++- 2 files changed, 71 insertions(+), 15 deletions(-) diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index e7898638..91fcc877 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -339,18 +339,18 @@ export default { .then((res) => { this.importLoading = false this.importBtnTitle = '导入人员数据' - let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) - console.log('filename', fileName) - let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) - var url = window.URL.createObjectURL(blob) - var aLink = document.createElement('a') - aLink.style.display = 'none' - aLink.href = url - aLink.setAttribute('download', fileName) - document.body.appendChild(aLink) - aLink.click() - document.body.removeChild(aLink) //下载完成移除元素 - window.URL.revokeObjectURL(url) //释放掉blob对象 + // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + // console.log('filename', fileName) + // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) + // var url = window.URL.createObjectURL(blob) + // var aLink = document.createElement('a') + // aLink.style.display = 'none' + // aLink.href = url + // aLink.setAttribute('download', fileName) + // document.body.appendChild(aLink) + // aLink.click() + // document.body.removeChild(aLink) //下载完成移除元素 + // window.URL.revokeObjectURL(url) //释放掉blob对象 this.getTableData() }) .catch( err => { diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue index b0d9a180..3ea56996 100644 --- a/src/views/modules/visual/measure/service.vue +++ b/src/views/modules/visual/measure/service.vue @@ -116,7 +116,9 @@
- +
+ 导出 +
{ + console.log('resllll', res) + let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) + console.log('filename', fileName) + let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }) + var url = window.URL.createObjectURL(blob) + var aLink = document.createElement('a') + aLink.style.display = 'none' + aLink.href = url + aLink.setAttribute('download', fileName) + document.body.appendChild(aLink) + aLink.click() + document.body.removeChild(aLink) //下载完成移除元素 + window.URL.revokeObjectURL(url) //释放掉blob对象 + }) + .catch((err) => { + console.log('获取导出情失败', err) + return this.$message.error('网络错误') + }) + }, getTreeData(data){ if (!Array.isArray(data)) return [] let arr = data.map(item => { @@ -468,6 +511,7 @@ export default { if (item.categoryName == params.name) code = item.categoryCode }) if (code) { + this.categoryCode = code const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' this.getServiceList(_arr[0], orgType, code) @@ -508,6 +552,9 @@ export default { scoped > From af3951ada0e348d22685dbfd44c06e1c55604a90 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 15 Dec 2021 11:18:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/visual/measure/dialogInfo.vue | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue index 7b46272c..2a50f80d 100644 --- a/src/views/modules/visual/measure/dialogInfo.vue +++ b/src/views/modules/visual/measure/dialogInfo.vue @@ -51,31 +51,34 @@
-
+
服务方： {{ info.serviceShowName }}
-
- 实际服务时间： - {{ info.serviceStartTime }} 至
- {{ info.serviceEndTime }} -
-
- 完成情况： - {{ info.finishResult == "resolved" ? "已解决" : "未解决" }} -
- {{ info.finishDesc }} -
-
- 评价： - - - -
+ +
@@ -194,17 +197,18 @@ export default { if (code === 0) { // console.log('data-org----dict', data) this.info = data; - this.getAnalyse(); + this.getAnalyse(demandId); } else { this.$message.error(msg); } }, - async getAnalyse() { + async getAnalyse(demandId) { // const url = "/gov/org/customeragency/staffinagencylist"; this.loading = true; const url = "/heart/userdemand/demand-research-analysis"; let params = { firstCategoryCode: this.info.firstCategoryCode, + demandRecId: demandId, icResiUserId: this.info.icResiUserId, epmetUserIdList: [this.info.epmetUserId], queryOrigin: this.queryOrigin, From 2885636dd9313febec9832c6efc09f1cea0ebb90 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 15 Dec 2021 11:24:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?= =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B67?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/basicinfo/cpts/incident-info.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue index 4d116c6f..f3a86089 100644 --- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue @@ -36,7 +36,10 @@
提报给： - {{ info.eventPerson.join("、") || "--" }} +
+
{{ item }}
+
{{ item }}
+
From e27ccbfeb4e75d4a3b782c1ddb65a0a9330c71bb Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 15 Dec 2021 13:52:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=AA=E6=96=BD=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/visual/measure/service.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue index 3ea56996..e0caf574 100644 --- a/src/views/modules/visual/measure/service.vue +++ b/src/views/modules/visual/measure/service.vue @@ -514,6 +514,7 @@ export default { this.categoryCode = code const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + this.pageNo = 1 this.getServiceList(_arr[0], orgType, code) } }, @@ -536,11 +537,15 @@ export default { pageSizeChangeHandleNew(val) { this.pageNo = 1; this.pageSize = val; - this.handleCascader(this.selectAgency) + const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') + const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + this.getServiceList(_arr[0], orgType, this.categoryCode) }, pageCurrentChangeHandleNew(val) { this.pageNo = val; - this.handleCascader(this.selectAgency) + const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') + const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' + this.getServiceList(_arr[0], orgType, this.categoryCode) }, }, };