问题修改

src/views/dataBoard/overview/components/jdwgy.vue

@@ -138,15 +138,12 @@ export default {
           );
         });
       } else {
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { code, msg, data } }) => {
+        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { data } }) => {
           this.loading = false;
-          if (code === 0) {
+          console.log(data);
           this.list = data.personnelInfoVOList;
           this.unitList = data.departmentInfoVOList ? data.departmentInfoVOList : [];
           this.$emit("setNum", data.orgPersonnelVOList);
-          } else {
-            this.$message.error(msg);
-          }
         });
       }
     },

src/views/dataBoard/overview/components/map-top.vue

@@ -4,7 +4,7 @@
       <div class="item" :class="selectIndex === 'staffAgency' ? 'xz' : ''">
         <div class="item-info" @click="selectIcon('staffAgency')">
           <div>
-            <img src="~@/assets/images/shuju/overview/sqgzz-icon.png"/>
+            <img src="~@/assets/images/shuju/overview/sqgzz-icon.png" />
             社区工作者
           </div>
           <div>
@@ -15,7 +15,7 @@
       <div class="item" :class="selectIndex === 'staffGrid' ? 'xz' : ''">
         <div class="item-info" @click="selectIcon('staffGrid')">
           <div>
-            <img src="~@/assets/images/shuju/overview/wgy-icon.png"/>
+            <img src="~@/assets/images/shuju/overview/wgy-icon.png" />
             网格员
           </div>
           <div>
@@ -24,9 +24,9 @@
         </div>
       </div>
       <div class="item" :class="selectIndex === 'chief' ? 'xz' : ''">
-        <div class="item-info" @click="selectIcon( 'chief')">
+        <div class="item-info" @click="selectIcon('chief')">
           <div>
-            <img src="~@/assets/images/shuju/overview/lzz-icon.png"/>
+            <img src="~@/assets/images/shuju/overview/lzz-icon.png" />
             楼组/单元长
           </div>
           <div>
@@ -37,7 +37,7 @@
       <div class="item" :class="selectIndex === 'publicWelfareNum' ? 'xz' : ''">
         <div class="item-info" @click="selectIcon('publicWelfareNum')">
           <div>
-            <img src="~@/assets/images/shuju/overview/gyg-icon.png"/>
+            <img src="~@/assets/images/shuju/overview/gyg-icon.png" />
             公益岗
           </div>
           <div>
@@ -47,18 +47,16 @@
       </div>
       <div class="item" :class="selectIndex === 'staffDepartment' ? 'xz' : ''">
         <div class="item-info" @click="selectIcon('staffDepartment')">
-          <div>
+          <div><img src="~@/assets/images/shuju/overview/dwzz-icon.png" />单位/组织</div>
-            <img src="~@/assets/images/shuju/overview/dwzz-icon.png"/>单位/组织
-          </div>
           <div>
             <b>{{ numData.staffDepartmentNum }}</b>
           </div>
         </div>
       </div>
-      <div class="item" :class="selectIndex === 'volunteer'? 'xz':''">
+      <div class="item" :class="selectIndex === 'volunteer' ? 'xz' : ''">
         <div class="item-info" @click="selectIcon('volunteer')">
           <div>
-            <img src="~@/assets/images/shuju/overview/zyz-icon.png"/>
+            <img src="~@/assets/images/shuju/overview/zyz-icon.png" />
             志愿者
           </div>
           <div>
@@ -71,7 +69,7 @@
       <div class="item" :class="selectIndex === 'unit' ? 'xz' : ''" @click="selectIcon('unit')">
         <div class="item-info">
           <div>
-            <img src="~@/assets/images/overview/icon_wg.png"/>
+            <img src="~@/assets/images/overview/icon_wg.png" />
             微网格
           </div>
           <div>
@@ -82,7 +80,7 @@
       <div class="item" :class="selectIndex === 'building' ? 'xz' : ''" @click="selectIcon('building')">
         <div class="item-info">
           <div>
-            <img src="~@/assets/images/overview/icon_ld.png"/>
+            <img src="~@/assets/images/overview/icon_ld.png" />
             楼栋
           </div>
           <div>
@@ -90,10 +88,10 @@
           </div>
         </div>
       </div>
-      <div class="item" >
+      <div class="item">
         <div class="item-info">
           <div>
-            <img src="~@/assets/images/overview/icon_fw.png"/>
+            <img src="~@/assets/images/overview/icon_fw.png" />
             房屋
           </div>
           <div>
@@ -101,10 +99,10 @@
           </div>
         </div>
       </div>
-      <div class="item" >
+      <div class="item">
         <div class="item-info">
           <div>
-            <img src="~@/assets/images/overview/icon_jm.png"/>
+            <img src="~@/assets/images/overview/icon_jm.png" />
             居民
           </div>
           <div>
@@ -125,12 +123,16 @@ export default {
     },
     level: {
       type: String,
-      default: '',
+      default: "",
+    },
+    peopleType: {
+      type: String,
+      default: "",
     },
   },
   data() {
     return {
-      selectIndex: 0,
+      selectIndex: "",
       numData: {},
     };
   },
@@ -140,6 +142,18 @@ export default {
         this.getData(val);
       }
     },
+    peopleType(val) {
+      if (val) {
+        this.selectIndex = val;
+      }
+    },
+    level(val) {
+      if (val === "grid") {
+        this.selectIndex = "unit";
+      } else {
+        this.selectIndex = "staffAgency";
+      }
+    },
   },
   mounted() {
     if (this.currentLevelData.orgId) {
@@ -152,14 +166,7 @@ export default {
       this.$emit("changeType", type);
     },
     getData(item) {
-      this.$http
+      this.$http.get("/actual/base/streetOverview/mapOrgSum?level=" + item.orgLevel + "&orgId=" + item.orgId).then(({ data: { data } }) => {
-          .get(
-              "/actual/base/streetOverview/mapOrgSum?level=" +
-              item.orgLevel +
-              "&orgId=" +
-              item.orgId
-          )
-          .then(({data: {data}}) => {
         this.numData = data;
       });
     },
@@ -167,11 +174,7 @@ export default {
 };
 </script>
 
-<style
+<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
-    lang="scss"
-    src="@/assets/scss/dataBoard/overview/index.scss"
-    scoped
-></style>
 <style lang="scss" scoped>
 .xz {
   background: url("@/assets/images/shuju/overview/top-xz-bg.png") !important;

src/views/dataBoard/overview/index.vue

@@ -19,7 +19,7 @@
       </div>
       <div class="g-center">
         <div :class="listShow ? 'm-map' : 'g-center-open'" style="overflow: hidden">
-          <map-top :currentLevelData="currentLevelData" @changeType="changeType" :level="currentLevel" />
+          <map-top :currentLevelData="currentLevelData" :peopleType="peopleType" @changeType="changeType" :level="currentLevel" />
           <div v-if="breadList.length > 1" class="go-back" @click="goBackMap">
             <img src="~@/assets/images/shuju/overview/go-back.png" />
           </div>