From 9712c947bebeece9da709a8a07f7625e5c2d58cd Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 Feb 2023 16:27:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=91=E6=87=92=E5=8A=A0=E8=BD=BD=E4=B8=8E=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 6 +- .../modules/base/community/community.vue | 129 ++++++++++++++---- 2 files changed, 102 insertions(+), 33 deletions(-) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 288b75729..9f40b73b9 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -1618,9 +1618,9 @@ export default { this.getHouseList() }, async handleClick (tab, event) { - console.log(tab); - console.log(event); - console.log(tab._props.label ); + // console.log(tab); + // console.log(event); + // console.log(tab._props.label ); if (tab._props.label == '教育') { if (!this.form.resiId) { this.newForm.eduInfoDto = this.form.eduInfoDto diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 59a6ae2da..17c6603fd 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -4,7 +4,7 @@
+ v-model="filterText" @keydown.native.enter="handleChangeSerch()"> @@ -15,10 +15,11 @@ :props="defaultProps" :highlight-current="true" node-key="id" - :default-expanded-keys="openNodes" :expand-on-click-node="false" :filter-node-method="filterNode" - @node-click="handleNodeClick"> + @node-click="handleNodeClick" + lazy + :load="lazyLoadTree"> @@ -140,10 +141,19 @@ + + item.label == val) + // this.optionsV.forEach( function(item){ + // if(item.label==val){ + // console.log(1); + // } + // }) + // console.log(this.optionsV ); + // }, handleChangeB (val) { this.buildingUnitId = ""; @@ -443,7 +468,21 @@ export default { this.houseId = ""; this.getHouseList(); }, - + async lazyLoadTree(node, resolve) { + const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`; + const { data, code, msg } = await requestGet(url); + if (code === 0) { + data.forEach((element) => { + if (element.level === "building") { + element.isLeaf = true; + } + }); + resolve(data); + } else { + this.$message.error(msg); + } + // } + }, async getValiheList () { const { user } = this.$store.state; if (!this.selGridId) { @@ -493,6 +532,42 @@ export default { } + }, + //回车搜索组织 + async handleChangeSerch (){ + this.startLoading() + this.$refs.ref_tree.$data.store.lazy = !this.filterText + if(this.filterText.length > 0 && this.filterText!=''){ + const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}` + const {data,code,msg} = await requestGet(url) + if(data[0].children.length>0){ + this.treeData = data + }else{ + this.treeData = [] + setTimeout(() => { + this.loadTree() + }, 5) + this.$message.error('暂未找到!') + } + }else { + this.treeData = [] + this.loadTree() + } + this.endLoading() + } , + startLoading () { + loading = Loading.service({ + lock: true, // 是否锁定 + text: '正在加载……', // 加载中需要显示的文字 + background: 'rgba(0,0,0,.7)' // 背景颜色 + }) + }, + // 结束加载动画 + endLoading () { + // clearTimeout(timer); + if (loading) { + loading.close() + } }, async getUniList () { @@ -584,30 +659,24 @@ export default { } }, async loadTree (isRefresh) { - const url = "/actual/base/communityBuilding/listBuildingTree" - let params = {} - - const { data, code, msg } = await requestPost(url, params) - + const url = "/actual/base/communityBuilding/tree/initTree" + const { data, code, msg } = await requestGet(url) if (code === 0) { this.openNodes = [] - this.openNodes.push(data[0].id) + this.openNodes.push(data.id) - this.treeData = data - this.handleTreeData(this.treeData) + this.treeData = [] + this.treeData.push(data) + if (!isRefresh && data) { + this.selTreeObj = data; + if (!this.selTreeObj.latitude) { + this.selTreeObj.latitude = this.centerPoint[0]; + } - - if (!isRefresh && data.length > 0) { - - this.selTreeObj = data[0] - if (!this.selTreeObj.latitude) { - this.selTreeObj.latitude = this.centerPoint[0] - } - - if (!this.selTreeObj.longitude) { - this.selTreeObj.longitude = this.centerPoint[1] - } - } + if (!this.selTreeObj.longitude) { + this.selTreeObj.longitude = this.centerPoint[1]; + } + } } else { this.$message.error(msg) @@ -820,9 +889,9 @@ export default { } }, watch: { - filterText (val) { - this.$refs.ref_tree.filter(val); - }, + // filterText (val) { + // this.$refs.ref_tree.filter(val); + // }, }, components: { From 72eb3c500cca970868a97ab87b2306b9e317507e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 15 Feb 2023 18:06:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/store/index.js | 4 +- src/views/components/selectStaff.vue | 10 ++--- src/views/main-content.vue | 8 ++-- .../activivityList/yearplanList.vue | 2 +- .../communityService/fuwujilu/fuwuList.vue | 30 +++++++-------- .../communityService/fuwujiluOld/fuwuList.vue | 16 ++++---- .../communityService/fuwuxiangmu/index.vue | 2 +- .../communityService/fuwuzuzhi/index.vue | 2 +- .../communityService/policy/policyList.vue | 14 +++---- .../customer/customize/CategoryEdit.vue | 8 ++-- .../customer/customize/CategoryList.vue | 6 +-- .../modules/customer/customize/MostList.vue | 16 ++++---- .../productConfig/mostedit/MostList.vue | 4 +- .../modules/secretaryLog/cpts/notice.vue | 4 +- .../difficulty/difficultyDetail.vue | 12 +++--- .../difficulty/difficultyForm.vue | 28 +++++++------- .../difficulty/difficultyList.vue | 22 +++++------ .../humanisticCare/careDetail.vue | 12 +++--- .../secretaryLog/humanisticCare/careForm.vue | 28 +++++++------- .../secretaryLog/humanisticCare/careList.vue | 18 ++++----- .../modules/secretaryLog/workLog/form.vue | 22 +++++------ .../modules/secretaryLog/workLog/index.vue | 18 ++++----- .../modules/shequzhili/event/cpts/add.vue | 2 +- .../shequzhili/event/cpts/event-detail.vue | 4 +- .../shequzhili/event/cpts/event-info.vue | 14 +++---- .../event/cpts/process-form-demand.vue | 34 ++++++++--------- .../event/cpts/process-form-issue.vue | 4 +- .../event/cpts/process-form-project.vue | 38 +++++++++---------- .../event/cpts/process-form-replay.vue | 4 +- .../modules/shequzhili/event/eventList.vue | 16 ++++---- .../modules/shequzhili/issue/cpts/add.vue | 2 +- .../issue/cpts/evaluationDetail.vue | 2 +- .../shequzhili/issue/cpts/eventDetail.vue | 2 +- .../shequzhili/issue/cpts/issue-detail.vue | 14 +++---- .../shequzhili/issue/cpts/issue-info.vue | 6 +-- .../shequzhili/issue/cpts/suggestDetail.vue | 2 +- .../issue/cptsAudit/eventDetail.vue | 2 +- .../shequzhili/issue/cptsAudit/issue-info.vue | 4 +- .../shequzhili/issue/issueAuditList.vue | 8 ++-- .../modules/shequzhili/issue/issueList.vue | 8 ++-- .../shequzhili/statics/gridMemberEvent.vue | 4 +- .../shequzhili/xiangmu/cpts/event-info.vue | 2 +- .../shequzhili/xiangmu/cpts/issue-info.vue | 2 +- .../shequzhili/xiangmu/cpts/issue-suggest.vue | 4 +- .../xiangmu/cpts/project-evaluation.vue | 2 +- .../shequzhili/xiangmu/cpts/project-info.vue | 32 ++++++++-------- .../modules/shequzhili/xiangmu/index.vue | 4 +- .../shequzhili/xiangmu/xiangmu-ling.vue | 10 ++--- .../visual/basicinfo/cpts/incident-info.vue | 16 ++++---- .../visual/basicinfo/cpts/topic-info.vue | 8 ++-- src/views/modules/visual/basicinfo/people.vue | 4 +- .../visual/command/cpts/demandInfo.vue | 2 +- .../modules/visual/command/cpts/eventInfo.vue | 2 +- .../modules/visual/command/cpts/popup.vue | 2 +- .../visual/communityGovern/cpt/issue-info.vue | 2 +- .../communityGovern/cpt/project-info.vue | 8 ++-- .../communityGovern/distributionAnalyze.vue | 10 ++--- .../communityGovern/fivelayers/eventInfo.vue | 2 +- .../communityGovern/fivelayers/fuwuInfo.vue | 2 +- .../fivelayers/mapIndex copy 2.vue | 6 +-- .../fivelayers/mapIndex copy.vue | 6 +-- .../fivelayers/mapIndex-baidu.vue | 6 +-- .../communityGovern/fivelayers/mapIndex.vue | 2 +- .../fivelayers/serviceInfo.vue | 2 +- .../visual/communityGovern/processAnalyze.vue | 12 +++--- .../visual/communityGovern/resibuzz.vue | 4 +- .../shijianchuli/event-info.vue | 8 ++-- .../shijianchuli/shijianchulifenxi copy.vue | 6 +-- .../shijianchuli/shijianchulifenxi.vue | 6 +-- .../shijianfenlei/shijianfenleifenxi.vue | 6 +-- 70 files changed, 317 insertions(+), 317 deletions(-) diff --git a/src/js/store/index.js b/src/js/store/index.js index 197b66ebc..e00f6958c 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -97,7 +97,7 @@ export default new Vuex.Store({ }, setTipsList({ commit }, time) { return new Promise(async (resolve, reject) => { - const url = "/gov/project/memoAttr/memosToRemind"; + const url = "/governance/memoAttr/memosToRemind"; const params = { remindTime: time || "", }; @@ -111,7 +111,7 @@ export default new Vuex.Store({ setTipsTime({ commit, dispatch }) { return new Promise(async (resolve, reject) => { if (interTimer) clearInterval(interTimer); - const url = "/gov/project/memoAttr/memoTime"; + const url = "/governance/memoAttr/memoTime"; const { data, code, msg } = await requestPost(url); if (code === 0) { diff --git a/src/views/components/selectStaff.vue b/src/views/components/selectStaff.vue index c7478383b..09747b596 100644 --- a/src/views/components/selectStaff.vue +++ b/src/views/components/selectStaff.vue @@ -764,8 +764,8 @@ export default { }); const url = projectId - ? "/gov/project/trace/departmentstafflist" - : "/gov/issue/manage/departmentstafflist"; + ? "/governance/trace/departmentstafflist" + : "/governance/manage/departmentstafflist"; const { data, code, msg } = await requestPost( url, @@ -834,10 +834,10 @@ export default { }); const url = projectId - ? "/gov/project/trace/processorlist" + ? "/governance/trace/processorlist" : issueId - ? "/gov/issue/manage/processorlist" - : "/gov/project/trace/approvalagencylist"; + ? "/governance/manage/processorlist" + : "/governance/trace/approvalagencylist"; const { data, code, msg } = await requestPost( url, diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 6a2226b02..eb6dfc340 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -258,7 +258,7 @@ export default { // }, 1000) }, async closeTips(memoId) { - const url = "/gov/project/memoAttr/setReaded"; + const url = "/governance/memoAttr/setReaded"; const params = { memoId, }; @@ -267,9 +267,9 @@ export default { }, async getInfo(item) { const urls = { - work_diary: "/gov/project/memoWorkDiary", - concern: "/gov/project/memoConcern", - difficulty: "/gov/project/memoDifficulty/detail", + work_diary: "/governance/memoWorkDiary", + concern: "/governance/memoConcern", + difficulty: "/governance/memoDifficulty/detail", }; const params = { id: item.memoId, diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue index 7256964de..4a010a0a0 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue @@ -480,7 +480,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue index f407881a5..85320aa94 100644 --- a/src/views/modules/communityService/fuwujilu/fuwuList.vue +++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue @@ -370,13 +370,13 @@ export default { formData: { - serviceName: '',//项目名称 - serviceOrgType: '',//服务组织类型 - serviceOrgId: '',//服务组织Id - serviceTimeStart: '',//服务开始时间yyyy-MM-dd - serviceTimeEnd: '',//服务结束时间yyyy-MM-dd - serviceStatus: '',//服务状态。in_service服务中;completed:已完成 - satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect + serviceName: '',//项目名称 + serviceOrgType: '',//服务组织类型 + serviceOrgId: '',//服务组织Id + serviceTimeStart: '',//服务开始时间yyyy-MM-dd + serviceTimeEnd: '',//服务结束时间yyyy-MM-dd + serviceStatus: '',//服务状态。in_service服务中;completed:已完成 + satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect }, pageNo: 1, @@ -642,7 +642,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, @@ -690,13 +690,13 @@ export default { resetSearch () { this.formData = { - serviceName: '',//项目名称 - serviceOrgType: '',//服务组织类型 - serviceOrgId: '',//服务组织Id - serviceTimeStart: '',//服务开始时间yyyy-MM-dd - serviceTimeEnd: '',//服务结束时间yyyy-MM-dd - serviceStatus: '',//服务状态。in_service服务中;completed:已完成 - satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect + serviceName: '',//项目名称 + serviceOrgType: '',//服务组织类型 + serviceOrgId: '',//服务组织Id + serviceTimeStart: '',//服务开始时间yyyy-MM-dd + serviceTimeEnd: '',//服务结束时间yyyy-MM-dd + serviceStatus: '',//服务状态。in_service服务中;completed:已完成 + satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect } diff --git a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue index 48f54205b..dc4a2e6df 100644 --- a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue +++ b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue @@ -328,13 +328,13 @@ export default { ], formData: { - serviceCategoryKey: '',//服务类别id - serviceProjectName: '',//项目名称 - serviceOrgName: '',//服务组织名称 - serviceTimeStart: '',//服务开始时间yyyy-MM-dd - serviceTimeEnd: '',//服务结束时间yyyy-MM-dd - serviceStatus: '',//服务状态。in_service服务中;completed:已完成 - satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect + serviceCategoryKey: '',//服务类别id + serviceProjectName: '',//项目名称 + serviceOrgName: '',//服务组织名称 + serviceTimeStart: '',//服务开始时间yyyy-MM-dd + serviceTimeEnd: '',//服务结束时间yyyy-MM-dd + serviceStatus: '',//服务状态。in_service服务中;completed:已完成 + satisfaction: '',//满意度.不满意:bad、基本满意:good、非常满意:perfect }, pageNo: 1, @@ -535,7 +535,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue index 795625bb3..c6b48929c 100644 --- a/src/views/modules/communityService/fuwuxiangmu/index.vue +++ b/src/views/modules/communityService/fuwuxiangmu/index.vue @@ -265,7 +265,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, searchData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue index 12c1cddc5..6baeb8cc6 100644 --- a/src/views/modules/communityService/fuwuzuzhi/index.vue +++ b/src/views/modules/communityService/fuwuzuzhi/index.vue @@ -272,7 +272,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, searchData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue index 401a59030..33f8a5ec3 100644 --- a/src/views/modules/communityService/policy/policyList.vue +++ b/src/views/modules/communityService/policy/policyList.vue @@ -240,9 +240,9 @@ export default { formData: { - title: '',// 政策标题 - content: '',//政策内容 - expiredFlag: '',//是否过期;1:已过期;0:未过期 + title: '',// 政策标题 + content: '',//政策内容 + expiredFlag: '',//是否过期;1:已过期;0:未过期 }, pageNo: 1, @@ -438,7 +438,7 @@ export default { }, async handleExport () { - const url = "/gov/project/icEvent/export"; + const url = "/governance/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ url: window.SITE_CONFIG["apiURL"] + url, @@ -486,9 +486,9 @@ export default { resetSearch () { this.formData = { - title: '',// 政策标题 - content: '',//政策内容 - expiredFlag: '',//是否过期;1:已过期;0:未过期 + title: '',// 政策标题 + content: '',//政策内容 + expiredFlag: '',//是否过期;1:已过期;0:未过期 } diff --git a/src/views/modules/customer/customize/CategoryEdit.vue b/src/views/modules/customer/customize/CategoryEdit.vue index 9bbe347fd..e522957af 100644 --- a/src/views/modules/customer/customize/CategoryEdit.vue +++ b/src/views/modules/customer/customize/CategoryEdit.vue @@ -100,10 +100,10 @@ export default { this.dataForm.sort = sort if (this.dataForm.level === 'l1') { - this.url = "/gov/issue/issueprojectcategorydict/savefirstcategory" + this.url = "/governance/issueprojectcategorydict/savefirstcategory" // this.url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/savefirstcategory" } else { - this.url = "/gov/issue/issueprojectcategorydict/savesecondcategory" + this.url = "/governance/issueprojectcategorydict/savesecondcategory" // this.url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/savesecondcategory" } @@ -119,10 +119,10 @@ export default { this.dataForm = dataForm if (this.dataForm.level === 'l1') { - this.url = "/gov/issue/issueprojectcategorydict/savefirstcategory" + this.url = "/governance/issueprojectcategorydict/savefirstcategory" // this.url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/savefirstcategory" } else { - this.url = "/gov/issue/issueprojectcategorydict/savesecondcategory" + this.url = "/governance/issueprojectcategorydict/savesecondcategory" // this.url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/savesecondcategory" } diff --git a/src/views/modules/customer/customize/CategoryList.vue b/src/views/modules/customer/customize/CategoryList.vue index 6fa7cb137..3756ad459 100644 --- a/src/views/modules/customer/customize/CategoryList.vue +++ b/src/views/modules/customer/customize/CategoryList.vue @@ -130,7 +130,7 @@ export default { async loadData () { this.dataListLoading = true // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/customercategorylist' - const url = '/gov/issue/issueprojectcategorydict/customercategorylist' + const url = '/governance/issueprojectcategorydict/customercategorylist' this.tableParams.customerId = this.customerId @@ -169,7 +169,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - const url = '/gov/issue/issueprojectcategorydict/isdisablecategory' + const url = '/governance/issueprojectcategorydict/isdisablecategory' // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/isdisablecategory' const param = { customerId: this.customerId, @@ -196,7 +196,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - const url = '/gov/issue/issueprojectcategorydict/delcategory' + const url = '/governance/issueprojectcategorydict/delcategory' // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory' const param = { customerId: this.customerId, diff --git a/src/views/modules/customer/customize/MostList.vue b/src/views/modules/customer/customize/MostList.vue index 15d0d6e23..27fa85dbc 100644 --- a/src/views/modules/customer/customize/MostList.vue +++ b/src/views/modules/customer/customize/MostList.vue @@ -364,7 +364,7 @@ export default { } }) this.$http - .post('/gov/project/parameter/load-thirdplatform-config', { customerId: this.customerId }) + .post('/governance/parameter/load-thirdplatform-config', { customerId: this.customerId }) .then(({ data: res }) => { if (res.code === 0) { this.selectSys = res.data.customerSelectedPlatformList @@ -388,7 +388,7 @@ export default { }) } this.$http - .post('/gov/project/parameter/save-thirdplatform-config', params) + .post('/governance/parameter/save-thirdplatform-config', params) .then(({ data: res }) => { if (res.code === 0) { this.$message.success('保存成功') @@ -403,7 +403,7 @@ export default { // 滞留提醒初始化 async initRemind () { // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/project/parameter/remindinit" - const url = '/gov/project/parameter/remindinit' + const url = '/governance/parameter/remindinit' const params = { customerId: this.customerId @@ -420,7 +420,7 @@ export default { async initReview () { this.startLoading() // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/parameter/reviewinit" - const url = '/gov/issue/parameter/reviewinit' + const url = '/governance/parameter/reviewinit' const params = { customerId: this.customerId @@ -442,7 +442,7 @@ export default { async saveRemind () { this.startLoading() // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/project/parameter/remindsave" - const url = '/gov/project/parameter/remindsave' + const url = '/governance/parameter/remindsave' const params = { customerId: this.customerId, @@ -461,7 +461,7 @@ export default { async saveReview () { this.startLoading() // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/parameter/reviewsave" - const url = '/gov/issue/parameter/reviewsave' + const url = '/governance/parameter/reviewsave' this.reviewForm.auditSwitch = this.auditSwitchShow ? 'open' : 'close' const params = { customerId: this.customerId, @@ -484,7 +484,7 @@ export default { }, async setDefaultRemind () { // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/project/parameter/reminddefault" - const url = '/gov/project/parameter/reminddefault' + const url = '/governance/parameter/reminddefault' const params = { customerId: this.customerId @@ -504,7 +504,7 @@ export default { // 恢复议题发布审核 async setDefaultReview () { // const url = "https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/parameter/reviewdefault" - const url = '/gov/issue/parameter/reviewdefault' + const url = '/governance/parameter/reviewdefault' const params = { customerId: this.customerId diff --git a/src/views/modules/productConfig/mostedit/MostList.vue b/src/views/modules/productConfig/mostedit/MostList.vue index de32c822a..264e5c0a7 100644 --- a/src/views/modules/productConfig/mostedit/MostList.vue +++ b/src/views/modules/productConfig/mostedit/MostList.vue @@ -342,7 +342,7 @@ export default { type: 'warning' }) .then(() => { - const url = '/gov/issue/parameter/reviewinit' + const url = '/governance/parameter/reviewinit' const param = { customerId: this.customerId } @@ -377,7 +377,7 @@ export default { type: 'warning' }) .then(() => { - const url = '/gov/project/parameter/remindinit' + const url = '/governance/parameter/remindinit' const param = { customerId: this.customerId, detentionDays: this.detentionDays, diff --git a/src/views/modules/secretaryLog/cpts/notice.vue b/src/views/modules/secretaryLog/cpts/notice.vue index 5fd0960fe..9d1b100b9 100644 --- a/src/views/modules/secretaryLog/cpts/notice.vue +++ b/src/views/modules/secretaryLog/cpts/notice.vue @@ -68,7 +68,7 @@ export default { async read() { const item = this.list[0]; - const url = "/gov/project/memoAttr/setReaded"; + const url = "/governance/memoAttr/setReaded"; const { data, code, msg } = await requestPost(url, { memoId: item.memoId, @@ -82,7 +82,7 @@ export default { }, async getList() { - const url = "/gov/project/memoAttr/memosToRemind"; + const url = "/governance/memoAttr/memosToRemind"; const { data, code, msg } = await requestPost(url, {}); if (code === 0) { console.log("列表请求成功!!!!!!!!!!!!!!"); diff --git a/src/views/modules/secretaryLog/difficulty/difficultyDetail.vue b/src/views/modules/secretaryLog/difficulty/difficultyDetail.vue index f90289b9f..5f0ca1984 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyDetail.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyDetail.vue @@ -81,11 +81,11 @@ export default { difficultyId: '', formData: { - content: '',//内容 - resolveWay: '',//解决方式 - remark: '',//备注 - scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + content: '',//内容 + resolveWay: '',//解决方式 + remark: '',//备注 + scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] }, @@ -111,7 +111,7 @@ export default { async loadFormData () { // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/detail' - const url = '/gov/project/memoDifficulty/detail' + const url = '/governance/memoDifficulty/detail' let params = { id: this.difficultyId, readFlag: '0', diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue index 56dde073b..86c170634 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue @@ -140,11 +140,11 @@ export default { }, difficultyId: '', formData: { - content: '',//内容 - resolveWay: '',//解决方式 - remark: '',//备注 - scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + content: '',//内容 + resolveWay: '',//解决方式 + remark: '',//备注 + scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] }, @@ -186,7 +186,7 @@ export default { async loadFormData () { // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/detail' - const url = '/gov/project/memoDifficulty/detail' + const url = '/governance/memoDifficulty/detail' let params = { id: this.difficultyId, readFlag: '0', @@ -221,7 +221,7 @@ export default { } else { await this.addDifficulty() - + } }) @@ -237,12 +237,12 @@ export default { let url = '' if (this.formType === 'add') { - url = '/gov/project/memoDifficulty/save' + url = '/governance/memoDifficulty/save' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/save" this.formData.id = '' } else { - url = '/gov/project/memoDifficulty/update' + url = '/governance/memoDifficulty/update' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/update" } @@ -333,11 +333,11 @@ export default { this.difficultyId = '' this.formData = { - content: '',//内容 - resolveWay: '',//解决方式 - remark: '',//备注 - scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + content: '',//内容 + resolveWay: '',//解决方式 + remark: '',//备注 + scheduledTime: '',//预计处理时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] } diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue index d4870c6eb..a1ed847fc 100644 --- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue +++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue @@ -213,10 +213,10 @@ export default { scheduledTimeRange: [], timeRange: [], formData: { - content: '',//内容摘要 - startTime: '',//开始时间yyyy-mm-dd - endTime: '',//结束时间yyyy-mm-dd - scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd + content: '',//内容摘要 + startTime: '',//开始时间yyyy-mm-dd + endTime: '',//结束时间yyyy-mm-dd + scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd scheduledEndTime: '',//预计处理结束时间 yyyy-mm-dd }, sHeight: 0, @@ -251,7 +251,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/gov/project/memoDifficulty/page" + const url = "/governance/memoDifficulty/page" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/page" let params = { pageSize: this.pageSize, @@ -338,7 +338,7 @@ export default { }, async deleteDifficulty (row) { - const url = "/gov/project/memoDifficulty/delete" + const url = "/governance/memoDifficulty/delete" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/delete" let ids = [row.id] let params = { @@ -364,10 +364,10 @@ export default { this.scheduledTimeRange = [] this.timeRange = [] this.formData = { - content: '',//内容摘要 - startTime: '',//开始时间yyyy-mm-dd - endTime: '',//结束时间yyyy-mm-dd - scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd + content: '',//内容摘要 + startTime: '',//开始时间yyyy-mm-dd + endTime: '',//结束时间yyyy-mm-dd + scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd scheduledEndTime: '',//预计处理结束时间 yyyy-mm-dd } this.pageSize = 10 @@ -378,7 +378,7 @@ export default { //导出表格 async handleExport (row) { let title = '难点堵点详情' - let url = `/gov/project/memoDifficulty/${row.id}/exportWord` + let url = `/governance/memoDifficulty/${row.id}/exportWord` let params = {} diff --git a/src/views/modules/secretaryLog/humanisticCare/careDetail.vue b/src/views/modules/secretaryLog/humanisticCare/careDetail.vue index 48404018a..9b388e147 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careDetail.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careDetail.vue @@ -82,14 +82,14 @@ export default { careId: '', formData: { - content: '',//关怀事项 - concernType: '',//关怀类型 - resiName: '',//关怀人员 + content: '',//关怀事项 + concernType: '',//关怀类型 + resiName: '',//关怀人员 status: '',//状态 0未完成 1已完成 phone: '',//电话 address: '',//地址 - scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] }, @@ -115,7 +115,7 @@ export default { async loadFormData () { // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern' - const url = '/gov/project/memoConcern' + const url = '/governance/memoConcern' let params = { id: this.careId, readFlag: '0', diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue index fd3ed8282..5e19d3856 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue @@ -184,14 +184,14 @@ export default { }, careId: '', formData: { - content: '',//关怀事项 - concernType: '',//关怀类型 - resiName: '',//关怀人员 + content: '',//关怀事项 + concernType: '',//关怀类型 + resiName: '',//关怀人员 status: 0,//状态 0未完成 1已完成 phone: '',//电话 address: '',//地址 - scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] }, @@ -233,7 +233,7 @@ export default { async loadFormData () { // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern' - const url = '/gov/project/memoConcern' + const url = '/governance/memoConcern' let params = { id: this.careId, readFlag: '0', @@ -284,7 +284,7 @@ export default { // message: '请输入正确的手机号码' // }) // return false; - // } + // } if (this.fileList.length > 0) { this.formData.attachmentList = this.fileList @@ -292,12 +292,12 @@ export default { let url = '' if (this.formType === 'add') { - url = '/gov/project/memoConcern/save' + url = '/governance/memoConcern/save' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save" this.formData.id = '' } else { - url = '/gov/project/memoConcern/update' + url = '/governance/memoConcern/update' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update" } @@ -388,14 +388,14 @@ export default { this.careId = '' this.formData = { - content: '',//关怀事项 - concernType: '',//关怀类型 - resiName: '',//关怀人员 + content: '',//关怀事项 + concernType: '',//关怀类型 + resiName: '',//关怀人员 status: 0,//状态 0未完成 1已完成 phone: '',//电话 address: '',//地址 - scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] } diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue index 06ad3710a..1b5b52ea1 100644 --- a/src/views/modules/secretaryLog/humanisticCare/careList.vue +++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue @@ -280,9 +280,9 @@ export default { scheduledTimeRange: [], timeRange: [], formData: { - content: '',//关怀事项 - concernType: '',//关怀类型 - resiName: '',//关怀人员 + content: '',//关怀事项 + concernType: '',//关怀类型 + resiName: '',//关怀人员 status: '',//状态 0未完成 1已完成 startTime: '',//开始时间 yyyy-mm-dd endTime: '',//结束时间 yyyy-mm-dd @@ -320,7 +320,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/gov/project/memoConcern/page" + const url = "/governance/memoConcern/page" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/page" let params = { pageSize: this.pageSize, @@ -408,7 +408,7 @@ export default { }, async deleteCare (row) { - const url = "/gov/project/memoConcern/delete" + const url = "/governance/memoConcern/delete" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/delete" let ids = [row.id] let params = { @@ -434,9 +434,9 @@ export default { this.scheduledTimeRange = [] this.timeRange = [] this.formData = { - content: '',//关怀事项 - concernType: '',//关怀类型 - resiName: '',//关怀人员 + content: '',//关怀事项 + concernType: '',//关怀类型 + resiName: '',//关怀人员 status: '',//状态 0未完成 1已完成 startTime: '',//开始时间 yyyy-mm-dd endTime: '',//结束时间 yyyy-mm-dd @@ -452,7 +452,7 @@ export default { async handleExport (row) { let title = '人员关怀详情' - let url = `/gov/project/memoConcern/${row.id}/exportWord` + let url = `/governance/memoConcern/${row.id}/exportWord` let params = {} app.ajax.exportFilePost( diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue index a72bbbc07..4cf7032ce 100644 --- a/src/views/modules/secretaryLog/workLog/form.vue +++ b/src/views/modules/secretaryLog/workLog/form.vue @@ -115,9 +115,9 @@ export default { }, id: '', formData: { - content: '',//内容 - workType: '',//解决方式 - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + content: '',//内容 + workType: '',//解决方式 + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] }, @@ -160,7 +160,7 @@ export default { async loadFormData () { // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/detail' - const url = '/gov/project/memoWorkDiary' + const url = '/governance/memoWorkDiary' let params = { id: this.id, readFlag: '0', @@ -195,7 +195,7 @@ export default { } else { await this.addDifficulty() - + } @@ -212,12 +212,12 @@ export default { let url = '' if (this.formType === 'add') { - url = '/gov/project/memoWorkDiary/save' + url = '/governance/memoWorkDiary/save' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/save" this.formData.id = '' } else { - url = '/gov/project/memoWorkDiary/update' + url = '/governance/memoWorkDiary/update' // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/update" } @@ -230,7 +230,7 @@ export default { message: '操作成功' }) this.resetData() - + this.$emit('dialogOk') this.btnDisable = false this.$store.dispatch('setTipsList') @@ -308,9 +308,9 @@ export default { this.id = '' this.formData = { - content: '',//内容 - workType: '',//解决方式 - remindTime: '',//提醒时间yyyy-mm-dd hh:mm + content: '',//内容 + workType: '',//解决方式 + remindTime: '',//提醒时间yyyy-mm-dd hh:mm attachmentList: [] } diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue index 8b4f9237d..530121aa0 100644 --- a/src/views/modules/secretaryLog/workLog/index.vue +++ b/src/views/modules/secretaryLog/workLog/index.vue @@ -184,9 +184,9 @@ export default { scheduledTimeRange: [], timeRange: [], formData: { - content: '',//内容摘要 - startTime: '',//开始时间yyyy-mm-dd - endTime: '',//结束时间yyyy-mm-dd + content: '',//内容摘要 + startTime: '',//开始时间yyyy-mm-dd + endTime: '',//结束时间yyyy-mm-dd workType: '' }, @@ -224,7 +224,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/gov/project/memoWorkDiary/page" + const url = "/governance/memoWorkDiary/page" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/page" let params = { pageSize: this.pageSize, @@ -309,7 +309,7 @@ export default { }, async deleteDifficulty (row) { - const url = "/gov/project/memoWorkDiary/delete" + const url = "/governance/memoWorkDiary/delete" // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/delete" let ids = [row.id] let params = { @@ -334,9 +334,9 @@ export default { resetSearch () { this.timeRange = [] this.formData = { - content: '',//内容摘要 - startTime: '',//开始时间yyyy-mm-dd - endTime: '',//结束时间yyyy-mm-dd + content: '',//内容摘要 + startTime: '',//开始时间yyyy-mm-dd + endTime: '',//结束时间yyyy-mm-dd workType: '' } this.pageSize = 10 @@ -346,7 +346,7 @@ export default { //导出表格 async handleExport (row) { - let url = `/gov/project/memoWorkDiary/${row.id}/exportWord` + let url = `/governance/memoWorkDiary/${row.id}/exportWord` let params = {} await this.$http({ diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 7f5e460d5..b0c0bbcc7 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -461,7 +461,7 @@ export default { } }, async getCategoryList () { - const url = "/gov/issue/issueprojectcategorydict/list"; + const url = "/governance/issueprojectcategorydict/list"; let params = {}; diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 802afef57..ecc20e83e 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -89,7 +89,7 @@
- @@ -60,11 +60,11 @@ -
@@ -368,7 +368,7 @@ export default { async loadMapData () { const _that = this // this.$refs.lineChart.showLoading() - const url = "/gov/project/project/projectdistributionanalysisright"; + const url = "/governance/project/projectdistributionanalysisright"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisright"; let params = { orgId: this.orgId, @@ -496,7 +496,7 @@ export default { const _that = this - const url = "/gov/project/project/projectdistributionanalysisleft"; + const url = "/governance/project/projectdistributionanalysisleft"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft"; let params = { orgId: this.orgId, diff --git a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue index 7e260517e..cdd9e717a 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/eventInfo.vue @@ -63,7 +63,7 @@ export default { methods: { async handleSearch () { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue index 2c84b082f..ad61ecff9 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue @@ -61,7 +61,7 @@ export default { methods: { async handleSearch () { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue index ec8af55dc..7730e2e79 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue @@ -887,7 +887,7 @@ const vueGis = { }, async loadEvent (info) { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { @@ -1929,7 +1929,7 @@ export default vueGis; .ol-overlaycontainer-stopevent { display: none; } - + \ No newline at end of file + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue index a113c259a..74cbe5d27 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -898,7 +898,7 @@ const vueGis = { }, async loadEvent (info) { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { @@ -1857,7 +1857,7 @@ export default vueGis; .ol-overlaycontainer-stopevent { display: none; } - + \ No newline at end of file + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue index 30210f532..50b9ca78d 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue @@ -890,7 +890,7 @@ const vueGis = { }, async loadEvent (info) { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { @@ -1937,7 +1937,7 @@ export default vueGis; .ol-overlaycontainer-stopevent { display: none; } - + \ No newline at end of file + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 1898a35c9..15a6a426c 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -897,7 +897,7 @@ const vueGis = { }, async loadEvent (info) { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue index b35437118..f48b583c9 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue @@ -72,7 +72,7 @@ export default { methods: { async handleSearch () { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; const { data, code, msg } = await requestPost(url, { diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index 469b98d5b..10a3b49b7 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -434,7 +434,7 @@ export default { console.log(feature) const featureInfo = feature.values_.properties.info let coordinate = [featureInfo.longitude, featureInfo.latitude] - const url = "/gov/project/trace/projectdetail"; + const url = "/governance/trace/projectdetail"; const { data, code, msg } = await requestPost(url, { projectId: featureInfo.projectId, @@ -464,17 +464,17 @@ export default {
内部备注: `+ projectInfo.internalRemark + ` -
+
处理部门: `+ projectInfo.departmentNameList + ` -
+
分类: `+ projectInfo.projectCate + ` -
+
标签: `+ projectInfo.projectTag + ` -
- + + ` this.$refs.map.handleShowPopup(showData, coordinate) diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue index 6b3ea9c4b..1b139b3f5 100644 --- a/src/views/modules/visual/communityGovern/resibuzz.vue +++ b/src/views/modules/visual/communityGovern/resibuzz.vue @@ -275,7 +275,7 @@ export default { this.$refs.pieChart.showLoading() } - const url = "/gov/issue/issue/resibuzz-leftpiechart"; + const url = "/governance/issue/resibuzz-leftpiechart"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz-leftpiechart"; let params = { orgId: this.orgId, @@ -446,7 +446,7 @@ export default { //加载组织数据 async getTable () { - const url = "/gov/issue/issue/resibuzz"; + const url = "/governance/issue/resibuzz"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/issue/issue/resibuzz"; let params = { status: this.status, diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index d558898e2..a6459c9d0 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -297,7 +297,7 @@ export default { //加载组织数据 async getEventInfo () { - const url = "/gov/project/icEvent/detail"; + const url = "/governance/icEvent/detail"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { @@ -313,7 +313,7 @@ export default { //加载处理进展 async getEventProcess () { - const url = "/gov/project/icEvent/process"; + const url = "/governance/icEvent/process"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processes/" + this.eventId; const { data, code, msg } = await requestPost(url, { @@ -335,7 +335,7 @@ export default { //加载组织数据 async getYanPan () { - const url = "/gov/project/icEvent/processAnalysis/analysis/" + this.eventId; + const url = "/governance/icEvent/processAnalysis/analysis/" + this.eventId; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/analysis/" + this.eventId; let param = {} @@ -364,7 +364,7 @@ export default { if (!this.yanPan.categoryPids) { return false } - const url = "/gov/project/icEvent/processAnalysis/categoryEventList"; + const url = "/governance/icEvent/processAnalysis/categoryEventList"; // const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList"; let param = { diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue index c73db8d08..31e4f4fad 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue @@ -389,7 +389,7 @@ export default { this.$refs.pieChart.clear() } - const url = "/gov/project/icEvent/processAnalysis/processStatusRatio"; + const url = "/governance/icEvent/processAnalysis/processStatusRatio"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio"; let params = { orgId: this.orgId, @@ -439,7 +439,7 @@ export default { //加载组织数据 async getTable () { - const url = "/gov/project/icEvent/processAnalysis/eventList"; + const url = "/governance/icEvent/processAnalysis/eventList"; //const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList"; let params = { processStatus: this.processStatus, @@ -517,7 +517,7 @@ export default { } const _that = this // this.$refs.pieChart.showLoading() - const url = "/gov/project/icEvent/processAnalysis/monthlyIncrement"; + const url = "/governance/icEvent/processAnalysis/monthlyIncrement"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/monthlyIncrement"; let params = { orgId: this.orgId, diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 964a673e5..b3b909fe5 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -396,7 +396,7 @@ export default { this.$refs.pieChart.clear(); } - const url = "/gov/project/icEvent/processAnalysis/processStatusRatio"; + const url = "/governance/icEvent/processAnalysis/processStatusRatio"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio"; let params = { orgId: this.orgId, @@ -445,7 +445,7 @@ export default { //加载组织数据 async getTable() { - const url = "/gov/project/icEvent/processAnalysis/eventList"; + const url = "/governance/icEvent/processAnalysis/eventList"; //const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList"; let params = { processStatus: this.processStatus, @@ -522,7 +522,7 @@ export default { } const _that = this; // this.$refs.pieChart.showLoading() - const url = "/gov/project/icEvent/processAnalysis/monthlyIncrement"; + const url = "/governance/icEvent/processAnalysis/monthlyIncrement"; //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/monthlyIncrement"; let params = { orgId: this.orgId, diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 799fc1bc0..47fb8461d 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -348,7 +348,7 @@ export default { this.$refs.pieChart.clear() } - const url = "/gov/project/icEvent/category-analysis/total" + const url = "/governance/icEvent/category-analysis/total" let params = { orgId: this.orgId, orgType: this.orgType, @@ -385,7 +385,7 @@ export default { this.$refs.gridPieChart.clear() } - const url = "/gov/project/icEvent/category-analysis/org-total" + const url = "/governance/icEvent/category-analysis/org-total" let params = { orgId: this.orgId, orgType: this.orgType, @@ -419,7 +419,7 @@ export default { //加载组织数据 async getTable () { - const url = '/gov/project/icEvent/processAnalysis/eventList' + const url = '/governance/icEvent/processAnalysis/eventList' let params = { orgId: this.tableOrgId ? this.tableOrgId : this.orgId, orgType: this.tableOrgType ? this.tableOrgType : this.orgType, From 9c7e667958d277b5e7316ca7b6b8761bc858ea91 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Wed, 15 Feb 2023 19:31:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=9F=A5=E7=9C=8B/?= =?UTF-8?q?=E6=88=BF=E5=B1=8Bcopy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiInfo.vue | 496 ++++++---- src/views/components/resiSearch.vue | 5 - .../modules/base/community/community copy.vue | 883 ++++++++++++++++++ src/views/modules/base/resi.vue | 23 +- 4 files changed, 1195 insertions(+), 212 deletions(-) create mode 100644 src/views/modules/base/community/community copy.vue diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index 276a376be..30d13cac2 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -97,7 +97,7 @@
其他信息
- +
文化程度:
{{educationText}} @@ -107,7 +107,7 @@ {{eduInfoDto.eduRemark?eduInfoDto.eduRemark:'--'}}
- +
兴趣分类 :
@@ -131,7 +131,7 @@ - +
宗教:
{{residentReligionObj.religion?residentReligionObj.religion:'--'}} @@ -141,7 +141,7 @@ {{residentReligionObj.religionRemark?residentReligionObj.religionRemark:'--'}}
- +
@@ -268,7 +268,7 @@ - +
@@ -350,7 +350,7 @@ - +
@@ -407,7 +407,168 @@ - + + + + +
+
出生地 :
+ {{residentBirthRecordObj?residentBirthRecordObj.birthplace?residentBirthRecordObj.birthplace:'--':'--'}} +
+
+ +
+
父亲姓名 :
+ {{residentBirthRecordObj?residentBirthRecordObj.father ?residentBirthRecordObj.father :'--':'--'}} +
+
+ +
+
母亲姓名 :
+ {{residentBirthRecordObj?residentBirthRecordObj.mother?residentBirthRecordObj.mother:'--':'--'}} +
+
+
+ + +
+
胎次 :
+ {{residentBirthRecordObj?residentBirthRecordObj.count?residentBirthRecordObj.count:'--':'--'}} +
+
+ +
+
申报日期 :
+ {{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}} +
+
+
+
+ + + +
+
死亡时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} +
+
+ +
+
加入原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} +
+
+ +
+
移除时间 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} +
+
+
+ + +
+
移除原因 :
+ {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} +
+
+
+
+ + + +
+
迁出日期 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}} +
+
+ +
+
迁出类型 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.type ?residentMoveOutRecordObj.type :'--':'--'}} +
+
+ +
+
迁出原因 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.reason ?residentMoveOutRecordObj.reason:'--':'--'}} +
+
+
+ + +
+
迁出至组织 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}} +
+
+ +
+
小区 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName ?residentMoveOutRecordObj.villageName :'--':'--'}} +
+
+ +
+
楼号 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName ?residentMoveOutRecordObj.buildName:'--':'--'}} +
+
+
+ + +
+
单元 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName ?residentMoveOutRecordObj.unitName :'--':'--'}} +
+
+ +
+
房屋 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName ?residentMoveOutRecordObj.homeName :'--':'--'}} +
+
+ +
+
外迁地址 :
+ {{residentMoveOutRecordObj?residentMoveOutRecordObj.address ?residentMoveOutRecordObj.address:'--':'--'}} +
+
+
+
+ + + + + + + + + + + +
@@ -464,7 +625,7 @@ - +
@@ -501,7 +662,7 @@ - +
@@ -563,7 +724,7 @@ - +
@@ -634,7 +795,7 @@ - +
@@ -650,7 +811,7 @@ - +
志愿者类别 :
@@ -672,7 +833,7 @@ - +
@@ -682,7 +843,7 @@ - +
特殊人群类别 :
@@ -696,167 +857,6 @@
- - - -
-
出生地 :
- {{residentBirthRecordObj?residentBirthRecordObj.birthplace?residentBirthRecordObj.birthplace:'--':'--'}} -
-
- -
-
父亲姓名 :
- {{residentBirthRecordObj?residentBirthRecordObj.father ?residentBirthRecordObj.father :'--':'--'}} -
-
- -
-
母亲姓名 :
- {{residentBirthRecordObj?residentBirthRecordObj.mother?residentBirthRecordObj.mother:'--':'--'}} -
-
-
- - -
-
胎次 :
- {{residentBirthRecordObj?residentBirthRecordObj.count?residentBirthRecordObj.count:'--':'--'}} -
-
- -
-
申报日期 :
- {{residentBirthRecordObj?residentBirthRecordObj.reportDate ?residentBirthRecordObj.reportDate :'--':'--'}} -
-
-
-
- - - -
-
死亡时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathDate?residentDeathRecordObj.deathDate.substr(0,10):'--':'--'}} -
-
- -
-
加入原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.deathReason ?residentDeathRecordObj.deathReason :'--':'--'}} -
-
- -
-
移除时间 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeDate ?residentDeathRecordObj.removeDate.substr(0,10) :'--':'--'}} -
-
-
- - -
-
移除原因 :
- {{residentDeathRecordObj?residentDeathRecordObj.removeReason?residentDeathRecordObj.removeReason:'--':'--'}} -
-
-
-
- - - -
-
迁出日期 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}} -
-
- -
-
迁出类型 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.type ?residentMoveOutRecordObj.type :'--':'--'}} -
-
- -
-
迁出原因 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.reason ?residentMoveOutRecordObj.reason:'--':'--'}} -
-
-
- - -
-
迁出至组织 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}} -
-
- -
-
小区 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName ?residentMoveOutRecordObj.villageName :'--':'--'}} -
-
- -
-
楼号 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName ?residentMoveOutRecordObj.buildName:'--':'--'}} -
-
-
- - -
-
单元 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName ?residentMoveOutRecordObj.unitName :'--':'--'}} -
-
- -
-
房屋 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName ?residentMoveOutRecordObj.homeName :'--':'--'}} -
-
- -
-
外迁地址 :
- {{residentMoveOutRecordObj?residentMoveOutRecordObj.address ?residentMoveOutRecordObj.address:'--':'--'}} -
-
-
-
- - - - - - - - - - - -
@@ -865,6 +865,7 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 29f223fc7..c6d73f8c9 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -661,6 +661,7 @@ export default { obj.agencyId = ""; } this.currentPage = 1 + console.log(obj); this.getTableData(obj) }, @@ -1033,17 +1034,17 @@ export default { await this.residentBaseInfo(); }, // 获取详情 - residentBaseInfo () { - this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.$refs.baseForm.old_from(res.data); - } - }).catch((err) => { - return this.$message.error("网络错误"); - }); - }, + // residentBaseInfo () { + // this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => { + // if (res.code !== 0) { + // return this.$message.error(res.msg); + // } else { + // this.$refs.baseForm.old_from(res.data); + // } + // }).catch((err) => { + // return this.$message.error("网络错误"); + // }); + // }, handlerReset() { this.$refs.baseForm.resetForm(); },