diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index ed8deba3..ecc3d638 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -1,3 +1,6 @@ +@import "../../c/config"; +@import "../../c/function"; +@import "./c/common"; .div_top { margin-left: 10px; height: 35px; @@ -296,6 +299,15 @@ top: 13px; left: 18px; } + .icon_roomstate { + position: absolute; + top: 16px; + right: 16px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + } .icon_category { position: absolute; @@ -312,9 +324,9 @@ height: 20px; } .icon_name{ - text-align: center; - margin:5px; - font-size: 16px; + + display: flex; + justify-content: center; } } @@ -365,11 +377,12 @@ box-shadow: 0 0 10px inset #1a5afd; .user_item { - padding: 13px 8px 0 14px; - font-size: 16px; + padding: 9px 8px 0 12px; + font-size: 14px; font-family: PingFang SC; font-weight: 400; color: #ffffff; + line-height: 10px; .user_item_content { display: flex; @@ -498,3 +511,74 @@ cursor: pointer; } } + +.m-room-pop { + @include shield; + background-color: rgba(#000, 0.9); + overflow-y: auto; + + .wrap { + position: relative; + margin: 120px auto; + width: 680px; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .btn-close { + position: absolute; + top: -15px; + right: -15px; + cursor: pointer; + } + + .list { + // display: flex; + // flex-wrap: wrap; + padding: 5px 60px 5px 30px; + + .item { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 100%; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + margin: 15px 0; + + &::before { + position: absolute; + left: 0; + top: 9px; + content: ""; + display: block; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; + } + } + } + + + } +} diff --git a/src/assets/scss/modules/visual/personCategory.scss b/src/assets/scss/modules/visual/personCategory.scss index 4c578bcd..39c6e7af 100644 --- a/src/assets/scss/modules/visual/personCategory.scss +++ b/src/assets/scss/modules/visual/personCategory.scss @@ -8,7 +8,14 @@ color: #fff; // background: url("../../../img/modules/visual/warning-box.png") no-repeat center; background-size: 100% 100%; - padding: 45px 21px 35px 24px; + padding: 15px 21px 15px 24px; + + + + /deep/ .el-scrollbar__wrap { + margin-right:-17px !important + } + &-top { display: flex; @@ -152,7 +159,7 @@ &-bottom { box-sizing: border-box; width: 100%; - height: calc(100% - 300px); + height: calc(100vh - 535px); min-height: 300px; margin-top: 60px; } diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index ecf63da5..7cd5384b 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -43,18 +43,21 @@ + +
+
出租
+
+
-
{{iconItem.name}}
- @@ -99,33 +102,6 @@
- - -
@@ -137,6 +113,11 @@ class="no-data-img" /> + + @@ -147,6 +128,7 @@ import { Loading } from 'element-ui'; //引入Loading服务 import { requestPost } from "@/js/dai/request"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; import nextTick from "dai-js/tools/nextTick"; +import roomInfo from "@/views/modules/visual/basicinfo/cpts/roomInfo"; let loading;//加载动画 @@ -166,6 +148,7 @@ export default { selHouseId: '', selHouseName: '', selHouseIndex: 0, + showHouseInfo: false, userArray: [], selUserName: '', @@ -179,6 +162,9 @@ export default { runNum: 0, runAgencyArray: [], + + + } }, async mounted () { @@ -219,6 +205,8 @@ export default { this.selHouseId = this.roomArray[index].houseId this.selHouseName = this.roomArray[index].houseName + this.showHouseInfo = true + // this.$emit('refreshInfoList', this.selHouseId, 'room')- }, //点击全部成员 @@ -235,7 +223,7 @@ export default { }); - await nextTick(100); + await nextTick(50); if ((selIndex === 0 || selIndex) && !this.roomArray[selIndex].showAllUser) { @@ -443,7 +431,7 @@ export default { ...mapGetters(["clientHeight"]) }, - components: { ScreenLoading }, + components: { ScreenLoading, roomInfo }, } @@ -556,13 +544,14 @@ export default { diff --git a/src/views/modules/visual/basicinfo/basicInfoMain copy.vue b/src/views/modules/visual/basicinfo/basicInfoMain copy.vue deleted file mode 100644 index c8daa908..00000000 --- a/src/views/modules/visual/basicinfo/basicInfoMain copy.vue +++ /dev/null @@ -1,1074 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue new file mode 100644 index 00000000..2b0681bc --- /dev/null +++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue @@ -0,0 +1,175 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue index 70ba1f77..4f9503e5 100644 --- a/src/views/modules/visual/basicinfo/peopleSearch.vue +++ b/src/views/modules/visual/basicinfo/peopleSearch.vue @@ -124,9 +124,8 @@ export default { total: 0, orgLevel: 'search', selUserId: '', - //下钻层级记录 - runNum: 0, - runAgencyArray: [], + + }; }, activated () { diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue index 0323e79a..f164545b 100644 --- a/src/views/modules/visual/basicinfo/personCategory/index.vue +++ b/src/views/modules/visual/basicinfo/personCategory/index.vue @@ -1,106 +1,106 @@ @@ -109,12 +109,17 @@ import { requestPost } from "@/js/dai/request"; import screenTable from "./recordList"; import cptCard from "@/views/modules/visual/cpts/card"; import nextTick from "dai-js/tools/nextTick"; +import People from "../people"; export default { components: { cptCard, screenTable, + People, + + + }, data () { return { @@ -146,10 +151,11 @@ export default { agencyInfo: {}, categoryList: [], - - activeIndex: 0, + orgLevel: 'search', + selUserId: '', + }; }, async mounted () { @@ -160,6 +166,7 @@ export default { }, + methods: { hiddenTypeList () { @@ -256,6 +263,20 @@ export default { }, + + //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） people 点击详情 + async toSubAgency (userId) { + + this.selUserId = userId + this.orgLevel = 'people' + }, + + //返回所选组织 + handleClickBack () { + this.orgLevel = 'search' + + }, + }, watch: { dateIdShow () { @@ -267,6 +288,12 @@ export default { }, }; + + + diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue index db350194..c2a228cb 100644 --- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue +++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue @@ -1,4 +1,5 @@