diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss index 70c4e5d9..88e617d6 100644 --- a/src/assets/scss/modules/visual/basicInfoMain.scss +++ b/src/assets/scss/modules/visual/basicInfoMain.scss @@ -37,7 +37,7 @@ width: 100%; // padding: 10px 5px 13px; // margin-top: 8px; - height: calc(88vh); + height: calc(88vh - 5px); color: #fff; // background: url('../../../img/modules/visual/warning-box.png') no-repeat // center; diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue index 50f54367..dbb0a3c4 100644 --- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue +++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue @@ -95,264 +95,7 @@ export default { selBuildingName: '', roomLoaded: false, - roomArray: [ - { - houseId: "1", - houseName: "101室", - categoryList: [ - { - name: '党员', - iconUrl: require('../../../../assets/img/shuju/dangyuan.png'), - isSpecial: '1', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "2", - houseName: "102室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "3", - houseName: "103室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "4", - houseName: "104室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "5", - houseName: "105室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "6", - houseName: "106室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, { - houseId: "1", - houseName: "101室", - categoryList: [ - { - name: '党员', - iconUrl: require('../../../../assets/img/shuju/dangyuan.png'), - isSpecial: '1', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "2", - houseName: "102室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "3", - houseName: "103室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "4", - houseName: "104室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "5", - houseName: "105室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "6", - houseName: "106室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, { - houseId: "1", - houseName: "101室", - categoryList: [ - { - name: '党员', - iconUrl: require('../../../../assets/img/shuju/dangyuan.png'), - isSpecial: '1', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "2", - houseName: "102室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - }, - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "3", - houseName: "103室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "4", - houseName: "104室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "5", - houseName: "105室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - }, - { - houseId: "6", - houseName: "106室", - categoryList: [ - { - name: '低保', - iconUrl: require('../../../../assets/img/modules/visual/dabing.png'), - isSpecial: '0', - } - ] - } - ], + roomArray: [], selHouseId: '', selHouseName: '', selHouseIndex: 0, @@ -414,6 +157,7 @@ export default { //点击全部成员 async handleShowAllUser (selIndex) { // this.startLoading() + await this.loadUser(this.roomArray[selIndex].houseId, selIndex) this.roomArray.forEach((element, index) => { let obj = JSON.parse(JSON.stringify(element)) @@ -422,7 +166,7 @@ export default { obj.showAllUser = !obj.showAllUser this.$set(this.roomArray, selIndex, obj) - this.loadUser(element.houseId, selIndex) + } else { obj.showAllUser = false this.$set(this.roomArray, index, obj) diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue index fffed07d..8c0f4a59 100644 --- a/src/views/modules/visual/basicinfo/basicInfoMain.vue +++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue @@ -316,7 +316,7 @@ const vueGis = { name: '搜索' } this.$nextTick(() => { - this.$refs.ref_search.loadList(); + this.$refs.ref_search.reset(); }); } else { diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue index e19d780f..7e44c6d3 100644 --- a/src/views/modules/visual/basicinfo/peopleSearch.vue +++ b/src/views/modules/visual/basicinfo/peopleSearch.vue @@ -97,7 +97,10 @@ export default { } }, - + reset () { + this.searchName = '' + this.tableData = [] + }, async loadList () { if (this.searchName) { const url = "/epmetuser/icresiuser/searchbyname" @@ -130,7 +133,11 @@ export default { this.pageNo = val this.loadList() }, - } + }, + destroyed () { + console.log("我已经离开了!"); + + }, };