Merge branch 'jw_feature_songzhen' of http://120.46.222.128:10021/elink-star/epmet-work-pc into jw_feature_dev

# Conflicts:
#	src/views/dataBoard/overview/components/jdwgy.vue

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

@@ -1,8 +1,7 @@
 <template>
   <div class="m-subbox m-jdwgy">
     <div class="table">
-      <el-table :data="list" v-if="currentLevelData.orgLevel != 'grid'" v-loading="loading"
+      <el-table :data="list" v-if="currentLevelData.orgLevel != 'grid' && peopleType != 'staffDepartment'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
-                element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
         <el-table-column label="序号" type="index" width="80" />
         <el-table-column prop="orgName" width="120" label="组织名称" />
         <el-table-column prop="name" width="120" label="姓名" />
@@ -23,6 +22,16 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <!-- 单位/组织 -->
+      <el-table :data="unitList" v-if="currentLevelData.orgLevel != 'grid' && peopleType === 'staffDepartment'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
+        <el-table-column label="序号" type="index" width="80" />
+        <el-table-column prop="departmentName" label="单位名称" />
+        <el-table-column prop="departmentDuty" label="职责" />
+        <el-table-column prop="deptType" label="单位类型" />
+        <el-table-column prop="totalUser" label="总人数" />
+      </el-table>
+
       <el-table v-if="currentLevelData.orgLevel == 'grid'" :data="wglist" v-loading="loading" max-height="190px" height="190px">
         <el-table-column label="序号" type="index" width="50" />
         <el-table-column prop="name" width="140" label="组织名称" />
@@ -62,6 +71,7 @@ export default {
     return {
       list: [],
       wglist: [],
+      unitList: [],
       genders: ["未知", "男", "女"],
       types: { red: "红", yellow: "黄", green: "绿色" },
       chooseName: {},
@@ -70,6 +80,7 @@ export default {
   },
   watch: {
     peopleType(val) {
+      // console.log("val", val);
       this.getData();
     },
     currentLevelData(val) {
@@ -99,12 +110,10 @@ export default {
           );
         });
       } else {
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" +
+        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { data } }) => {
-            this.currentLevelData.orgLevel + "&orgId=" +
-            this.currentLevelData.orgId + "&personnelType=" +
-            this.peopleType).then(({data: {data}}) => {
           this.loading = false;
           this.list = data.personnelInfoVOList;
+          this.unitList = data.departmentInfoVOList ? data.departmentInfoVOList : [];
           this.$emit("setNum", data.orgPersonnelVOList);
         });
       }