From d7f6e01f8af0aab8aa37c11e1c6524347606393c Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 29 Nov 2022 13:30:41 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/change/changewelfare.vue | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue index f25e3efa7..bb4ce7828 100644 --- a/src/views/modules/plugins/change/changewelfare.vue +++ b/src/views/modules/plugins/change/changewelfare.vue @@ -56,9 +56,37 @@ +
{{ $t('export') }} + 下载模板 + + 导入 +
+ +
{ + this.download(data, title + ".xls"); + }, + (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); + } + }, + // 上传文件之前的钩子 + beforeUpload (file) { + this.files = file; + + const isText = file.type === "application/vnd.ms-excel"; + const isTextComputer = + file.type === + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + + if (!isText && !isTextComputer) { + this.$message.error("请选择正确格式的文件"); + this.files = null; + this.fileName = ""; + return false; + } else { + this.fileName = file.name; + return true; + } + }, + async uploadFile () { + if (this.fileName == "") { + this.$message.warning("请选择要上传的文件！"); + return false; + } + + this.$message({ + showClose: true, + message: "导入中，请到系统管理-导入记录中查看进度", + duration: 0, + }); + + //清空上传列表 + this.$refs["upload"].clearFiles(); + let url = ""; + + let fileFormData = new FormData(); + fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名 + + url = "/epmetuser/changeWelfare/pointImport"; + + window.app.ajax.post2( + url, + fileFormData, + (data, rspMsg) => { + if (data.code === 0 && data.msg == "success") { + // this.$message.success('导入成功') + } else { + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) + // this.$message.error(rspMsg) + } + this.loadTable(); + }, + (rspMsg, data) => { }, + { headers: { "Content-Type": "multipart/form-data" } } + ); + }, exportHandle () { const url = this.mixinViewModuleOptions.exportURL this.$http({ @@ -275,6 +405,11 @@ export default { diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index be668fb5d..794f39b3f 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -76,40 +76,44 @@
居住成员信息
-
- +
+ - - - - - + - + - + + + + + - + + + + + - + - +
- + - + @@ -294,6 +298,7 @@ export default { checkReason: '', checkVisible: false, disabledBtn: false, + disabledBtn_check: false, mzOptions:[], } }, @@ -411,7 +416,9 @@ export default { lessorRelation: this.dataForm.lessorRelation, reason: this.checkReason } + this.disabledBtn_check = true, this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { + this.disabledBtn_check = false if (res.code !== 0) { return this.$message.error(res.msg) } @@ -492,4 +499,13 @@ export default { // width: 280px; } } +.add-member{ + border-bottom: 1px dashed #dcdfe6; + margin-bottom: 20px; + .el-form-item { + .el-form-item__content{ + width: 190px !important; + } + } +} From 1e4abeb448e997b20d602a765f8c0a2f74997e81 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 6 Dec 2022 15:01:00 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 71 +++++++++++++++---- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 9bb14f981..4154a30bc 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -150,34 +150,34 @@ 添加成员

- + - + - + - + - + - + - + - + - +
- + --> - +
- + - + Date: Tue, 6 Dec 2022 16:36:35 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 75 ++++--------------- 1 file changed, 16 insertions(+), 59 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 4154a30bc..e64242d71 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -150,34 +150,34 @@ 添加成员

- + - + - + - + - + - + - + - + - +
- + --> - +
- + - + Date: Wed, 7 Dec 2022 09:27:58 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E5=B0=8F=E5=AF=A8=E5=AD=90=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E7=96=AB=E8=8B=97=E8=AE=B0=E5=BD=95=E5=92=8C=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequ/cpts/people-more.vue | 16 +++++++++++++++- .../visual/basicinfo/cpts/people-more.vue | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 8e20b49ef..1f7d8d23f 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -308,6 +308,9 @@ export default { data () { return { + customerId: '', + isXiaozhaizi: false, + fieldList: [], groupList: [], groupIndex: 0, @@ -405,6 +408,16 @@ export default { }, mounted () { + //磐石街道：1580460084738760705 + //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 + this.customerId = localStorage.getItem("customerId"); + + this.isXiaozhaizi = false + + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true + } this.getApiData(); }, @@ -589,7 +602,8 @@ export default { tableName: "ic_hs", }, ]; - if (!this.isShundeju) { + + if (!this.isShundeju && !this.isXiaozhaizi) { arr = [ ...arr, { diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index 3084ebbe4..8decf5b23 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -211,6 +211,9 @@ export default { data () { return { + customerId: '', + isXiaozhaizi: false, + fieldList: [], groupList: [], groupIndex: 0, @@ -395,6 +398,16 @@ export default { }, mounted () { + //磐石街道：1580460084738760705 + //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 + this.customerId = localStorage.getItem("customerId"); + + this.isXiaozhaizi = false + + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true + } this.getApiData(); }, @@ -536,7 +549,7 @@ export default { } }); }); - + await Promise.all( this.groupList.map((subList, index) => { return Promise.all( @@ -564,7 +577,7 @@ export default { tableName: "ic_hs", }, ]; - if (!this.isShundeju) { + if (!this.isShundeju && !this.isXiaozhaizi) { arr = [ ...arr, { From 5073454185d3c1c10c4178b5f5bacfc9d62b7d24 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 7 Dec 2022 15:39:14 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index e64242d71..05fffda0c 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -277,7 +277,7 @@ -
+
-
+
-
+
Date: Wed, 7 Dec 2022 15:47:54 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 05fffda0c..fc98783a2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -7,7 +7,8 @@ + @change="handleChangeAgency" + style="width: 300px;"> + @change="handleChangeGrid" + style="width: 300px;"> Date: Wed, 7 Dec 2022 16:47:26 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-look-or-check.vue | 4 +++- src/views/modules/plugins/rent/rentcontractinfo.vue | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index 794f39b3f..7dbf7fbb2 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -252,6 +252,7 @@ export default { data () { return { visible: false, + pageId:'', dataForm: { id: '', flag: '', @@ -382,7 +383,8 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { + let Url = this.pageId === 'rentcontractinfo' ? 'plirentcontractinfolog' : 'rentContractInfo' + this.$http.get(`/pli/power/${Url}/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 7ae1c67ea..6a1f7533e 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -295,6 +295,7 @@ export default { this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.pageId= 'rentcontractinfo' this.$refs.addOrUpdate.init() }) }, From 3d1a53cdbe160b2d8fb72d139c28aba7e8830e13 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Wed, 7 Dec 2022 17:06:59 +0800 Subject: [PATCH 20/31] 1 --- .../modules/plugins/rent/rentcontractinfo-look-or-check.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index 7dbf7fbb2..6a8457ff4 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -225,8 +225,8 @@ {{ $t('cancel') }} - {{ $t('checkBTGBtn') }} - {{ $t('checkTGBtn') }} + {{ $t('checkBTGBtn') }} + {{ $t('checkTGBtn') }}
From b77a739dde2535d8890c541fbe62233bd42c66d8 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Thu, 8 Dec 2022 13:59:52 +0800 Subject: [PATCH 21/31] 1 --- .../modules/plugins/rent/rentcontractinfo-look-or-check.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index 6a8457ff4..487743d18 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -151,7 +151,7 @@ --> - + From b8b7adc91074cbefe96690fb25633ac7686ea30c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 9 Jan 2023 16:28:08 +0800 Subject: [PATCH 22/31] 111 --- .../modules/base/community/buildTable.vue | 12 +- .../modules/base/community/community.vue | 332 +++++------------- .../modules/base/community/roomTable.vue | 4 - 3 files changed, 85 insertions(+), 263 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index b8d5ecafc..b28c2bd9a 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -365,11 +365,6 @@ export default { this.agencyObj = treeObj - // if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限 - // this.showImportBtn = true - // } else { - // this.showImportBtn = false - // } } @@ -412,12 +407,7 @@ export default { }, async handleDetail (row) { - // this.formTitle = '楼栋详情' - // this.formShow = true - // const _data = await this.detail(row) - // this.$nextTick(() => { - // this.$refs.ref_form.initForm('detail', _data, this.agencyObj) - // }) + this.detailShow = true diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index fb38da89d..8c8f8f1f9 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -3,9 +3,9 @@
- - + --> + @node-click="handleNodeClick" + lazy + :load="lazyLoadTree"> @@ -122,72 +123,6 @@ - -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- - nowData } return { - filterText: '', + // filterText: '', treeLoading: true, treeData: [], openNodes: [], @@ -335,19 +266,10 @@ export default { disabledDate: startDisabledDate }, - optionsV: [], - optionsB: [], - optionsH: [], - optionsD: [], - neighborHoodId: "", - buildingId: "", - buildingUnitId: "", - houseId: "", selGridId: '', selAgencyId: '', - vDisabled: false, - bDisabled: false, + } }, components: { @@ -358,8 +280,6 @@ export default { await this.loadOrgData() await this.loadTree() - // await this.loadOpenNode() - this.getValiheList('', '') await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -373,7 +293,6 @@ export default { }, computed: { rowHeight () { - return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px' }, @@ -385,114 +304,35 @@ 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(); - }, - - async getValiheList () { - const { user } = this.$store.state; - if (!this.selGridId) { - this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId - } - - 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); - } - - - }, + async lazyLoadTree (node, resolve) { + console.log(node) + // debugger + if (node.level !== 0) { + const url = "/gov/org/building/next-tree-node" + let params = { + id: node.data.id, + level: node.data.level + } - 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) - const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + resolve(data) - if (code === 0) { - this.optionsB = data; - this.buildingId = ""; - this.buildingUnitId = ""; - this.houseId = ""; - } else { - this.$message.error(msg); + } else { + this.$message.error(msg) + } } - + // this.$http.get(`/sys/region/list?pid=${tree.id}`).then(({ data: res }) => { + // if (res.code !== 0) { + // return this.$message.error(res.msg) + // } + // resolve(res.data) + // }).catch(() => { }) }, - 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); - } - }, - 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) { this.showRoomTable = true @@ -516,45 +356,28 @@ export default { this.remark = '' this.updateStartDate = '' this.updateEndDate = '' - this.neighborHoodId = '' - this.buildingId = '' - this.buildingUnitId = '' - this.houseId = '' this.pageSize = 10 this.pageNo = 1 - // this.handleNodeClick(this.selObj) - // this.loadTable() - }, - - async loadOpenNode () { - const url = "/gov/org/building/tree-ids" - let params = {} - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.openNodes = data - - } else { - this.$message.error(msg) - } }, + async loadTree (isRefresh) { - const url = "/gov/org/building/treelist" + const url = "/gov/org/building/treeinit" let params = {} const { data, code, msg } = await requestPost(url, params) if (code === 0) { this.openNodes = [] - this.openNodes.push(data[0].id) + this.openNodes.push(data.id) - this.treeData = data - if (!isRefresh && data.length > 0) { + this.treeData = [] + this.treeData.push(data) - this.selTreeObj = data[0] + if (!isRefresh && data) { + + this.selTreeObj = data if (!this.selTreeObj.latitude) { this.selTreeObj.latitude = this.centerPoint[0] } @@ -602,30 +425,22 @@ export default { this.selObj = JSON.parse(JSON.stringify(obj)) this.getTreeObj(obj) await nextTick(1000) - this.vDisabled = false - this.bDisabled = false + if (obj.level === 'building') {//点击楼栋 this.selAgencyId = '' this.selGridId = '' - await this.getValiheList() - this.neighborHoodId = this.selTreeObj.pid - await this.getBuildList() - this.buildingId = this.selTreeObj.id - await this.getUniList() + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) - this.vDisabled = true - this.bDisabled = true + } else if (obj.level === 'neighborHood') {//点击小区 this.selAgencyId = '' this.selGridId = '' - await this.getValiheList() - this.neighborHoodId = this.selTreeObj.id - await this.getBuildList() + this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) - this.vDisabled = true + } else { this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) @@ -636,7 +451,7 @@ export default { this.selAgencyId = this.selTreeObj.id this.selGridId = '' } - this.getValiheList('', '') + } @@ -654,30 +469,51 @@ export default { }, //进入下一级 - toNextLevel (row, level) { - + async toNextLevel (row, level) { + console.log(row) if (level === 'community') { - this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data - this.openNodes.push(this.selTreeObj.id) + this.selTreeObj.id = row.neighborHoodId + this.selTreeObj.label = row.neighborHoodName + this.selTreeObj.latitude = row.latitude + this.selTreeObj.level = 'neighborHood' + this.selTreeObj.longitude = row.longitude + } else { - this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data + this.selTreeObj.id = row.buildingId + this.selTreeObj.label = row.buildingName + this.selTreeObj.latitude = row.latitude + this.selTreeObj.level = "building" + this.selTreeObj.longitude = row.longitude } + console.log(this.selTreeObj) - this.handleNodeClick(this.selTreeObj) - this.$nextTick(() => { - // ref_tree 元素的ref value 绑定的node-key - this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id); - }); + this.ownerName = '' + this.ownerPhone = '' + this.rentFlag = '' + this.purpose = '' + this.remark = '' + this.updateStartDate = '' + this.updateEndDate = '' + this.showRoomTable = false - const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素 - setTimeout(() => { - if (node) { - this.$nextTick(() => { - node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示 - }) - } - }, 100) + this.selObj = JSON.parse(JSON.stringify(this.selTreeObj)) + // this.getTreeObj(obj) + await nextTick(1000) + + if (this.selObj.level === 'building') {//点击楼栋 + this.selAgencyId = '' + this.selGridId = '' + + this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) + + } else if (this.selObj.level === 'neighborHood') {//点击小区 + this.selAgencyId = '' + this.selGridId = '' + + this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) + + } }, @@ -756,9 +592,9 @@ export default { } }, watch: { - filterText (val) { - this.$refs.ref_tree.filter(val); - } + // filterText (val) { + // this.$refs.ref_tree.filter(val); + // } }, components: { communityTable, buildTable, roomTable diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 200139c66..1adca7f56 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -425,10 +425,6 @@ export default { this.agencyLevel = "agency"; } - // if (fromTree) { - // this.agencyObj = treeObj - - // } let params = { pageSize: this.pageSize, pageNo: this.pageNo, From f79fa6b3f2daa1b45cda2fd3a3c68d0e58571ecf Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 9 Jan 2023 17:19:40 +0800 Subject: [PATCH 23/31] 11 --- .../modules/base/community/community.vue | 64 +++++++++++++++++-- .../modules/base/community/roomTable.vue | 18 ++++-- 2 files changed, 72 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 8c8f8f1f9..250bf2de0 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -15,6 +15,7 @@ :props="defaultProps" :highlight-current="true" node-key="id" + :default-expanded-keys="openNodes" :expand-on-click-node="false" :filter-node-method="filterNode" @node-click="handleNodeClick" @@ -39,6 +40,17 @@ :label-width="'80px'">
+ + + @@ -216,6 +230,17 @@ export default { children: 'children', label: 'showName' }, + orgOptions: [], + orgOptionProps: { + multiple: false, + value: 'agencyId', + label: 'agencyName', + children: 'subAgencyList', + checkStrictly: true + }, + agencyIdArray: [], + orgType: '', + orgId: '', selTreeObj: {}, @@ -280,6 +305,7 @@ export default { await this.loadOrgData() await this.loadTree() + await this.getOrgTreeList() await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -304,6 +330,34 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { + async getOrgTreeList () { + let url = '/gov/org/customeragency/agencygridtree' + let params = {} + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + this.orgOptions = [] + this.orgOptions.push(data) + + } else { + this.$message.error(msg) + } + + }, + handleChangeAgency (val) { + let obj = this.$refs["myCascader"].getCheckedNodes()[0].data + if (obj) { + + this.orgType = obj.level === 'grid' ? 'grid' : 'agency' + this.orgId = obj.agencyId + + } else { + this.orgType = '' + this.orgId = '' + } + + + }, async lazyLoadTree (node, resolve) { console.log(node) // debugger @@ -324,12 +378,6 @@ export default { } } - // this.$http.get(`/sys/region/list?pid=${tree.id}`).then(({ data: res }) => { - // if (res.code !== 0) { - // return this.$message.error(res.msg) - // } - // resolve(res.data) - // }).catch(() => { }) }, @@ -356,10 +404,14 @@ export default { this.remark = '' this.updateStartDate = '' this.updateEndDate = '' + this.orgType = '' + this.orgId = '' this.pageSize = 10 this.pageNo = 1 + this.agencyIdArray = [] + }, async loadTree (isRefresh) { diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 1adca7f56..a03e289c7 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -438,10 +438,12 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, - neighborHoodId: this.neighborHoodId, - buildingId: this.buildingId, - buildingUnitId: this.buildingUnitId, - houseId: this.houseId, + // neighborHoodId: this.neighborHoodId, + // buildingId: this.buildingId, + // buildingUnitId: this.buildingUnitId, + // houseId: this.houseId, + orgType: this.orgType, + orgId: this.orgId, }; const url = "/gov/org/house/houselist"; @@ -956,6 +958,14 @@ export default { type: String, default: "", }, + orgType: { + type: String, + default: "", + }, + orgId: { + type: String, + default: "", + }, }, }; From 3a925799218e441ef64f36d9489753deebf62b1b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 10 Jan 2023 08:51:55 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/buildTable.vue | 12 +- .../modules/base/community/community.vue | 354 ++++-- .../modules/base/community/roomTable.vue | 22 +- .../base/communityYantai/buildDetail.vue | 271 +++++ .../base/communityYantai/buildForm.vue | 492 ++++++++ .../base/communityYantai/buildTable.vue | 886 ++++++++++++++ .../base/communityYantai/community.vue | 721 +++++++++++ .../base/communityYantai/communityDetail.vue | 263 +++++ .../base/communityYantai/communityForm.vue | 576 +++++++++ .../base/communityYantai/communityTable.vue | 1050 +++++++++++++++++ .../base/communityYantai/roomDetail.vue | 303 +++++ .../modules/base/communityYantai/roomForm.vue | 473 ++++++++ .../base/communityYantai/roomTable.vue | 987 ++++++++++++++++ 13 files changed, 6274 insertions(+), 136 deletions(-) create mode 100644 src/views/modules/base/communityYantai/buildDetail.vue create mode 100644 src/views/modules/base/communityYantai/buildForm.vue create mode 100644 src/views/modules/base/communityYantai/buildTable.vue create mode 100644 src/views/modules/base/communityYantai/community.vue create mode 100644 src/views/modules/base/communityYantai/communityDetail.vue create mode 100644 src/views/modules/base/communityYantai/communityForm.vue create mode 100644 src/views/modules/base/communityYantai/communityTable.vue create mode 100644 src/views/modules/base/communityYantai/roomDetail.vue create mode 100644 src/views/modules/base/communityYantai/roomForm.vue create mode 100644 src/views/modules/base/communityYantai/roomTable.vue diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index b28c2bd9a..b8d5ecafc 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -365,6 +365,11 @@ export default { this.agencyObj = treeObj + // if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限 + // this.showImportBtn = true + // } else { + // this.showImportBtn = false + // } } @@ -407,7 +412,12 @@ export default { }, async handleDetail (row) { - + // this.formTitle = '楼栋详情' + // this.formShow = true + // const _data = await this.detail(row) + // this.$nextTick(() => { + // this.$refs.ref_form.initForm('detail', _data, this.agencyObj) + // }) this.detailShow = true diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 250bf2de0..fb38da89d 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -3,9 +3,9 @@
- + + @node-click="handleNodeClick"> @@ -40,17 +38,6 @@ :label-width="'80px'">
- - - + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + @@ -222,7 +277,7 @@ export default { return time.getTime() > nowData } return { - // filterText: '', + filterText: '', treeLoading: true, treeData: [], openNodes: [], @@ -230,17 +285,6 @@ export default { children: 'children', label: 'showName' }, - orgOptions: [], - orgOptionProps: { - multiple: false, - value: 'agencyId', - label: 'agencyName', - children: 'subAgencyList', - checkStrictly: true - }, - agencyIdArray: [], - orgType: '', - orgId: '', selTreeObj: {}, @@ -291,10 +335,19 @@ export default { disabledDate: startDisabledDate }, + optionsV: [], + optionsB: [], + optionsH: [], + optionsD: [], + neighborHoodId: "", + buildingId: "", + buildingUnitId: "", + houseId: "", selGridId: '', selAgencyId: '', - + vDisabled: false, + bDisabled: false, } }, components: { @@ -305,7 +358,8 @@ export default { await this.loadOrgData() await this.loadTree() - await this.getOrgTreeList() + // await this.loadOpenNode() + this.getValiheList('', '') await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) if (this.treeData.length > 0) { @@ -319,6 +373,7 @@ export default { }, computed: { rowHeight () { + return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px' }, @@ -330,56 +385,113 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { - async getOrgTreeList () { - let url = '/gov/org/customeragency/agencygridtree' - let params = {} - const { data, code, msg } = await requestPost(url, params) + 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(); + }, + + async getValiheList () { + const { user } = this.$store.state; + if (!this.selGridId) { + this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId + } + + 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.orgOptions = [] - this.orgOptions.push(data) + this.optionsV = data; + this.neighborHoodId = "" + this.buildingId = ""; + this.buildingUnitId = ""; + this.houseId = ""; } else { - this.$message.error(msg) + this.$message.error(msg); } + }, - handleChangeAgency (val) { - let obj = this.$refs["myCascader"].getCheckedNodes()[0].data - if (obj) { - this.orgType = obj.level === 'grid' ? 'grid' : 'agency' - this.orgId = obj.agencyId + 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.orgType = '' - this.orgId = '' + this.$message.error(msg); } }, - async lazyLoadTree (node, resolve) { - console.log(node) - // debugger - if (node.level !== 0) { - const url = "/gov/org/building/next-tree-node" - let params = { - id: node.data.id, - level: node.data.level - } + async getUniList () { - const { data, code, msg } = await requestPost(url, params) + const url = "/gov/org/icbuildingunit/unitoption"; + // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" + let params = { + buildingId: this.buildingId, + }; - if (code === 0) { - resolve(data) + const { data, code, msg } = await requestPost(url, params); - } else { - this.$message.error(msg) - } + if (code === 0) { + this.optionsD = data; + this.buildingUnitId = ""; + this.houseId = ""; + } else { + this.$message.error(msg); } - }, + }, + 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) { @@ -404,32 +516,45 @@ export default { this.remark = '' this.updateStartDate = '' this.updateEndDate = '' - this.orgType = '' - this.orgId = '' + this.neighborHoodId = '' + this.buildingId = '' + this.buildingUnitId = '' + this.houseId = '' this.pageSize = 10 this.pageNo = 1 + // this.handleNodeClick(this.selObj) + // this.loadTable() + }, - this.agencyIdArray = [] + async loadOpenNode () { + const url = "/gov/org/building/tree-ids" + let params = {} - }, + const { data, code, msg } = await requestPost(url, params) + if (code === 0) { + this.openNodes = data + + + } else { + this.$message.error(msg) + } + }, async loadTree (isRefresh) { - const url = "/gov/org/building/treeinit" + const url = "/gov/org/building/treelist" let params = {} const { data, code, msg } = await requestPost(url, params) if (code === 0) { this.openNodes = [] - this.openNodes.push(data.id) - - this.treeData = [] - this.treeData.push(data) + this.openNodes.push(data[0].id) - if (!isRefresh && data) { + this.treeData = data + if (!isRefresh && data.length > 0) { - this.selTreeObj = data + this.selTreeObj = data[0] if (!this.selTreeObj.latitude) { this.selTreeObj.latitude = this.centerPoint[0] } @@ -477,22 +602,30 @@ export default { this.selObj = JSON.parse(JSON.stringify(obj)) this.getTreeObj(obj) await nextTick(1000) - + this.vDisabled = false + this.bDisabled = false if (obj.level === 'building') {//点击楼栋 this.selAgencyId = '' this.selGridId = '' - + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.pid + await this.getBuildList() + this.buildingId = this.selTreeObj.id + await this.getUniList() this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) - + this.vDisabled = true + this.bDisabled = true } else if (obj.level === 'neighborHood') {//点击小区 this.selAgencyId = '' this.selGridId = '' - + await this.getValiheList() + this.neighborHoodId = this.selTreeObj.id + await this.getBuildList() this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) - + this.vDisabled = true } else { this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) @@ -503,7 +636,7 @@ export default { this.selAgencyId = this.selTreeObj.id this.selGridId = '' } - + this.getValiheList('', '') } @@ -521,51 +654,30 @@ export default { }, //进入下一级 - async toNextLevel (row, level) { - console.log(row) - if (level === 'community') { - this.selTreeObj.id = row.neighborHoodId - this.selTreeObj.label = row.neighborHoodName - this.selTreeObj.latitude = row.latitude - this.selTreeObj.level = 'neighborHood' - this.selTreeObj.longitude = row.longitude + toNextLevel (row, level) { + if (level === 'community') { + this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data + this.openNodes.push(this.selTreeObj.id) } else { - this.selTreeObj.id = row.buildingId - this.selTreeObj.label = row.buildingName - this.selTreeObj.latitude = row.latitude - this.selTreeObj.level = "building" - this.selTreeObj.longitude = row.longitude + this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data } - console.log(this.selTreeObj) - - this.ownerName = '' - this.ownerPhone = '' - this.rentFlag = '' - this.purpose = '' - this.remark = '' - this.updateStartDate = '' - this.updateEndDate = '' - this.showRoomTable = false - - this.selObj = JSON.parse(JSON.stringify(this.selTreeObj)) - // this.getTreeObj(obj) - await nextTick(1000) - - if (this.selObj.level === 'building') {//点击楼栋 - this.selAgencyId = '' - this.selGridId = '' - - this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj) - } else if (this.selObj.level === 'neighborHood') {//点击小区 - this.selAgencyId = '' - this.selGridId = '' - - this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj) + this.handleNodeClick(this.selTreeObj) + this.$nextTick(() => { + // ref_tree 元素的ref value 绑定的node-key + this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id); + }); - } + const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素 + setTimeout(() => { + if (node) { + this.$nextTick(() => { + node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示 + }) + } + }, 100) }, @@ -644,9 +756,9 @@ export default { } }, watch: { - // filterText (val) { - // this.$refs.ref_tree.filter(val); - // } + filterText (val) { + this.$refs.ref_tree.filter(val); + } }, components: { communityTable, buildTable, roomTable diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index a03e289c7..200139c66 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -425,6 +425,10 @@ export default { this.agencyLevel = "agency"; } + // if (fromTree) { + // this.agencyObj = treeObj + + // } let params = { pageSize: this.pageSize, pageNo: this.pageNo, @@ -438,12 +442,10 @@ export default { sortType: this.sortType, updateStartDate: this.updateStartDate, updateEndDate: this.updateEndDate, - // neighborHoodId: this.neighborHoodId, - // buildingId: this.buildingId, - // buildingUnitId: this.buildingUnitId, - // houseId: this.houseId, - orgType: this.orgType, - orgId: this.orgId, + neighborHoodId: this.neighborHoodId, + buildingId: this.buildingId, + buildingUnitId: this.buildingUnitId, + houseId: this.houseId, }; const url = "/gov/org/house/houselist"; @@ -958,14 +960,6 @@ export default { type: String, default: "", }, - orgType: { - type: String, - default: "", - }, - orgId: { - type: String, - default: "", - }, }, }; diff --git a/src/views/modules/base/communityYantai/buildDetail.vue b/src/views/modules/base/communityYantai/buildDetail.vue new file mode 100644 index 000000000..5fcec1356 --- /dev/null +++ b/src/views/modules/base/communityYantai/buildDetail.vue @@ -0,0 +1,271 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/base/communityYantai/buildForm.vue b/src/views/modules/base/communityYantai/buildForm.vue new file mode 100644 index 000000000..271d1b91a --- /dev/null +++ b/src/views/modules/base/communityYantai/buildForm.vue @@ -0,0 +1,492 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/base/communityYantai/buildTable.vue b/src/views/modules/base/communityYantai/buildTable.vue new file mode 100644 index 000000000..b28c2bd9a --- /dev/null +++ b/src/views/modules/base/communityYantai/buildTable.vue @@ -0,0 +1,886 @@ + + + + diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue new file mode 100644 index 000000000..250bf2de0 --- /dev/null +++ b/src/views/modules/base/communityYantai/community.vue @@ -0,0 +1,721 @@ + + + + + + + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityDetail.vue b/src/views/modules/base/communityYantai/communityDetail.vue new file mode 100644 index 000000000..f08478197 --- /dev/null +++ b/src/views/modules/base/communityYantai/communityDetail.vue @@ -0,0 +1,263 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityForm.vue b/src/views/modules/base/communityYantai/communityForm.vue new file mode 100644 index 000000000..3b329ca7d --- /dev/null +++ b/src/views/modules/base/communityYantai/communityForm.vue @@ -0,0 +1,576 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityTable.vue b/src/views/modules/base/communityYantai/communityTable.vue new file mode 100644 index 000000000..b7e916e4c --- /dev/null +++ b/src/views/modules/base/communityYantai/communityTable.vue @@ -0,0 +1,1050 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/roomDetail.vue b/src/views/modules/base/communityYantai/roomDetail.vue new file mode 100644 index 000000000..f1b066107 --- /dev/null +++ b/src/views/modules/base/communityYantai/roomDetail.vue @@ -0,0 +1,303 @@ + + + + diff --git a/src/views/modules/base/communityYantai/roomForm.vue b/src/views/modules/base/communityYantai/roomForm.vue new file mode 100644 index 000000000..496095faa --- /dev/null +++ b/src/views/modules/base/communityYantai/roomForm.vue @@ -0,0 +1,473 @@ + + + + diff --git a/src/views/modules/base/communityYantai/roomTable.vue b/src/views/modules/base/communityYantai/roomTable.vue new file mode 100644 index 000000000..a03e289c7 --- /dev/null +++ b/src/views/modules/base/communityYantai/roomTable.vue @@ -0,0 +1,987 @@ + + + + From d14528b9e1c13c20c30fde970f4b0d92201d6c7a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 10 Jan 2023 10:37:19 +0800 Subject: [PATCH 25/31] 11 --- src/views/modules/base/communityYantai/community.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue index 250bf2de0..aa8a2889b 100644 --- a/src/views/modules/base/communityYantai/community.vue +++ b/src/views/modules/base/communityYantai/community.vue @@ -228,7 +228,8 @@ export default { openNodes: [], defaultProps: { children: 'children', - label: 'showName' + label: 'showName', + isLeaf: 'isLeaf' }, orgOptions: [], orgOptionProps: { @@ -371,6 +372,12 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { + data.forEach(element => { + if (element.level === 'building') { + element.isLeaf = true + } + }); + console.log(data) resolve(data) } else { From 5260ec8123f769bc1fb5e46854d30a77a5ff95bc Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 11 Jan 2023 14:18:53 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/index.vue | 9 ++ src/views/modules/renFangTongJi/index.vue | 170 +++++++++++----------- 2 files changed, 90 insertions(+), 89 deletions(-) diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 685e21816..7e66c198d 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -123,6 +123,7 @@
-
+
{{ item.num }}
{{ item.name }}
-
+

下级平台使用进度汇总

- - - + + + - + - - - - - - - + + + + + + +
- - + + @@ -115,10 +94,12 @@ import shequtongji from "./cpts/shequtongji"; export default { name: "renFangTongJi", components: { shequtongji }, - data() { + data () { return { displayedDetail: false, tableData: [], + tableLoading: false, + loadInfo: '', orgId: "", orgType: "", @@ -185,35 +166,35 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 420; }, ...mapGetters(["clientHeight"]), }, watch: { - orgId() { + orgId () { this.getTableData(); }, }, - mounted() { + mounted () { this.getCommunityData(); this.getResiData(); this.getHouseData(); this.getTableData(); }, methods: { - handleClickCard(item) { + handleClickCard (item) { if (item.name == "开通平台社区数") { this.showDetail(); } }, - async showDetail(orgId = "") { + async showDetail (orgId = "") { this.displayedDetail = true; this.detailOrgId = orgId; }, - async getCommunityData() { + async getCommunityData () { const url = "/gov/org/agency/usingCommunityStats"; const { data, code, msg } = await requestPost(url, { @@ -230,7 +211,7 @@ export default { } }, - async getResiData() { + async getResiData () { const url = "/epmetuser/icresiuser/userchart"; const { data, code, msg } = await requestPost(url, { @@ -257,7 +238,7 @@ export default { } }, - async getHouseData() { + async getHouseData () { const url = "/gov/org/house/housechart"; const { data, code, msg } = await requestPost(url, { @@ -286,7 +267,9 @@ export default { } }, - async getTableData() { + async getTableData () { + this.loadInfo = '数据加载中' + this.tableLoading = true const url = "/gov/org/house/subuserhouselist"; const { data, code, msg } = await requestPost(url, { @@ -297,9 +280,17 @@ export default { if (code === 0) { this.tableData = data ? data.map((item) => { - return item; - }) + return item; + }) : []; + + if (this.tableData.length === 0) { + this.loadInfo = '暂无数据' + } else { + this.loadInfo = '' + + } + } }, }, @@ -318,6 +309,7 @@ export default { .item { display: flex; + justify-content: center; width: 24%; margin-top: 15px; // margin-right: 1%; From 56b051aa70d3ba81eea2715660afba2ac28d845f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 11 Jan 2023 15:02:58 +0800 Subject: [PATCH 27/31] 111 --- src/views/modules/base/epidemic/antiInfo.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index f3da2d964..166dd41b8 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -293,6 +293,7 @@ :close-on-press-escape="false" :title="formTitle" width="1150px" + :z-index="1000" top="5vh" class="dialog-h" @closed="handleCnalceForm"> @@ -879,7 +880,7 @@ export default { let params = { id } - + this.$message.error('111') const { data, code, msg } = await requestPost(url, params) if (code === 0) { From affd6ba55d956b3ee2a5d92683e8277808e57769 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 11 Jan 2023 17:58:34 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E8=BD=AC=E6=9C=8D=E5=8A=A1=E7=9A=84?= =?UTF-8?q?=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/cpts/process-form-demand.vue | 661 +++++++++--------- 1 file changed, 312 insertions(+), 349 deletions(-) diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 77c0193f0..df5912b9c 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -1,10 +1,12 @@ - - - - \ No newline at end of file + diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index df5912b9c..f5a0c1bce 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -607,34 +607,6 @@ export default { } }, - convert(lat, lng) { - markers.setGeometries([]); - // var input = document.getElementById('location').value.split(','); - let location; - if (lat && lng) { - location = new TMap.LatLng(lat, lng); - } else { - location = new TMap.LatLng( - this.formData.latitude, - this.formData.longitude - ); - } - - // map.setCenter(location); - markers.updateGeometries([ - { - id: "main", // 点标注数据数组 - position: location, - }, - ]); - geocoder - .getAddress({ location: location }) // 将给定的坐标位置转换为地址 - .then((result) => { - this.formData.serviceLocation = result.result.address; - // 显示搜索到的地址 - }); - }, - // 开启加载动画 startLoading() { loading = Loading.service({ From 6d06a086c2f0f439ad720d35441ecc6062c4b901 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 13 Jan 2023 09:30:46 +0800 Subject: [PATCH 30/31] 11 --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 166dd41b8..b9d79224e 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -293,7 +293,7 @@ :close-on-press-escape="false" :title="formTitle" width="1150px" - :z-index="1000" + :z-index="2000" top="5vh" class="dialog-h" @closed="handleCnalceForm"> From dca2761304b72c363d43492103efa7c58684462b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 13 Jan 2023 09:32:16 +0800 Subject: [PATCH 31/31] 11 --- src/views/modules/base/epidemic/antiInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index b9d79224e..3dcf9377a 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -880,7 +880,7 @@ export default { let params = { id } - this.$message.error('111') + // this.$message.error('111') const { data, code, msg } = await requestPost(url, params) if (code === 0) {