Merge branch 'dev-0420' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-0420

src/views/modules/base/resi.vue

@@ -3,7 +3,10 @@
     <el-card class="resi-card">
       <el-collapse v-if="openSearch" v-model="activeNames">
         <el-collapse-item v-for="item in searchList" :key="item.itemGroupId" 
-          :title="item.groupName" :name="item.itemGroupId">
+           :name="item.itemGroupId">
+           <template slot="title">
+              <div class="collapse-title">{{ item.groupName }}</div>
+            </template>
           <resi-search v-if="searchList.length > 0"
                   :ref="'resiSearch' + item.itemGroupId"
                   :form-list="item.queryItemList"
@@ -411,8 +414,8 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight() {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const h = this.clientHeight - this.searchH - 310 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
+      const _h = this.clientHeight - 310 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }
   },
@@ -1359,6 +1362,9 @@ export default {
     // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
+.collapse-title {
+  font-weight: bold;
+}
 .resi-table {
   ::v-deep .el-button--text {
     text-decoration: underline;

src/views/modules/visual/basicinfo/peopleList.vue

@@ -10,7 +10,7 @@
       </el-breadcrumb>
     </div>
 
-    <div v-if="orgLevel!=='people'">
+    <div>
 
       <div class="list_box">
         <div class="info_tip">
@@ -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 () {