update

src/router/index.ts

@@ -83,7 +83,7 @@ const routes: Array<RouteConfig> = [
         name: 'SystemFloor',
         component: () => import(/* webpackChunkName: "equipmentFacilities" */ '../views/equipmentFacilities/SystemFloor.vue'),
         meta: {
-            keepAlive: true,
+            keepAlive: false,
             showTabbar: true,
             hideNarBar: true,
         },

src/store/index.ts

@@ -12,8 +12,8 @@ export default new Vuex.Store({
         ssoToken: 'admin:liujiandong',
         appTitle: '管理说明书', //顶部标题
         // ssoToken: null,
-        // plazaId: '1000772', //项目Id
-        plazaId: '1000423', //项目Id
+        plazaId: '1000772', //项目Id 北京通州
+        // plazaId: '1000423', //项目Id 大连高新
         fmapID: '',
         haveFengMap: -1, //是否有蜂鸟地图的数据 -1为等待 0 为失败 1 为成功
         isMessage: true, //是否有发布的图

src/views/equipmentFacilities/ElectricWell.vue

@@ -26,7 +26,7 @@
                         <i class='iconfont wanda-floor-func-active'></i>
                         {{item.floor}}
                     </div>
-                    <div class='floor-right'>
+                    <div class='floor-right' @click='goToMapView(item.floor)'>
                         查看平面图
                         <van-icon name='arrow' />
                     </div>
@@ -124,15 +124,16 @@ export default {
             showPopup: false,
             floorList: [],
             currentFloor: '全部',
+            currentWellType: '全部',
             // 弹窗中使用数据
             modalData: {
-                system: '',
-                sbss: '',
+                floor: '',
+                wellType: '',
             },
             // 弹窗中使用备份数据
             modalDataBak: {
-                system: '',
-                sbss: '',
+                floor: '',
+                wellType: '',
             },
         }
     },
@@ -167,7 +168,7 @@ export default {
         handleRightClick() {
             this.showPopup = true
             // 设置选中的专业系统
-            this.changeFloor({ code: this.currentFloor })
+            this.changeFloor({ gcname: this.currentFloor })
         },
         /**
          * 获取电井列表
@@ -181,6 +182,10 @@ export default {
             if (this.keyword) {
                 getParams.keyword = `${this.keyword}:welldes,shopsnumList;`
             }
+            if (this.currentFloor && this.currentFloor !== '全部') {
+                getParams.floor = this.currentFloor
+            }
+            // debugger
             let resData = await queryShops({ getParams })
             console.log(resData)
             if (!resData && !resData?.data) {
@@ -204,6 +209,18 @@ export default {
             // console.log(JSON.stringify(res_data, null, 2))
         },
         /**
+         * 点击的楼层,跳转楼层平面图
+         */
+        goToMapView(chooseFloor) {
+            let { floorsArr } = this
+            let currentFloor = floorsArr.filter((v) => v.code === chooseFloor)[0]
+            let floor = {
+                FloorId: currentFloor.gcname,
+                FloorName: currentFloor.code,
+            }
+            this.$router.push({ name: 'MapView', params: { floor } })
+        },
+        /**
          * 点击加载更多,显示该楼层下的更多数据
          */
         loadMore(item) {
@@ -232,26 +249,27 @@ export default {
             let floorList = this.floorList
             floorList.map((item) => {
                 item.active = ''
-                if (item.code === data.code) {
+                if (item.gcname === data.gcname) {
                     item.active = 'active'
                 }
             })
             // 弹窗选中的系统
-            this.$set(this.modalDataBak, 'system', data.smsxt)
+            this.$set(this.modalDataBak, 'floor', data.gcname)
         },
         /**
          * 重置
          */
         reset() {
             this.modalDataBak = {
-                system: '',
-                sbss: '',
+                floor: '',
+                wellType: '',
             }
             this.modalData = {
-                system: '',
-                sbss: '',
+                floor: '',
+                wellType: '',
             }
-            this.system_code = this.smsxt
+            this.currentFloor = '全部'
+            this.currentWellType = '全部'
             this.showPopup = false
         },
         /**
@@ -260,10 +278,11 @@ export default {
         confirm() {
             this.modalData = cloneDeep(this.modalDataBak)
             this.showPopup = false
-            this.system_code = this.floorList.filter((v) => v.active)[0].smsxt
+            this.currentFloor = this.modalData.floor
+            this.currentWellType = this.modalData.wellType
             // 初始化数据,查询列表
             this.initData()
-            this.onLoad()
+            this.getList()
         },
     },
 }
@@ -339,7 +358,7 @@ export default {
             }
             // 电井列表
             .well-container {
-                padding: 15px;
+                padding: 15px 15px 10px 15px;
                 flex: 1;
                 overflow: auto;
                 .well {
@@ -493,7 +512,7 @@ export default {
                 bottom: 30px;
                 right: 0;
                 width: 100%;
-                height: 50px;
+                height: 40px;
                 display: flex;
                 justify-content: space-around;
                 .van-button {

src/views/equipmentFacilities/EquipmentList.vue

@@ -536,7 +536,7 @@ export default {
                 bottom: 30px;
                 right: 0;
                 width: 100%;
-                height: 50px;
+                height: 40px;
                 display: flex;
                 justify-content: space-around;
                 .van-button {

src/views/equipmentFacilities/SystemFloor.vue

@@ -23,6 +23,7 @@ export default {
         }
     },
     created() {
+        console.log(this.$route)
         this.title = this.$route.params.title
     },
     beforeMount() {},

src/views/equipmentFacilities/index.vue

@@ -79,8 +79,8 @@ export default {
                     //暖通
                     { text: '空调系统原理图', dataType: 'img', typecode: '2011', count: '无' },
                     { text: '分水器支路分布图', dataType: 'floor' },
-                    { text: '机房平面布置图' },
-                    { text: '楼层分布' },
+                    { text: '机房平面布置图', dataType: 'room' },
+                    { text: '楼层分布', dataType: 'floor' },
                 ],
                 1003: [
                     //消防
@@ -88,22 +88,22 @@ export default {
                     { text: '消防喷淋系统示意图', dataType: 'img', typecode: '2015', count: '无' },
                     { text: '消防窗喷系统示意图', dataType: 'img', typecode: '2016', count: '无' },
                     { text: '消火栓系统示意图', dataType: 'img', typecode: '2017', count: '无' },
-                    { text: '消防泵房引出管理分布图', dataType: 'floor' },
-                    { text: '机房平面布置图' },
-                    { text: '楼层分布+附加数据' },
+                    { text: '消防泵房引出管路分布图', dataType: 'floor' },
+                    { text: '机房平面布置图', dataType: 'room' },
+                    { text: '楼层分布+附加数据', dataType: 'floor' },
                 ],
                 1004: [
                     //弱电
                     { text: '门禁管理系统原理图', dataType: 'img', typecode: '2019', count: '无' },
                     { text: 'BA楼宇智能化系统原理图', dataType: 'img', typecode: '2020', count: '无' },
-                    { text: '机房平面布置图' },
+                    { text: '机房平面布置图', dataType: 'room' },
                     { text: '楼层分布', dataType: 'floor' },
                 ],
                 1005: [
                     //给排水
                     { text: '给水系统原理示意图', dataType: 'img', typecode: '2021', count: '无' },
                     { text: '排水系统原理示意图', dataType: 'img', typecode: '2022', count: '无' },
-                    { text: '机房平面布置图' },
+                    { text: '机房平面布置图', dataType: 'room' },
                     { text: '楼层分布', dataType: 'floor' },
                 ],
                 1006: [
@@ -167,6 +167,7 @@ export default {
             this.showRight = false
             this.currentSmsxt = smsxt
             this.systemText = text + '系统'
+            console.log( this.systemText)
             /**
              * 查询图片数量,设备卡片
              */
@@ -368,15 +369,15 @@ export default {
          */
         handleRoom(item) {
             // TODO: 机房平面布置图
-            // this.$router.push({ name: 'EngineRoomPicture', params: {} })
+            this.$router.push({ name: 'EngineRoomPicture', params: {} })
         },
         /**
          * 跳转 楼层分布
          */
         handleFloor(item) {
-            let title = this.systemText + '-楼层分布'
-            // TODO: 楼层分布
-            // this.$router.push({ name: 'SystemFloor', params: { title } })
+
+            let title = this.systemText + ' - 楼层分布'
+            this.$router.push({ name: 'SystemFloor', params: { title } })
         },
         /**
          * 跳转 电井间控制商铺范围

src/views/overview/index.vue

@@ -167,9 +167,10 @@
                 speed='50'
                 scrollable
                 :text='noticeBarText'
+                @click='goToUpdateRecord'
             />
             <span v-else>近一个月,说明书无更新</span>
-            <van-icon v-show='showNoticeBar' class='building-arrow' name='arrow' size='14px' @click='goToUpdateRecord' />
+            <van-icon v-show='showNoticeBar' class='building-arrow' name='arrow' size='14px'  />
         </div>
     </div>
 </template>