From af4cb4e19312b26f1a88c17038669bc56c3b8a9a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 21 Apr 2022 09:25:07 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/basicInfoMain.scss    |  18 ++-
 .../modules/base/community/buildTable.vue     |  11 +-
 .../modules/base/community/community.vue      |  18 +++
 .../modules/base/community/communityTable.vue |  17 +--
 .../modules/base/community/roomTable.vue      |   2 +-
 .../visual/basicinfo/basicInfoCommunity.vue   | 114 ++++++++++++++----
 .../visual/basicinfo/basicInfoMain.vue        |  15 ++-
 7 files changed, 147 insertions(+), 48 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 8d0f82176..ed8deba39 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -301,13 +301,23 @@
         position: absolute;
         bottom: 14px;
         left: 9px;
+        display: flex;
+        justify-content: flex-start;
         // margin-left: 7px;
 
-        > img {
-          margin-left: 5px;
-          width: 21px;
-          height: 20px;
+        .div_icon_item{
+          .icon_img{
+            margin-left: 5px;
+            width: 21px;
+            height: 20px;
+          }
+          .icon_name{
+           text-align: center;
+            margin:5px;
+            font-size: 16px;
+          }
         }
+       
       }
       .div_user:hover {
         cursor: pointer;
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 680a89209..4edc6b48b 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -71,6 +71,12 @@
         <el-table-column prop="buildingName"
                          label="楼栋名称"
                          min-width="180">
+          <template slot-scope="scope">
+            <a class="name-a"
+               @click="handleToNextLevel(scope.row)">
+              {{ scope.row.buildingName }}
+            </a>
+          </template>
         </el-table-column>
         <el-table-column prop="neighborHoodName"
                          label="所属小区"
@@ -97,10 +103,7 @@
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <!-- <el-button type="text"
-                       style="color:#feb349;text-decoration: underline;"
-                       size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
+
             <el-button type="text"
                        class="div-table-button--detail"
                        size="small"
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index caf105692..156903b8b 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -19,6 +19,11 @@
                  :expand-on-click-node="false"
                  :filter-node-method="filterNode"
                  @node-click="handleNodeClick">
+
+          <span slot-scope="{ node, data }"
+                class="custom-tree-node">
+            <span :id="data.id">{{ data.showName }}</span>
+          </span>
         </el-tree>
       </el-scrollbar>
 
@@ -194,6 +199,7 @@ export default {
     handleSearch () {
       if (this.ownerName || this.ownerPhone || this.rentState) {
         this.showRoomTable = true
+
         this.$nextTick(() => {
           this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
         })
@@ -315,16 +321,28 @@ export default {
 
       if (level === 'community') {
         this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
+        this.openNodes.push(this.selTreeObj.id)
       } else {
         this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
       }
 
+
       this.handleNodeClick(this.selTreeObj)
       this.$nextTick(() => {
         // ref_tree 元素的ref   value 绑定的node-key
         this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
       });
 
+      const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
+      setTimeout(() => {
+        if (node) {
+          this.$nextTick(() => {
+            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
+          })
+        }
+      }, 100)
+
+
     },
 
     //解析树数据
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 1ead26d0e..e93868afa 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -96,11 +96,12 @@
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
                          min-width="100">
-          <!-- <template slot-scope="scope">
-            <a class="name-a" @click="handleDetail(scope.row)">
+          <template slot-scope="scope">
+            <a class="name-a"
+               @click="handleToNextLevel(scope.row)">
               {{ scope.row.neighborHoodName }}
             </a>
-          </template> -->
+          </template>
         </el-table-column>
         <el-table-column prop="agencyName"
                          label="所属组织"
@@ -131,14 +132,6 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <!-- <el-button type="text"
-                       style="color:#feb349;text-decoration: underline;"
-                       size="small"
-                       @click="handleToNextLevel(scope.row)">进入</el-button> -->
-            <!-- <el-button type="text"
-                       class="div-table-button--qr"
-                       size="small"
-                       @click="handleDownQr(scope.row, 'neighborHood')">二维码</el-button> -->
             <el-button type="text"
                        class="div-table-button--detail"
                        size="small"
@@ -236,10 +229,8 @@ export default {
   },
   computed: {
     tableHeight () {
-
       return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
 
-
     },
 
     ...mapGetters(['clientHeight', 'iframeHeight'])
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 5d0c53753..70066d410 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -244,7 +244,7 @@ export default {
         this.ownerPhone = null
         this.rentFlag = null
       } else if (source === 'search') {//来源于查询
-
+        this.agencyObj = treeObj
         this.ownerName = ownerName
         this.ownerPhone = ownerPhone
         this.rentFlag = rentFlag
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 9e5f972cd..ecf63da53 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -1,7 +1,7 @@
 <template>
 
   <div class="div_community_info"
-       @click="handleShowAllUser()">
+       @click="handleCloseAllUser()">
     <div class="div_select">
 
       <img src="../../../../assets/img/shuju/title-tip.png"
@@ -10,7 +10,8 @@
       <div class="second-select">
         <el-select v-model="selBuildingId"
                    :popper-append-to-body="false"
-                   placeholder="请选择">
+                   placeholder="请选择"
+                   @click="handleCloseAllUser()">
           <el-option v-for="(item,index) in buildingArray"
                      :key="item.buildingId"
                      :label="item.buildingName"
@@ -21,8 +22,10 @@
       </div>
 
     </div>
+
     <div class="div_room_bar">
-      <el-scrollbar style="height:100%">
+      <el-scrollbar v-if="roomArray.length>0"
+                    style="height:100%">
         <div class="info_loading"
              v-if="roomLoaded">
           <screen-loading>加载中</screen-loading>
@@ -41,17 +44,35 @@
                    alt />
             </div>
             <div class="icon_category">
-              <img v-for="(iconItem,iconIndex) in item.iconArrayShow"
+
+              <div class="div_icon_item"
+                   v-for="(iconItem,iconIndex) in item.iconArrayShow"
+                   :key="iconIndex">
+                <el-popover trigger="click"
+                            popper-class="icon_popover"
+                            width="10"
+                            placement="bottom">
+                  <div class="icon_name">{{iconItem.name}} </div>
+                  <div slot="reference">
+
+                    <img class="icon_img"
+                         :src="iconItem.iconUrl"
+                         alt />
+                  </div>
+
+                </el-popover>
+              </div>
+              <!-- <img v-for="(iconItem,iconIndex) in item.iconArrayShow"
                    :key="iconIndex"
                    :src="iconItem.iconUrl"
-                   alt />
+                   alt /> -->
             </div>
 
-            <!-- <el-popover v-model="item.showAllUser"
+            <el-popover v-model="item.showAllUser"
                         placement="bottom"
                         width="50"
                         popper-class="my_popover"
-                        trigger="click">
+                        trigger="manual">
               <div class="user_list">
                 <div v-for="(userItem,userIndex) in userArray"
                      :key="userIndex"
@@ -76,10 +97,10 @@
                 <img src="../../../../assets/img/xiala.png"
                      alt />
               </div>
-        
-            </el-popover> -->
 
-            <div @click.stop="handleShowAllUser(index)"
+            </el-popover>
+
+            <!-- <div @click.stop="handleShowAllUser(index)"
                  class="div_user">
 
               <span>全部成员</span>
@@ -103,12 +124,18 @@
                 </div>
 
               </div>
-            </div>
+            </div> -->
 
           </div>
 
         </div>
       </el-scrollbar>
+
+      <div v-else
+           class="no-data">
+        <img src="@/assets/img/modules/visual/noData.png"
+             class="no-data-img" />
+      </div>
     </div>
   </div>
 
@@ -119,6 +146,7 @@ import { mapGetters } from "vuex";
 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";
 
 let loading;//加载动画
 
@@ -157,6 +185,7 @@ export default {
 
 
   },
+
   methods: {
     //小区id，小区名称
     async initData (neighborHoodId, neighborHoodName) {
@@ -194,28 +223,40 @@ export default {
     },
     //点击全部成员
     async handleShowAllUser (selIndex) {
-      // this.startLoading()
+
+      this.userArray = []
+      this.roomArray.forEach((element, index) => {
+
+        let obj = JSON.parse(JSON.stringify(element))
+
+        obj.showAllUser = false
+        this.$set(this.roomArray, index, obj)
+        // element.showAllUser = false
+
+      });
+
+      await nextTick(100);
 
       if ((selIndex === 0 || selIndex) && !this.roomArray[selIndex].showAllUser) {
+
         await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
+
       }
 
 
+    },
+    //关闭成员显示
+    async handleCloseAllUser () {
+
+      this.userArray = []
       this.roomArray.forEach((element, index) => {
-        let obj = JSON.parse(JSON.stringify(element))
 
-        if (index === selIndex) {
-          obj.showAllUser = !obj.showAllUser
-          this.$set(this.roomArray, selIndex, obj)
+        let obj = JSON.parse(JSON.stringify(element))
 
+        obj.showAllUser = false
+        this.$set(this.roomArray, index, obj)
 
-        } else {
-          obj.showAllUser = false
-          this.$set(this.roomArray, index, obj)
-          // element.showAllUser = false
-        }
       });
-      // this.endLoading()
 
     },
 
@@ -228,6 +269,13 @@ export default {
 
     },
 
+    onEnterTd () {
+      console.log('进入')
+    },
+    onLeaveTd () {
+      console.log('出来')
+    },
+
     //加载楼栋数据
     async loadBuilding () {
       const url = "/gov/org/agency/baseinfofamilybuilding"
@@ -320,7 +368,7 @@ export default {
     },
 
     //加载成员数据
-    async loadUser (houseId, index) {
+    async loadUser (houseId, selIndex) {
       const url = "/epmetuser/icresiuser/getpeoplebyroom"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icresiuser/getpeoplebyroom"
       let params = {
@@ -333,6 +381,11 @@ export default {
         this.userArray = data
         if (this.userArray.length === 0) {
           this.$message.warning('该房间下没有住户')
+        } else {
+          let objItem = JSON.parse(JSON.stringify(this.roomArray[selIndex]))
+
+          objItem.showAllUser = true
+          this.$set(this.roomArray, selIndex, objItem)
         }
 
       } else {
@@ -433,7 +486,7 @@ export default {
 .second-select {
   margin: 0 10px 10px;
   ::v-deep .el-input {
-    width: 180px;
+    width: 380px;
     height: 36px;
     .el-input__inner {
       height: 100%;
@@ -442,6 +495,7 @@ export default {
       line-height: 36px;
       background: #06186d;
       border: 1px solid #1a64cc;
+      width: 380px;
     }
 
     .el-icon-arrow-up:before {
@@ -491,6 +545,12 @@ export default {
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden !important;
   }
+
+  .no-data {
+    padding-top: 120px;
+    display: flex;
+    justify-content: center;
+  }
 }
 </style>
 <style lang="scss" >
@@ -499,4 +559,10 @@ export default {
   margin-top: 10px;
   border: 0;
 }
+.el-popover.icon_popover {
+  min-width: 80px !important;
+  margin-top: 5px !important;
+  padding: 6px !important;
+  background-color: rgb(247, 250, 253);
+}
 </style>
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index a9edec041..3358597db 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -107,7 +107,8 @@
                 <div class="list_item">
                   <div v-for="(colItem,colIndex) in item"
                        :key="colIndex"
-                       class="list_item_col" @click="handleTo(colItem)">
+                       class="list_item_col"
+                       @click="handleTo(colItem)">
                     <img :src="colItem.dataIcon"
                          alt />
                     <div class="item_content">
@@ -310,7 +311,7 @@ const vueGis = {
 
   },
   methods: {
-    handleTo(item) {
+    handleTo (item) {
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people-list`,
         query: {
@@ -526,8 +527,18 @@ const vueGis = {
 
     //返回所选组织
     handleClickAgency (index) {
+      //如果是从小区返回，清空一下小区的人员显示列表
+      if (this.orgLevel === 'neighborHood') {
+
+        this.$nextTick(() => {
+          // 小区id，小区名称
+          this.$refs.ref_community.handleCloseAllUser();
+        });
+
+      }
       const cutNum = this.runAgencyArray.length - index//要减去的长度
       this.runNum = this.runNum - cutNum
+
       this.orgData = this.runAgencyArray[index]
 
       for (let i = 0; i < cutNum; i++) {

From 251112432c79dea0f214b8953d8f4dc5134ac39c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 21 Apr 2022 16:22:23 +0800
Subject: [PATCH 2/6] 111

---
 .../scss/modules/visual/basicInfoMain.scss    |   94 +-
 .../scss/modules/visual/personCategory.scss   |   11 +-
 .../visual/basicinfo/basicInfoCommunity.vue   |   59 +-
 .../visual/basicinfo/basicInfoMain copy.vue   | 1074 -----------------
 .../visual/basicinfo/cpts/roomInfo.vue        |  175 +++
 .../modules/visual/basicinfo/peopleSearch.vue |    5 +-
 .../visual/basicinfo/personCategory/index.vue |  200 +--
 .../basicinfo/personCategory/recordList.vue   |   58 +-
 8 files changed, 460 insertions(+), 1216 deletions(-)
 delete mode 100644 src/views/modules/visual/basicinfo/basicInfoMain copy.vue
 create mode 100644 src/views/modules/visual/basicinfo/cpts/roomInfo.vue

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index ed8deba39..ecc3d6387 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 4c578bcdd..39c6e7af3 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 ecf63da53..7cd5384bd 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -43,18 +43,21 @@
               <img :src="item.partyUrl"
                    alt />
             </div>
+
+            <div class="icon_roomstate">
+              <div>出租</div>
+            </div>
+
             <div class="icon_category">
 
               <div class="div_icon_item"
                    v-for="(iconItem,iconIndex) in item.iconArrayShow"
                    :key="iconIndex">
-                <el-popover trigger="click"
+                <el-popover trigger="hover"
                             popper-class="icon_popover"
-                            width="10"
                             placement="bottom">
                   <div class="icon_name">{{iconItem.name}} </div>
                   <div slot="reference">
-
                     <img class="icon_img"
                          :src="iconItem.iconUrl"
                          alt />
@@ -99,33 +102,6 @@
               </div>
 
             </el-popover>
-
-            <!-- <div @click.stop="handleShowAllUser(index)"
-                 class="div_user">
-
-              <span>全部成员</span>
-              <img src="../../../../assets/img/xiala.png"
-                   alt />
-
-              <div class="user_list"
-                   v-show="item.showAllUser&&userArray.length>0">
-                <div v-for="(userItem,userIndex) in userArray"
-                     :key="userIndex"
-                     class="user_item"
-                     @click.stop="handleClickUser(userItem.userId)">
-                  <div class="user_item_content">
-                    <div class="name">{{userItem.name}}</div>
-
-                    <img src="../../../../assets/img/jinru.png"
-                         alt />
-
-                  </div>
-                  <div :class="['item_line',{'last_line':userIndex==(userArray.length-1)}]"></div>
-                </div>
-
-              </div>
-            </div> -->
-
           </div>
 
         </div>
@@ -137,6 +113,11 @@
              class="no-data-img" />
       </div>
     </div>
+
+    <room-info v-show="showHouseInfo"
+               v-if="selHouseId"
+               :selHouseId="selHouseId"
+               @close="showHouseInfo = false" />
   </div>
 
 </template>
@@ -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 },
 }
 
 </script>
@@ -556,13 +544,14 @@ export default {
 <style lang="scss" >
 .el-popover.my_popover {
   padding: 0px;
-  margin-top: 10px;
+  margin-top: 14px;
   border: 0;
 }
 .el-popover.icon_popover {
-  min-width: 80px !important;
+  font-size: 14px;
+  min-width: 50px !important;
   margin-top: 5px !important;
-  padding: 6px !important;
+  padding: 3px !important;
   background-color: rgb(247, 250, 253);
 }
 </style>
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 c8daa9089..000000000
--- a/src/views/modules/visual/basicinfo/basicInfoMain copy.vue	
+++ /dev/null
@@ -1,1074 +0,0 @@
-<template>
-  <div style="position: relative">
-
-    <!-- 组织路由 -->
-    <div class="div_top">
-      <div class="router_line"></div>
-      <div class="div_router">
-        <span class="router_parents"
-              v-for="(item,index) in runAgencyArray"
-              @click="handleClickAgency(index)"
-              :key="index">{{item.name}}<span class="arrow">></span></span>
-
-        <span class="router_child">{{orgData.name}}</span>
-      </div>
-    </div>
-
-    <!-- 组织列表 -->
-    <!-- <transition name="slideFade">
-      <div class="div_agency_tran"
-           transiton="slideFade">
-        <div @click="showAgencyList=!showAgencyList"
-             class="arrow_tip">
-          <img src="@/assets/img/modules/visual/popupbox.png"
-               alt />
-        </div>
-
-        <div v-show="showAgencyList&&(orgLevel!=='people' && orgLevel!=='search' && orgLevel!=='neighborHood')"
-             class="div_agency_list">
-          <div class="agency_main">
-            <el-scrollbar style="height:98%"
-                          wrap-style="overflow-x:hidden">
-
-              <div v-if="subAgencyArray.length>0"
-                   class="agency_list">
-                <div v-for="(item,index) in subAgencyArray"
-                     :key="index"
-                     @click="clickAgencyItem(item,index)"
-                     :class="['agency_item',{'agency_item_on':index%2 ==0}]">
-                  <div class="agency_item_name">{{item.name}}</div>
-
-                </div>
-              </div>
-              <div v-else>
-                <img src="@/assets/img/modules/visual/noData.png"
-                     alt=""
-                     srcset=""
-                     class="no-data-img" />
-              </div>
-            </el-scrollbar>
-
-          </div>
-        </div>
-
-      </div>
-    </transition> -->
-
-    <div :class="['div_agency_tran','div_agency_tran-fade-in',{'div_agency_tran-fade-out':!agencyFadeIn}]">
-      <div @click="hideAgencyList"
-           class="arrow_tip">
-        <!-- <img src="@/assets/img/modules/visual/popupbox.png"
-             alt /> -->
-      </div>
-
-      <div v-show="(orgLevel!=='people' && orgLevel!=='search' && orgLevel!=='neighborHood')"
-           :class="['div_agency_list','div_agency_list-fade-in',{'div_agency_list-fade-out':!agencyFadeIn}]">
-        <div class="agency_main">
-          <el-scrollbar style="height:98%"
-                        wrap-style="overflow-x:hidden">
-
-            <div v-if="subAgencyArray.length>0"
-                 class="agency_list">
-              <div v-for="(item,index) in subAgencyArray"
-                   :key="index"
-                   @click="clickAgencyItem(item,index)"
-                   :class="['agency_item',{'agency_item_on':index%2 ==0}]">
-                <div class="agency_item_name">{{item.name}}</div>
-
-              </div>
-            </div>
-            <div v-else>
-              <img src="@/assets/img/modules/visual/noData.png"
-                   alt=""
-                   srcset=""
-                   class="no-data-img" />
-            </div>
-          </el-scrollbar>
-
-        </div>
-      </div>
-
-    </div>
-
-    <people-search v-show="orgLevel==='search'"
-                   @toSubAgency="toSubAgency"
-                   ref="ref_search"></people-search>
-    <people v-if="orgLevel==='people'"
-            :uid="selUserId"
-            ref="ref_people"></people>
-
-    <div v-show="orgLevel!=='people' && orgLevel!=='search'"
-         class="div_content">
-
-      <basic-info-community v-show="orgLevel==='neighborHood'"
-                            @toSubAgency="toSubAgency"
-                            ref="ref_community"
-                            @refreshInfoList="refreshInfoList"></basic-info-community>
-
-      <div v-show="orgLevel!=='people' && orgLevel!=='search' && orgLevel!=='neighborHood'"
-           class="div_map"
-           id="map"
-           ref="map">
-        <!-- <div id="map"
-             class="map"></div> -->
-      </div>
-
-      <div class="div_data">
-        <div @click="handleSearch"
-             class="div_search">
-          <div class="div_search_left">
-            <i slot="prefix"
-               class="icon">
-              <img src="../../../../assets/img/modules/visual/sousuo.png"
-                   alt />
-            </i>
-            <span>请输入姓名</span>
-          </div>
-
-          <div class="btn">搜索</div>
-
-        </div>
-
-        <div class="div_info">
-          <el-scrollbar style="height:98%">
-            <div class="info_tip">
-              <img src="../../../../assets/img/shuju/title-tip.png"
-                   alt />
-              <div class="tip_title">分类列表</div>
-            </div>
-
-            <div class="info_loading"
-                 v-if="infoLoading">
-              <screen-loading>加载中</screen-loading>
-            </div>
-
-            <div v-if="!infoLoading"
-                 class="info_list">
-              <div v-for="(item,index) in listDatashow"
-                   :key="index"
-                   class="item">
-                <div class="list_item">
-                  <div v-for="(colItem,colIndex) in item"
-                       :key="colIndex"
-                       class="list_item_col">
-                    <img :src="colItem.dataIcon"
-                         alt />
-                    <div class="item_content">
-                      <div class="item_label">{{colItem.label}}</div>
-                      <div class="item_count">{{colItem.count}}</div>
-                    </div>
-
-                  </div>
-                </div>
-                <div :class="['item_line',{'last_line':index==(listDatashow.length-1)}]"></div>
-              </div>
-
-            </div>
-          </el-scrollbar>
-        </div>
-
-      </div>
-    </div>
-
-  </div>
-
-</template>
-
-<script>
-import 'ol/ol.css'
-import { Map, View } from 'ol'
-import TileLayer from 'ol/layer/Tile.js';
-import XYZ from 'ol/source/XYZ.js';
-import VectorLayer from 'ol/layer/Vector.js';
-import VectorSource from 'ol/source/Vector.js';
-import GeoJSON from 'ol/format/GeoJSON.js';
-import Point from "ol/geom/Point.js";
-import Feature from "ol/Feature.js";
-import Overlay from 'ol/Overlay';
-import { defaults as defaultInteractions, Select, DoubleClickZoom } from 'ol/interaction.js';
-import { getCenter, boundingExtent } from 'ol/extent.js';
-import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style.js';
-
-import nextTick from 'dai-js/tools/nextTick'
-import { mapGetters } from "vuex";
-import { Loading } from 'element-ui'; //引入Loading服务
-import { requestPost } from "@/js/dai/request";
-import BasicInfoCommunity from "./basicInfoCommunity";
-import PeopleSearch from "./peopleSearch";
-import People from "./people";
-import cptCard from "@/views/modules/visual/cpts/card";
-import ScreenLoading from "@/views/modules/visual/cpts/loading";
-
-var centerPointGlobal = [120.38945519, 36.0722275]
-
-let loading;//加载动画
-
-let map;
-let mapView;
-let gaodeMapLayer;//背景地图图层
-let parentLayer;//上级组织图层
-let parentSource;//上级组织多边形
-let polygonLayer;//变电站标注图层
-let iconLayer; // icon标注图层
-let iconSource; // icon
-let polygonSource;//变电站标注多边形
-let select;//选中标注
-
-
-//url图标
-
-let iconUrlArray = [
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a775d15e62374350b80e5cdf1912a4eb.png',
-  'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/884efcf6d6b44224a7fda599dd1b14cb.png'
-];
-let textColorArray = [
-  'rgba(236, 69, 4, 0.66)',
-  'rgba(0, 146, 238, 0.75)',
-  'rgba(238, 151, 0, 0.8)'
-];
-let polygonColorArray = [
-  'rgba(210, 2, 2, 0.24)',
-  'rgba(43, 231, 253, 0.25)',
-  'rgba(183, 185, 0, 0.16)'
-];
-//变电站标注的文字样式
-var createTextStyle = function (feature) {
-  return new Text({
-    textAlign: undefined,
-    font: "18px Arial",
-    //fontFamily: "Courier New, monospace",
-    // fontWeight: "bold",
-    text: feature.values_.name,
-    backgroundFill: new Fill({
-      // color: 'rgba(0, 146, 238, 0.75)'
-      color: textColorArray[feature.values_.colorIndex]
-    }),
-    padding: [4, 10, 4, 10],
-    //text: "变电站名称",
-    fill: new Fill({ color: "#ffffff" }),
-    // stroke: new Stroke({ color: "#ffffff", width: 3 }),
-    offsetY: -30,
-    offsetX: -50,
-    overflow: true,
-  });
-};
-
-//上级组织标注样式
-var parentStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      // fill: new Fill({
-      //   color: [255, 255, 255, 0.3]
-      // }),
-      stroke: new Stroke({
-        color: [0, 103, 182, 1],
-        width: 2
-      }),
-
-      // text: createTextStyle(feature)
-    });;
-  };
-})()
-
-
-//变电站标注样式
-var polygonStyleFunction = (function () {
-  return function (feature) {
-    return new Style({
-      fill: new Fill({
-        // color: [255, 255, 255, 0.3]
-        color: polygonColorArray[feature.values_.colorIndex]
-      }),
-      stroke: new Stroke({
-        color: polygonColorArray[feature.values_.colorIndex],
-        width: 3
-      }),
-
-      text: createTextStyle(feature)
-    });;
-  };
-})()
-
-const vueGis = {
-  name: 'HomeMap',
-  data () {
-    return {
-      showAgencyList: true,
-      agencyFadeIn: true,
-      centerPoint: [],//中心点位置
-      zoom: 14,//缩放范围：区14
-      minZoom: 1,//最小缩放
-
-      orgData: {},//当前组织对象
-      orgId: '',
-      orgLevel: '',
-
-      subAgencyArray: [],//下拉框数据
-      iconCoordinators: [],
-      currentCoordinate: null,
-      overlay: null,
-
-      //右侧搜索
-      searchName: "",
-
-      //右侧列表
-      infoLoading: true,
-      listData: [],//得到的数据
-      listDatashow: [],//处理成一行两列的数据
-
-      //下钻层级记录
-      runNum: 0,
-      runAgencyArray: [],
-      selUserId: '',
-      center: [],
-      zoom: null,
-      parentPolygon: [],
-
-      centerFlag: 'point',//定义中心点的flag  point点 fit 自适应
-
-    }
-  },
-  async mounted () {
-
-    //加载组织数据
-    await this.loadOrgData()
-
-    //初始化地图
-    this.initMap()
-
-    await nextTick(300)
-    this.addParentLayer()
-    this.loadParentPolygon()
-    //添加标注图层
-    this.addPolygonLayer()
-
-    //添加icontuceng
-    this.addIconLayer()
-
-    //加载当前园区的标注
-    this.loadPolygon(this.subAgencyArray)
-    this.setMapLocation()
-    await this.loadList()
-
-  },
-  methods: {
-    hideAgencyList () {
-
-      if (this.showAgencyList) {
-        this.agencyFadeIn = false
-        setTimeout(() => {
-          this.showAgencyList = false
-        }, 1000)
-
-      } else {
-        this.agencyFadeIn = true
-        this.showAgencyList = true
-      }
-
-
-    },
-    handleSearch () {
-      this.toSubAgency('search')
-    },
-
-    //获取右侧infolist数据
-    async loadList () {
-      this.infoLoading = true
-      const url = "/epmetuser/statsresiwarn/list"
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/statsresiwarn/list"
-      let params = {
-        id: this.orgId,
-        level: this.orgLevel
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-      this.infoLoading = false
-      if (code === 0) {
-        this.listData = data
-        // this.listData = this.listData1
-        this.listDatashow = []
-        let itemArray = []
-        this.listData.forEach((item, index) => {
-          if (!item.dataIcon) {
-            item.dataIcon = require('../../../../assets/img/modules/visual/dibao.png')
-          }
-
-          if (index % 2 === 0) {//偶数
-            itemArray.push(item)
-          } else {
-            itemArray.push(item)
-            this.listDatashow.push(itemArray)
-            itemArray = []
-          }
-
-        });
-
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //子组件点击房间，刷新右侧list
-    refreshInfoList (selId, type) {
-      this.orgId = selId
-      this.level = ''
-    },
-
-    //点击组织列表数据
-    clickAgencyItem (item, index) {
-
-      let e = {
-        selected: []
-      }
-      let one = {
-        values_: item
-      }
-      e.selected.push(one)
-
-      this.toSubAgency('polygon', e)
-    },
-
-    //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）   search 点击搜索  people 点击详情
-    async toSubAgency (type, e, searchName) {
-
-      //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
-      if (type === 'people') {
-        this.runNum++
-        this.runAgencyArray.push(this.orgData)
-        this.orgLevel = 'people'
-        this.selUserId = e
-        this.orgId = ''
-        this.orgData = {
-          id: '',
-          level: 'people',
-          name: '人员档案'
-        }
-        this.searchName = searchName
-
-      } else if (type === 'search') {
-        this.runNum++
-        this.runAgencyArray.push(this.orgData)
-        this.orgLevel = 'search'
-        this.orgId = ''
-        this.orgData = {
-          id: '',
-          level: 'search',
-          name: '搜索'
-        }
-        this.$nextTick(() => {
-          this.$refs.ref_search.reset();
-        });
-
-      } else {
-
-        if (!e) {
-          return false
-        }
-        if (!e.selected[0]) {
-          return false
-        }
-        this.runNum++
-        this.orgData.center = map.getView().getCenter()
-        this.orgData.zoom = map.getView().getZoom()
-        console.log('center', map.getView().getCenter())
-        console.log('zoom', map.getView().getZoom())
-
-        this.runAgencyArray.push(this.orgData)
-
-        this.subAgencyArray.forEach(item => {
-          if (item.id === e.selected[0].values_.id) {
-            this.orgId = item.id
-            this.orgLevel = item.level
-            this.orgData = item
-          }
-        });
-
-        if (this.orgLevel === 'neighborHood') {
-          this.loadList()
-          this.$nextTick(() => {
-            // 小区id，小区名称
-            this.$refs.ref_community.initData(this.orgData.id, this.orgData.name);
-          });
-
-        } else {
-          this.refreshMap(true)
-        }
-
-      }
-
-    },
-
-    //刷新地图
-    async refreshMap (isRefreshView) {
-
-      //加载组织数据
-      await this.loadOrgData()
-
-      //绘制父级组织数据
-      this.loadParentPolygon()
-      //绘制本级组织数据
-      this.loadPolygon(this.subAgencyArray)
-
-      //重置地图中心点
-
-      // if (isRefreshView) {
-      this.setMapLocation()
-
-      // }
-
-      await this.loadList()
-
-    },
-
-    //设置地图定位的中心点和缩放级别
-    setMapLocation () {
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel)
-      }
-      this.centerPoint = []
-
-
-      //如果存在中心点（返回时赋值）
-      if (this.center && this.center.length > 0) {
-        this.centerPoint = this.center
-        this.centerFlag = 'point'
-        this.center = []
-
-      } else if (parentLayer.getSource().getFeatures()[0]) {//如果是初次进入，不存在下级组织，用父级组织
-        this.centerFlag = 'flag_parent'
-
-
-      } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
-        this.centerFlag = 'flag_polygon'
-
-      } else if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
-        this.centerFlag = 'point'
-
-      } else {
-        this.centerPoint = centerPointGlobal
-        this.centerFlag = 'point'
-      }
-      // debugger
-      if (this.centerFlag === 'flag_parent') {
-        let parentFeatures = parentLayer.getSource().getFeatures()[0]
-        let polygon = parentFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else if (this.centerFlag === 'flag_polygon') {
-        let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
-        let polygon = polygonFeatures.getGeometry();
-        map.getView().fit(polygon, map.getSize());
-        this.zoom = map.getView().getZoom() - 1
-
-      } else {
-        mapView.setCenter(this.centerPoint);
-
-      }
-      mapView.setZoom(this.zoom);
-
-
-
-    },
-
-    //返回所选组织
-    handleClickAgency (index) {
-      const cutNum = this.runAgencyArray.length - index//要减去的长度
-      this.runNum = this.runNum - cutNum
-      this.orgData = this.runAgencyArray[index]
-
-      for (let i = 0; i < cutNum; i++) {
-        this.runAgencyArray.pop()
-      }
-
-      this.orgId = this.orgData.id
-      this.orgLevel = this.orgData.level
-      this.center = this.orgData.center
-      this.zoom = this.orgData.zoom
-
-      if (this.orgLevel === 'people') {
-
-      } else if (this.orgLevel === 'search') {
-        this.$nextTick(() => {
-          this.$refs.ref_search.loadByName(this.searchName);
-        });
-
-      } else if (this.orgLevel === 'neighborHood') {//显示小区
-
-      } else {
-
-        this.$nextTick(() => {
-          this.refreshMap(true)
-          this.$forceUpdate()
-        });
-
-      }
-
-    },
-
-    //加载组织数据
-    async loadOrgData () {
-
-      const url = "/gov/org/agency/maporg"
-      let params = {
-        orgId: this.orgId,
-        level: this.orgLevel
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-
-        this.orgData = data
-        this.orgId = this.orgData.id
-        this.orgLevel = this.orgData.level
-        this.parentPolygon = []
-        this.parentPolygon.push(data)
-        if (data.children && data.children.length > 0) {
-          this.subAgencyArray = data.children
-        } else {
-          this.subAgencyArray = []
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    //加载父级组织多边形
-    loadParentPolygon () {
-      parentSource.clear()//清空变电站标注
-
-      let featureData = []//标注数据
-      if (this.parentPolygon && this.parentPolygon.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        this.parentPolygon.forEach(agencyItem => {
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
-            }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
-
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
-
-              } else {//奇
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
-
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        });
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-        parentSource.addFeatures(feature)
-
-      }
-
-    },
-
-    //加载当前园区的标注
-    loadPolygon (subAgencyArray) {
-      polygonSource.clear()//清空多边形标注
-      iconSource.clear()//清空多边形标注
-
-      let featureData = []//标注数据
-      if (subAgencyArray && subAgencyArray.length > 0) {//判断是否存在下级标注
-        let oneData = {}
-
-        let count = 0
-        for (let i = 0; i < subAgencyArray.length; i++) {
-          const agencyItem = subAgencyArray[i]
-
-
-          if (agencyItem.coordinates && agencyItem.coordinates !== '') {//如果有坐标
-            let urlNum = count % 3
-            count++
-
-            oneData = {
-              type: 'Feature',
-              id: agencyItem.id,
-              properties: {
-                id: agencyItem.id,
-                level: agencyItem.level,
-                name: agencyItem.name,
-                colorIndex: urlNum//颜色随机的索引
-              },
-              geometry: {
-                type: 'Polygon',
-                coordinates: [],
-              },
-            }
-            let coorArray = agencyItem.coordinates.split(',')//坐标数组
-
-            let itemArray = []//单个点位的[lon,lat]，数组
-            let polygonArray = []//整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
-
-            coorArray.forEach((item, index) => {
-              itemArray.push(item)
-              if (index % 2 == 0) {//偶
-
-              } else {//奇
-                polygonArray.push(itemArray)
-                itemArray = []
-              }
-
-            });
-            oneData.geometry.coordinates.push(polygonArray)
-            featureData.push(oneData)
-          }
-        }
-      }
-
-      if (featureData && featureData.length > 0) {
-        var geojsonObject = {
-          'type': 'FeatureCollection',
-          'features': featureData
-        };
-        let feature = (new GeoJSON()).readFeatures(geojsonObject)
-
-        polygonSource.addFeatures(feature)
-
-        let iconFeatures = [];
-        feature.forEach(oneIcon => {
-
-          var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy]
-          // var center = getCenter(extent);   //获取边界区域的中心位置
-          //添加标注
-          let x = (parseFloat(extent[0]) + parseFloat(extent[2])) / 2
-          let y = (parseFloat(extent[1]) + parseFloat(extent[3])) / 2
-
-          let oneArray = [x, y]
-          this.iconCoordinators.push(oneArray)
-          // debugger
-          //地图icon样式
-          let oneCctv = new Feature({
-            geometry: new Point([x, y]),
-            id: oneIcon.id_,
-            properties: {
-              type: "icon",
-              id: oneIcon.id_
-            }
-          });
-
-          let iconStyle = new Style({
-            image: new Icon({
-              // anchor: [0.5, 0.5],
-              // imgSize: [32, 32],
-              scale: 0.5,
-              // src: "/img/largeScreen/icon_camra.png"
-              // src: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png"
-              src: iconUrlArray[oneIcon.values_.colorIndex]
-            })
-          });
-
-          oneCctv.setStyle(iconStyle);
-          iconFeatures.push(oneCctv);
-
-        });
-
-        iconSource.addFeatures(iconFeatures);
-      }
-
-    },
-
-
-    //根据组织层级设置缩放级别
-    setZoom (agencyLevel) {
-      if (agencyLevel === 'district') {
-        this.zoom = 12
-      } else if (agencyLevel === 'street') {
-        this.zoom = 13
-      } else if (agencyLevel === 'community') {
-        this.zoom = 14
-      }
-
-    },
-
-    firstCenterMap () {
-      this.centerPoint = []
-      if (this.orgData.longitude && this.orgData.latitude) {
-        this.centerPoint.push(this.orgData.longitude)
-        this.centerPoint.push(this.orgData.latitude)
-
-      } else {
-        this.centerPoint = centerPointGlobal
-      }
-
-      if (!this.zoom) {
-        this.setZoom(this.orgData.agencyLevel)
-      }
-    },
-
-    initMap () {
-      this.firstCenterMap()
-
-      gaodeMapLayer = new TileLayer({
-        title: "地图",
-        source: new XYZ({
-          //指定url瓦片
-          url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
-          wrapX: true//x方向平铺，也可以选择false
-        }),
-        zIndex: 20
-      });
-
-      mapView = new View({
-        //中心点坐标
-        center: this.centerPoint,
-        // projection: 'EPSG:3857',
-        projection: 'EPSG:4326',
-        zoom: this.zoom,
-        minZoom: this.minZoom
-      })
-
-      //初始化map和地图底图
-      //创建地图容器
-      map = new Map({
-        layers: [gaodeMapLayer],
-        //加载瓦片图层数据
-        view: mapView,
-        target: 'map'
-        //目标加载到map中
-      })
-
-      map.on('singleclick', function (e) {
-        // console.log(e.coordinate)
-        // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
-      })
-
-      //去除双击放大效果
-      const dblClickInteraction = map
-        .getInteractions()
-        .getArray()
-        .find(interaction => {
-          return interaction instanceof DoubleClickZoom;
-        });
-      map.removeInteraction(dblClickInteraction);
-
-    },
-    //添加变电站标注图层
-    addParentLayer () {
-      parentSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      parentLayer = new VectorLayer({
-        source: parentSource,
-        style: parentStyleFunction,
-        zIndex: 50
-      });
-
-
-      map.addLayer(parentLayer)
-
-
-    },
-
-    //添加变电站标注图层
-    addPolygonLayer () {
-      polygonSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      polygonLayer = new VectorLayer({
-        source: polygonSource,
-        style: polygonStyleFunction,
-        zIndex: 50
-      });
-
-      //选中多边形后的样式
-      var overlayStyle = (function () {
-
-        return function (feature) {
-          var styles = {};
-          styles['Polygon'] = [
-            new Style({
-              stroke: new Stroke({
-                color: '#ec9000',
-                width: 2
-              })
-            }),
-
-            new Style({
-              fill: new Fill({
-                color: 'rgba(0, 0, 255, 0.1)'
-              })
-            }),
-            new Style({
-              text: createTextStyle(feature)
-            })
-          ];
-          styles['MultiPolygon'] = styles['Polygon'];
-          return styles[feature.getGeometry().getType()];
-        };
-      })();
-
-      select = new Select({
-        style: overlayStyle
-      });
-
-
-      map.addLayer(polygonLayer)
-      map.addInteraction(select);
-
-      select.on('select', e => {
-        this.toSubAgency('polygon', e)
-      });
-
-    },
-
-    addIconLayer () {
-      iconSource = new VectorSource({
-        //features: (new GeoJSON()).readFeatures(geojsonObject)
-      });
-
-      iconLayer = new VectorLayer({
-        source: iconSource,
-        zIndex: 70
-      });
-
-      map.addLayer(iconLayer);
-
-    },
-
-    //取随机数
-    getRndBetween (lowerLimit, upperLimit) {
-      return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit;
-    },
-
-    //开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, //是否锁定
-        text: '正在加载……', //加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' //背景颜色
-      });
-
-    },
-
-    //结束加载动画
-    endLoading () {
-      //clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
-    },
-  },
-  props: {
-
-    // vueFlag: {
-    //   type: String,
-    //   default: "alarm"
-    // }
-  },
-  computed: {
-
-    mapHeight () {
-
-      return this.clientHeight - 120;
-
-    },
-    // zoom: {
-    //   get () {
-    //     //根据不同屏幕分辨率，控制zoom大小
-    //     if (this.clientHeight < 900) {
-    //       return 2.3
-    //     } else {
-    //       return 2.8
-    //     }
-    //   },
-    //   set (value) {
-    //   }
-    // },
-    ...mapGetters(["clientHeight"])
-
-  },
-  components: { BasicInfoCommunity, PeopleSearch, People, cptCard, ScreenLoading },
-}
-export default vueGis;
-</script>
-
-<style
-  lang="scss"
-  src="@/assets/scss/modules/visual/basicInfoMain.scss"
-  scoped
-></style>
-
-<style lang="scss" >
-.div_content {
-  .ol-viewport {
-    border-radius: 5px;
-  }
-}
-.ol-overlaycontainer-stopevent {
-  display: none;
-}
-</style>  
-
-<style lang="scss" scoped>
-.aaa {
-  height: 100px;
-  width: 100px;
-  background-color: aquamarine;
-}
-.slideFade-enter {
-  animation: slideFade-dialog-fade-in 0.5s ease;
-}
-.slideFade-leave {
-  animation: slideFade-dialog-fade-out 0.5s ease forwards;
-}
-.slideFade-enter-active {
-  animation: slideFade-dialog-fade-in 0.5s ease;
-}
-.slideFade-leave-active {
-  animation: slideFade-dialog-fade-out 0.5s ease forwards;
-}
-
-@keyframes slideFade-dialog-fade-in {
-  from {
-    left: 110px;
-  }
-  to {
-    left: 0px;
-  }
-}
-@keyframes slideFade-dialog-fade-out {
-  from {
-    left: 0px;
-  }
-  to {
-    left: 100px;
-  }
-}
-</style>
\ 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 000000000..2b0681bc8
--- /dev/null
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="m-room-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>房屋信息</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div class="list">
+
+          <div class="item">
+            <span class="item-field">所属小区：</span>
+            <span>{{ formData.neighborHoodName }}</span>
+          </div>
+        </div>
+        <div class="list">
+          <div class="item">
+            <span class="item-field">所属楼栋：</span>
+            <span>{{  formData.buildingName }}</span>
+          </div>
+
+        </div>
+        <div class="list">
+          <div class="item">
+            <span class="item-field">房屋名称：</span>
+            <span>{{ formData. houseName }}</span>
+          </div>
+        </div>
+        <div class="list">
+          <div class="item">
+            <span class="item-field">房屋类型：</span>
+            <span>{{ formData.neighborHoodName }}</span>
+          </div>
+
+        </div>
+        <div class="list">
+
+          <div class="item">
+            <span class="item-field">房屋状态：</span>
+            <span>{{ formData. houseName }}</span>
+          </div>
+
+        </div>
+        <div class="list">
+
+          <div class="item">
+            <span class="item-field">房主姓名：</span>
+            <span>{{ formData.neighborHoodName }}</span>
+          </div>
+        </div>
+        <div class="list">
+          <div class="item">
+            <span class="item-field">房主电话：</span>
+            <span>{{  formData.buildingName }}</span>
+          </div>
+        </div>
+        <div class="list">
+          <div class="item">
+            <span class="item-field">房主身份证：</span>
+            <span>{{ formData. houseName }}</span>
+          </div>
+
+        </div>
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+import cptTb from "@/views/modules/visual/cpts/tb";
+
+export default {
+  name: "peopleMore",
+  props: {
+    selHouseId: {
+      type: String,
+      default: "",
+    },
+    gridName: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard, cptTb
+  },
+
+  data () {
+    return {
+      formData: {
+        gridId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
+        name: '',
+        idCard: '',
+        mobile: '',
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        detailAddress: '',
+        sourceAddressCode: '',
+        presentAddressPathCode: '',
+        sourceAddress: '',
+        sourceAddressPathCode: '',
+        arriveDate: '',
+        remark: '',
+        leaveDate: '',
+        userType: 'input',
+        content: '',
+        channel: []
+
+      },
+    };
+  },
+
+  computed: {
+
+  },
+
+  watch: {
+    selHouseId () {
+      this.getApiData();
+    },
+  },
+
+  mounted () {
+    this.getApiData();
+  },
+
+  methods: {
+
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+
+      this.loadHouseInfo()
+
+    },
+
+    async loadHouseInfo () {
+
+      const url = "/gov/org/house/gethouseinfo/" + this.selHouseId
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+  },
+};
+</script>
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
\ 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 70ba1f77a..4f9503e5f 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 0323e79a7..f164545b3 100644
--- a/src/views/modules/visual/basicinfo/personCategory/index.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/index.vue
@@ -1,106 +1,106 @@
 <template>
-  <div @click="hiddenTypeList()"
-       class="warning-box">
-    <cpt-card>
-      <div class="title">
-        <img src="@/assets/img/shuju/title-tip.png" />
-        <span>人员类别分析</span>
-
-        <div class="second-select cascader">
-
-          <el-cascader class="customer_cascader"
-                       ref="myCascader"
-                       v-model="agencyIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeAgency"></el-cascader>
+  <div>
+    <!-- 组织路由 -->
+    <div class="div_top">
+      <div class="router_line"></div>
+      <div class="div_router">
+        <div v-if="orgLevel==='search'">
+          <span class="router_child">人员类别</span>
         </div>
-        <div class="second-select ">
-
-          <el-date-picker v-model="dateIdShow"
-                          type="date"
-                          :clearable="false"
-                          @change="handleChangeDate"
-                          :picker-options="pickerOptions"
-                          prefix-icon="el-icon-caret-bottom"
-                          placeholder="选择日期"
-                          value-format="yyyy-MM-dd">
-          </el-date-picker>
+        <div v-if="orgLevel==='people'"> <span class="router_parents"
+                @click="handleClickBack">人员类别<span class="arrow">></span></span>
 
+          <span class="router_child">个人档案</span>
         </div>
       </div>
-      <el-scrollbar style="width: 100%">
-        <div class="warning-box-top">
-          <div class="top-item"
-               :class="{'top-item-active': activeIndex == index}"
-               @click="onClickList(item,index)"
-               v-for="(item, index) in categoryList"
-               :key="index">
-            <div class="top-item-img">
-              <img :src="item.dataIcon" />
-              <div class="top-item-left">
-                <span>{{ item.categoryName }}</span>
-                <span>{{ item.total }}</span>
-              </div>
-            </div>
-            <div class="top-item-num">
-              <div class="item_left">较上月</div>
-              <div class="item_right">
-                <div class="item_right_row">
-                  <div class="item_right_title">增加</div>
-                  <div>
-                    <span v-if=" item.immigration!==0">{{ "+" }}</span>
-                    <span>{{  item.immigration }}</span>
-                  </div>
+    </div>
+    <div v-if="orgLevel!=='people'"
+         @click="hiddenTypeList()"
+         class="warning-box">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>人员类别分析</span>
+
+          <div class="second-select cascader">
+
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
+          </div>
+          <div class="second-select ">
+
+            <el-date-picker v-model="dateIdShow"
+                            type="date"
+                            :clearable="false"
+                            @change="handleChangeDate"
+                            :picker-options="pickerOptions"
+                            prefix-icon="el-icon-caret-bottom"
+                            placeholder="选择日期"
+                            value-format="yyyy-MM-dd">
+            </el-date-picker>
 
+          </div>
+        </div>
+        <el-scrollbar style="width: 100%">
+          <div class="warning-box-top">
+            <div class="top-item"
+                 :class="{'top-item-active': activeIndex == index}"
+                 @click="onClickList(item,index)"
+                 v-for="(item, index) in categoryList"
+                 :key="index">
+              <div class="top-item-img">
+                <img :src="item.dataIcon" />
+                <div class="top-item-left">
+                  <span>{{ item.categoryName }}</span>
+                  <span>{{ item.total }}</span>
                 </div>
+              </div>
+              <div class="top-item-num">
+                <div class="item_left">较上月</div>
+                <div class="item_right">
+                  <div class="item_right_row">
+                    <div class="item_right_title">增加</div>
+                    <div>
+                      <span v-if=" item.immigration!==0">{{ "+" }}</span>
+                      <span>{{  item.immigration }}</span>
+                    </div>
 
-                <div class="item_right_row row2">
-                  <div class="item_right_title">减少</div>
-                  <div>
-                    <span v-if=" item.emigration!==0">{{ "-" }}</span>
-                    <span>{{  item.emigration }}</span>
                   </div>
 
-                </div>
+                  <div class="item_right_row row2">
+                    <div class="item_right_title">减少</div>
+                    <div>
+                      <span v-if=" item.emigration!==0">{{ "-" }}</span>
+                      <span>{{  item.emigration }}</span>
+                    </div>
 
-              </div>
-              <!-- <div class="num-item">
-                <div>较上月</div>
-
-                <div>
-                  <div>
-                    <span>新人员增加</span>
-                    <span v-if=" item.immigration!==0">{{ "+" }}</span>
-                    <span>{{  item.immigration }}</span>
                   </div>
 
                 </div>
-              </div> -->
-              <!-- <div class="num-item">
-                <div>{{"  "}}</div>
-
-                <div>
-                  <div>
-                    <span>原人员减少</span>
-                    <span v-if=" item.emigration!==0">{{ "-" }}</span>
-                    <span>{{  item.emigration }}</span>
-                  </div>
-                </div>
-              </div> -->
+
+              </div>
             </div>
           </div>
-        </div>
 
-      </el-scrollbar>
+        </el-scrollbar>
 
-      <div class="warning-box-bottom">
-        <screen-table ref="ref_recordlist"></screen-table>
+        <div class="warning-box-bottom">
+          <screen-table ref="ref_recordlist"
+                        @toSubAgency="toSubAgency"></screen-table>
 
-      </div>
-    </cpt-card>
+        </div>
+      </cpt-card>
+    </div>
+
+    <people v-if="orgLevel==='people'"
+            :uid="selUserId"
+            ref="ref_people"></people>
   </div>
 </template>
 
@@ -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 {
   },
 };
 </script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/basicInfoMain.scss"
+  scoped
+></style>
 <style
   lang="scss"
   src="@/assets/scss/modules/visual/typeAnalyze.scss"
@@ -277,3 +304,4 @@ export default {
   src="@/assets/scss/modules/visual/personCategory.scss"
   scoped
 ></style>
+
diff --git a/src/views/modules/visual/basicinfo/personCategory/recordList.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
index db3501940..c2a228cb2 100644
--- a/src/views/modules/visual/basicinfo/personCategory/recordList.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
@@ -1,4 +1,5 @@
 <template>
+
   <div class="warning-table">
     <div class="table">
       <div class="table-header">
@@ -50,15 +51,16 @@
         <div class="table-body-tr"
              v-for="(value, index) in tableData"
              :key="index">
-          <div class="td"
+          <div :class="['td',indexs===1?'tr-underline':'']"
                v-for="(item, indexs) in value"
                :style="{width:widthList[indexs]}"
-               :key="indexs">
+               :key="indexs"
+               @click="handelToPeople(indexs,index)">
             <span>{{ item }}</span>
 
           </div>
         </div>
-        <screen-loading v-if="visibleLoading">加载中</screen-loading>
+        <!-- <screen-loading v-if="visibleLoading">加载中</screen-loading> -->
         <div class="no-data"
              v-if="tableData.length == 0 && !visibleLoading">
           <img src="@/assets/img/modules/visual/noData.png"
@@ -68,7 +70,7 @@
         </div>
       </div>
     </div>
-    <div class="pagination">
+    <div class="pagination-record">
       <el-pagination :current-page="pageNo"
                      :page-size="pageSize"
                      background
@@ -79,6 +81,7 @@
       </el-pagination>
     </div>
   </div>
+
 </template>
 
 <script>
@@ -96,6 +99,7 @@ export default {
   data () {
     return {
       visibleLoading: false,
+      tableAllData: [],
       tableData: [],
       showTypeSelect: false,
       widthList: ['5%', '10%', '15%', '10%', '20%', '30%'],
@@ -106,8 +110,9 @@ export default {
       dateId: '',
       categoryKey: '',
       pageNo: 1,
-      pageSize: 10,
-      total: 0
+      pageSize: 7,
+      total: 0,
+
     };
   },
   watch: {
@@ -118,9 +123,22 @@ export default {
     this.loadTypeList()
   },
 
+
   created () { },
 
   methods: {
+
+    //点击查看
+    handelToPeople (titleIndex, index) {
+      if (titleIndex === 1) {
+        // console.log(this.tableData)
+        console.log(this.tableAllData[index])
+        this.$emit('toSubAgency', this.tableAllData[index].icUserId)
+
+      }
+
+    },
+
     hiddenTypeList () {
 
       this.showTypeSelect = false
@@ -181,6 +199,7 @@ export default {
       };
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+        this.tableAllData = data.list
         data.list.forEach((item, index) => {
           tableData.push([
             index + 1,
@@ -230,10 +249,11 @@ export default {
   width: 100%;
   height: 100%;
   .table {
-    width: 100%;
+    position: relative;
+    width: 99%;
     height: 100%;
     &-header {
-      width: 100%;
+      width: 99%;
       height: 50px;
       display: flex;
       justify-content: space-around;
@@ -247,6 +267,7 @@ export default {
         text-align: center;
         width: calc(100% / 5);
       }
+
       &-select {
         position: relative;
 
@@ -328,6 +349,15 @@ export default {
             }
           }
         }
+        .tr-underline {
+          font-size: 18px;
+          font-weight: 400;
+          color: rgba(197, 210, 255, 0.85);
+          text-decoration: underline;
+        }
+        .tr-underline:hover {
+          cursor: pointer;
+        }
       }
 
       &-tr:nth-child(2n) {
@@ -339,6 +369,7 @@ export default {
           no-repeat center;
         background-size: 100% 100%;
       }
+
       // 暂无数据
       .no-data {
         width: 100%;
@@ -353,10 +384,13 @@ export default {
       }
     }
   }
-  .pagination {
+  .pagination-record {
+    position: absolute;
     box-sizing: border-box;
-    margin-top: 20px;
-    width: 100%;
+    right: 20px;
+    bottom: 10px;
+    // margin-top: 20px;
+    // width: 100%;
     height: 40px;
     display: flex;
     justify-content: flex-end;
@@ -431,3 +465,5 @@ export default {
   }
 }
 </style>
+
+

From 5ef7a316b0ebbf26d737244c5a33401dea701ce4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 21 Apr 2022 16:57:15 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/basicinfo/cpts/roomInfo.vue        | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
index 2b0681bc8..8e06df7f2 100644
--- a/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
+++ b/src/views/modules/visual/basicinfo/cpts/roomInfo.vue
@@ -12,13 +12,13 @@
           <img src="@/assets/img/shuju/people/close.png" />
         </div>
 
-        <div class="list">
+        <!-- <div class="list">
 
           <div class="item">
             <span class="item-field">所属小区：</span>
             <span>{{ formData.neighborHoodName }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="list">
           <div class="item">
             <span class="item-field">所属楼栋：</span>
@@ -35,7 +35,7 @@
         <div class="list">
           <div class="item">
             <span class="item-field">房屋类型：</span>
-            <span>{{ formData.neighborHoodName }}</span>
+            <span>{{ formData.houseTypeName }}</span>
           </div>
 
         </div>
@@ -43,7 +43,15 @@
 
           <div class="item">
             <span class="item-field">房屋状态：</span>
-            <span>{{ formData. houseName }}</span>
+            <span>{{ formData. rentName }}</span>
+          </div>
+
+        </div>
+        <div class="list">
+
+          <div class="item">
+            <span class="item-field">房屋用途：</span>
+            <span>{{ formData. purposeName }}</span>
           </div>
 
         </div>
@@ -51,19 +59,19 @@
 
           <div class="item">
             <span class="item-field">房主姓名：</span>
-            <span>{{ formData.neighborHoodName }}</span>
+            <span>{{ formData.ownerName?formData.ownerName:'无' }}</span>
           </div>
         </div>
         <div class="list">
           <div class="item">
             <span class="item-field">房主电话：</span>
-            <span>{{  formData.buildingName }}</span>
+            <span>{{  formData.ownerPhone?formData.ownerPhone:'无' }}</span>
           </div>
         </div>
         <div class="list">
           <div class="item">
             <span class="item-field">房主身份证：</span>
-            <span>{{ formData. houseName }}</span>
+            <span>{{ formData. ownerIdCard?formData.ownerIdCard:'无' }}</span>
           </div>
 
         </div>
@@ -75,7 +83,7 @@
 
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-import { requestPost } from "@/js/dai/request";
+import { requestGet } from "@/js/dai/request";
 import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
@@ -152,9 +160,9 @@ export default {
 
     async loadHouseInfo () {
 
-      const url = "/gov/org/house/gethouseinfo/" + this.selHouseId
+      const url = "/gov/org/ichouse/" + this.selHouseId
 
-      const { data, code, msg } = await requestPost(url)
+      const { data, code, msg } = await requestGet(url)
 
       if (code === 0) {
         this.formData = data

From 86bcca423059689a9e775aff61e85d4f7f0e1b8c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 22 Apr 2022 09:39:50 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/shuju/measure/jijin.png        | Bin 0 -> 1507 bytes
 src/assets/img/shuju/measure/minban.png       | Bin 0 -> 1510 bytes
 src/assets/img/shuju/measure/other.png        | Bin 0 -> 1523 bytes
 .../visual/communityParty/community.vue       |  25 ++++++++++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/img/shuju/measure/jijin.png
 create mode 100644 src/assets/img/shuju/measure/minban.png
 create mode 100644 src/assets/img/shuju/measure/other.png

diff --git a/src/assets/img/shuju/measure/jijin.png b/src/assets/img/shuju/measure/jijin.png
new file mode 100644
index 0000000000000000000000000000000000000000..78cdcf288bee341eba32c5c6b759fc5a2fdb7503
GIT binary patch
literal 1507
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>+}F%q>h@%q*M@T^tP!U7elGo!#8r%$+Ta
z%q@)#O<iGnUGkGlb5rw5V0u#!dM$D41*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8eKK
z^PqZDaJ$7Er(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N3P78}R!3=B+Ro-U3d
z6}Q$*-k*QjLFD*-%f7j8hJPKoav4QcGy(#-l6oW}1(F!9Eaa|dh!u#HY?zuirFEvN
z2ggD$k5mVaQU@LnRz(f3Xr+nIreFTEO7?c=+3$<Ei+pbBMf|$){oTF2zxS1&Kl9n<
zmwf-7;<7Z&rth%@(sLLpKXBPBda|`<y{^uR6T3fJz1n$i)5bWD8JTmV+TMDuI&<YB
zW0$YYIghS63Hs~v->qJedW&Cc{$<YPTRwj`xSlm>XQYaCxa{lwCjVj-z22-mv2#*N
zKwy5#slcQqldt=|SGHiU7X0Q>q2RUAc(MB7{PdvRT3M!Z6qhHtE%lf&d-KObe>O!#
zY4h1X+xnA1e$%I`r$5}VoiJ0+@Ct)f=as~@597P#`me98;dT8|aaXDOn#L7zy@$!n
zORr|AWe1;sX7G>Yobp=NHRUnk|5jcM`;mCP#mw?si^T57TVs}V&Cts_A;A~e(W<g8
zW9v6v<G1&XlkTf)O58jZDz0K0GSPJEa(6Eqw^xe2J7ix?j=i3F?(OvnQae&#f6Y8!
zIz4H!d)iDE&3{t=F5Q0|mY-B1wTEHqxhVHQ`yK3hA4=xtI-3XW6!n~_Au{oH#LZ7q
zO*IR@g<cSu!R~y}A^hNi_aB18wynClFU`nj(uo@y)5`0f`JVCrQN!0!8@p1LcZrS0
zt5A)7zw>sKZNB`Bow@F@qiZxH`#=4iH4nHCz3pwd|9-(D^9MQ|oU_Y6ZVOn@aqrca
zi06h!_UXA=MKIXc^zof&+VbO9^OBbOb=SXs7M|a=N53igQP_|737w^KC8BHCf4}Hw
aU}k7{d_J>bd1(Zw*!6Vvb6Mw<&;$TK>OSQF

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/minban.png b/src/assets/img/shuju/measure/minban.png
new file mode 100644
index 0000000000000000000000000000000000000000..b99bb7677e51d1afb3344d16fc7e77b6cc028bc1
GIT binary patch
literal 1510
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>>iKj166lEZv+9T^tP!U7anRj4WK8og7V^
zT?|be&7EO-UGkGlb5rw5V0u&FdL0dL>IJ2R+ybD@E~!PCWvMA{Mftf3U_V=B;&zJ*
zPV=C8Q*gS)(iNv(eV}9XK{1OI(=Z`m@&Pg7=@!U=r~K4BU~(@4rt4GfXB8M2m?Ax0
z978H@t(km2Ti8+L`29EQbIk8vQ_Isjs>N2X5ORA?^Z$l$ThWWn4;;G{s>F^I>nGW8
z#IfjCeGCw&5`O9EGJ)$VTkzH!*Z$lvx%4ON+wm{fiC52>Z4(!_J9B2XdH%llXQPi<
zF8}{g^KZ}7)jr1yxMLWPJ8<q{`My?t&z1K)-CC<+lGzMrh3lNs@^tf2_R}-m?)F6N
zr&YOT^#{ZM+x9C>efKg`ReScO`KJ?<a~YyJ?XKzVIG=F(-O3aDPR_6rTfKVa3`SWq
zr;ac8nmE@KN63HL7IRC_q+ebB!y$W7!>K}9r%YyC3N>CEuXm0;`scUHfq}ElPjO64
z|M}eDJ*P^mxZ5+1$zL3kJ~3>y3%~Vn@3o+nev|xs3_Z5CeX-3}Ietd#=N@OF%TIRv
z+EW%jtMR9-h4#^{bJomUl%%5in0t5Dl@lB9MJ-<@XXLu`;dZGlfA>1vd8v>(HR*BY
zq(^Fn*JDe(<khN;cD{RGXS#o*p|-q7{3PG(8#6W(TyR`fki28UZ@Y4{^l#Z7FP3%3
zEw(th(|mbv+A_~cAA9O$W32z*TDvypz!#AU#yZz-Tb{gT&57&ouess(^D>jOdDkKC
zJ-4#t9PP?}cfH`*!7Oyq;rT%ikGq`f{~dlKa(}(E=+3K8XC>=zO|X~zB*}H|>yk2y
zNk!%>wr>r~tDl)&wEZr}o0A>)FRobB+tK`EdW|6`tKjSPg8R3wSQP%iM1tqqqHc3$
zR;d>aSqA_9%{sVK&ed!N>uE)I_CGAE4@&R_as282J1_pu4~-Mn%*UF;1@|8=+o0d1
h*EBUl{w;?A!|WwzuN*t@-V;>vdb;|#taD0e0s!@dK+ymI

literal 0
HcmV?d00001

diff --git a/src/assets/img/shuju/measure/other.png b/src/assets/img/shuju/measure/other.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa3e23523450078a0531e9636cb5fba7ebdeb22
GIT binary patch
literal 1523
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVxeGesb^?r
zVqk2hqhMrUXsK^tp>JrcYhY+)U}j}%t^fr}K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4Kr@W=jf`}GDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf)UV33L4>=c`5nj
z#hPFZzP?tTdBr7(dC94sF1AWQBlI#eQ>-jqOw3H3ja{4#T^tP!U7an=j1ApfUEM4l
z-7G8&jm%+sUGkGlb5rw5V0u#!dR=kq1*L`D0-((<sYRJ(sVQzn`MC;UKU-zuc8e2E
z^PqZDaJ$7Br(S)aWAs5Wixkr^Az<<WG2!VJ$bqN))I4BvF9N3PALrYbFfcHsdAc};
zRNPuK`E0hZqsW2#Z^F%9F57rgjaNvQQCmam>jTXWbI0|MTw9bX1fm31{&%>To#$p#
z^>L9nzmws1CEJealay{<SrTe!m}!=oGt1X(w(R|uK(pHs`g(t6ROa8?QyK5AvGjwz
zUFMugcVfc|clMuA^jy-m$4Tze^6>2B_Z7-YpLa3{Olp3aA@#+e!GGa}?VKjj3{$ft
zbF6(ghj05YJ5fpBbMr|P&aC>H=AJZ0(G_;3B>@_??y<ivbewp^6)5y^n@~SnLlCoa
z^2@!>=N8OywY2-OlRYi*H_O==y??e!k$mirCpIW>`s|9_U8r*0pKIgv-D}M96=j&x
zt%^9mEBCQ%pRl81md^^V6-tf2+LNx=Zri-?=C_4g<>hDgv|e@2Uh?w^Tj>f{mPIFo
zUvYoR$Ys3xe&UohKR3@(+T7*nz`s^*g`kb}+cdB5_R~}f_g#MJ_|ltK=k&22R}Z=V
z#$_vSY;m-UH$T7g{e_(`4zBxa@Ycsj<=!Rde-q}-I(UxXLCAHDaf9>9%Uez!+F@CA
zU8Cd9y0_oo*XEVQYcnm>x~9D1)Pw1)3BOOx+xltay`6n!<r6Mgxcltvn3MieYFTcL
z(V5Ul1!wl2{Iz+BtFK1OPh)<d^NE48S~k{sSq%S~X}7})*51<Vo^g3u;=4SPU23oV
zcjc)4+&gids*NW9+^}1J=bA4~Tb^zGJ4XKFjk6WXt15VI?0>SM_cZ6^?KWli_X_GN
zFTbHtIP<K_WcLLMVwWDge!u?k`(Bq61<91dsW;LuH`F{`ecN;5?eOEiX4M}#&;MpB
r>M3vi%V%46ZqBoblgj(*I1L!2pPipvs+*??Duz8>{an^LB{Ts5Z~j0X

literal 0
HcmV?d00001

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 26027e7ba..4ca3c39e0 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -352,6 +352,18 @@ export default {
           4: {
             color: 'rgba(192, 21, 195, 1)',
             icon: require('../../../../assets/img/shuju/measure/qita.png')
+          },
+          5: {
+            color: '#ee7801',
+            icon: require('../../../../assets/img/shuju/measure/minban.png')
+          },
+          6: {
+            color: '#e70683',
+            icon: require('../../../../assets/img/shuju/measure/jijin.png')
+          },
+          7: {
+            color: '#0189d5',
+            icon: require('../../../../assets/img/shuju/measure/other.png')
           }
         }
         this.partyItem = data.map((item, index) => {
@@ -511,8 +523,14 @@ export default {
             item.urlIndex = 2
           } else if (item.type === '机关直属部门') {
             item.urlIndex = 3
-          } else if (item.type === '其他') {
+          } else if (item.type === '社会团体') {
             item.urlIndex = 4
+          } else if (item.type === '民办非企业单位') {
+            item.urlIndex = 5
+          } else if (item.type === '基金会') {
+            item.urlIndex = 6
+          } else if (item.type === '其他') {
+            item.urlIndex = 7
           }
         });
 
@@ -522,7 +540,10 @@ export default {
           require('../../../../assets/img/shuju/measure/lxzz.png'),//两新组织
           require('../../../../assets/img/shuju/measure/qydw.png'),//区域单位党建
           require('../../../../assets/img/shuju/measure/jgzs.png'),//机关直属部门
-          require('../../../../assets/img/shuju/measure/qita.png')//其他
+          require('../../../../assets/img/shuju/measure/qita.png'),//社会团体
+          require('../../../../assets/img/shuju/measure/minban.png'),//民办
+          require('../../../../assets/img/shuju/measure/jijin.png'),//基金
+          require('../../../../assets/img/shuju/measure/other.png')//其他
         ]
 
 

From b2e69be0841619c4fd3bba6e8be36eb0c91917b4 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 22 Apr 2022 11:03:35 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=88=B7=E7=B1=8D?=
 =?UTF-8?q?=EF=BC=8C=E8=80=81=E5=B9=B4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue |  2 +-
 src/views/components/resiForm.vue | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 4a2fdff25..d3b243f5f 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -812,7 +812,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 190px;
+    width: 190px;
 }
 
 </style>
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index eeaaedc04..1c1c95d7e 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -491,9 +491,16 @@ export default {
       console.log('n---', n)
       if (n.columnName !== 'ID_CARD') return
       if (!isCard(this.form.ID_CARD)) return
-      const { sex, birth } = computedCard(this.form.ID_CARD)
+      const { user } = this.$store.state
+      const i = user.areaCodePath && user.areaCodePath.length - 1
+      const huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
+      const _id = this.form.ID_CARD.substr(0, 6)
+      const { sex, birth, age } = computedCard(this.form.ID_CARD)
       this.form.BIRTHDAY = birth
       this.form.GENDER = sex == 1 ? '1' : '2'
+      this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0'
+      this.form.IS_BDHJ = huji == _id ? '1' : ''
+      console.log('age-----', age, _id)
     },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
@@ -760,7 +767,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 190px;
+    width: 190px;
 }
 .resi-cell-value {
   :deep .el-col {

From 805b5025e5378b2d496f639bf8041fdccc982ed3 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 22 Apr 2022 11:15:49 +0800
Subject: [PATCH 6/6] dd

---
 src/views/components/resiForm.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 1c1c95d7e..c84b11a16 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -492,8 +492,11 @@ export default {
       if (n.columnName !== 'ID_CARD') return
       if (!isCard(this.form.ID_CARD)) return
       const { user } = this.$store.state
-      const i = user.areaCodePath && user.areaCodePath.length - 1
-      const huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
+      let huji = '', i = 0
+      if (user.areaCodePath && user.areaCodePath.length > 0) {
+        i = user.areaCodePath.length - 1
+        huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
+      }
       const _id = this.form.ID_CARD.substr(0, 6)
       const { sex, birth, age } = computedCard(this.form.ID_CARD)
       this.form.BIRTHDAY = birth