diff --git a/src/assets/images/home/dangerHomeBgS.png b/src/assets/images/home/dangerHomeBgS.png new file mode 100644 index 000000000..10cbef339 Binary files /dev/null and b/src/assets/images/home/dangerHomeBgS.png differ diff --git a/src/assets/images/home/dangerHomeS.png b/src/assets/images/home/dangerHomeS.png new file mode 100644 index 000000000..59ec22133 Binary files /dev/null and b/src/assets/images/home/dangerHomeS.png differ diff --git a/src/assets/images/home/dangerPeopleS.png b/src/assets/images/home/dangerPeopleS.png new file mode 100644 index 000000000..fab9ff60b Binary files /dev/null and b/src/assets/images/home/dangerPeopleS.png differ diff --git a/src/assets/images/home/freeHomeS.png b/src/assets/images/home/freeHomeS.png new file mode 100644 index 000000000..2b4a8729a Binary files /dev/null and b/src/assets/images/home/freeHomeS.png differ diff --git a/src/assets/images/home/hasPeopleS.png b/src/assets/images/home/hasPeopleS.png new file mode 100644 index 000000000..549913a25 Binary files /dev/null and b/src/assets/images/home/hasPeopleS.png differ diff --git a/src/assets/images/home/homeBottomS.png b/src/assets/images/home/homeBottomS.png new file mode 100644 index 000000000..e8890fde8 Binary files /dev/null and b/src/assets/images/home/homeBottomS.png differ diff --git a/src/js/store/modules/huaXiang.js b/src/js/store/modules/huaXiang.js index ef86d9932..e1457ab02 100644 --- a/src/js/store/modules/huaXiang.js +++ b/src/js/store/modules/huaXiang.js @@ -1,16 +1,20 @@ -const huaXiang ={ +const huaXiang = { state: { - userInfo:null || JSON.parse(localStorage.getItem('resiPort')) , - houseInfo:null || JSON.parse(localStorage.getItem('housePort')) + userInfo: null || JSON.parse(localStorage.getItem('resiPort')), + houseInfo: null || JSON.parse(localStorage.getItem('housePort')), + buildingInfo: null || JSON.parse(localStorage.getItem('buildingPort')), }, mutations: { setData(state, payload) { state.userInfo = payload; }, - sethouseData(state, payload){ + sethouseData(state, payload) { state.houseInfo = payload; - } + }, + setbuildingData(state, payload) { + state.buildingInfo = payload; + }, }, actions: { saveData({ commit }, payload) { @@ -18,9 +22,13 @@ const huaXiang ={ localStorage.setItem('resiPort', JSON.stringify(payload)); }, saveDataH({ commit }, payload) { - commit('sethouseData', payload); - localStorage.setItem('housePort', JSON.stringify(payload)); - } + commit('sethouseData', payload); + localStorage.setItem('housePort', JSON.stringify(payload)); + }, + saveDataB({ commit }, payload) { + commit('setbuildingData', payload); + localStorage.setItem('buildingPort', JSON.stringify(payload)); + } } }; diff --git a/src/router/index.js b/src/router/index.js index 804dd9827..e7e25fd44 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -113,21 +113,31 @@ export const moduleRoutes = { props: true, name: "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: "", + }, + }, + { + path: "loudong-huaxiang", + props: true, + name: "loudong-huaxiang", + component: () => import("@/views/modules/portrayal/loudong/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端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一 @@ -716,14 +726,18 @@ router.beforeEach((to, from, next) => { if (to.name === "caiji") { return next(); } - if(to.name === 'jumin-huaxiang'){ + if (to.name === 'jumin-huaxiang') { to.meta.title = store.state.huaXiang.userInfo.name return next(); } - if(to.name === 'fangwu-huaxiang'){ + if (to.name === 'fangwu-huaxiang') { to.meta.title = store.state.huaXiang.houseInfo.doorName return next(); } + if (to.name === 'loudong-huaxiang') { + to.meta.title = store.state.huaXiang.buildingInfo.fullName + return next(); + } if (window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes)) { return next(); } diff --git a/src/views/dataBoard/cpts/homeDetails/index.vue b/src/views/dataBoard/cpts/homeDetails/index.vue index c2d877e6c..f0dad1cc1 100644 --- a/src/views/dataBoard/cpts/homeDetails/index.vue +++ b/src/views/dataBoard/cpts/homeDetails/index.vue @@ -403,12 +403,14 @@ export default { searchId: "", buildingList: [], houseMountArr: [ - // [ - // { doorName: 101, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, - // { doorName: 102, riskyNum: 1, importanceNum: 0, rentFlag: "0" }, - // { doorName: 103, riskyNum: 0, importanceNum: 1, rentFlag: "0" }, - // { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "2" }, - // ], + [ + // { doorName: 101, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, + // { doorName: 102, riskyNum: 1, importanceNum: 0, rentFlag: "0" }, + // { doorName: 103, riskyNum: 0, importanceNum: 1, rentFlag: "0" }, + // { doorName: 104, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, + // { doorName: 105, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, + // { doorName: 205, riskyNum: 0, importanceNum: 0, rentFlag: "0" }, + ], ], freeHomeArr: [], }; @@ -487,6 +489,7 @@ export default { (unitInfos.buildingName ? unitInfos.buildingName : "") + (unitInfos.unitNum ? unitInfos.unitNum + "单元" : ""); this.houseMountArr = this.getDoorNameList(houseList); + console.log(this.houseMountArr); if (this.houseMountArr.length > 0) { this.flexWidth = this.houseMountArr[0].length * 58; } diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index e8102ed84..7d2b4a14c 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -852,7 +852,16 @@ export default { // 查看 async handleLook(row) { this.lookResiId = row.resiId; - this.dialogVisible2 = true; + // this.dialogVisible2 = true; + let { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId } = row + this.$store.dispatch('saveData', { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId }); + this.$router.push({ name: 'jumin-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "jumin-huaxiang") { + return {...item, title: name }; + } + return item; + }); }, // 编辑 diff --git a/src/views/modules/portrayal/loudong/cpts/buildingTable.vue b/src/views/modules/portrayal/loudong/cpts/buildingTable.vue new file mode 100644 index 000000000..af3a15433 --- /dev/null +++ b/src/views/modules/portrayal/loudong/cpts/buildingTable.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/modules/portrayal/loudong/cpts/house.vue b/src/views/modules/portrayal/loudong/cpts/house.vue new file mode 100644 index 000000000..af3a15433 --- /dev/null +++ b/src/views/modules/portrayal/loudong/cpts/house.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/modules/portrayal/loudong/cpts/unit.vue b/src/views/modules/portrayal/loudong/cpts/unit.vue new file mode 100644 index 000000000..af3a15433 --- /dev/null +++ b/src/views/modules/portrayal/loudong/cpts/unit.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/views/modules/portrayal/loudong/index.vue b/src/views/modules/portrayal/loudong/index.vue new file mode 100644 index 000000000..f08812fc2 --- /dev/null +++ b/src/views/modules/portrayal/loudong/index.vue @@ -0,0 +1,713 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue index a3f2208fb..eef8ca796 100644 --- a/src/views/modules/shequ/chaxun.vue +++ b/src/views/modules/shequ/chaxun.vue @@ -607,15 +607,27 @@ export default { // this.currentHouseId = item.id; // await nextTick(); // this.showedHouseInfo = true; - let { doorName,id,fullName } = this.searchFangwu.list[rowIndex] - this.$store.dispatch('saveDataH', { doorName,houseId:id,fullName }); - this.$router.push({ name: 'fangwu-huaxiang' }); - this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { - if (item.name === "fangwu-huaxiang") { - return {...item, title: doorName }; - } - return item; - }); + console.log(this.searchFangwu.list[rowIndex]); + let { doorName,id,fullName,level,buildingId,quartersName,buildingName,buildingUnitName,buildingUnitId } = this.searchFangwu.list[rowIndex] + if(level == 'unit' || level == 'building'){ + this.$store.dispatch('saveDataB', { doorName,houseId:id,fullName,buildingId,buildingUnitId,level}); + this.$router.push({ name: 'loudong-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "loudong-huaxiang") { + return {...item, title: quartersName+ buildingName+buildingUnitName}; + } + return item; + }); + }else{ + this.$store.dispatch('saveDataH', { doorName,houseId:id,fullName }); + this.$router.push({ name: 'fangwu-huaxiang' }); + this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { + if (item.name === "fangwu-huaxiang") { + return {...item, title: doorName }; + } + return item; + }); + } }, getApiData() {},