From ebf73f051978a04e91b9d5db91c8767381a4a047 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 29 Apr 2022 16:14:26 +0800 Subject: [PATCH 1/7] dd --- src/views/modules/base/resi.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index a7375532..6aa78cf9 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -17,6 +17,7 @@ ref="resiSearch" :form-list="searchList[0].queryItemList" :column-name="defaultCategotyKey" + :show-grid="true" :is-arrow="true" @search="handleSearch" /> From 12120a62c866cce813261e7ed4e00a555c5f2637 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 5 May 2022 10:40:29 +0800 Subject: [PATCH 2/7] dd --- src/views/modules/base/resi.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 6aa78cf9..19db9ea3 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -60,14 +60,14 @@ :loading="importLoading">{{importBtnTitle}} - {{exportBtnTitle}} + @click="handleExport">{{exportBtnTitle}} --> 自定义导出 + @click="diyExport">导出 Date: Thu, 5 May 2022 10:51:58 +0800 Subject: [PATCH 3/7] =?UTF-8?q?13=E9=9C=80=E6=B1=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/houseStatic.scss | 20 +++++--- .../modules/base/community/buildTable.vue | 50 +++++++++++++++++++ .../basicinfo/houseStatic/houseStatic.vue | 23 ++++++--- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss index 665448d5..339245a0 100644 --- a/src/assets/scss/modules/visual/houseStatic.scss +++ b/src/assets/scss/modules/visual/houseStatic.scss @@ -164,17 +164,19 @@ display: flex; justify-content: flex-start; margin-top: 30px; + .cz-tip-dot { - margin-top:2px; - width: 20px; - height: 10px; + margin-top:1px; + width: 18px; + height: 8px; background: #ff7800; border-radius: 4px; } >span{ margin-left:10px; + font-size: 10px; } } @@ -184,14 +186,15 @@ margin-top: 30px; .ld-tip-dot{ - margin-top:2px; - width: 20px; - height: 10px; + margin-top:1px; + width: 18px; + height: 8px; background: #00E5ED; border-radius: 4px; } >span{ margin-left:10px; + font-size: 10px; } } @@ -269,6 +272,11 @@ } } + .table_item:hover{ + background: url('../../../img/modules/visual/hover-bac.png') no-repeat + center; + background-size: 100% 100%; + } .item_dark{ background: #082586; diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 43afa3df..eb376ac9 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -59,6 +59,7 @@ :data="tableData" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" border + @sort-change="handleSortChange" :height="tableHeight" v-loading="tableLoading" style="width: 100%" @@ -106,6 +107,24 @@ + + + { + item.isChange = false if (item.agencyId === this.staffAgencyId) { item.showBtn = true this.validTableDataNum++ @@ -649,4 +686,17 @@ export default { diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue index f6437d36..944306dc 100644 --- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue +++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue @@ -281,21 +281,25 @@ export default { }; }, async mounted () { - this.dataLoading = true + await this.getApiData() - this.dataLoading = false + }, methods: { async getApiData () { + this.dataLoading = true this.housePieInitState = false this.userPieInitState = false this.getHousechart() this.getUserchart() - this.getSubuserhouselist() this.getHousePie() this.getUserPie() + + await this.getSubuserhouselist() + this.dataLoading = false + }, housePieInitOk (dom) { console.log('pie准备好了', dom) @@ -310,7 +314,6 @@ export default { }, - async getHousechart (node, resolve) { if (this.$refs.housePieChart) { this.$refs.housePieChart.showLoading() @@ -567,16 +570,19 @@ export default { // this.getTable() }, - handleToSubAgency (item) { + async handleToSubAgency (item) { + if (!this.dataLoading) { + this.toSubAgency(item) + + await this.getApiData() + } - this.toSubAgency(item) - this.getApiData() }, - //下钻到下一级 type点击的类型:polygon 点击多边形(分为点击组织/小区) people 点击详情 + //下钻到下一级 async toSubAgency (item) { this.runNum++ @@ -586,6 +592,7 @@ export default { orgName: this.orgName, } + this.runAgencyArray.push(obj) this.orgId = item.orgId From e54efaf5e635036cb18454f6662b28f66d2ea2d2 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 6 May 2022 09:34:47 +0800 Subject: [PATCH 4/7] dd --- src/views/modules/base/resi.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 19db9ea3..8c552f2c 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -3,7 +3,10 @@ + :name="item.itemGroupId"> + Date: Fri, 6 May 2022 09:51:31 +0800 Subject: [PATCH 5/7] dd --- .../modules/visual/basicinfo/peopleList.vue | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue index 1438a50d..abad7f68 100644 --- a/src/views/modules/visual/basicinfo/peopleList.vue +++ b/src/views/modules/visual/basicinfo/peopleList.vue @@ -10,7 +10,7 @@ -
+
@@ -115,6 +115,7 @@ export default { pageNo: 1, total: 0, orgLevel: 'search', + orgId: '', selUserId: '', //下钻层级记录 runNum: 0, @@ -128,11 +129,18 @@ export default { this.searchName = '' this.tableData = [] const { columnName, label, id, level } = this.$route.query + this.orgLevel = level + this.orgId = id this.searchName = columnName this.tableTitle = label this.loadList(id, level) }, + deactivated() { + this.orgLevel = '' + this.orgId = '' + this.pageNo = 1 + }, beforeRouteEnter(to, from, next) { const arr = [ {...from }, { ...to, meta: { title: '人员列表'}}] next((vm) =>{ @@ -176,24 +184,9 @@ export default { pageCurrentChangeHandle (val) { this.pageNo = val - this.loadList() + this.loadList(this.orgId, this.orgLevel) }, - //下钻到下一级 type点击的类型:polygon 点击多边形(分为点击组织/小区) people 点击详情 - async toSubAgency (type, userId) { - - - this.orgLevel = 'people' - this.selUserId = userId - - - }, - - //返回所选组织 - handleClickBack () { - this.orgLevel = 'search' - - }, }, destroyed () { From 31f0b1fdda053098635937783a5ba8b9243b7bbe Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 6 May 2022 13:33:55 +0800 Subject: [PATCH 6/7] 111 --- .../modules/base/community/buildTable.vue | 52 +++++++++--- .../modules/base/community/roomTable.vue | 85 +++++++++++++++++++ 2 files changed, 127 insertions(+), 10 deletions(-) diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index eb376ac9..99a435b3 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -59,7 +59,7 @@ :data="tableData" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" border - @sort-change="handleSortChange" + @sort-change="handleSortOrderChange" :height="tableHeight" v-loading="tableLoading" style="width: 100%" @@ -85,7 +85,7 @@ + min-width="110">