From 89800bde92cd8a7e4a1ff5092c0edb81fb2fcbac Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 18 Dec 2023 20:13:22 +0800
Subject: [PATCH] bug#965 bug#990 bug#987 bug#984 #bug974...
---
.../overview/familyPortrait/index.vue | 21 ++++--
.../dataBoard/overview/resident/index.vue | 66 +++++++++++++++----
src/views/dataBoard/renfang/cpts/fwgl.vue | 17 +++--
src/views/dataBoard/renfang/cpts/jmgl.vue | 15 +++--
src/views/dataBoard/renfang/house/list.vue | 16 +++--
src/views/dataBoard/renfang/index.vue | 18 +++--
src/views/dataBoard/renfang/resi/list.vue | 13 ++--
.../visualizing/components/laonianren.vue | 13 +++-
.../potentialPeople/index.vue | 2 +
.../base/organization/organization.vue | 4 ++
.../communityService/fuwuzhaoren/addForm.vue | 4 +-
.../fuwuzhaoren/detailForm.vue | 2 +-
.../communityService/fuwuzhaoren/index.vue | 4 +-
.../gangweizhaoren/addForm.vue | 4 +-
.../gangweizhaoren/detailForm.vue | 2 +-
.../communityService/gangweizhaoren/index.vue | 4 +-
.../jinengzhaoren/addForm.vue | 4 +-
.../jinengzhaoren/detailForm.vue | 2 +-
.../communityService/jinengzhaoren/index.vue | 4 +-
.../wennuanzhaoren/addForm.vue | 4 +-
.../wennuanzhaoren/detailForm.vue | 2 +-
.../communityService/wennuanzhaoren/index.vue | 4 +-
22 files changed, 162 insertions(+), 63 deletions(-)
diff --git a/src/views/dataBoard/overview/familyPortrait/index.vue b/src/views/dataBoard/overview/familyPortrait/index.vue
index ed82a3539..a9449c693 100644
--- a/src/views/dataBoard/overview/familyPortrait/index.vue
+++ b/src/views/dataBoard/overview/familyPortrait/index.vue
@@ -43,11 +43,21 @@ export default {
// },
// },
activated() {
- const { name, name2, id, buId, type } = this.$route.query;
- this.breadcrumbList[1].name = name2;
- this.breadcrumbList[2].name = name;
- const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
- this.breadcrumbList[1].path = url;
+ const { name, name2, id, buId, type, orgId, type_name } = this.$route.query;
+ if (type === 'renfang') {
+ this.breadcrumbList[0].name = '人房数据';
+ this.breadcrumbList[0].path = '/dataBoard/renfang/index';
+ this.breadcrumbList[1].name = name2;
+ const url = `/dataBoard/renfang/house-list?org_id=${orgId}&type_name=${type_name}`;
+ this.breadcrumbList[1].path = url;
+ this.breadcrumbList[2].name = name;
+ } else {
+ this.breadcrumbList[1].name = name2;
+ this.breadcrumbList[2].name = name;
+ const url = type === "building" ? `/homeDetails/index?id=${id}&buId=${buId}&typeB=${type}` : `/homeDetails/index?id=${buId}&buId=${buId}&typeB=${type}`;
+ this.breadcrumbList[1].path = url;
+ }
+
},
};
@@ -62,6 +72,7 @@ export default {
padding-left: 26px;
margin-bottom: 20px;
}
+
.breadcrumb {
margin-bottom: 25px;
}
diff --git a/src/views/dataBoard/overview/resident/index.vue b/src/views/dataBoard/overview/resident/index.vue
index b1815382d..19571129b 100644
--- a/src/views/dataBoard/overview/resident/index.vue
+++ b/src/views/dataBoard/overview/resident/index.vue
@@ -1,10 +1,6 @@
@@ -12,6 +8,7 @@