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 @@ + + + + + diff --git a/src/views/modules/portrayal/fangwu/index.vue b/src/views/modules/portrayal/fangwu/index.vue new file mode 100644 index 000000000..5c0d14d73 --- /dev/null +++ b/src/views/modules/portrayal/fangwu/index.vue @@ -0,0 +1,120 @@ + + + + diff --git a/src/views/modules/jumin/cpts/leftBto.vue b/src/views/modules/portrayal/jumin/cpts/leftBto.vue similarity index 71% rename from src/views/modules/jumin/cpts/leftBto.vue rename to src/views/modules/portrayal/jumin/cpts/leftBto.vue index 74b77ba06..a932a21f8 100644 --- a/src/views/modules/jumin/cpts/leftBto.vue +++ b/src/views/modules/portrayal/jumin/cpts/leftBto.vue @@ -3,9 +3,9 @@
- - {{ 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 @@
- +
共{{ complainTotal }}条
@@ -15,7 +15,7 @@
- +
共{{ shengTotal }}条
@@ -28,7 +28,7 @@
- +
共{{ shequTotal }}条
@@ -41,7 +41,7 @@
- +
共{{ shijianTotal }}条
@@ -54,7 +54,7 @@
- +
共{{ xuqiuTotal }}条
@@ -67,23 +67,21 @@
-
- - - - - -
共{{ fuwuTotal }}条
-
- - - - -
-
-
+
+ + + +
共{{ fuwuTotal }}条
+
+ + + + +
+
+
@@ -131,21 +129,34 @@ export default { }; }, //创建前 - created() { }, - mounted() { - this.getComplainList() - this.getShengList() - this.getShequList() - this.getshijianList() - this.getxuqiuList() - this.getfuwuList() + created() { + if (this.type == '0') { + this.resiId = [this.userInfo.resiId] + } else if (this.type == '1') { + this.resiId = this.familyResiList + } + console.log(this.resiId, '子组件获取'); + }, + async mounted() { + await this.getComplainList() + await this.getShengList() + await this.getShequList() + await this.getshijianList() + await this.getxuqiuList() + await this.getfuwuList() }, props: { - userInfo: { + userInfo: { type: Object, - default: { - resiId: '' - } + default: () => { } + }, + familyResiList: { + type: Array, + default: () => [] + }, + type: { + type: String, + default: '0' } }, //方法 @@ -160,8 +171,13 @@ export default { }, getComplainList() { + if (this.resiId.length == 0) { + this.complainList = [] + this.complainLabel = `12345投诉(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } @@ -186,8 +202,13 @@ export default { }); }, getShengList() { + if (this.resiId.length == 0) { + this.shengList = [] + this.shengLabel = `省满意度调查(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } @@ -199,8 +220,13 @@ export default { }); }, getShequList() { + if (this.resiId.length == 0) { + this.shequList = [] + this.shequLabel = `社区满意度自查(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } @@ -222,8 +248,13 @@ export default { }); }, getshijianList() { + if (this.resiId.length == 0) { + this.shijianList = [] + this.shijianLabel = `上报事件(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } @@ -241,8 +272,13 @@ export default { }); }, getxuqiuList() { + if (this.resiId.length == 0) { + this.xuqiuList = [] + this.xuqiuLabel = `居民需求(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } @@ -258,8 +294,13 @@ export default { }); }, getfuwuList() { + if (this.resiId.length == 0) { + this.fuwuList = [] + this.fuwuLabel = `社区服务(0)` + return + } let parm = { - residList: [this.userInfo.resiId], + residList: this.resiId, pageNo: this.pageNo, pageSize: this.pageSize } diff --git a/src/views/modules/jumin/cpts/table/complain.vue b/src/views/modules/portrayal/jumin/cpts/table/complain.vue similarity index 100% rename from src/views/modules/jumin/cpts/table/complain.vue rename to src/views/modules/portrayal/jumin/cpts/table/complain.vue diff --git a/src/views/modules/jumin/cpts/table/fuwu.vue b/src/views/modules/portrayal/jumin/cpts/table/fuwu.vue similarity index 100% rename from src/views/modules/jumin/cpts/table/fuwu.vue rename to src/views/modules/portrayal/jumin/cpts/table/fuwu.vue diff --git a/src/views/modules/jumin/cpts/table/sheng.vue b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue similarity index 95% rename from src/views/modules/jumin/cpts/table/sheng.vue rename to src/views/modules/portrayal/jumin/cpts/table/sheng.vue index f9462965d..689697e2c 100644 --- a/src/views/modules/jumin/cpts/table/sheng.vue +++ b/src/views/modules/portrayal/jumin/cpts/table/sheng.vue @@ -26,9 +26,7 @@ export default { }, data() { return { - queryParams: { - residList: [], - }, + list: [], total: 0, rowId: null, diff --git a/src/views/modules/jumin/cpts/table/shequ.vue b/src/views/modules/portrayal/jumin/cpts/table/shequ.vue similarity index 100% rename from src/views/modules/jumin/cpts/table/shequ.vue rename to src/views/modules/portrayal/jumin/cpts/table/shequ.vue diff --git a/src/views/modules/jumin/cpts/table/shijian.vue b/src/views/modules/portrayal/jumin/cpts/table/shijian.vue similarity index 100% rename from src/views/modules/jumin/cpts/table/shijian.vue rename to src/views/modules/portrayal/jumin/cpts/table/shijian.vue diff --git a/src/views/modules/jumin/cpts/table/xuqiu.vue b/src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue similarity index 100% rename from src/views/modules/jumin/cpts/table/xuqiu.vue rename to src/views/modules/portrayal/jumin/cpts/table/xuqiu.vue diff --git a/src/views/modules/jumin/cpts/xiangshoufuwu.vue b/src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue similarity index 100% rename from src/views/modules/jumin/cpts/xiangshoufuwu.vue rename to src/views/modules/portrayal/jumin/cpts/xiangshoufuwu.vue diff --git a/src/views/modules/jumin/huaxiang.vue b/src/views/modules/portrayal/jumin/index.vue similarity index 73% rename from src/views/modules/jumin/huaxiang.vue rename to src/views/modules/portrayal/jumin/index.vue index f540f90b3..303358a19 100644 --- a/src/views/modules/jumin/huaxiang.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -4,11 +4,11 @@
-
居民档案
+
居民档案
详情 >
- {{ userInfo.name }} + {{ userInfo.name }}
@@ -18,9 +18,9 @@
-
各项业务记录
+
各项业务记录
- +
@@ -28,17 +28,17 @@
-
家庭关系
+
家庭关系
- +
-
享受服务次数统计
+
享受服务次数统计
@@ -46,7 +46,7 @@
-
积分记录
+
积分记录
@@ -81,7 +81,6 @@ export default { //创建前 async created() { this.userInfo = this.$store.state.huaXiang.userInfo - await this.getFamilyRelationshipList() }, mounted() { }, @@ -90,15 +89,6 @@ export default { }, //方法 methods: { - async getFamilyRelationshipList() { - let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId - let { code, data, msg } = await requestPost(url) - if (code == 0) { - this.familyList = data - } else { - this.$message.error(msg) - } - }, async handlerUserInfo() { await nextTick(); this.showedResiInfo = true; diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index 5cb7b1db5..c8afc75f8 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -20,7 +20,7 @@
-
+
生成本月社区自查问卷表
@@ -53,7 +53,7 @@
- { + if (item.name === "fangwu-huaxiang") { + return {...item, title: doorName }; + } + return item; + }); }, getApiData() {},