From 290cb675fe03ba6a7052e453098cf91bcfb0f405 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Thu, 21 Sep 2023 11:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E3=80=81=E5=B1=85=E6=B0=91=E7=94=BB?=
 =?UTF-8?q?=E5=83=8F=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GridTree/nodeWrap.vue          |  3 +-
 src/router/index.js                           |  6 +-
 .../personnel/components/Breadcrumb/index.vue |  0
 .../personnel/components/Pagination/index.vue |  0
 .../personnel/components/Tabs/index.vue       |  0
 .../personnel/components/Title/index.vue      |  0
 .../personnel/index.vue                       |  0
 .../personnel/modules/BusinessRecords.vue     |  0
 .../personnel/modules/EnjoyService.vue        |  0
 .../personnel/modules/Family.vue              |  0
 .../personnel/modules/MatterDetails.vue       |  0
 .../personnel/modules/PointsRecord.vue        |  0
 .../organizational/microgrid/index.vue        | 79 +++++++++++--------
 13 files changed, 51 insertions(+), 37 deletions(-)
 rename src/views/dataBoard/{organizational => cpts}/personnel/components/Breadcrumb/index.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/components/Pagination/index.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/components/Tabs/index.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/components/Title/index.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/index.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/modules/BusinessRecords.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/modules/EnjoyService.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/modules/Family.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/modules/MatterDetails.vue (100%)
 rename src/views/dataBoard/{organizational => cpts}/personnel/modules/PointsRecord.vue (100%)

diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index c22d450d1..0f046637d 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -96,7 +96,8 @@ export default {
     },
     gotoPersonnel(item) {
       const grandPid = this.findParentParentId(this.nodeConfig, item.pid);
-      this.$router.push(`/organizational/microgrid/${item.id}/${grandPid}`);
+      const name = item.name ? item.name : "恭喜发财";
+      this.$router.push(`/organizational/microgrid/${item.id}/${grandPid}/${name}`);
     },
   },
 };
