diff --git a/src/js/store/modules/huaXiang.js b/src/js/store/modules/huaXiang.js
index aa4cbc5e1..ef86d9932 100644
--- a/src/js/store/modules/huaXiang.js
+++ b/src/js/store/modules/huaXiang.js
@@ -1,19 +1,26 @@
const huaXiang ={
state: {
- userInfo:null || JSON.parse(localStorage.getItem('huaX'))
+ userInfo:null || JSON.parse(localStorage.getItem('resiPort')) ,
+ houseInfo:null || JSON.parse(localStorage.getItem('housePort'))
},
mutations: {
setData(state, payload) {
state.userInfo = payload;
+ },
+ sethouseData(state, payload){
+ state.houseInfo = payload;
}
},
actions: {
saveData({ commit }, payload) {
- console.log(payload,'vueX接参');
commit('setData', payload);
- localStorage.setItem('huaX', JSON.stringify(payload));
- }
+ localStorage.setItem('resiPort', JSON.stringify(payload));
+ },
+ saveDataH({ commit }, payload) {
+ commit('sethouseData', payload);
+ localStorage.setItem('housePort', JSON.stringify(payload));
+ }
}
};
diff --git a/src/router/index.js b/src/router/index.js
index 6a1db845a..804dd9827 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,12 +112,22 @@ export const moduleRoutes = {
path: "jumin-huaxiang",
props: true,
name: "jumin-huaxiang",
- component: () => import("@/views/modules/jumin/huaxiang"),
+ component: () => import("@/views/modules/portrayal/jumin/index"),
meta: {
isTab: true,
title: "",
},
- }
+ },
+ {
+ path: "fangwu-huaxiang",
+ props: true,
+ name: "fangwu-huaxiang",
+ component: () => import("@/views/modules/portrayal/fangwu/index"),
+ meta: {
+ isTab: true,
+ title: "",
+ },
+ }
],
};
// pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
@@ -710,6 +720,10 @@ router.beforeEach((to, from, next) => {
to.meta.title = store.state.huaXiang.userInfo.name
return next();
}
+ if(to.name === 'fangwu-huaxiang'){
+ to.meta.title = store.state.huaXiang.houseInfo.doorName
+ return next();
+ }
if (window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
return next();
}
diff --git a/src/views/modules/portrayal/fangwu/cpts/leftTop.vue b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
new file mode 100644
index 000000000..95fb3f613
--- /dev/null
+++ b/src/views/modules/portrayal/fangwu/cpts/leftTop.vue
@@ -0,0 +1,80 @@
+
+
家庭标签
{{ houseInfo.fullName }}
+
各项业务记录
家庭关系
享受服务次数统计
积分记录
-
{{ item.name }}({{ item.houseHolderRel == "本人" ? "户主" : item.houseHolderRel ? item.houseHolderRel : '--'
}})
@@ -33,24 +33,42 @@ export default {
//创建前
created() {
},
- mounted() {
- console.log(this.userInfo);
- this.getFamilyRelationshipList()
+ async mounted() {
+ await this.getFamilyRelationshipList()
},
props: {
userInfo: {
type: Object,
default: () => { }
+ },
+ houseInfo:{
+ type: Object,
+ default: () => { }
+ },
+ type:{
+ type: String,
+ default: '0'
}
},
//方法
methods: {
async getFamilyRelationshipList() {
- let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId
+ let id = ''
+ if(this.type == '0'){
+ id = this.userInfo.resiId
+ }else if(this.type == '1'){
+ id = this.houseInfo.houseId
+ }
+ let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=${this.type}&resid=` + id
let { code, data, msg } = await requestPost(url)
if (code == 0) {
// 找到符合条件的对象的索引
- const index = data.findIndex(item => item.name == this.userInfo.name);
+ let index = ''
+ if(this.type == '0'){
+ index = data.findIndex(item => item.name == this.userInfo.name);
+ }else{
+ index = data.findIndex(item => item.houseHolderRel == '本人');
+ }
// 如果找到符合条件的对象
if (index !== -1) {
// 移除这个对象并将其放到数组的第一个位置
diff --git a/src/views/modules/jumin/cpts/leftTop.vue b/src/views/modules/portrayal/jumin/cpts/leftTop.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/leftTop.vue
rename to src/views/modules/portrayal/jumin/cpts/leftTop.vue
diff --git a/src/views/modules/jumin/cpts/pointsRecord.vue b/src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/pointsRecord.vue
rename to src/views/modules/portrayal/jumin/cpts/pointsRecord.vue
diff --git a/src/views/modules/jumin/cpts/rightBto.vue b/src/views/modules/portrayal/jumin/cpts/rightBto.vue
similarity index 100%
rename from src/views/modules/jumin/cpts/rightBto.vue
rename to src/views/modules/portrayal/jumin/cpts/rightBto.vue
diff --git a/src/views/modules/jumin/cpts/rightTop.vue b/src/views/modules/portrayal/jumin/cpts/rightTop.vue
similarity index 74%
rename from src/views/modules/jumin/cpts/rightTop.vue
rename to src/views/modules/portrayal/jumin/cpts/rightTop.vue
index 222226069..42dcbee5a 100644
--- a/src/views/modules/jumin/cpts/rightTop.vue
+++ b/src/views/modules/portrayal/jumin/cpts/rightTop.vue
@@ -2,7 +2,7 @@
{{ userInfo.name }}
+
{{ userInfo.name }}