From b7e3e2ce50cd7139c2c2cc96dde7d27c7c024bf7 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Sun, 8 Oct 2023 15:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=82=E8=A7=88=09=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/overview/components/jdwgy.vue   | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue
index f5946eb4b..6bc4faf9b 100644
--- a/src/views/dataBoard/overview/components/jdwgy.vue
+++ b/src/views/dataBoard/overview/components/jdwgy.vue
@@ -1,17 +1,16 @@
 <template>
   <div class="m-subbox m-jdwgy">
     <div class="table">
-      <el-table :data="list" v-if="currentLevelData.orgLevel != 'grid'" 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="orgName" width="120" label="组织名称"/>
-        <el-table-column prop="name" width="120" label="姓名"/>
+      <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">
+        <el-table-column label="序号" type="index" width="80" />
+        <el-table-column prop="orgName" width="120" label="组织名称" />
+        <el-table-column prop="name" width="120" label="姓名" />
         <el-table-column prop="gender" width="120" label="性别">
           <template slot-scope="scope">
             {{ genders[scope.row.gender] }}
           </template>
         </el-table-column>
-        <el-table-column prop="age" width="120" label="年龄"/>
+        <el-table-column prop="age" width="120" label="年龄" />
         <el-table-column prop="mobile" label="电话">
           <template slot-scope="scope">
             {{ $sensitive(scope.row.mobile, 3, 7) }}
@@ -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="组织名称" />
@@ -31,11 +40,11 @@
             <span :style="'color:' + scope.row.type">{{ types[scope.row.type] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="houseNum" width="90" label="户数"/>
-        <el-table-column prop="demandNum" width="90" label="需求"/>
-        <el-table-column prop="eventNum" width="90" label="事件"/>
-        <el-table-column prop="importanceNum" label="重点人群"/>
-        <el-table-column prop="safetyNum" label="安全隐患"/>
+        <el-table-column prop="houseNum" width="90" label="户数" />
+        <el-table-column prop="demandNum" width="90" label="需求" />
+        <el-table-column prop="eventNum" width="90" label="事件" />
+        <el-table-column prop="importanceNum" label="重点人群" />
+        <el-table-column prop="safetyNum" label="安全隐患" />
         <el-table-column prop="operate" width="80" label="操作">
           <template slot-scope="scope">
             <el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
@@ -62,14 +71,16 @@ export default {
     return {
       list: [],
       wglist: [],
+      unitList: [],
       genders: ["未知", "男", "女"],
-      types: {red: "红", yellow: "黄", green: "绿色"},
+      types: { red: "红", yellow: "黄", green: "绿色" },
       chooseName: {},
       loading: false,
     };
   },
   watch: {
     peopleType(val) {
+      // console.log("val", val);
       this.getData();
     },
     currentLevelData(val) {
@@ -87,24 +98,19 @@ export default {
     getData(level = "", orgId = "") {
       this.loading = true;
       if (level == "grid") {
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" +
-            this.peopleType +
-            "&level=" + this.currentLevelData.orgLevel +
-            "&orgId=" + this.currentLevelData.orgId).then(({data: {data}}) => {
+        this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + this.peopleType + "&level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId).then(({ data: { data } }) => {
           this.loading = false;
           this.wglist = data;
           this.$emit(
-              "setPoint",
-              data.filter((item) => item.longitude && item.latitude)
+            "setPoint",
+            data.filter((item) => item.longitude && item.latitude)
           );
         });
       } else {
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" +
-            this.currentLevelData.orgLevel + "&orgId=" +
-            this.currentLevelData.orgId + "&personnelType=" +
-            this.peopleType).then(({data: {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;
           this.list = data.personnelInfoVOList;
+          this.unitList = data.departmentInfoVOList ? data.departmentInfoVOList : [];
           this.$emit("setNum", data.orgPersonnelVOList);
         });
       }