From 12990af8bef89ec3c08eee2d3dd84cff6ad95121 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 24 Oct 2022 18:02:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/epidemic/natFocus/natFocusList.vue | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index 527e2d4ef..6ad5af005 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -304,7 +304,12 @@ size="small" @click="handleVisiteList(scope.row)">随访记录 - +
+ 删除 +
{ + + let delUrl = "/epmetuser/icEpidemicSpecialAttention/delete"; + const { data, code, msg } = await requestPost(delUrl, [row.id]); + + if (code === 0) { + this.$message({ + type: "success", + message: "删除成功", + }); + this.loadTable(); + } else { + this.$message.error(msg); + } + }) + .catch((err) => { + if (err == "cancel") { + // this.$message({ + // type: "info", + // message: "已取消删除" + // }); + } + }); + }, + async deleteFocus (row) { const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del" From 734d243dd6571ab4f82c321a184d87847c782ff6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 25 Oct 2022 15:04:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 191 +++++++++++++++++- src/views/modules/base/epidemic/antiInfo.vue | 95 ++++++++- .../modules/base/epidemic/natInfo/natList.vue | 1 - .../base/epidemic/natInfo/noNatList.vue | 44 +++- 4 files changed, 324 insertions(+), 7 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 03b19b0de..3970bc7a2 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -122,6 +122,71 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + 0) { @@ -299,6 +376,109 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { + handleChangeV (val) { + + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + this.getBuildList(); + this.getUniList(); + this.getHouseList(); + }, + handleChangeB (val) { + + this.buildingUnitId = ""; + this.houseId = ""; + this.getUniList(); + this.getHouseList(); + }, + handleChangeD () { + this.houseId = ""; + this.getHouseList(); + }, + + getValiheList () { + const { user } = this.$store.state; + if (!this.selGridId) { + this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId + } + this.$http + .post("/gov/org/icneighborhood/neighborhoodoption", { + gridId: this.selGridId, + agencyId: this.selAgencyId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + + this.optionsV = res.data; + this.neighborHoodId = '' + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + + getBuildList () { + this.$http + .post("/gov/org/icbuilding/buildingoption", { + neighborHoodId: this.neighborHoodId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + + this.optionsB = res.data; + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getUniList () { + this.$http + .post("/gov/org/icbuildingunit/unitoption", { + buildingId: this.buildingId, + }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + + this.optionsD = res.data; + this.buildingUnitId = ""; + this.houseId = ""; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, + getHouseList () { + this.$http + .post("/gov/org/ichouse/houseoption", { unitId: this.buildingUnitId }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg); + } else { + + this.optionsH = res.data; + this.houseId = ""; + } + }) + .catch(() => { + return this.$message.error("网络错误"); + }); + }, handleSearch () { // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) { @@ -414,6 +594,15 @@ export default { } else { this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) + + if (obj.level === 'grid') { + this.selAgencyId = '' + this.selGridId = this.selTreeObj.id + } else { + this.selAgencyId = this.selTreeObj.id + this.selGridId = '' + } + this.getValiheList() } }) @@ -507,7 +696,7 @@ export default { obj.longitude = this.centerPoint[1] } this.selTreeObj = obj - console.log(this.selTreeObj) + console.log('selTreeObj', this.selTreeObj) }, diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 34db813b7..c87b14164 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -141,6 +141,22 @@ + + + + + +
+
+ + 导出 +
{ + this.download(data, title + '.xlsx') + }, + (rspMsg, data) => { + this.$message.error(rspMsg); + } + ); + + }, + + // 下载文件 + download (data, fileName) { + if (!data) { + return + } + + var csvData = new Blob([data]) + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName); + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement('a'); + document.body.appendChild(a); + a.style = 'display: none'; + var url = window.URL.createObjectURL(csvData); + a.href = url; + a.download = fileName; + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + } + + }, + handleSizeChange (val) { this.pageSize = val this.pageNo = 1 diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 648b2e73f..947399282 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -22,7 +22,6 @@ + + + + + + + + + + + Date: Tue, 25 Oct 2022 17:07:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 178 ++++++++++-------- .../modules/base/community/roomTable.vue | 32 ++++ 2 files changed, 134 insertions(+), 76 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 3970bc7a2..074edc48e 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -220,6 +220,10 @@ :ownerPhone="ownerPhone" :rentFlag="rentFlag" :purpose="purpose" + :neighborHoodId="neighborHoodId" + :buildingId="buildingId" + :buildingUnitId="buildingUnitId" + :houseId="houseId" :remark="remark" :updateStartDate="updateStartDate" :updateEndDate="updateEndDate" @@ -252,6 +256,7 @@ import roomTable from './roomTable' import { requestPost } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 +import nextTick from 'dai-js/tools/nextTick' let loading // 加载动画 export default { @@ -350,7 +355,7 @@ export default { await this.loadOrgData() await this.loadTree() // await this.loadOpenNode() - this.getValiheList() + this.getValiheList('', '') await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -382,86 +387,90 @@ export default { this.buildingUnitId = ""; this.houseId = ""; this.getBuildList(); - this.getUniList(); - this.getHouseList(); + // this.getUniList(); + // this.getHouseList(); }, handleChangeB (val) { this.buildingUnitId = ""; this.houseId = ""; this.getUniList(); - this.getHouseList(); + // this.getHouseList(); }, handleChangeD () { this.houseId = ""; this.getHouseList(); }, - getValiheList () { + async getValiheList () { const { user } = this.$store.state; if (!this.selGridId) { this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId } - this.$http - .post("/gov/org/icneighborhood/neighborhoodoption", { - gridId: this.selGridId, - agencyId: this.selAgencyId, - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - this.optionsV = res.data; - this.neighborHoodId = '' - this.buildingId = ""; - this.buildingUnitId = ""; - this.houseId = ""; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); + const url = "/gov/org/icneighborhood/neighborhood-options"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + gridId: this.selGridId, + agencyId: this.selAgencyId, + isPage: false + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsV = data; + + this.neighborHoodId = "" + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + + }, - getBuildList () { - this.$http - .post("/gov/org/icbuilding/buildingoption", { - neighborHoodId: this.neighborHoodId, - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { + async getBuildList () { + const url = "/gov/org/icbuilding/buildingoption"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + neighborHoodId: this.neighborHoodId, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsB = data; + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + - this.optionsB = res.data; - this.buildingId = ""; - this.buildingUnitId = ""; - this.houseId = ""; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); }, - getUniList () { - this.$http - .post("/gov/org/icbuildingunit/unitoption", { - buildingId: this.buildingId, - }) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { + async getUniList () { + + const url = "/gov/org/icbuildingunit/unitoption"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + buildingId: this.buildingId, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.optionsD = data; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); + } + - this.optionsD = res.data; - this.buildingUnitId = ""; - this.houseId = ""; - } - }) - .catch(() => { - return this.$message.error("网络错误"); - }); }, getHouseList () { this.$http @@ -503,6 +512,10 @@ export default { this.remark = '' this.updateStartDate = '' this.updateEndDate = '' + this.neighborHoodId = '' + this.buildingId = '' + this.buildingUnitId = '' + this.houseId = '' this.pageSize = 10 this.pageNo = 1 @@ -572,7 +585,7 @@ export default { }, - handleNodeClick (obj) { + async handleNodeClick (obj) { this.ownerName = '' this.ownerPhone = '' this.rentFlag = '' @@ -584,27 +597,40 @@ export default { this.selObj = JSON.parse(JSON.stringify(obj)) this.getTreeObj(obj) + await nextTick(1000) - this.$nextTick(() => { - if (obj.level === 'building') {//点击楼栋 - this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + if (obj.level === 'building') {//点击楼栋 + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + this.selAgencyId = '' + this.selGridId = '' + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.pid + await this.getBuildList() + this.buildingId = this.selTreeObj.id + await this.getUniList() - } else if (obj.level === 'neighborHood') {//点击小区 - this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) - } else { - this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) + } else if (obj.level === 'neighborHood') {//点击小区 + this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) + this.selAgencyId = '' + this.selGridId = '' + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.id + await this.getBuildList() - if (obj.level === 'grid') { - this.selAgencyId = '' - this.selGridId = this.selTreeObj.id - } else { - this.selAgencyId = this.selTreeObj.id - this.selGridId = '' - } - this.getValiheList() + } else { + this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) + + if (obj.level === 'grid') { + this.selAgencyId = '' + this.selGridId = this.selTreeObj.id + } else { + this.selAgencyId = this.selTreeObj.id + this.selGridId = '' } - }) + this.getValiheList('', '') + } + }, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 354b3684d..3183efbff 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -297,6 +297,10 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; this.$refs.baobiao.init({ elseParams: { @@ -401,6 +405,10 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; const url = "/gov/org/house/houselist"; @@ -602,6 +610,10 @@ export default { updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, buildingId: this.agencyObj.id, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; if (this.agencyObj.level === "grid") { @@ -699,6 +711,10 @@ export default { remark: this.remark, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, buildingId: "", neighborHoodId: "", }; @@ -891,6 +907,22 @@ export default { type: String, default: "", }, + neighborHoodId: { + type: String, + default: "", + }, + buildingId: { + type: String, + default: "", + }, + buildingUnitId: { + type: String, + default: "", + }, + houseId: { + type: String, + default: "", + }, }, }; From c34a8eb69e50f5caf4e78ea07f874fc948af67bc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 09:42:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=AC=E8=BE=96?= =?UTF-8?q?=E5=8C=BA=E5=B1=85=E6=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/natInfo/natList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 947399282..609c6d914 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -412,7 +412,7 @@ export default { this.tableData.forEach(item => { - item.isResiUserShow = item.isResiUser === '0' ? '否' : '是' + item.isResiUserShow = item.isLocalResiUser === '0' ? '否' : '是' if (item.natResult === '1') { item.natResultShow = '阳性' } else if (item.natResult === '0') { From 54544f9931fd6af7a1ca9d2fd38e532dbbf62801 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 26 Oct 2022 14:07:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/community.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 074edc48e..4507abb30 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -127,6 +127,7 @@