From 7a4caefb135137d780c500d6472936d563e04042 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 21 Jun 2024 16:19:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/warn/building.vue | 5 +- src/views/dataBoard/renfang/warn/resi.vue | 97 ++++++------------- 2 files changed, 35 insertions(+), 67 deletions(-) diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index aabb45c75..44406f916 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -156,8 +156,9 @@ export default { this.$router.push({ path:"/dataBoard/renfang/warn-resi", query:{ - building_id:item.building_id, - resident_type:this.type_id + building_id:item.buildingId, + resident_type:this.type_id, + warnCate:this.level } }) // this.breadList.push({ diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 793b027b6..5e4ba00d3 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -29,6 +29,7 @@ @@ -39,6 +40,8 @@ import cptTb from "@/views/dataBoard/cpts/tb"; import cptBread from "@/views/dataBoard/renfang/cpts/bread"; import resiDetails from "@/views/dataBoard/cpts/resi-details"; import { requestPostBi } from "@/js/dai/request-bipass"; +import { requestPost } from "@/js/dai/request"; + import getQueryPara from "dai-js/modules/getQueryPara"; export default { @@ -63,6 +66,8 @@ export default { data() { return { + warnCate:null, + tableTitle: "预警人员列表", searchName: "", @@ -150,6 +155,8 @@ export default { }, }, ], + + popupShow:false }; }, @@ -157,14 +164,16 @@ export default { activated() { this.building_id = getQueryPara("building_id"); this.resident_type = getQueryPara('resident_type') + this.warnCate = getQueryPara('warnCate') this.pageNo = 1; this.getList(); - this.getCount(); + // this.getCount(); }, methods: { showInfo(index) { let item = this.srcTableData[index]; - this.displayedResiId = item.user_id; + this.displayedResiId = item.resiId; + this.popupShow = true; }, handlePageNoChange(pageNo) { @@ -179,79 +188,37 @@ export default { }, async getList() { - const { resident_type, building_id, pageNo, pageSize } = this; - this.loading = true; - - const url = "building_resident_list"; - - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - resident_type, - building_id, - pageNo, - pageSize, - }, - }, - { - // mockId: 60069169, - } - ); - + const { resident_type, building_id, pageNo, pageSize ,warnCate} = this; + let params = { + buildId:building_id, + categoryKey:resident_type, + pageNo, + pageSize, + warnCate + }; + let url = '/actual/base/peopleRoomOverview/warnBuildingResiInfo' + const { data, code, msg } = await requestPost(url,params); this.loading = false; - if (code === 0) { - this.srcTableData = data; - // this.total = data.total; - - this.list = data.map((item, index) => { + this.srcTableData = data.list; + this.total = data.total; + this.list = data.list.map((item, index) => { return [ index + 1, - item.user_name ? item.user_name : "--", - item.grid ? item.grid : "--", - item.house ? item.house : "--", - item.telephone ? item.telephone : "--", - item.idcard ? item.idcard : "--", - item.gender ? item.gender : "--", - item.birthday ? item.birthday : "--", - - { type: "operate", list: ["查看"] }, + item.resiName ? item.resiName : "--", + item.gridName ? item.gridName : "--", + item.fullName ? item.fullName : "--", + item.mobile ? item.mobile : "--", + item.idNum ? item.idNum : "--", + item.gender?item.gender=='2'?'女':'男' :'--', + item.birthday?item.birthday:'--', + { type: "operate", list: ["查看人员"] }, ]; }); } else { this.$message.error(msg); } }, - - async getCount() { - const { resident_type, building_id, pageNo, pageSize } = this; - - const url = "building_resident_list_total"; - - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - resident_type, - building_id, - pageNo, - pageSize, - }, - }, - { - // mockId: 63071800, - } - ); - - if (code === 0) { - if (Array.isArray(data) && data.length > 0) { - this.total = parseInt(data[0].count); - } - } else { - this.$message.error(msg); - } - }, handleClickBreadItem({ item }) { if (item.type == "back") { this.$router.push({ From 01cba2312b4065eea0da66dfeb9d88861f89d017 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 21 Jun 2024 17:51:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E4=BA=BA=E5=8F=A3=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7a4caefb135137d780c500d6472936d563e04042. --- src/views/dataBoard/renfang/warn/building.vue | 5 +- src/views/dataBoard/renfang/warn/resi.vue | 97 +++++++++++++------ 2 files changed, 67 insertions(+), 35 deletions(-) diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index 44406f916..aabb45c75 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -156,9 +156,8 @@ export default { this.$router.push({ path:"/dataBoard/renfang/warn-resi", query:{ - building_id:item.buildingId, - resident_type:this.type_id, - warnCate:this.level + building_id:item.building_id, + resident_type:this.type_id } }) // this.breadList.push({ diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 5e4ba00d3..793b027b6 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -29,7 +29,6 @@ @@ -40,8 +39,6 @@ import cptTb from "@/views/dataBoard/cpts/tb"; import cptBread from "@/views/dataBoard/renfang/cpts/bread"; import resiDetails from "@/views/dataBoard/cpts/resi-details"; import { requestPostBi } from "@/js/dai/request-bipass"; -import { requestPost } from "@/js/dai/request"; - import getQueryPara from "dai-js/modules/getQueryPara"; export default { @@ -66,8 +63,6 @@ export default { data() { return { - warnCate:null, - tableTitle: "预警人员列表", searchName: "", @@ -155,8 +150,6 @@ export default { }, }, ], - - popupShow:false }; }, @@ -164,16 +157,14 @@ export default { activated() { this.building_id = getQueryPara("building_id"); this.resident_type = getQueryPara('resident_type') - this.warnCate = getQueryPara('warnCate') this.pageNo = 1; this.getList(); - // this.getCount(); + this.getCount(); }, methods: { showInfo(index) { let item = this.srcTableData[index]; - this.displayedResiId = item.resiId; - this.popupShow = true; + this.displayedResiId = item.user_id; }, handlePageNoChange(pageNo) { @@ -188,37 +179,79 @@ export default { }, async getList() { - const { resident_type, building_id, pageNo, pageSize ,warnCate} = this; - let params = { - buildId:building_id, - categoryKey:resident_type, - pageNo, - pageSize, - warnCate - }; - let url = '/actual/base/peopleRoomOverview/warnBuildingResiInfo' - const { data, code, msg } = await requestPost(url,params); + const { resident_type, building_id, pageNo, pageSize } = this; + this.loading = true; + + const url = "building_resident_list"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + resident_type, + building_id, + pageNo, + pageSize, + }, + }, + { + // mockId: 60069169, + } + ); + this.loading = false; + if (code === 0) { - this.srcTableData = data.list; - this.total = data.total; - this.list = data.list.map((item, index) => { + this.srcTableData = data; + // this.total = data.total; + + this.list = data.map((item, index) => { return [ index + 1, - item.resiName ? item.resiName : "--", - item.gridName ? item.gridName : "--", - item.fullName ? item.fullName : "--", - item.mobile ? item.mobile : "--", - item.idNum ? item.idNum : "--", - item.gender?item.gender=='2'?'女':'男' :'--', - item.birthday?item.birthday:'--', - { type: "operate", list: ["查看人员"] }, + item.user_name ? item.user_name : "--", + item.grid ? item.grid : "--", + item.house ? item.house : "--", + item.telephone ? item.telephone : "--", + item.idcard ? item.idcard : "--", + item.gender ? item.gender : "--", + item.birthday ? item.birthday : "--", + + { type: "operate", list: ["查看"] }, ]; }); } else { this.$message.error(msg); } }, + + async getCount() { + const { resident_type, building_id, pageNo, pageSize } = this; + + const url = "building_resident_list_total"; + + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + resident_type, + building_id, + pageNo, + pageSize, + }, + }, + { + // mockId: 63071800, + } + ); + + if (code === 0) { + if (Array.isArray(data) && data.length > 0) { + this.total = parseInt(data[0].count); + } + } else { + this.$message.error(msg); + } + }, handleClickBreadItem({ item }) { if (item.type == "back") { this.$router.push({ From c1f9066bf216b59f716df0804331510306501797 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 21 Jun 2024 16:19:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=BA=E5=8F=A3=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/warn/building.vue | 5 +- src/views/dataBoard/renfang/warn/resi.vue | 97 ++++++------------- 2 files changed, 35 insertions(+), 67 deletions(-) diff --git a/src/views/dataBoard/renfang/warn/building.vue b/src/views/dataBoard/renfang/warn/building.vue index aabb45c75..44406f916 100644 --- a/src/views/dataBoard/renfang/warn/building.vue +++ b/src/views/dataBoard/renfang/warn/building.vue @@ -156,8 +156,9 @@ export default { this.$router.push({ path:"/dataBoard/renfang/warn-resi", query:{ - building_id:item.building_id, - resident_type:this.type_id + building_id:item.buildingId, + resident_type:this.type_id, + warnCate:this.level } }) // this.breadList.push({ diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue index 793b027b6..5e4ba00d3 100644 --- a/src/views/dataBoard/renfang/warn/resi.vue +++ b/src/views/dataBoard/renfang/warn/resi.vue @@ -29,6 +29,7 @@ @@ -39,6 +40,8 @@ import cptTb from "@/views/dataBoard/cpts/tb"; import cptBread from "@/views/dataBoard/renfang/cpts/bread"; import resiDetails from "@/views/dataBoard/cpts/resi-details"; import { requestPostBi } from "@/js/dai/request-bipass"; +import { requestPost } from "@/js/dai/request"; + import getQueryPara from "dai-js/modules/getQueryPara"; export default { @@ -63,6 +66,8 @@ export default { data() { return { + warnCate:null, + tableTitle: "预警人员列表", searchName: "", @@ -150,6 +155,8 @@ export default { }, }, ], + + popupShow:false }; }, @@ -157,14 +164,16 @@ export default { activated() { this.building_id = getQueryPara("building_id"); this.resident_type = getQueryPara('resident_type') + this.warnCate = getQueryPara('warnCate') this.pageNo = 1; this.getList(); - this.getCount(); + // this.getCount(); }, methods: { showInfo(index) { let item = this.srcTableData[index]; - this.displayedResiId = item.user_id; + this.displayedResiId = item.resiId; + this.popupShow = true; }, handlePageNoChange(pageNo) { @@ -179,79 +188,37 @@ export default { }, async getList() { - const { resident_type, building_id, pageNo, pageSize } = this; - this.loading = true; - - const url = "building_resident_list"; - - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - resident_type, - building_id, - pageNo, - pageSize, - }, - }, - { - // mockId: 60069169, - } - ); - + const { resident_type, building_id, pageNo, pageSize ,warnCate} = this; + let params = { + buildId:building_id, + categoryKey:resident_type, + pageNo, + pageSize, + warnCate + }; + let url = '/actual/base/peopleRoomOverview/warnBuildingResiInfo' + const { data, code, msg } = await requestPost(url,params); this.loading = false; - if (code === 0) { - this.srcTableData = data; - // this.total = data.total; - - this.list = data.map((item, index) => { + this.srcTableData = data.list; + this.total = data.total; + this.list = data.list.map((item, index) => { return [ index + 1, - item.user_name ? item.user_name : "--", - item.grid ? item.grid : "--", - item.house ? item.house : "--", - item.telephone ? item.telephone : "--", - item.idcard ? item.idcard : "--", - item.gender ? item.gender : "--", - item.birthday ? item.birthday : "--", - - { type: "operate", list: ["查看"] }, + item.resiName ? item.resiName : "--", + item.gridName ? item.gridName : "--", + item.fullName ? item.fullName : "--", + item.mobile ? item.mobile : "--", + item.idNum ? item.idNum : "--", + item.gender?item.gender=='2'?'女':'男' :'--', + item.birthday?item.birthday:'--', + { type: "operate", list: ["查看人员"] }, ]; }); } else { this.$message.error(msg); } }, - - async getCount() { - const { resident_type, building_id, pageNo, pageSize } = this; - - const url = "building_resident_list_total"; - - const { data, code, msg } = await requestPostBi( - url, - { - queryParam: { - resident_type, - building_id, - pageNo, - pageSize, - }, - }, - { - // mockId: 63071800, - } - ); - - if (code === 0) { - if (Array.isArray(data) && data.length > 0) { - this.total = parseInt(data[0].count); - } - } else { - this.$message.error(msg); - } - }, handleClickBreadItem({ item }) { if (item.type == "back") { this.$router.push({ From a9a92b3845b86cacdf92ad03f24dda7432301cc8 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 24 Jun 2024 16:51:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiSearch.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 1335645c9..dff365634 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -131,11 +131,11 @@ - + 至 + placeholder="请输入" typ="number" clearable size="small"> @@ -1019,7 +1019,7 @@ export default { } } if (this.form.integrityScoreFrom&&this.form.integrityScoreTo) { - if (this.form.integrityScoreFrom > this.form.integrityScoreTo) { + if (Number(this.form.integrityScoreFrom) >Number(this.form.integrityScoreTo)) { this.$message.warning('结束分数不能小于开始分数') } }