Merge branch 'dev-fangyi' into test

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

@@ -14,14 +14,19 @@
       </div>
     </div>
 
-    <div class="div_content">
+    <people v-if="orgLevel==='people'"
+            :uid="selUserId"
+            ref="ref_people"></people>
+
+    <div v-show="orgLevel!=='people' "
+         class="div_content">
 
       <basic-info-community v-show="orgLevel==='neighborHood'"
                             @toSubAgency="toSubAgency"
                             ref="ref_community"
                             @refreshInfoList="refreshInfoList"></basic-info-community>
 
-      <div v-show="orgLevel!=='neighborHood'"
+      <div v-show="orgLevel!=='people'  && orgLevel!=='neighborHood'"
            class="div_map"
            id="map"
            ref="map">
@@ -147,6 +152,7 @@ import { Loading } from 'element-ui'; //引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import BasicInfoCommunity from "./basicInfoCommunity";
 
+import People from "./people";
 import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
 
@@ -378,46 +384,59 @@ const vueGis = {
       this.toSubAgency('polygon', e)
     },
 
-    //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区） 
+    //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）    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 (!e) {
+        if (!e) {
-        return false
+          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 (!e.selected[0]) {
-
+          return false
-      if (this.orgLevel === 'neighborHood') {
+        }
-        this.loadList()
+        this.runNum++
-        this.$nextTick(() => {
+        this.orgData.center = map.getView().getCenter()
-          // 小区id，小区名称
+        this.orgData.zoom = map.getView().getZoom()
-          this.$refs.ref_community.initData(this.orgData.id, this.orgData.name);
+        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
+          }
         });
 
-      } else {
+        if (this.orgLevel === 'neighborHood') {
-        this.refreshMap(true)
+          this.loadList()
-      }
+          this.$nextTick(() => {
+            // 小区id，小区名称
+            this.$refs.ref_community.initData(this.orgData.id, this.orgData.name);
+          });
 
+        } else {
+          this.refreshMap(true)
+        }
 
+      }
 
     },
 
@@ -511,7 +530,11 @@ const vueGis = {
       this.center = this.orgData.center
       this.zoom = this.orgData.zoom
 
-      if (this.orgLevel === 'neighborHood') {//显示小区
+      if (this.orgLevel === 'people') {
+
+      }
+
+      else if (this.orgLevel === 'neighborHood') {//显示小区
 
       } else {
 
@@ -928,7 +951,7 @@ const vueGis = {
     ...mapGetters(["clientHeight"])
 
   },
-  components: { BasicInfoCommunity, cptCard, ScreenLoading },
+  components: { BasicInfoCommunity, People, cptCard, ScreenLoading },
 }
 export default vueGis;
 </script>