From a4c7934a4351d5cf71ef26d33e0279591002eeb4 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 13 Sep 2023 11:02:42 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8C=87=E6=B4=BE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Title/index.vue | 4 ++-- .../shequzhili/event/cpts/event-info.vue | 19 ++++--------------- .../event/cpts/process-form-designate.vue | 5 +++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/views/dataBoard/satisfactionEval/components/Title/index.vue b/src/views/dataBoard/satisfactionEval/components/Title/index.vue index 6faadb2bc..e776c3a2e 100644 --- a/src/views/dataBoard/satisfactionEval/components/Title/index.vue +++ b/src/views/dataBoard/satisfactionEval/components/Title/index.vue @@ -26,8 +26,8 @@ export default { + diff --git a/src/views/modules/communityService/gangweizhaoren/detailForm.vue b/src/views/modules/communityService/gangweizhaoren/detailForm.vue new file mode 100644 index 000000000..3725285ac --- /dev/null +++ b/src/views/modules/communityService/gangweizhaoren/detailForm.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/modules/communityService/gangweizhaoren/editForm.vue b/src/views/modules/communityService/gangweizhaoren/editForm.vue new file mode 100644 index 000000000..25c2025f1 --- /dev/null +++ b/src/views/modules/communityService/gangweizhaoren/editForm.vue @@ -0,0 +1,825 @@ + + + + + + diff --git a/src/views/modules/communityService/gangweizhaoren/index.vue b/src/views/modules/communityService/gangweizhaoren/index.vue new file mode 100644 index 000000000..c52cd75af --- /dev/null +++ b/src/views/modules/communityService/gangweizhaoren/index.vue @@ -0,0 +1,856 @@ + + + + + diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue new file mode 100644 index 000000000..eb156431e --- /dev/null +++ b/src/views/modules/communityService/gangweizhaoren/personList.vue @@ -0,0 +1,486 @@ + + + + + + diff --git a/src/views/modules/communityService/jinengzhaoren/addForm.vue b/src/views/modules/communityService/jinengzhaoren/addForm.vue new file mode 100644 index 000000000..df7e8d952 --- /dev/null +++ b/src/views/modules/communityService/jinengzhaoren/addForm.vue @@ -0,0 +1,1066 @@ + + + + + + diff --git a/src/views/modules/communityService/jinengzhaoren/detailForm.vue b/src/views/modules/communityService/jinengzhaoren/detailForm.vue new file mode 100644 index 000000000..957ac9931 --- /dev/null +++ b/src/views/modules/communityService/jinengzhaoren/detailForm.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/modules/communityService/jinengzhaoren/editForm.vue b/src/views/modules/communityService/jinengzhaoren/editForm.vue new file mode 100644 index 000000000..81f498918 --- /dev/null +++ b/src/views/modules/communityService/jinengzhaoren/editForm.vue @@ -0,0 +1,825 @@ + + + + + + diff --git a/src/views/modules/communityService/jinengzhaoren/index.vue b/src/views/modules/communityService/jinengzhaoren/index.vue new file mode 100644 index 000000000..e97ae326e --- /dev/null +++ b/src/views/modules/communityService/jinengzhaoren/index.vue @@ -0,0 +1,856 @@ + + + + + diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue new file mode 100644 index 000000000..eb156431e --- /dev/null +++ b/src/views/modules/communityService/jinengzhaoren/personList.vue @@ -0,0 +1,486 @@ + + + + + + diff --git a/src/views/modules/communityService/wennuanzhaoren/addForm.vue b/src/views/modules/communityService/wennuanzhaoren/addForm.vue new file mode 100644 index 000000000..1b5631265 --- /dev/null +++ b/src/views/modules/communityService/wennuanzhaoren/addForm.vue @@ -0,0 +1,1066 @@ + + + + + + diff --git a/src/views/modules/communityService/wennuanzhaoren/detailForm.vue b/src/views/modules/communityService/wennuanzhaoren/detailForm.vue new file mode 100644 index 000000000..b1b2f994c --- /dev/null +++ b/src/views/modules/communityService/wennuanzhaoren/detailForm.vue @@ -0,0 +1,399 @@ + + + + + diff --git a/src/views/modules/communityService/wennuanzhaoren/editForm.vue b/src/views/modules/communityService/wennuanzhaoren/editForm.vue new file mode 100644 index 000000000..8cb3dab2e --- /dev/null +++ b/src/views/modules/communityService/wennuanzhaoren/editForm.vue @@ -0,0 +1,825 @@ + + + + + + diff --git a/src/views/modules/communityService/wennuanzhaoren/index.vue b/src/views/modules/communityService/wennuanzhaoren/index.vue new file mode 100644 index 000000000..f8ce68030 --- /dev/null +++ b/src/views/modules/communityService/wennuanzhaoren/index.vue @@ -0,0 +1,856 @@ + + + + + diff --git a/src/views/modules/communityService/wennuanzhaoren/personList.vue b/src/views/modules/communityService/wennuanzhaoren/personList.vue new file mode 100644 index 000000000..eb156431e --- /dev/null +++ b/src/views/modules/communityService/wennuanzhaoren/personList.vue @@ -0,0 +1,486 @@ + + + + + + From 5e95aaa340ac865ac741f92b80c2626db38365c4 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 13 Sep 2023 18:14:02 +0800 Subject: [PATCH 04/14] =?UTF-8?q?pc=E7=AB=AF=E8=A7=92=E8=89=B2=E7=AE=A1?= =?UTF-8?q?=E7=90=86:=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=97=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/role/role.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index ee54eeaa2..aefa56b03 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -69,6 +69,15 @@ label="角色名称" min-width="100"> + + + Date: Thu, 14 Sep 2023 09:54:45 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=9A=82=E4=B8=8D=E5=9B=9E=E5=A4=8D=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/event/cpts/event-info.vue | 10 +++++++--- .../modules/shequzhili/event/cpts/process-form.vue | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 61cb12c6a..45387e70a 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -263,7 +263,6 @@ export default { //加载组织数据 async getProjectProcess() { const url = "/governance/icEvent/process"; - // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/process"; const { data, code, msg } = await requestPost(url, { icEventId: this.eventId, }); @@ -326,7 +325,7 @@ export default { this.eventInfoData.categoryList = []; this.eventInfoData.categoryList.push(this.replayInfo.categoryId); } - } else { + } else if (this.formData.operationType === "5") { this.project = {}; this.demand = {}; this.replayInfo = this.$refs.ref_process_form_designate.replayInfo; @@ -337,6 +336,10 @@ export default { this.eventInfoData.categoryList = []; this.eventInfoData.categoryList.push(this.replayInfo.categoryId); } + } else if (this.formData.operationType === '4') { + this.project = {}; + this.demand = {}; + this.replayInfo = {}; } this.formData = { ...this.eventInfoData, @@ -348,7 +351,8 @@ export default { }, async submit() { - if (this.formData.operationType == 0 || this.formData.operationType == 5) { + if (this.formData.operationType === 0 || this.formData.operationType === 5 + || this.formData.operationType === 6 || this.formData.operationType === '4') { const url = "/governance/icEvent/add"; const { formData } = this; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index 28020705a..3e977c1e5 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -163,6 +163,8 @@ export default { this.replayInfo = this.$refs.ref_process_form_replay_end.formData this.okflag = true } + }else { + return false } }, handleCancle() { From 4f6bd3c075671343a9047689530f20fc67730c61 Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 14 Sep 2023 14:36:36 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5=E6=A8=A1=E7=89=88=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8D=E6=BB=A1=E6=84=8F=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4=E6=B8=85=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/satisfaction/detail/index.vue | 2 +- .../modules/shequzhili/event/eventList.vue | 115 ++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) diff --git a/src/views/modules/satisfaction/detail/index.vue b/src/views/modules/satisfaction/detail/index.vue index 0b21db30a..4be5f9f4e 100644 --- a/src/views/modules/satisfaction/detail/index.vue +++ b/src/views/modules/satisfaction/detail/index.vue @@ -291,7 +291,7 @@ export default { }, async handleExport() { - const url = "/governance/icEvent/export"; + const url = "/governance/eventInspect/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index e8b22c840..cb2373758 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -101,6 +101,14 @@
新增 + 下载模板 + + 导入 + 导出 @@ -491,6 +499,113 @@ export default { this.$message.error(msg); } }, + //下载模版 + async handleExportModule() { + let url = '/governance/icEvent/downloadTemplate'; + let params = {}; + await this.$http({ + method: 'POST', + url, + responseType: 'blob', + data: params + }) + .then(res => { + if (res.headers['content-disposition']) { + let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]); + 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对象 + } else this.$message.error('下载失败'); + }) + .catch(err => { + console.log('err', err); + return this.$message.error('网络错误'); + }); + }, + handleExcelSuccess(res, file) { + if (!res.code === 0 && !res.msg === 'success') { + this.$message.error(res.msg); + } + }, + handleProgress(event, file, fileList) { + + }, + beforeExcelUpload(file) { + const isType = file.type === 'application/vnd.ms-excel'; + const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + const fileType = isType || isTypeComputer; + const isLt1M = file.size / 1024 / 1024 < 10; + if (!fileType) { + this.$message.error('上传文件只能是xls/xlsx格式！'); + } + + if (!isLt1M) { + this.$message.error('上传文件大小不能超过 10MB!'); + } + return fileType && isLt1M; + }, + async uploadHttpRequest(file) { + this.importLoading = true; + this.importBtnTitle = '正在上传中...'; + this.$message({ + showClose: true, + dangerouslyUseHTMLString: true, + message: "导入中，请到系统管理-导入记录中查看进度", + duration: 3000 + }); + let than = this; + document.getElementById('clickA').addEventListener('click', function () { + than.$router.replace('/main/importRecord-index'); + }); + const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 + formData.append('file', file.file); //添加文件对象 + formData.append('code', ''); //添加文件对象 + await this.$http + .post('/governance/icEvent/importEvent', formData) + .then(res => { + console.log('res-up', res); + if (res.data.code == 0 && res.data.msg == 'success') { + const data = res.data.data; + this.dataList = [ + ...Object.keys(data.option.exist).map(k => { + return { + index: k, + srcField: data.option.exist[k], + exist: true, + field: data.option.exist[k] + }; + }), + ...Object.keys(data.option.notExist).map(k => { + return { + index: k, + srcField: data.option.notExist[k], + exist: false, + field: '' + }; + }) + ]; + this.importOption = data.option; + this.importCode = data.code; + this.fileData = file; + } else this.$message.error(res.data.msg); + }) + .catch(err => { + console.log('失败', err); + file.onError(); //上传失败的文件会从文件列表中删除 + }); + this.importLoading = false; + this.importBtnTitle = '导入'; + this.$refs.upload.clearFiles(); + }, //显示语音窗口 handleShowVoice(url) { From 6a35630dea497295ba3cd9533500979389b1b37e Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 14 Sep 2023 17:24:35 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=87=AA=E6=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitySelfInsp/followUpDetail.vue | 1 - .../satisfaction/communitySelfInsp/index.vue | 88 +------------------ 2 files changed, 1 insertion(+), 88 deletions(-) diff --git a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue index 70fb1f53a..0eaabc99e 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/followUpDetail.vue @@ -100,7 +100,6 @@ export default { }, //创建前 async created() { - console.log(this.period); await this.getDicts() await this.handleArr() await this.getInspResult() diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index 71d37f317..ced74c97b 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -313,104 +313,18 @@ export default { }, // 搜索事件 handleSearch(val) { - console.log(this.formData); this.getTableData(); }, // 获取列表 async getTableData() { - // this.tableLoading = true; - // this.tableData = [ - // { - // satisfactionCategory: "culturalFacility", - // satisfactionCategoryName: "文化设施", - // score: "20", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "sportsFacility", - // satisfactionCategoryName: "体育设施", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "ecologicalEnv", - // satisfactionCategoryName: "生态环境", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "socialSecurity", - // satisfactionCategoryName: "社会治安", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "socialAssistance", - // satisfactionCategoryName: "社会救助", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "oldPeopleProvide", - // satisfactionCategoryName: "老有所养", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "basicEducation", - // satisfactionCategoryName: "基础教育", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // { - // satisfactionCategory: "medical", - // satisfactionCategoryName: "病有所医", - // score: "50", - // badQty: 40, - // goodQty: 20, - // veryGoodQty: 30, - // }, - // ]; - // const allowedCategories = this.dicts.satisfaction_category.map( - // (item) => item.value - // ); - // this.tableData.forEach((item) => { - // if (allowedCategories.includes(item.satisfactionCategory)) { - // this.option.series[0].data.push(item.veryGoodQty); - // this.option.series[1].data.push(item.goodQty); - // this.option.series[2].data.push(item.badQty); - // this.option.xAxis.data.push(item.satisfactionCategoryName); - // this.satisfactionCategory.push(item.satisfactionCategory); - // this.score.push({ - // score: item.score, - // satisfactionCategoryName: item.satisfactionCategoryName, - // imgUrl: require(`../../../../assets/img/satisfaction/${item.satisfactionCategory}.png`), - // }); - // } - // }); - // console.log(this.score, "综合得分"); const url = "/governance/satisfaction/communitySelfInsp/stats/synthesis"; - const { formData } = this; const { data, code, msg } = await requestGet(url, { ...formData }); this.tableLoading = false; if (code === 0) { this.total = data.total || 0; + this.score = [] this.tableData = data.categoryDatas; this.formData.inspRecordId = data.inspRecordId; this.synthesisScore = data.synthesisScore; From a7d2e52462af27e71ce05dbb634fd412652645ab Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 15 Sep 2023 11:21:47 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=8A=A0=E8=BD=BD=E7=BB=84=E7=BB=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/shequzhili/event/cpts/add.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index f448450c4..aa4820a8d 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -157,22 +157,22 @@ export default { btnDisable: false, gridList: [], //所属网格list--场所区域 qudaoArray: [ - { - value: "1", - label: "多媒体反应", - }, - { - value: "2", - label: "社区电话", - }, + // { + // value: "1", + // label: "多媒体反应", + // }, + // { + // value: "2", + // label: "社区电话", + // }, { value: "3", label: "12345", }, - { - value: "4", - label: "网络员手持终端", - }, + // { + // value: "4", + // label: "网络员手持终端", + // }, ], formData: iniFmData(), @@ -316,7 +316,7 @@ export default { const url = "/gov/org/customergrid/gridoption"; let params = { agencyId: this.agencyId, - purpose: "addorupdate", + purpose: "query", }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { From fdaee2a840195c685ff45f83ee553b3e631386e0 Mon Sep 17 00:00:00 2001 From: duanliangtao Date: Mon, 18 Sep 2023 10:39:04 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E6=A6=82=E8=A7=88=E6=96=87=E6=A1=88=E4=B8=BA=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A6=82=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/home/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index e5c701260..a73cf35aa 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -47,14 +47,14 @@
- 社区总览 + 组织总览
- 社区简介 + 组织简介

{{ pandectData.deptName }}，划分为{{ From 879dc782e3320b274795e33e6b68f46336ed0bd4 Mon Sep 17 00:00:00 2001 From: luyan Date: Mon, 18 Sep 2023 14:57:44 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E6=A0=87=E7=AD=BE=E9=87=8D=E5=A4=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/event/cpts/event-info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 45387e70a..77a0ab5d2 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -74,7 +74,7 @@ -