From 5c24cb1524f299fe73ca7d9bdee5aa898d7ba9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com>
Date: Sun, 8 Oct 2023 19:17:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=9C=89=E6=97=A0=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataBoard/overview/components/jdwgy.vue   | 127 +++++++++++++-----
 src/views/dataBoard/renfang/index.vue         |  26 ++--
 src/views/dataBoard/renfang/resi/classNew.vue |  26 ++--
 3 files changed, 123 insertions(+), 56 deletions(-)

diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue
index 0ccc7c1e1..33ef7db38 100644
--- a/src/views/dataBoard/overview/components/jdwgy.vue
+++ b/src/views/dataBoard/overview/components/jdwgy.vue
@@ -1,7 +1,16 @@
 <template>
   <div class="m-subbox m-jdwgy">
     <div class="table">
-      <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
+        :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="姓名" />
@@ -18,13 +27,25 @@
         </el-table-column>
         <el-table-column prop="operate" width="80" label="操作">
           <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
+            <el-button @click="handleClick(scope.row)" type="text" size="small">
+              查看</el-button
+            >
           </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
+        :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="职责" />
@@ -32,12 +53,20 @@
         <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
+        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="组织名称" />
         <el-table-column prop="type" width="90" label="类型">
           <template slot-scope="scope">
-            <span :style="'color:' + scope.row.type">{{ types[scope.row.type] }}</span>
+            <span :style="'color:' + scope.row.type">{{
+              types[scope.row.type]
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="houseNum" width="90" label="户数" />
@@ -47,7 +76,9 @@
         <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>
+            <el-button @click="handleClick(scope.row)" type="text" size="small">
+              查看</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -109,44 +140,72 @@ export default {
       this.loading = true;
       if (this.currentLevelData.orgLevel == "grid") {
         const personType = this.ifUnit ? "unit" : this.peopleType;
-        this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + personType + "&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)
-          );
-        });
+        this.$http
+          .get(
+            "/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" +
+              personType +
+              "&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)
+            );
+          });
       } else {
-        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);
-        });
+        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);
+          });
       }
     },
     handleClick(item) {
-      if (this.currentLevelData.orgLevel == "grid") {
-        this.$router.push({
-          path: "/homeDetails/index",
-          query: {
-            id: item.id,
-          },
-        });
+      if (item.id) {
+        if (this.currentLevelData.orgLevel == "grid") {
+          this.$router.push({
+            path: "/homeDetails/index",
+            query: {
+              id: item.id,
+            },
+          });
+        } else {
+          this.$router.push({
+            path: "/dataBoard/overview/resident",
+            query: {
+              user_id: item.id,
+            },
+          });
+        }
       } else {
-        this.$router.push({
-          path: "/dataBoard/overview/resident",
-          query: {
-            user_id: item.id,
-          },
-        });
+        this.$message.error("该人员暂无居民信息！");
       }
     },
   },
 };
 </script>
-<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
+<style
+  lang="scss"
+  src="@/assets/scss/dataBoard/overview/index.scss"
+  scoped
+></style>
 <style lang="scss" src="@/assets/scss/dataBoard/table.scss" scoped></style>
 <style lang="scss" scoped>
 /deep/ .table {
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 7c1fb83f3..f4aa3483a 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -536,7 +536,7 @@ export default {
 
       this.loading = true;
     },
-	jumpPath(pageType, type_id = "", type_name){
+    jumpPath(pageType, type_id = "", type_name) {
       this.$router.push({
         path: "/dataBoard/renfang/visualizing",
         query: {
@@ -546,17 +546,21 @@ export default {
           pageType,
         },
       });
-	},
+    },
     toResiClassPage(pageType, type_id = "", type_name) {
-      this.$router.push({
-        path: "/dataBoard/renfang/resi-class",
-        query: {
-          org_id: this.orgId,
-          type_id,
-          type_name,
-          pageType,
-        },
-      });
+      if (type_id) {
+        this.$router.push({
+          path: "/dataBoard/renfang/resi-class",
+          query: {
+            org_id: this.orgId,
+            type_id,
+            type_name,
+            pageType,
+          },
+        });
+      } else {
+        this.$message.error("该人员暂无居民信息！");
+      }
     },
 
     handleClickDotBtn(type, info) {
diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue
index 7e18b631d..13b01c5f2 100644
--- a/src/views/dataBoard/renfang/resi/classNew.vue
+++ b/src/views/dataBoard/renfang/resi/classNew.vue
@@ -585,17 +585,21 @@ export default {
     },
     jumpPage(index) {
       let item = this.listData[index];
-      this.$router.push({
-        path: "/dataBoard/renfang/resident",
-        query: {
-          org_id: this.org_id,
-          type_id: this.type_id,
-          user_id: item.id,
-          type: this.type,
-          pageType: this.pageType,
-          type_name: this.type_name,
-        },
-      });
+      if (item.id) {
+        this.$router.push({
+          path: "/dataBoard/renfang/resident",
+          query: {
+            org_id: this.org_id,
+            type_id: this.type_id,
+            user_id: item.id,
+            type: this.type,
+            pageType: this.pageType,
+            type_name: this.type_name,
+          },
+        });
+      } else {
+        this.$message.error("该人员暂无居民信息！");
+      }
     },
     handlePageNoChange(pageNo) {
       this.pageNo = pageNo;