@@ -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">
{{scope.row.sort}}
@@ -199,6 +200,7 @@ export default {
total: 0,
pageSize: 20,
pageNo: 0,
+ sortType: 'asc',//asc:正,desc:倒
tableLoading: true,
tableData: [],
@@ -231,9 +233,15 @@ export default {
},
methods: {
- handleSortChange () {
+ handleSortOrderChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
},
+ // handleChangeSort(row){
+
+ // },
handleEditSort (row) {
if (!row.isChange) {
@@ -242,10 +250,32 @@ export default {
},
- onInputBlur (row) {
- row.isChange = false
+ async handleChangeSort (row, index) {
+ // row.isChange = false
console.log(row.sort)
+ let params = {
+ id: row.buildingId,
+ sort: row.sort,
+ type: 'building',
+ }
+
+ let url = '/gov/org/house/update-sort'
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '操作成功'
+ })
+
+
+ } else {
+
+ this.$message.error(msg)
+ }
+
},
@@ -262,6 +292,7 @@ export default {
async loadTable (fromTree, treeObj) {
this.tableLoading = true
if (fromTree) {
+ this.sortType = 'asc'
this.agencyObj = treeObj
@@ -278,7 +309,7 @@ export default {
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
-
+ sortType: this.sortType,
neighborHoodId: this.agencyObj.id
}
@@ -288,6 +319,7 @@ export default {
this.validTableDataNum = 0
this.total = data.total
data.list.forEach(item => {
+ item.sort = item.sort.toFixed(2)
item.isChange = false
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
@@ -688,7 +720,7 @@ export default {
@import "@/assets/scss/modules/visual/communityManage.scss";
.item_width_4 {
- width: 100px;
+ width: 120px;
}
/deep/.el-input-number--medium .el-input-number__decrease,
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 3b771eca..bb1b835e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -42,6 +42,7 @@
:data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
v-loading="tableLoading"
+ @sort-change="handleSortOrderChange"
border
:height="tableHeight"
style="width: 100%"
@@ -51,6 +52,26 @@
:selectable="checkSelect"
width="55">
+
+
+
+ {{scope.row.sort}}
+
+
+
+
+
@@ -168,6 +189,7 @@ export default {
total: 0,
pageSize: 20,
pageNo: 0,
+ sortType: 'asc',//asc:正,desc:倒
tableLoading: true,
// showImportBtn: false,//是否显示操作按钮,根据登录人所属组织判断
@@ -220,7 +242,53 @@ export default {
...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
+ handleSortOrderChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
+
+ },
+ handleSortChange (value) {
+ console.log(value.column, value.prop, value.order)
+ this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+ this.loadTable()
+
+ },
+
+ handleEditSort (row) {
+ if (!row.isChange) {
+ row.isChange = true
+ }
+
+ },
+
+ async handleChangeSort (row, index) {
+ // row.isChange = false
+ console.log(row.sort)
+ let params = {
+ id: row.houseId,
+ sort: row.sort,
+ type: 'house',
+ }
+ let url = '/gov/org/house/update-sort'
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.$message({
+ type: 'success',
+ message: '操作成功'
+ })
+
+
+ } else {
+
+ this.$message.error(msg)
+ }
+
+
+ },
checkSelect (row, index) {
let isChecked = false;
@@ -242,6 +310,7 @@ export default {
this.tableLoading = true
if (source === 'tree') {//来源于tree,查询数据清空
+ this.sortType = 'asc'
this.agencyObj = treeObj
this.ownerName = null
this.ownerPhone = null
@@ -265,6 +334,7 @@ export default {
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag,
+ sortType: this.sortType,
}
const url = "/gov/org/house/houselist"
@@ -275,6 +345,8 @@ export default {
this.total = data.total
this.validTableDataNum = 0
data.list.forEach(item => {
+ item.sort = item.sort.toFixed(2)
+ item.isChange = false
item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
if (item.agencyId === this.staffAgencyId) {
@@ -650,4 +722,17 @@ export default {
From 015c46632b9a593dca9cc7939de04e48e7bc3902 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Fri, 6 May 2022 13:53:54 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=87=E5=AD=97?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/visual/basicInfoMain copy.scss | 499 ------------------
.../scss/modules/visual/basicInfoMain.scss | 2 +-
.../visual/basicinfo/basicInfoCommunity.vue | 2 +
3 files changed, 3 insertions(+), 500 deletions(-)
delete mode 100644 src/assets/scss/modules/visual/basicInfoMain copy.scss
diff --git a/src/assets/scss/modules/visual/basicInfoMain copy.scss b/src/assets/scss/modules/visual/basicInfoMain copy.scss
deleted file mode 100644
index 938856f4..00000000
--- a/src/assets/scss/modules/visual/basicInfoMain copy.scss
+++ /dev/null
@@ -1,499 +0,0 @@
-.div_top {
- margin-left: 10px;
- height: 35px;
- .router_line {
- width: 212px;
- height: 1px;
- border: 1px solid #ffffff;
- opacity: 0.09;
- /* opacity: 0.09; */
- }
- .div_router {
- margin-top: 5px;
- font-size: 16px;
-
- .router_parents {
- color: #a0c3d9;
-
- .arrow {
- padding: 0 5px;
- }
- }
- .router_parents:hover {
- cursor: pointer;
- }
-
- .router_child {
- color: #ffffff;
- }
- }
-}
-
-.div_content {
- display: flex;
-
- .div_map {
- box-sizing: border-box;
- width: 100%;
- // padding: 10px 5px 13px;
- // margin-top: 8px;
- height: calc(88vh - 15px);
- color: #fff;
- // background: url('../../../img/modules/visual/warning-box.png') no-repeat
- // center;
- // background-size: 100% 100%;
- }
-
- .div_data {
- flex: 0 0 562px;
- margin-left: 12px;
-
- .div_search {
- width: 100%;
- height: 56px;
- text-align: center;
- background-color: #011168;
- border-radius: 4px 0 0 4px;
- border: none;
- box-shadow: 0 0 10px inset #1a5afd;
- font-size: 18px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
- opacity: 0.7;
- display: flex;
- justify-content: space-between;
- .div_search_left {
- display: flex;
- justify-content: flex-start;
- .icon {
- display: flex;
- align-items: center;
- margin-left: 29px;
-
- > img {
- width: 24px;
- height: 24px;
- }
- }
-
- > span {
- line-height: 56px;
- margin-left: 10px;
- }
- }
-
- .btn {
- text-align: center;
- flex: 0 0 113px;
- height: 56px;
- background: linear-gradient(90deg, #1a5afd, #26c4ff);
- font-size: 20px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
- line-height: 56px;
- border-radius: 0 4px 4px 0;
- }
- }
-
- .div_search:hover {
- cursor: pointer;
- }
-
- .div_info {
- box-sizing: border-box;
- width: 100%;
- margin-top: 21px;
- height: calc(88vh - 87px);
- color: #fff;
- background: url('../../../img/modules/visual/warning-box.png') no-repeat
- center;
- background-size: 100% 100%;
- // padding: 45px 21px 35px 24px;
-
- .info_loading {
- margin-top: 50px;
- }
- .info_tip {
- padding: 31px 0 0 19px;
- display: flex;
- > img {
- height: 34px;
- width: 46px;
- }
-
- .tip_title {
- line-height: 34px;
- margin-left: 7px;
- font-size: 22px;
- font-family: PingFang SC;
- font-weight: 800;
- color: #ffffff;
- }
- }
-
- .info_list {
- margin-top: 9px;
-
- .item {
- .item_line {
- margin-top: 13px;
- margin-left: 24px;
- width: 517px;
- height: 0px;
- border: 1px dotted #1797ff31;
- border-width: 0.5px;
- }
- .last_line {
- border: 1px dotted #1797ff00;
- }
- .list_item {
- display: flex;
- padding: 18px 59px 0;
- justify-content: space-between;
-
- .list_item_col {
- flex: 0 0 240px;
- display: flex;
-
- > img {
- height: 76px;
- width: 76px;
- }
-
- .item_content {
- margin-left: 10px;
- height: 76px;
- display: flex;
- flex-direction: column;
- justify-content: center;
-
- .item_label {
- font-size: 18px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
- }
- .item_count {
- margin-top: 10px;
- font-size: 28px;
- font-family: PingFang SC;
- font-weight: bold;
- color: #00fffc;
- }
- }
- }
- }
-
- ::v-deep .el-popper {
- padding: 0px;
- }
- //
- }
- }
- }
-
- .div_info {
- /deep/ .el-scrollbar__wrap {
- overflow-x: hidden !important;
- }
- }
- }
-}
-
-.div_community_info {
- box-sizing: border-box;
- flex: 0 0 calc(100vw - 620px);
- // width: calc(100vw - 560px);
-
- height: calc(88vh - 10px);
- color: #fff;
- background: url('../../../img/modules/visual/warning-box.png') no-repeat
- center;
- background-size: 100% 100%;
-
- .div_select {
- margin-top: 28px;
- margin-left: 24px;
- display: flex;
- .customer_select {
- display: flex;
- justify-content: flex-start;
-
- > span {
- width: auto;
- font-size: 22px;
- font-family: PingFang SC;
- font-weight: 800;
- color: #ffffff;
- line-height: 34px;
- }
- }
- > img {
- height: 34px;
- width: 46px;
- }
-
- .tip_title {
- line-height: 34px;
- margin-left: 12px;
- font-size: 22px;
- font-family: PingFang SC;
- font-weight: 800;
- color: #ffffff;
- }
- }
-
- .div_room_bar {
- box-sizing: border-box;
-
- margin-top: 9px;
- height: calc(88vh - 120px);
- }
-
- .div_room {
- // height: calc(88vh - 40px);
- // margin-top: 9px;
- display: flex;
- flex-wrap: wrap;
- justify-content: flex-start;
- margin: 0 21px 0 21px;
-
- .item:hover {
- cursor: pointer;
- }
- .item_sel {
- box-shadow: 0 0 10px inset #1a5afd;
- }
- .item {
- background-color: #011168;
- margin-top: 12px;
- width: 244px;
- height: 190px;
- border: 1px solid #037ddc;
- border-radius: 8px;
- text-align: center;
- margin-left: 11px;
- position: relative;
-
- // &:first-child {
- // margin-left: 0;
- // }
-
- .housename {
- margin-top: 70px;
- font-size: 24px;
- font-family: PingFang SC;
- font-weight: 500;
- color: #ffffff;
- // line-height: 180px;
- }
-
- .icon_party {
- position: absolute;
- top: 13px;
- left: 18px;
- }
-
- .icon_category {
- position: absolute;
- bottom: 14px;
- left: 9px;
- // margin-left: 7px;
-
- > img {
- margin-left: 5px;
- width: 21px;
- height: 20px;
- }
- }
- .div_user:hover {
- cursor: pointer;
- }
-
- .div_user {
- position: absolute;
- bottom: 10px;
- right: 11px;
- width: 88px;
- height: 30px;
- background: #073082;
- border-radius: 15px;
-
- > img {
- width: 10px;
- height: 6px;
- margin-left: 4px;
- }
-
- > span {
- font-size: 14px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
- line-height: 30px;
- }
- }
- }
- }
-
- .div_room::after {
- content: '';
- flex: 1;
- }
-}
-
-.user_list {
- position: relative;
- z-index: 10;
-
- background: #020340;
- border: 1px solid #0a359b;
- border-radius: 4px;
- box-shadow: 0 0 10px inset #1a5afd;
-
- .user_item {
- padding: 13px 8px 0 14px;
- font-size: 16px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
-
- .user_item_content {
- display: flex;
- // justify-content: space-between;
- align-items: center;
-
- .name {
- max-width: 80%;
- text-align: left;
- }
-
- > img {
- margin-left: auto;
-
- margin-top: 4px;
- width: 8px;
- height: 12px;
- }
- }
-
- .item_line {
- margin-top: 9px;
- width: 70px;
- height: 0px;
- border: 1px dotted #1797ff31;
- border-width: 0.5px;
- }
- .last_line {
- border: 1px dotted #1797ff00;
- }
- }
-}
-.div_agency_tran {
- transition: width 2s ease-out, opacity 1s ease-in, visibility 1s ease-in;
- width: 0;
- height: 470px;
- z-index: 1000;
- position: absolute;
- top: 50px;
- right: 600px;
- box-sizing: border-box;
- display: flex;
- justify-content: center;
- align-items: center;
-
- .div_agency_list {
- width: 320px;
- height: 470px;
- color: #fff;
- background: url('../../../img/modules/visual/box-2.png') no-repeat center;
- background-size: 100% 100%;
- padding: 45px 20px 35px 20px;
-
- .agency_main {
- height: 100%;
- position: relative;
- }
-
- .agency_main {
- /deep/ .el-scrollbar__wrap {
- overflow-x: hidden !important;
- }
- }
-
- .no-data-img {
- text-align: center;
- margin-top: 50px;
- margin-left: 15px;
- }
- .agency_list {
- .agency_item {
- // height: 60px;
- padding: 15px 0;
- font-size: 17px;
- font-family: PingFang SC;
- font-weight: 400;
- color: #ffffff;
- // line-height: 50px;
- padding-left: 12px;
- display: flex;
- flex-direction: row;
- align-items: center;
- // padding-top: 15px;
-
- .agency_item_name {
- // line-height: 20px;
- }
- }
-
- .agency_item_on {
- background: #08216c;
- border-radius: 2px;
- }
-
- .agency_item:hover {
- cursor: pointer;
- background-color: #011168;
- border-radius: 4px 0 0 4px;
- border: none;
- box-shadow: 0 0 10px inset #1a5afd;
- border-radius: 2px;
- }
- }
- }
-
- .arrow_tip {
- margin-right: -2px;
- > img {
- width: 21px;
- height: 176px;
- }
- }
- .arrow_tip:hover {
- cursor: pointer;
- }
-}
-
-.div_agency_tran-fade-in {
- width: 341px;
- opacity: 1;
- visibility: 1;
-}
-.div_agency_tran-fade-out {
- visibility: 0;
- opacity: 1;
- width: 0;
- right: 575px;
-}
-// .div_agency_list-fade-in {
-// width: 341px;
-// opacity: 1;
-// visibility: 1;
-// }
-// .div_agency_list-fade-out {
-// visibility: 0;
-// opacity: 0;
-// width: 0;
-// }
diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index d3817619..819f2df3 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -324,7 +324,7 @@
height: 20px;
}
.icon_name{
-
+ text-align: center;
display: flex;
justify-content: center;
}
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 3f8e1b79..12bcfd1f 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -37,6 +37,7 @@
:key="index"
:class="['item',{'item_sel':selHouseIndex==index}]"
@click="handleClickRoom(index)">
+
{{item.houseName}}
@@ -557,5 +558,6 @@ export default {
margin-top: 5px !important;
padding: 3px !important;
background-color: rgb(247, 250, 253);
+ text-align: center;
}