diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss index aac6c66a2..b18adc627 100644 --- a/src/assets/scss/modules/visual/people.scss +++ b/src/assets/scss/modules/visual/people.scss @@ -1,6 +1,6 @@ -@import '../../c/config'; -@import '../../c/function'; -@import './c/common'; +@import "../../c/config"; +@import "../../c/function"; +@import "./c/common"; .g-cpt { display: flex; @@ -227,13 +227,13 @@ font-weight: 400; color: #ffffff; line-height: 24px; - margin: 20px 0; + margin: 15px 0; &::before { position: absolute; left: 0; top: 9px; - content: ''; + content: ""; display: block; width: 7px; height: 7px; @@ -264,7 +264,7 @@ .tab { margin: 0 5px; - min-width: 76px; + min-width: 80px; padding: 0 10px; height: 36px; background: rgba(255, 255, 255, 0); @@ -272,7 +272,7 @@ box-shadow: 0 0 10px 0 inset #1257c9; border-radius: 2px; text-align: center; - font-size: 18px; + font-size: 17px; font-family: PingFang SC; font-weight: 400; color: #ffffff; @@ -548,7 +548,7 @@ &:hover { &::before { - content: ''; + content: ""; position: absolute; display: block; left: 0; @@ -560,7 +560,7 @@ } &::after { - content: ''; + content: ""; position: absolute; display: block; left: 15px; diff --git a/src/assets/scss/pages/loginWork.scss b/src/assets/scss/pages/loginWork.scss index ad12fc67b..534cccba9 100644 --- a/src/assets/scss/pages/loginWork.scss +++ b/src/assets/scss/pages/loginWork.scss @@ -166,29 +166,30 @@ } } -.div_row { - height: 50px; - text-align: center; - line-height: 50px; - - /* width: 100px; */ - /* background-color: rgb(241, 241, 241); */ +.m-pop { + height: auto; + + .div_row { + height: 50px; + text-align: center; + line-height: 50px; - &:hover { - color: rgb(2, 119, 173); - font-weight: bold; - text-decoration: underline; - } + &:hover { + color: rgb(2, 119, 173); + font-weight: bold; + text-decoration: underline; + } - .i_icon { - width: 15px; - height: 15px; - margin-right: 10px; - float: left; - } - .span_name { - font-size: 18px; - cursor: pointer; - /* color: rgb(37, 156, 235); */ + .i_icon { + width: 15px; + height: 15px; + margin-right: 10px; + float: left; + } + .span_name { + font-size: 18px; + cursor: pointer; + /* color: rgb(37, 156, 235); */ + } } } diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index c2c80ef6b..12bfae150 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -64,7 +64,7 @@ font-weight: 400; color: #333; line-height: 24px; - margin: 20px 0; + margin: 15px 0; &::before { position: absolute; @@ -94,14 +94,18 @@ padding-left: 20px; .tab-btn { + margin: 0 5px; width: 30px; text-align: center; cursor: pointer; + padding: 10px 0; + border-radius: 3px; + background-color: rgba(#000, 0.3); } .tab { margin: 0 5px; - min-width: 76px; + min-width: 80px; padding: 0 10px; height: 36px; background: #fff; @@ -109,7 +113,7 @@ box-shadow: 0 0 10px 0 inset #ddd; border-radius: 2px; text-align: center; - font-size: 18px; + font-size: 17px; font-family: PingFang SC; font-weight: 400; color: #333; diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index eb57496aa..8459e87c5 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -803,7 +803,7 @@ export default { } } .resi-cell-value .resi-cell-input { - max-width: 180px; + max-width: 190px; } @@ -841,7 +841,7 @@ export default { } } .resi-cell-select { - width: 180px; + width: 190px; box-sizing: border-box; margin-right: 10px; &-middle { diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index a6a4df460..9ebcf9c7c 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -759,7 +759,7 @@ export default { } } .resi-cell-value .resi-cell-input { - max-width: 180px; + max-width: 190px; } .resi-cell-value { :deep .el-col { @@ -787,7 +787,7 @@ export default { } } .resi-cell-select { - width: 180px; + width: 190px; box-sizing: border-box; margin-right: 10px; &-middle { diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 41b029a93..979d2997c 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -259,6 +259,10 @@ @closed="diaClose"> + @@ -272,6 +276,7 @@ import axios from 'axios' import { mapGetters } from 'vuex' import resiTransfer from '../../components/resiTransfer.vue' import resiChangeRecord from '../../components/resiChangeRecord.vue' +import peopleMore from "@/views/modules/shequ/cpts/people-more"; export default { components: { @@ -279,7 +284,8 @@ export default { resiForm, editResi, resiTransfer, - resiChangeRecord + resiChangeRecord, + peopleMore }, data () { return { @@ -297,6 +303,8 @@ export default { isIndeterminate: false, dialogEditVisible: false, dialogVisible: false, + // 显示人员详情 + showedPeopleMoreInfo: false, uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel', currentPage: 1, pageSize: 20, @@ -324,6 +332,10 @@ export default { tranferShow: false, changeRecordShow: false, + lookInfo: { + userId: '', + gridName: '' + } } }, props: { @@ -497,7 +509,7 @@ export default { item.options.forEach((n) => { if (n.value === row[item.columnName]) _val = n.label }) - if (row[item.columnName] == '0') _val = '--' + if (row[item.columnName] == '0') return _val = '' } return _val || row[item.columnName] @@ -696,10 +708,18 @@ export default { console.log(tab, event) }, async handleLook (row) { - this.disabled = true - this.editAgencyId = row.ORG_ID - await this.getFormList('edit') - this.getrowInfo(row.icResiUserId) + this.lookInfo.userId = row.icResiUserId + this.lookInfo.gridName = row.GRID_ID + this.showedPeopleMoreInfo = true; + // this.disabled = true + // this.editAgencyId = row.ORG_ID + // await this.getFormList('edit') + // this.getrowInfo(row.icResiUserId) + }, + handleCancleLook() { + this.lookInfo.userId = '' + this.lookInfo.gridName = '' + this.showedPeopleMoreInfo = false; }, async handleEdit (row) { this.disabled = false diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index c2d9a6d10..00f8f9158 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -23,7 +23,7 @@ {{ xiaoquName }}
- 所属楼宇： + 所属楼栋： {{ louName }}-{{ danyuanName }}
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index b5a1ca9a7..bd8bb9f04 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -27,7 +27,7 @@
- 所属楼宇： + 所属楼栋： {{ louName }}-{{ danyuanName }}
- - - - diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index dc3e71118..099b694e7 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -1,55 +1,58 @@