From d5a3b316a91e051c0a06174c8eec3f22d4473b4e Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 21 Feb 2023 11:34:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E7=94=A8=E5=A4=96=E7=BD=91=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E8=B0=83=E7=94=A8=E5=90=8E=E5=8F=B0api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production.sit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production.sit b/.env.production.sit index 393de85b5..4c51f6da4 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -1,7 +1,7 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = http://192.168.1.140/api -VUE_APP_API_SERVER = http://192.168.1.144/api +VUE_APP_API_SERVER = http://219.146.91.110:30801/api VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod:sit VUE_APP_PUBLIC_PATH=epmet-oper From 4f95ff72ca619f63d438ac81535da8e16d05d5a2 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Tue, 21 Feb 2023 12:41:08 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=85=B1=E6=80=A7=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/commonDemand/addForm.vue | 1171 +++++++++++++++++ .../commonDemand/detailForm.vue | 378 ++++++ .../commonDemand/editForm.vue | 748 +++++++++++ .../communityService/commonDemand/index.vue | 724 ++++++++++ 4 files changed, 3021 insertions(+) create mode 100644 src/views/modules/communityService/commonDemand/addForm.vue create mode 100644 src/views/modules/communityService/commonDemand/detailForm.vue create mode 100644 src/views/modules/communityService/commonDemand/editForm.vue create mode 100644 src/views/modules/communityService/commonDemand/index.vue diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue new file mode 100644 index 000000000..56ca56c04 --- /dev/null +++ b/src/views/modules/communityService/commonDemand/addForm.vue @@ -0,0 +1,1171 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue new file mode 100644 index 000000000..a5e428579 --- /dev/null +++ b/src/views/modules/communityService/commonDemand/detailForm.vue @@ -0,0 +1,378 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue new file mode 100644 index 000000000..f9344f9a1 --- /dev/null +++ b/src/views/modules/communityService/commonDemand/editForm.vue @@ -0,0 +1,748 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue new file mode 100644 index 000000000..32157ad5f --- /dev/null +++ b/src/views/modules/communityService/commonDemand/index.vue @@ -0,0 +1,724 @@ + + + + + + \ No newline at end of file From 282e6a038689c02d01a138748691700d060233a0 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 21 Feb 2023 15:00:42 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/commonDemand/index.vue | 221 +++++++++--------- 1 file changed, 110 insertions(+), 111 deletions(-) diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue index 32157ad5f..8a745bdf4 100644 --- a/src/views/modules/communityService/commonDemand/index.vue +++ b/src/views/modules/communityService/commonDemand/index.vue @@ -7,7 +7,7 @@ ref="ref_searchform" :label-width="'80px'">
- + - + - + - + - + @@ -96,7 +96,7 @@ :value="item.value"> - +
- +
- +
发起服务 - +
- + - + - + - + - + {{scope.row.serviceTimeStart}}-{{scope.row.serviceTimeEnd}} - + {{scope.row.serviceStatus==='in_service'?'进行中':'已完成'}} - + - + 取消 - + - +
- +
- + - + - + - + - \ No newline at end of file From 600956d0cbd90e4ea8afe40825bd74a06e7d6ccd Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 21 Feb 2023 15:23:10 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/commonDemand/addForm.vue | 213 ++++++++-------- .../commonDemand/detailForm.vue | 95 ++++--- .../commonDemand/editForm.vue | 241 +++++++++--------- .../communityService/commonDemand/index.vue | 6 +- 4 files changed, 276 insertions(+), 279 deletions(-) diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue index 56ca56c04..b1e902093 100644 --- a/src/views/modules/communityService/commonDemand/addForm.vue +++ b/src/views/modules/communityService/commonDemand/addForm.vue @@ -48,7 +48,7 @@ > - + - + - + - + 预览 - + - + - +
- + - + - + - +
- + - +
取 消 确 定
- + - + - + - \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/detailForm.vue b/src/views/modules/communityService/commonDemand/detailForm.vue index a5e428579..dfc14d2c9 100644 --- a/src/views/modules/communityService/commonDemand/detailForm.vue +++ b/src/views/modules/communityService/commonDemand/detailForm.vue @@ -7,17 +7,17 @@ 服务名称： {{ formData.serviceName || "--" }} - +
服务组织： {{ serviceOrgName || "--" }}
- +
服务范围： {{ formData.gridIdListName || "--" }}
- +
政策依据： {{ formData.policyTitle || "--" }} @@ -48,10 +48,10 @@ 备注： {{ formData.remark || "--" }}
- +

