From 7575b445e09776f711cec9f30db077830c90835c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=8B=A5=E6=99=A8?= <974220104@qq.com>
Date: Fri, 3 Nov 2023 13:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E7=94=BB=E5=83=8F=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F=E9=9D=A2=E5=8C=85?=
 =?UTF-8?q?=E5=B1=91=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 10 ++
 .../dataBoard/cpts/family/modules/Family.vue  | 10 +-
 .../cpts/personnel/modules/Family.vue         |  2 +-
 .../dataBoard/overview/residents/index.vue    | 95 +++++++++++++++++++
 4 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 src/views/dataBoard/overview/residents/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index e7e25fd44..176105423 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -440,6 +440,16 @@ export const dataBoardRoutes = {
         isTab: false,
       },
     },
+    {
+      path: "overview/residents",
+      props: true,
+      component: () => import("@/views/dataBoard/overview/residents/index"),
+      name: "dataBoard-overview-residents",
+      meta: {
+        title: "居民画像",
+        isTab: false,
+      },
+    },
     {
       path: "/organizational",
       props: true,
diff --git a/src/views/dataBoard/cpts/family/modules/Family.vue b/src/views/dataBoard/cpts/family/modules/Family.vue
index 464ce1089..a577d78d7 100644
--- a/src/views/dataBoard/cpts/family/modules/Family.vue
+++ b/src/views/dataBoard/cpts/family/modules/Family.vue
@@ -51,8 +51,14 @@ export default {
       return paramStr;
     },
     cheackCrrent(item) {
-      const params = { user_id: item.id };
-      this.$router.push("/dataBoard/overview/resident?" + this.getParams(params));
+      const params = {
+        ...this.$route.query,
+        user_id: item.id,
+        user_name: item.name,
+      };
+      this.$router.push(
+        "/dataBoard/overview/residents?" + this.getParams(params)
+      );
     },
     getDatas() {
       this.data = [];
diff --git a/src/views/dataBoard/cpts/personnel/modules/Family.vue b/src/views/dataBoard/cpts/personnel/modules/Family.vue
index 35c722384..0f5c73b0e 100644
--- a/src/views/dataBoard/cpts/personnel/modules/Family.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/Family.vue
@@ -76,7 +76,7 @@ export default {
       return paramStr;
     },
     cheackCrrent(item) {
-      const params = { ...this.$route.query, user_id: item.id };
+      const params = { ...this.$route.query, user_id: item.id,user_name:item.name };
       this.$router.push(this.$route.path + "?" + this.getParams(params));
     },
     getDatas() {
diff --git a/src/views/dataBoard/overview/residents/index.vue b/src/views/dataBoard/overview/residents/index.vue
new file mode 100644
index 000000000..8880303a1
--- /dev/null
+++ b/src/views/dataBoard/overview/residents/index.vue
@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <cpt-bread
+      @tap="clickBreadItem"
+      v-if="breadList.length > 1"
+      :bread-list="breadList"
+    />
+    <personnel />
+  </div>
+</template>
+
+<script>
+import cptBread from "@/views/dataBoard/renfang/cpts/bread";
+import personnel from "@/views/dataBoard/cpts/personnel";
+
+export default {
+  name: "resident",
+
+  components: {
+    cptBread,
+    personnel,
+  },
+
+  data() {
+    return {
+      breadList: [
+        {
+          path: "/dataBoard/overview/index",
+          meta: {
+            title: "概览",
+          },
+        },
+        {
+          path: "/homeDetails/index",
+          meta: {
+            title: "居民画像",
+          },
+        },
+        {
+          path: "/dataBoard/overview/familyPortrait",
+          meta: {
+            title: "居民画像",
+          },
+        },
+        {
+          meta: {
+            title: "居民画像",
+          },
+        },
+      ],
+    };
+  },
+  watch: {
+    "$route.query"(newVal, oldVal) {
+      this.breadList[1]["meta"]["title"] = newVal.name2;
+      this.breadList[2]["meta"]["title"] = newVal.name;
+      this.breadList[3]["meta"]["title"] = newVal.user_name;
+    },
+  },
+  activated(){
+      const data = this.$route.query;
+      this.breadList[1]["meta"]["title"] = data.name2;
+      this.breadList[2]["meta"]["title"] = data.name;
+      this.breadList[3]["meta"]["title"] = data.user_name;
+  },
+  mounted() {
+      const data = this.$route.query;
+      this.breadList[1]["meta"]["title"] = data.name2;
+      this.breadList[2]["meta"]["title"] = data.name;
+      this.breadList[3]["meta"]["title"] = data.user_name;
+  },
+  methods: {
+    getParams(params) {
+      let paramStr = "";
+      Object.keys(params).forEach((item) => {
+        if (paramStr === "") {
+          paramStr = `${item}=${params[item]}`;
+        } else {
+          paramStr = `${paramStr}&${item}=${params[item]}`;
+        }
+      });
+      return paramStr;
+    },
+    clickBreadItem({ item }) {
+      this.$router.push(item.path + "?" + this.getParams(this.$route.query));
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/dataBoard/renfang/index.scss"
+  scoped
+></style>