From 5990a7cd6a832ec2b72f385cceba0bf1b907cdd1 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 30 Oct 2023 18:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/home/dangerHomeBgS.png | Bin 0 -> 905 bytes src/assets/images/home/dangerHomeS.png | Bin 0 -> 2174 bytes src/assets/images/home/dangerPeopleS.png | Bin 0 -> 2207 bytes src/assets/images/home/freeHomeS.png | Bin 0 -> 754 bytes src/assets/images/home/hasPeopleS.png | Bin 0 -> 797 bytes src/assets/images/home/homeBottomS.png | Bin 0 -> 1657 bytes src/js/store/modules/huaXiang.js | 24 +- src/router/index.js | 40 +- .../dataBoard/cpts/homeDetails/index.vue | 15 +- src/views/modules/base/resi.vue | 11 +- .../portrayal/loudong/cpts/buildingTable.vue | 28 + .../modules/portrayal/loudong/cpts/house.vue | 28 + .../modules/portrayal/loudong/cpts/unit.vue | 28 + src/views/modules/portrayal/loudong/index.vue | 713 ++++++++++++++++++ src/views/modules/shequ/chaxun.vue | 30 +- 15 files changed, 880 insertions(+), 37 deletions(-) create mode 100644 src/assets/images/home/dangerHomeBgS.png create mode 100644 src/assets/images/home/dangerHomeS.png create mode 100644 src/assets/images/home/dangerPeopleS.png create mode 100644 src/assets/images/home/freeHomeS.png create mode 100644 src/assets/images/home/hasPeopleS.png create mode 100644 src/assets/images/home/homeBottomS.png create mode 100644 src/views/modules/portrayal/loudong/cpts/buildingTable.vue create mode 100644 src/views/modules/portrayal/loudong/cpts/house.vue create mode 100644 src/views/modules/portrayal/loudong/cpts/unit.vue create mode 100644 src/views/modules/portrayal/loudong/index.vue diff --git a/src/assets/images/home/dangerHomeBgS.png b/src/assets/images/home/dangerHomeBgS.png new file mode 100644 index 0000000000000000000000000000000000000000..10cbef339f4e288153f1e510581acc2a233d0047 GIT binary patch literal 905 zcmeAS@N?(olHy`uVBq!ia0vp^AwZnM!3HEH1jTcJ6k~CayA#8@b22X(7?_hzH81ea+q~OK*UNr%QhnP#kw>5)gBuhdHkL^ zwNl@6x_Z0S|8J2;KPKwR-;ynkQx;f0`IqN8`L&rZKN_d(`Dqw%@7>b( zO^g1AKJI^Ca_|1i{nD4zA8ghLus;~NZfS3BY5bnBeIHZ4?O#44u0ii>h+pWN_b=WY zj`sb&|BU1Gx0QEW{LW<^`1UMVcYn>|n&RkFw}J}mQl0qAO#gj}yWAYxe9y@1BU4GO z_uc2~r>xJ9oqOS@a(=)U7by|Lk0%z~;hM_k>SJT1vE6B@qo8m<&#AQmnE^+RC^r{r zhm0yAGF(&{zW$O|vFxvFzPIz=aqd+UUccpDwa1B9F|IE!e&I9K`u{vp>*ww%Jb6E` zUSVbU{a2<_1il|LopN}~^w>~&XTv@=& zZBjE=9YV+2F08+{(7fii?VfdB3z9wKF5f+~+}?9R^`x-bJKx{CZ}f}x@+y{(&H-wx QfO(6-)78&qol`;+0Mx9J^#A|> literal 0 HcmV?d00001 diff --git a/src/assets/images/home/dangerHomeS.png b/src/assets/images/home/dangerHomeS.png new file mode 100644 index 0000000000000000000000000000000000000000..59ec2213306eac66c5e20936b0cd0dd2096165c9 GIT binary patch literal 2174 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 literal 0 HcmV?d00001 diff --git a/src/assets/images/home/freeHomeS.png b/src/assets/images/home/freeHomeS.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4a8729aed5e5e7c913a3b563a674ab4747269a GIT binary patch literal 754 zcmeAS@N?(olHy`uVBq!ia0vp^AwZnM!3HEH1jTcJ6k~CayA#8@b22X(7?{?0x;TbZ z#J#=i=v@>j;`XpsRL61QzyI~w6>~!uEZ}@~d}n;q%&j#C-PT!KHm+8-%gNrcd*A!` zRj*ds&0qJr&%P>7vA{ycZ}sQxhkt7IQlma^^2 zU$8#*y6txHZ@+8bmhFD{C9&~hM#$rjJ8s?FceVZS!?n>mV(UY{-l?nIefL_`Ub%B@ zcbw+GXUcsb^&rJ)<;xPQIrGogUwGV-XEr-ZZ~9d~$9lP?$}b*2PConmbJp|eoVM(_ z!CD&4+g`d{xSI8}<KF+IC~^ zJjo9?rA}>6B~$$r_jdQF{xz?Wl-6;~`U7u)f%)DKD@ZmElGuX}91 zWBcp2(igK=RqfdB|IdB?_r;C-Lattx-+ORx?C*d4%U0jcZdln|3{1ofp00i_>zopr E05RH6r~m)} literal 0 HcmV?d00001 diff --git a/src/assets/images/home/hasPeopleS.png b/src/assets/images/home/hasPeopleS.png new file mode 100644 index 0000000000000000000000000000000000000000..549913a2592d42f25ee2f40cfb911fdf33a83a2b GIT binary patch literal 797 zcmeAS@N?(olHy`uVBq!ia0vp^VL+V5!3HD)b<(1M6k~CayA#8@b22X(7?`emx;TbZ z#J#=in=Ks3(E700xHCB8V$?=%cL8U~qkI25u+(o<_{aQxk)jLBW2cQ_nF}|bjM@2f z#gQd1U5f5J;axJJ%p!5#zP~r_UUYWML-t)QQ_K2fX;gUMSq19-4$eMTcr%MJ!MBxxdyVG-6YKCdE0@Gxmd?HX zCNlC#^~+_>%k5{#ZP}O0Ht)A?x6R*V)3&#sx4!Q=du{E!DX#bA4(Hun`+vDK+clQI a(#H#qUwHE*&j*;^89ZJ6T-G@yGywppreW~_ literal 0 HcmV?d00001 diff --git a/src/assets/images/home/homeBottomS.png b/src/assets/images/home/homeBottomS.png new file mode 100644 index 0000000000000000000000000000000000000000..e8890fde8212c8989baea47be492704f84dd4f15 GIT binary patch literal 1657 zcmd5-`#;lb9RKdiM$^b4oN&@eDp4rrI?j-YWz02JC-K5;$z_!}ql>7+VJ>OW=)6vH z*<3PYWAs9Ea?6n0>+$YKK>xO`f1FS6d@S}%U6p(`@N^JK2=XT=LFeeQvp z8QYooQ{QLiU!zo(){IT>rS5vW!u~}sYw!%koM1*DrxkaMR6PRW223;^nss;#*^)_H zUB5|}k#TdvG!7f~eFnFqng=?QsvjTgn{G3Cry>}ZZKN&p7Va&pV$l$&D!|f9@RyY{ z`F<%@w0Q^dC893m`aXVv=-4~$7UAxdEUtVc^lj`7CWlRv!0@fXL6s)Nn#E0-kd~R3 zbCdq&ZP$O`U&ZsROepkA>@s1Ldl~U4Qygq)&(yPE2vU@_(vxwhwyC0`dfqM0!g?l4 zPSnL{_|kL9M{PbM%LWrVU^QR5+H`diDh8l|JoPnQf;F98w#Udd9mBwl$d9w2qTe)8 zzO0K8ja}(98-60;kjQt@rlMqrQ?YER_hKro%0y$%7-eelih|i_D8WxR)E|Xdqw*OG z2cJy6rV5WF1Opr(gXPshbQTwmMJE|4d_Xq1k*nbs;fgj*g(M`>r+6U^CVJ$(*o_>@ z>)RFV!#jEc$0?G)VDtFiV+vVHX~|FeTj~PjCi14@F1LY{4ZLmDi;p>vhVV=8=S$;j z>`=z>X&YRrSTZ_TqU#F{!MQQCaI&VTNF&(2IaixM(9_jicdeS8Q82(0x&tp=`R}J< zUiTc4sAeDn;DNMm+?)M-iSB?M@x3bDb#|s2q)fyqF6VIlv$=jSwp`?6-eAOO#*uSmKQq5D!OsqrYYeXT!lgvV=oE4urxGZDPK$9(#~anFpfOC zEi7MZhI|O0!ucJ42qn?)gFW5Cx%2(1r#qfWSTXrXXsNno;6c=5ayB87NRA}v_-{we z*g+DOg2`RHc6fH3f1p4p@)&@cSQ>B$$V%Z)2ubPjO)5L1C z{gyJn0-yeT{hf*_dv`gWH+*?uPXwnt!N z?p&uc<+=Z|n&XUtAiOQ0U|ejV)QLp59ebicy51pOiwAci;d>ifJ2F?AfCF=gUuA7&6fX-rPF$h>%X8y6RvL$L)Q^Qlyy;x(!0*g^ zST=v^R)%ha#^`3RrQ+_Mt#9^aPE;kWa)~Nv1ZWrU-fMXyaU)$^NYZGQbRy5H)oX_K z1V1Zmk0z1m&9LLLvww6PMJa zI)qizARj&s#m`FvYjQt!Ov?e}H1ZdW33iY)h-OLb#a+vmB(refzmpRu^{+6t41s p1+F2F`v#~RmP?(8{w5o>1)YHPgizx-OX9x-aB+0Uup9`<{{eH7+(G~V literal 0 HcmV?d00001 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() {},