From 28b9d164c8a36b1d5f3184e42cfc0d31cf94d717 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Sat, 2 Apr 2022 09:50:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E6=A0=B8=E7=AE=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/antiInfo.vue | 6 +- src/views/modules/shequ/cpts/people-more.vue | 119 +++++++++++++++++++ 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index b7c209cf..4378dd86 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -434,7 +434,7 @@ - + diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index f7c47e98..c2d9a6d1 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -136,6 +136,87 @@ +
+ + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
From e12336c496789b6efdcbd4b8d998dc61e6a23ae4 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Sat, 2 Apr 2022 13:34:48 +0800 Subject: [PATCH 2/6] dd --- src/views/modules/base/epidemic/antiInfo.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 4378dd86..365c6ecf 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -185,7 +185,7 @@ header-align="center" align="center" label="姓名" - width="100"> + width="120"> + min-width="180"> + width="180"> Date: Sat, 2 Apr 2022 13:40:24 +0800 Subject: [PATCH 3/6] =?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 --- .../modules/base/community/buildTable.vue | 54 +--- .../modules/base/community/communityTable.vue | 42 +-- .../modules/base/community/roomTable.vue | 42 +-- .../modules/base/epidemic/natInfo/natList.vue | 2 +- .../visual/basicinfo/basicInfoMain.vue | 93 ++---- .../visual/basicinfo/cpts/people-more.vue | 302 +++++++++++++----- .../modules/visual/basicinfo/peopleSearch.vue | 61 +++- 7 files changed, 319 insertions(+), 277 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 342ef30f..7eaef1f1 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -81,6 +81,10 @@ class="diy-button--reset" size="small" @click="handleExport">导出 + 批量删除
@@ -159,19 +163,6 @@
-
- 全选 - 删除 -
-
@@ -209,16 +200,14 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 - // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 + agencyObj: {},//树所选的小区对象 ownerName: '', ownerPhone: '', validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 selection: [], - showDeletBtn: false, + //form相关 formShow: false, @@ -352,16 +341,7 @@ export default { this.$emit('refreshTree') }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, + deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的楼宇?", "提示", { @@ -388,23 +368,10 @@ export default { selectAll (selection) { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } - }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - - } else { - this.selAllFlag = false - } }, async handleDelete (row) { @@ -699,14 +666,7 @@ export default { } }, watch: { - selection (val) { - if (val.length > 0) { - this.showDeletBtn = true - } else { - this.showDeletBtn = false - } - } }, props: { staffAgencyId: { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 27660e25..3d4785f9 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -108,6 +108,10 @@ class="diy-button--qrcode" size="small" @click="handleDownQr(agencyObj, 'community')">社区二维码 + 批量删除 @@ -203,18 +207,6 @@ -
- 全选 - 删除 -
@@ -254,8 +246,7 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 + showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的组织对象 @@ -414,16 +405,7 @@ export default { this.$emit('refreshTree') }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, + deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的小区?", "提示", { @@ -451,23 +433,11 @@ export default { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - - } }, async handleDelete (row) { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 92710ca2..d7f2f6cd 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -64,6 +64,10 @@ class="diy-button--reset" size="small" @click="handleExport">导出 + 批量删除
@@ -154,19 +158,6 @@
-
- 全选 - 删除 -
- @@ -203,8 +194,7 @@ export default { pageSize: 20, pageNo: 0, tableLoading: true, - selAllFlag: false, - isIndeterminate: false,//复选框的不确定状态 + // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 agencyObj: {},//树所选的小区对象 @@ -350,17 +340,7 @@ export default { this.loadTable() }, - handleSelectAll (selectAllFlag) { - this.$refs.ref_table.clearSelection(); - if (selectAllFlag) { - this.tableData.forEach(row => { - if (row.showBtn) { - this.$refs.ref_table.toggleRowSelection(row); - } - }); - } - }, deleteBatch () { if (this.selection.length > 0) { this.$confirm("确认删除选择的房屋?", "提示", { @@ -386,23 +366,11 @@ export default { }, selectAll (selection) { this.selection = selection - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - } }, selectionChange (selection) { this.selection = selection - this.isIndeterminate = false - if (selection.length === this.validTableDataNum) { - this.selAllFlag = true - } else { - this.selAllFlag = false - - } }, async handleDelete (row) { diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 2b7aa7e1..6d84fe0e 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -165,7 +165,7 @@ header-align="center" align="center" show-overflow-tooltip - label="检测机构" + label="检测地点" min-width="230"> - - -
+
-
@@ -151,8 +146,7 @@ import { mapGetters } from "vuex"; import { Loading } from 'element-ui'; //引入Loading服务 import { requestPost } from "@/js/dai/request"; import BasicInfoCommunity from "./basicInfoCommunity"; -import PeopleSearch from "./peopleSearch"; -import People from "./people"; + import cptCard from "@/views/modules/visual/cpts/card"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; @@ -384,59 +378,46 @@ const vueGis = { this.toSubAgency('polygon', e) }, - //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 + //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） async toSubAgency (type, e, searchName) { //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图 - if (type === 'people') { - this.runNum++ - this.runAgencyArray.push(this.orgData) - this.orgLevel = 'people' - this.selUserId = e - this.orgId = '' - this.orgData = { - id: '', - level: 'people', - name: '人员档案' - } - this.searchName = searchName - } else { - if (!e) { - return false - } - if (!e.selected[0]) { - return false + if (!e) { + return false + } + if (!e.selected[0]) { + return false + } + this.runNum++ + this.orgData.center = map.getView().getCenter() + this.orgData.zoom = map.getView().getZoom() + console.log('center', map.getView().getCenter()) + console.log('zoom', map.getView().getZoom()) + + this.runAgencyArray.push(this.orgData) + + this.subAgencyArray.forEach(item => { + if (item.id === e.selected[0].values_.id) { + this.orgId = item.id + this.orgLevel = item.level + this.orgData = item } - this.runNum++ - this.orgData.center = map.getView().getCenter() - this.orgData.zoom = map.getView().getZoom() - console.log('center', map.getView().getCenter()) - console.log('zoom', map.getView().getZoom()) - - this.runAgencyArray.push(this.orgData) - - this.subAgencyArray.forEach(item => { - if (item.id === e.selected[0].values_.id) { - this.orgId = item.id - this.orgLevel = item.level - this.orgData = item - } + }); + + if (this.orgLevel === 'neighborHood') { + this.loadList() + this.$nextTick(() => { + // 小区id，小区名称 + this.$refs.ref_community.initData(this.orgData.id, this.orgData.name); }); - if (this.orgLevel === 'neighborHood') { - this.loadList() - this.$nextTick(() => { - // 小区id，小区名称 - this.$refs.ref_community.initData(this.orgData.id, this.orgData.name); - }); + } else { + this.refreshMap(true) + } - } else { - this.refreshMap(true) - } - } }, @@ -530,11 +511,7 @@ const vueGis = { this.center = this.orgData.center this.zoom = this.orgData.zoom - if (this.orgLevel === 'people') { - - } - - else if (this.orgLevel === 'neighborHood') {//显示小区 + if (this.orgLevel === 'neighborHood') {//显示小区 } else { @@ -951,7 +928,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { BasicInfoCommunity, PeopleSearch, People, cptCard, ScreenLoading }, + components: { BasicInfoCommunity, cptCard, ScreenLoading }, } export default vueGis; diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index 6198cc91..b5a1ca9a 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -7,42 +7,45 @@ 更多信息
-
+
-
+
-
+
所属网格： {{ gridName }}
-
+
所属小区： {{ xiaoquName }}
-
+
所属楼宇： {{ louName }}-{{ danyuanName }}
-
+
所属家庭： {{ homeName }}
-
+
{{ field.label }}： - {{ + ">{{ info[field.columnName] == null ? "--" : getOptionLabel( @@ -50,8 +53,7 @@ info[field.columnName], field.itemType ) - }} + }} {{ info[field.columnName] == null ? "--" : info[field.columnName] @@ -63,57 +65,43 @@
-
+
-
+
{{ item.label }}
-
+
-
+
-
-
+
+
{{ field.label }}： - {{ + ">{{ infoItem[field.columnName] == null ? "--" : getOptionLabel( @@ -121,8 +109,7 @@ infoItem[field.columnName], field.itemType ) - }} + }} {{ infoItem[field.columnName] == null @@ -132,21 +119,39 @@
-
-
+
+
+ + +
+ +
+
+
+ + +
+
+
+
{{ field.label }}： - {{ + ">{{ !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? "--" @@ -155,8 +160,7 @@ allInfo[group.tableName][0][field.columnName], field.itemType ) - }} + }} {{ !allInfo[group.tableName] || @@ -175,6 +179,7 @@ + + + +