反馈内容

- +
服务目标： {{ feedbackFormData.serviceGoal || "--" }} @@ -64,7 +64,7 @@ 服务人数： {{ feedbackFormData.servicePeopleNumber || 0 }}
- +
服务状态： {{ feedbackFormData.serviceStatusShow || "--" }} @@ -73,19 +73,19 @@ 满意度： {{ feedbackFormData.satisfactionShow || "--" }}
- +
地理位置： {{ feedbackFormData.address || "--" }}
- +
地图位置：
- +
附件：
- +
关 闭
- + - + - + - \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue index f9344f9a1..1f262bac8 100644 --- a/src/views/modules/communityService/commonDemand/editForm.vue +++ b/src/views/modules/communityService/commonDemand/editForm.vue @@ -1,13 +1,13 @@ - + - - + + - \ No newline at end of file diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue index 8a745bdf4..6791eae47 100644 --- a/src/views/modules/communityService/commonDemand/index.vue +++ b/src/views/modules/communityService/commonDemand/index.vue @@ -478,7 +478,7 @@ queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -501,7 +501,7 @@ async loadRuleList () { - const url = "/heart/policy/rulelist/" + this.policyId + const url = "/governance/policy/rulelist/" + this.policyId let params = {} @@ -601,7 +601,7 @@ async cancelFuwu () { - const url = '/heart/icServiceRecordV2/cancel'; + const url = '/governance/icServiceRecordV2/cancel'; let params = { serviceRecordId: this.serviceRecordId } From cb1de69384356b1dd4b34ea4686f001c7b354eda Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 21 Feb 2023 15:32:38 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=89=BE=E4=BA=BA?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=94=BF=E7=AD=96=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=8C=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/policy/addPolicy.vue | 170 +++++++++++++----- .../communityService/policy/policyList.vue | 2 +- 2 files changed, 125 insertions(+), 47 deletions(-) diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue index 6a72359a2..34f44ef42 100644 --- a/src/views/modules/communityService/policy/addPolicy.vue +++ b/src/views/modules/communityService/policy/addPolicy.vue @@ -8,25 +8,56 @@ :rules="dataRule" :disabled="formType==='detail'" class="div_form"> + + +
+ + + + + + + + + + + + +
+ - - - - - - + style="display: block"> + + - @@ -47,14 +78,21 @@ - - - + prop="policyLevel"> + + + + + -
@@ -101,15 +139,15 @@ :index="index">
- + --> -
+ - @@ -119,7 +157,7 @@ :options="demandOptions" :props="optionProps" @change="handleCateSlect"> - + --> { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel1 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); }, @@ -656,6 +713,8 @@ export default { resetData () { this.ruleList = [] this.formData = { + serviceTypeLevel1Id:'', + serviceTypeLevel2Id:'', policyLevel: '',//政府级别 startDate: '',//起始时间yyyy-MM-dd endDate: '',//截止时间yyyy-MM-dd @@ -680,6 +739,23 @@ export default { if (loading) { loading.close() } + }, + + // 服务类型下拉框选中事件 + handleChangeServiceTypeLevel1() { + this.formData.policyTypeLevel2Id = '' + this.$http + .get("/governance/commonServiceType/selectList/" + this.formData.policyTypeLevel1Id) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel2 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }) } }, computed: { @@ -697,7 +773,9 @@ export default { return { - + serviceType: [ + { required: true, message: '政策类型不能为空', trigger: 'blur' } + ], policyLevel: [ { required: true, message: '政策级别不能为空', trigger: 'change' } ], diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue index 33f8a5ec3..b892fe562 100644 --- a/src/views/modules/communityService/policy/policyList.vue +++ b/src/views/modules/communityService/policy/policyList.vue @@ -401,7 +401,7 @@ export default { async getTableData () { this.tableLoading = true - const url = "/heart/policy/list"; + const url = "/governance/policy/list"; // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList"; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { From b9bbb8bdd24b23594a82f52cfd984f9c596806f2 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 21 Feb 2023 17:42:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/commonDemand/addForm.vue | 79 ++++++++++++++++++- .../communityService/commonDemand/index.vue | 71 ++++++++++++++++- 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue index b1e902093..85f7ecdfe 100644 --- a/src/views/modules/communityService/commonDemand/addForm.vue +++ b/src/views/modules/communityService/commonDemand/addForm.vue @@ -12,7 +12,7 @@ :rules="dataRule" class="div_form" > - + --> + + +
+ + + + + + + + + + + + +
+ { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel1 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); }, methods: { + // 服务类型下拉框选中事件 + handleChangeServiceTypeLevel1() { + this.formData.serviceTypeLevel2Id = '' + this.$http + .get("/governance/commonServiceType/selectList/" + this.formData.serviceTypeLevel1Id) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel2 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }) + }, async iniDefaultData() { const { defaultData } = this; console.log("iniDefaultData3", defaultData); diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue index 6791eae47..33a2c9475 100644 --- a/src/views/modules/communityService/commonDemand/index.vue +++ b/src/views/modules/communityService/commonDemand/index.vue @@ -8,6 +8,42 @@ :label-width="'80px'">
+ +
+ + + + + + + + + + + + +
+ + + { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel2 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }) + }, handleSearch (val) { console.log(this.formData); @@ -454,6 +510,19 @@ } else { this.$message.error(msg) } + + this.$http + .get("/governance/commonServiceType/selectList/0") + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + this.serviceTypesLevel1 = res.data; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); }, handleServiceChange (type, val) { From fedeb5554de157b5e9f5fb7e80c6b5164508299d Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 22 Feb 2023 11:13:20 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/commonDemand/addForm.vue | 194 +++++++++--------- .../communityService/commonDemand/index.vue | 50 ++--- 2 files changed, 128 insertions(+), 116 deletions(-) diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue index 85f7ecdfe..2ef6e9b37 100644 --- a/src/views/modules/communityService/commonDemand/addForm.vue +++ b/src/views/modules/communityService/commonDemand/addForm.vue @@ -74,7 +74,7 @@ - - - - - - - - - - + + + + + + 至 + + + + + + + - - - 至 - + + + - + - + + + - - - + + + + + 至 + + + + - - - - - 至 - - - + @@ -759,6 +761,8 @@ resetSearch () { this.formData = { + serviceTypeLevel1Id:'',// 公共服务（政策级别）一级分类id + serviceTypeLevel2Id:'',// 公共服务（政策级别）二级分类id serviceName: '',//项目名称 serviceOrgType: '',//服务组织类型 serviceOrgId: '',//服务组织Id From 5a86e5051c7ce5de4e5efc46b5ad285fdd620c7d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 22 Feb 2023 13:57:03 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20/heart?= =?UTF-8?q?/userdemand=20=3D>=20/governance/userdemand?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/scoreRecord.vue | 4 ++-- .../modules/communityService/fuwujilu/addForm.vue | 2 +- .../modules/communityService/fuwujilu/fuwuList.vue | 2 +- .../modules/communityService/measure/index.vue | 14 +++++++------- .../modules/communityService/measure/info.vue | 14 +++++++------- src/views/modules/shequ/index.vue | 2 +- .../shequzhili/event/cpts/process-form-demand.vue | 2 +- .../shequzhili/xiangmu/cpts/demand-info.vue | 2 +- src/views/modules/visual/basicinfo/people.vue | 2 +- .../communityGovern/duoyuanfuwu/duoyuanDialog.vue | 2 +- .../modules/visual/communityParty/memberInfo.vue | 2 +- src/views/modules/visual/measure/dialogInfo.vue | 8 ++++---- src/views/modules/visual/measure/service.vue | 6 +++--- .../modules/visual/plugin/power/organization.vue | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue index 191a7336c..1ba828ea2 100644 --- a/src/views/components/scoreRecord.vue +++ b/src/views/components/scoreRecord.vue @@ -169,8 +169,8 @@ export default { async loadTable () { this.tableLoading = true - const url = "/heart/userdemand/recordList" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/userdemand/recordList" + const url = "/governance/userdemand/recordList" + // const url = "http://yapi.elinkservice.cn/mock/245/governance/userdemand/recordList" let params = { serviceType: this.serviceType, serviceId: this.serviceId, diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index 79ae83ab4..4eaa6d64b 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -693,7 +693,7 @@ export default { queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue index 85320aa94..7aa7a436b 100644 --- a/src/views/modules/communityService/fuwujilu/fuwuList.vue +++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue @@ -478,7 +478,7 @@ export default { queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index df5062b29..8cffaf27a 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -1002,7 +1002,7 @@ export default { ...this.form, }; await this.$http - .post("/heart/userdemand/add", _form) + .post("/governance/userdemand/add", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1023,7 +1023,7 @@ export default { serverId: this.form.serverId, }; await this.$http - .post("/heart/userdemand/assign", _form) + .post("/governance/userdemand/assign", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1049,7 +1049,7 @@ export default { score: reportType == "self_help" ? 0 : this.form.score, }; await this.$http - .post("/heart/userdemand/finish", _form) + .post("/governance/userdemand/finish", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1082,7 +1082,7 @@ export default { ...this.form, }; await this.$http - .post("/heart/userdemand/update", _form) + .post("/governance/userdemand/update", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1116,7 +1116,7 @@ export default { }; console.log("row1", row); this.$http - .post("/heart/userdemand/cancel", params) + .post("/governance/userdemand/cancel", params) .then(({ data: res }) => { console.log("row2", row); if (res.code !== 0) { @@ -1232,7 +1232,7 @@ export default { queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1297,7 +1297,7 @@ export default { pageSize: this.pageSize, }; await this.$http - .post("/heart/userdemand/pagelist", params) + .post("/governance/userdemand/pagelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index ea841984f..e7c354833 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -701,7 +701,7 @@ export default { serverId: this.form.serverId, }; await this.$http - .post("/heart/userdemand/assign", _form) + .post("/governance/userdemand/assign", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -730,7 +730,7 @@ export default { score: reportType == "self_help" ? 0 : this.form.score, }; await this.$http - .post("/heart/userdemand/finish", _form) + .post("/governance/userdemand/finish", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -766,7 +766,7 @@ export default { ...this.form, }; await this.$http - .post("/heart/userdemand/update", _form) + .post("/governance/userdemand/update", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -804,7 +804,7 @@ export default { ...this.form, }; await this.$http - .post("/heart/userdemand/add", _form) + .post("/governance/userdemand/add", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -824,7 +824,7 @@ export default { demandRecId: this.demandRecId, }; this.$http - .post("/heart/userdemand/cancel", params) + .post("/governance/userdemand/cancel", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -944,7 +944,7 @@ export default { queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -1010,7 +1010,7 @@ export default { demandRecId: this.demandRecId, }; await this.$http - .post("/heart/userdemand/demandDetail", params) + .post("/governance/userdemand/demandDetail", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue index 1e9825252..e12eb91aa 100644 --- a/src/views/modules/shequ/index.vue +++ b/src/views/modules/shequ/index.vue @@ -1029,7 +1029,7 @@ export default { }, async getSearchXuqiu() { - const url = "/heart/userdemand/search"; + const url = "/governance/userdemand/search"; const { searchData: { keyword }, searchXuqiu: { pageSize, pageNo }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 35fc6c645..528621a91 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -524,7 +524,7 @@ export default { }; - const url = "/heart/userdemand/servicelist" + const url = "/governance/userdemand/servicelist" const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue index f3717652f..36bc7b763 100644 --- a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue +++ b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue @@ -236,7 +236,7 @@ export default { }, //加载组织数据 async getInfo () { - const url = "/heart/userdemand/demandDetail"; + const url = "/governance/userdemand/demandDetail"; const { data, code, msg } = await requestPost(url, { demandRecId: this.demandRecId, diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue index e9ed6b397..0904b1987 100644 --- a/src/views/modules/visual/basicinfo/people.vue +++ b/src/views/modules/visual/basicinfo/people.vue @@ -712,7 +712,7 @@ export default { //加载组织数据 async getDemandData () { - const url = "/heart/userdemand/mydemand"; + const url = "/governance/userdemand/mydemand"; let params = { epmetUserIdList: this.info.epmetUserIdList, icResiUserId: this.userId, diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue index dfb584ae0..691b30b3f 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue @@ -175,7 +175,7 @@ export default { // 获取需求详情 async getDemandDetail (id) { this.info = {} - const url = '/heart/userdemand/demandDetail' + const url = '/governance/userdemand/demandDetail' const params = { demandRecId: id, // 需求id } diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue index dedf9f32c..f7aa88629 100644 --- a/src/views/modules/visual/communityParty/memberInfo.vue +++ b/src/views/modules/visual/communityParty/memberInfo.vue @@ -148,7 +148,7 @@ export default { async getDetail (id) { this.info = {} const _id = this.list[0].id - const url = "/heart/userdemand/demandDetail" + const url = "/governance/userdemand/demandDetail" let params = { demandRecId: id || _id } diff --git a/src/views/modules/visual/measure/dialogInfo.vue b/src/views/modules/visual/measure/dialogInfo.vue index 6cca94f7d..7b9f41c17 100644 --- a/src/views/modules/visual/measure/dialogInfo.vue +++ b/src/views/modules/visual/measure/dialogInfo.vue @@ -241,7 +241,7 @@ export default { }, async getInfo (demandId) { // const url = "/gov/org/customeragency/staffinagencylist"; - const url = "/heart/userdemand/demandDetail"; + const url = "/governance/userdemand/demandDetail"; let params = { demandRecId: demandId, }; @@ -284,7 +284,7 @@ export default { queryPurpose: query, }; await this.$http - .post("/heart/userdemand/servicelist", params) + .post("/governance/userdemand/servicelist", params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -312,7 +312,7 @@ export default { serverId: this.form.serverId, }; await this.$http - .post("/heart/userdemand/assign", _form) + .post("/governance/userdemand/assign", _form) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg); @@ -333,7 +333,7 @@ export default { async getAnalyse (demandId) { // const url = "/gov/org/customeragency/staffinagencylist"; this.loading = true; - const url = "/heart/userdemand/demand-research-analysis"; + const url = "/governance/userdemand/demand-research-analysis"; let params = { firstCategoryCode: this.info.firstCategoryCode, demandRecId: demandId, diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue index 6929b4855..51796f5e3 100644 --- a/src/views/modules/visual/measure/service.vue +++ b/src/views/modules/visual/measure/service.vue @@ -320,7 +320,7 @@ export default { }, async getServicePie(orgId, orgType) { - const url = "/heart/userdemand/category-analysis"; + const url = "/governance/userdemand/category-analysis"; let params = { orgId, orgType, @@ -361,7 +361,7 @@ export default { this.visibleLoading = false; }, async getServiceList(orgId, orgType, _code) { - const url = "/heart/userdemand/pagelist-analysis"; + const url = "/governance/userdemand/pagelist-analysis"; let params = { orgId, orgType, @@ -445,7 +445,7 @@ export default { } // .post('epmetuser/icresiuser/exportExcel', params) axios({ - url: window.SITE_CONFIG['apiURL'] + '/heart/userdemand/analysis-export', + url: window.SITE_CONFIG['apiURL'] + '/governance/userdemand/analysis-export', // url: 'epmetuser/icresiuser/exportExcel', method: 'post', data: params, diff --git a/src/views/modules/visual/plugin/power/organization.vue b/src/views/modules/visual/plugin/power/organization.vue index 26b98b41b..02f2f2cc3 100644 --- a/src/views/modules/visual/plugin/power/organization.vue +++ b/src/views/modules/visual/plugin/power/organization.vue @@ -265,7 +265,7 @@ export default { } }, async getVolunteerTeamNum () { - const url = "/heart/userdemand/servicelist" + const url = "/governance/userdemand/servicelist" let params = { serviceType: 'community_org' } From c0f697567d31b8074ae5ec5843c0ad3153f4f92b Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 22 Feb 2023 19:52:53 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=BF=81=E5=87=BA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiInfo.vue | 21 ++++++++++--- .../plugins/change/changerelocation.vue | 31 ++++++++++--------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 6a2dd0280..5305bc7cb 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -1,5 +1,5 @@