diff --git a/src/router/index.js b/src/router/index.js
index adf278a25..858bb677a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -236,7 +236,7 @@ export const dataBoardRoutes = {
       meta: {
         title: "可视化数据",
         isTab: false,
-        keepAlive:false
+        keepAlive: false,
       },
     },
     {
@@ -414,7 +414,7 @@ export const dataBoardRoutes = {
     {
       path: "/organizational/orgPersonnel",
       props: true,
-      component: () => import("@/views/dataBoard/organizational/personnel/index"),
+      component: () => import("@/views/dataBoard/cpts/personnel/index"),
       name: "OrgPersonnel",
       meta: {
         title: "居民画像",
@@ -422,7 +422,7 @@ export const dataBoardRoutes = {
       },
     },
     {
-      path: "/organizational/microgrid/:id/:pid",
+      path: "/organizational/microgrid/:id/:pid/:name",
       props: true,
       component: () => import("@/views/dataBoard/organizational/microgrid/index"),
       name: "Microgrid",
diff --git a/src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue b/src/views/dataBoard/cpts/personnel/components/Breadcrumb/index.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue
rename to src/views/dataBoard/cpts/personnel/components/Breadcrumb/index.vue
diff --git a/src/views/dataBoard/organizational/personnel/components/Pagination/index.vue b/src/views/dataBoard/cpts/personnel/components/Pagination/index.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/components/Pagination/index.vue
rename to src/views/dataBoard/cpts/personnel/components/Pagination/index.vue
diff --git a/src/views/dataBoard/organizational/personnel/components/Tabs/index.vue b/src/views/dataBoard/cpts/personnel/components/Tabs/index.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/components/Tabs/index.vue
rename to src/views/dataBoard/cpts/personnel/components/Tabs/index.vue
diff --git a/src/views/dataBoard/organizational/personnel/components/Title/index.vue b/src/views/dataBoard/cpts/personnel/components/Title/index.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/components/Title/index.vue
rename to src/views/dataBoard/cpts/personnel/components/Title/index.vue
diff --git a/src/views/dataBoard/organizational/personnel/index.vue b/src/views/dataBoard/cpts/personnel/index.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/index.vue
rename to src/views/dataBoard/cpts/personnel/index.vue
diff --git a/src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue b/src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue
rename to src/views/dataBoard/cpts/personnel/modules/BusinessRecords.vue
diff --git a/src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue b/src/views/dataBoard/cpts/personnel/modules/EnjoyService.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue
rename to src/views/dataBoard/cpts/personnel/modules/EnjoyService.vue
diff --git a/src/views/dataBoard/organizational/personnel/modules/Family.vue b/src/views/dataBoard/cpts/personnel/modules/Family.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/modules/Family.vue
rename to src/views/dataBoard/cpts/personnel/modules/Family.vue
diff --git a/src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue
rename to src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
diff --git a/src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue b/src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue
similarity index 100%
rename from src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue
rename to src/views/dataBoard/cpts/personnel/modules/PointsRecord.vue
diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue
index 0f8f8a1f0..300df0841 100644
--- a/src/views/dataBoard/organizational/microgrid/index.vue
+++ b/src/views/dataBoard/organizational/microgrid/index.vue
@@ -12,42 +12,41 @@
       <el-table :data="list" v-loading="loading" element-loading-text="加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 21, 64, 0.3)">
         <el-table-column label="序号" type="index" width="80" />
         <!-- 上报事件 -->
-        <template v-if="otherTabel === 'sbsj'">
-          <el-table-column prop="categoryName" label="事件类型" />
-          <el-table-column prop="addeventContentress" label="事件描述" />
-          <el-table-column prop="status" label="办理情况" />
-          <el-table-column prop="happenTime" label="上报时间" />
-        </template>
-
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="categoryName" label="事件类型" />
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="addeventContentress" label="事件描述" />
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="status" label="办理情况">
+          <template slot-scope="scope">
+            {{ getStatusMap(scope.row.status) }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="otherTabel === 'sbsj'" prop="happenTime" label="上报时间" />
         <!-- 居民需求 -->
-        <template v-if="otherTabel === 'jmxq'">
-          <el-table-column prop="categoryName" label="需求类型" />
-          <el-table-column prop="content" label="需求描述" />
-          <el-table-column prop="status" label="办理情况" />
-          <el-table-column prop="reportTime" label="上报时间" />
-        </template>
+        <el-table-column v-if="otherTabel === 'jmxq'" prop="categoryName" label="需求类型" />
+        <el-table-column v-if="otherTabel === 'jmxq'" prop="content" label="需求描述" />
+        <el-table-column v-if="otherTabel === 'jmxq'" prop="status" label="办理情况">
+          <template slot-scope="scope">
+            {{ getStatusMap(scope.row.status) }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="otherTabel === 'jmxq'" prop="reportTime" label="上报时间" />
         <!-- 统治人群 -->
-        <template v-if="otherTabel === 'tzrq'">
-          <el-table-column prop="organizationName" label="所属组织" />
-          <el-table-column prop="gridName" label="所属网格" />
-          <el-table-column prop="familyName" label="所属家庭" />
-          <el-table-column prop="name" label="姓名" />
-          <el-table-column prop="mobile" label="联系电话" />
-          <el-table-column prop="gender" label="性别" />
-          <el-table-column prop="idNum" label="证件号" />
-          <el-table-column prop="categoryType" label="人员类别" />
-          <el-table-column prop="remark" label="备注" />
-        </template>
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="organizationName" label="所属组织" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="gridName" label="所属网格" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="familyName" label="所属家庭" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="name" label="姓名" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="mobile" label="联系电话" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="gender" label="性别" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="idNum" label="证件号" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="categoryType" label="人员类别" />
+        <el-table-column v-if="otherTabel === 'tzrq'" prop="remark" label="备注" />
         <!-- 安全隐患 -->
-        <template v-if="otherTabel === 'aqyh'">
-          <el-table-column prop="placeOrgName" label="场所名称" />
-          <el-table-column prop="patrolTime" label="巡查时间" />
-          <el-table-column prop="staffName" label="巡查人员" />
-          <el-table-column prop="mobile" label="联系电话" />
-          <el-table-column prop="detailed" label="隐患明细" />
-          <el-table-column prop="attachmentUrl" label="图片" />
-          <el-table-column prop="reviewTime" label="拟复查时间" />
-        </template>
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="placeOrgName" label="场所名称" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="patrolTime" label="巡查时间" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="staffName" label="巡查人员" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="mobile" label="联系电话" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="detailed" label="隐患明细" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="attachmentUrl" label="图片" />
+        <el-table-column v-if="otherTabel === 'aqyh'" prop="reviewTime" label="拟复查时间" />
         <el-table-column label="操作" width="90" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="handleView(scope.row)">查看</el-button>
@@ -74,6 +73,7 @@ import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination
 import SameDialog from "./components/popDetails.vue";
 import ReportAnEvent from "./components/reportAnEvent.vue";
 import Safetyhazard from "./components/safetyhazard.vue";
+import { get } from "sortablejs";
 export default {
   name: "Microgrid",
   components: { Breadcrumb, Pagination, SameDialog, ReportAnEvent, Safetyhazard },
@@ -140,6 +140,7 @@ export default {
   },
   mounted() {
     this.getList();
+    this.breadcrumbList[1].name = this.paramsData.name + "（" + "微网格" + "）";
   },
   methods: {
     getList() {
@@ -166,6 +167,7 @@ export default {
     },
 
     chooseNav(item) {
+      this.list = [];
       this.itemNav = item.key;
       this.otherTabel = item.key === 1 ? "sbsj" : item.key === 2 ? "jmxq" : item.key === 3 ? "tzrq" : "aqyh";
       this.navList.forEach((d) => {
@@ -200,6 +202,17 @@ export default {
         this.showDialogSaft = true;
       }
     },
+
+    getStatusMap(s) {
+      const statusMap = new Map([
+        ["pending", "待处理"],
+        ["canceled", "已取消"],
+        ["assigned", "已派单"],
+        ["have_order", "已接单"],
+        ["finished", "已完成"],
+      ]);
+      return statusMap.get(s);
+    },
   },
 };
 </script>