Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/yunxing/wanda-bm-guide-h5 into dev

zhangyu 4 năm trước cách đây
mục cha
commit
f751f61c7a

+ 1 - 1
public/index.html

@@ -11,7 +11,7 @@
         <meta http-equiv="Cache" content="no-cache" />
         <!-- <meta name="viewport" content="target-densitydpi=device-dpi,width=750,user-scalable=0" /> -->
         <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
-        <link rel="stylesheet" href="//at.alicdn.com/t/font_2072883_7onlk4odzkb.css" />
+        <link rel="stylesheet" href="//at.alicdn.com/t/font_2072883_4p4goyb4c3s.css" />
         <title><%= htmlWebpackPlugin.options.title %></title>
     </head>
     <body>

+ 31 - 3
src/App.vue

@@ -86,7 +86,8 @@ export default {
     },
     beforeMount() {},
     created() {
-        store.commit('SETSSOTOKEN', 'admin:liujiandong')
+        this.handleUrl()
+        // store.commit('SETSSOTOKEN', 'admin:liujiandong')
         // console.log(window.location.href)
         this.SETHAVEFENGMAP(false)
         // 判断 安卓,ios
@@ -113,7 +114,7 @@ export default {
     },
     methods: {
         ...mapActions(['getfmapID', 'getFloors']),
-        ...mapMutations(['SETHAVEFENGMAP', 'SETCATEGORYID', 'SETSMSXT']),
+        ...mapMutations(['SETHAVEFENGMAP', 'SETCATEGORYID', 'SETSMSXT', 'SETSSOTOKEN', 'SETPLAZAID']),
         getFengMap() {
             this.getfmapID().then(() => {
                 this.getMap()
@@ -156,7 +157,7 @@ export default {
             // console.log(active)
             if (active == 1) {
                 this.SETCATEGORYID('LCGN')
-                this.SETSMSXT("")
+                this.SETSMSXT('')
             }
             this.$router.push({ name: this.routeDict[active] })
             store.commit('SETAPPTITLE', this.titleDict[active])
@@ -167,6 +168,33 @@ export default {
         getFloorList() {
             this.getFloors()
         },
+        /**
+         * 处理url参数
+         */
+        handleUrl() {
+            let url = window.location.href
+            let params = this.queryURLParams(url)
+            console.log('%c 路径参数:', 'color:blue')
+            console.log(params)
+            let { username, plazaId } = params
+            if (username) {
+                this.SETSSOTOKEN(`admin:${username}`)
+            }
+            if (plazaId) {
+                // TODO:
+                plazaId = '1000772'
+                this.SETPLAZAID(plazaId)
+            }
+        },
+        /**
+         * 查询url参数
+         */
+        queryURLParams(url) {
+            let obj = {}
+            url.replace(/([^?=&#]+)=([^?=&#]+)/g, (_, key, value) => (obj[key] = value))
+            url.replace(/#([^?=&#]+)/g, (_, hash) => (obj['HASH'] = hash))
+            return obj
+        },
     },
     watch: {
         plazaId(plazaId) {

+ 7 - 1
src/api/httputils.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import store from '@/store'
 import router from '@/router'
 // import { MessageBox } from 'element-ui'
-
+import { Toast } from 'vant'
 var CancelToken = axios.CancelToken
 var cancel
 
@@ -62,6 +62,12 @@ axiosservice.interceptors.response.use(
         return res
     },
     function(err) {
+        // TODO: 接口错误处理
+        let { data } = err.response
+        let message = data.path + data.error
+        // console.log(message)
+        Toast.setDefaultOptions({ duration: 3000 })
+        Toast('网络异常,请稍后再试')
         if (err.response.status == 401) {
             // store.commit('SETISREQUESTtAUTH', 'err')
             // router.push({

+ 3 - 3
src/components/equipmentFacilities/Card.vue

@@ -84,17 +84,17 @@ export default {
     position: relative;
     .name,
     .number {
-        font-size: 15px;
+        font-size: 13px;
         font-weight: 500;
         color: #333333;
         flex: 1;
     }
     .number > i {
-        font-size: 14px;
+        font-size: 12px;
         color: #666;
     }
     .type {
-        font-size: 14px;
+        font-size: 13px;
         font-weight: 500;
         color: #2bad88;
         flex: 1;

+ 1 - 1
src/components/systemMenu.vue

@@ -91,7 +91,7 @@ export default {
         flex-direction: column;
         justify-content: center;
         i {
-            margin-bottom: 10px;
+            margin-bottom: 5px;
         }
         i:before {
             font-size: 20px;

+ 31 - 6
src/main.ts

@@ -14,13 +14,38 @@ Vue.config.productionTip = false
 // FastClick.attach(document.body)
 
 import VConsole from 'vconsole'
+// new VConsole()
+
 // 开发环境引入 vConsole调试工具
 if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_RealEnv !== 'production') {
     // TODO: vConsole
-    // new VConsole()
+    new VConsole()
+}
+const ua = navigator.userAgent
+
+console.log('wdith:', window.screen.width)
+console.log('height:', window.screen.height)
+console.log('clientWidth:', document.body.clientWidth)
+console.log('clientHeight:', document.body.clientHeight)
+// 打包后,监听deviceready事件,处理 部分设备 不能使用cordova插件方法的问题
+if (process.env.NODE_ENV === 'production') {
+    window.addEventListener('deviceready', function() {
+        new Vue({
+            router,
+            store,
+            render: (h) => h(App),
+        }).$mount('#app')
+    })
+} else {
+    // 开发环境
+    new Vue({
+        router,
+        store,
+        render: (h) => h(App),
+    }).$mount('#app')
 }
-new Vue({
-    router,
-    store,
-    render: (h) => h(App),
-}).$mount('#app')
+// new Vue({
+//     router,
+//     store,
+//     render: (h) => h(App),
+// }).$mount('#app')

+ 18 - 7
src/router/index.ts

@@ -59,7 +59,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/equipmentList',
         name: 'EquipmentList',
-        component: () => import(/* webpackChunkName: "equipmentFacilities" */ '../views/equipmentFacilities/EquipmentList.vue'),
+        component: () => import(/* webpackChunkName: "equipmentList" */ '../views/equipmentFacilities/EquipmentList.vue'),
         meta: {
             keepAlive: false,
             showTabbar: false,
@@ -70,7 +70,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/engineRoomPicture',
         name: 'EngineRoomPicture',
-        component: () => import(/* webpackChunkName: "equipmentFacilities" */ '../views/equipmentFacilities/EngineRoomPicture.vue'),
+        component: () => import(/* webpackChunkName: "engineRoomPicture" */ '../views/equipmentFacilities/EngineRoomPicture.vue'),
         meta: {
             keepAlive: false,
             showTabbar: false,
@@ -81,7 +81,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/systemFloor',
         name: 'SystemFloor',
-        component: () => import(/* webpackChunkName: "equipmentFacilities" */ '../views/equipmentFacilities/SystemFloor.vue'),
+        component: () => import(/* webpackChunkName: "systemFloor" */ '../views/equipmentFacilities/SystemFloor.vue'),
         meta: {
             keepAlive: false,
             showTabbar: true,
@@ -92,7 +92,18 @@ const routes: Array<RouteConfig> = [
     {
         path: '/electricWell',
         name: 'ElectricWell',
-        component: () => import(/* webpackChunkName: "equipmentFacilities" */ '../views/equipmentFacilities/ElectricWell.vue'),
+        component: () => import(/* webpackChunkName: "electricWell" */ '../views/equipmentFacilities/ElectricWell.vue'),
+        meta: {
+            keepAlive: false,
+            showTabbar: false,
+            hideNarBar: true,
+        },
+    },
+    // 设备设置 --> 配电室低压柜及出线明细
+    {
+        path: '/lowVoltageCabinet',
+        name: 'LowVoltageCabinet',
+        component: () => import(/* webpackChunkName: "lowVoltageCabinet" */ '../views/equipmentFacilities/LowVoltageCabinet.vue'),
         meta: {
             keepAlive: false,
             showTabbar: false,
@@ -123,7 +134,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/comprehensiveMatterList',
         name: 'ComprehensiveMatterList',
-        component: () => import(/* webpackChunkName: "comprehensiveMatter" */ '../views/otherMatter/ComprehensiveMatterList.vue'),
+        component: () => import(/* webpackChunkName: "comprehensiveMatterList" */ '../views/otherMatter/ComprehensiveMatterList.vue'),
         meta: {
             keepAlive: false,
             showTabbar: false,
@@ -134,7 +145,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/auxiliaryRoom',
         name: 'AuxiliaryRoom',
-        component: () => import(/* webpackChunkName: "comprehensiveMatter" */ '../views/otherMatter/AuxiliaryRoom.vue'),
+        component: () => import(/* webpackChunkName: "auxiliaryRoom" */ '../views/otherMatter/AuxiliaryRoom.vue'),
         meta: {
             keepAlive: false,
             showTabbar: true,
@@ -155,7 +166,7 @@ const routes: Array<RouteConfig> = [
     {
         path: '/updateRecordDetail',
         name: 'UpdateRecordDetail',
-        component: () => import(/* webpackChunkName: "updateRecord" */ '../views/overview/UpdateRecordDetail.vue'),
+        component: () => import(/* webpackChunkName: "updateRecordDetail" */ '../views/overview/UpdateRecordDetail.vue'),
         meta: {
             keepAlive: false,
             showTabbar: false,

+ 1 - 1
src/store/index.ts

@@ -9,7 +9,7 @@ Vue.use(Vuex)
 
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:liujiandong',
+        ssoToken: 'admin:maohongru',
         appTitle: '管理说明书', //顶部标题
         // ssoToken: null,
         // plazaId: '1000772', //项目Id 北京通州

+ 0 - 75
src/views/equipmentFacilities/EngineRoomPicture copy.vue

@@ -1,75 +0,0 @@
-<template>
-    <div class='engine-room-picture'>
-        <van-nav-bar :title='title' left-arrow @click-left='backPage' @click-right='handleRightClick'>
-            <template #right>
-                <i class='iconfont wanda-scan'></i>
-            </template>
-        </van-nav-bar>
-        <van-list class='room-list' v-model='loading' :finished='finished' finished-text='已经到底了' @load='onLoad'>
-            <van-cell v-for='item in list' :key='item' :title='item' />
-        </van-list>
-    </div>
-</template>
-<script>
-/**
- * 机房平面布置图
- */
-import Vue from 'vue'
-import { NavBar, List, Cell } from 'vant'
-Vue.use(NavBar).use(List).use(Cell)
-export default {
-    name: 'EngineRoomPicture',
-    props: {},
-    data() {
-        return {
-            title: '机房平面布置图',
-            list: [],
-            loading: false,
-            finished: false,
-        }
-    },
-    components: {},
-    beforeMount() {},
-    mounted() {},
-    methods: {
-        backPage() {
-            this.$router.go(-1)
-        },
-        handleRightClick() {
-            console.log(1111)
-        },
-        onLoad() {
-            console.log('onload')
-            // 异步更新数据
-            // setTimeout 仅做示例,真实场景中一般为 ajax 请求
-            setTimeout(() => {
-                for (let i = 0; i < 10; i++) {
-                    this.list.push(this.list.length + 1)
-                }
-
-                // 加载状态结束
-                this.loading = false
-
-                // 数据全部加载完成
-                if (this.list.length >= 40) {
-                    this.finished = true
-                }
-            }, 1000)
-        },
-    },
-}
-</script>
-<style lang='less' scoped>
-.engine-room-picture {
-    width: 100%;
-    height: 100%;
-    // 返回箭头修改
-    /deep/ .van-nav-bar .van-icon {
-        color: #000;
-    }
-    .room-list {
-        height: calc(100% - 45px);
-        overflow: auto;
-    }
-}
-</style>

+ 10 - 1
src/views/equipmentFacilities/EngineRoomPicture.vue

@@ -150,6 +150,10 @@ export default {
             let postParams = {
                 system_code: this.smsxt,
             }
+            // 搜索 设备间名称
+            if (this.keyword) {
+                data.keyword = `${this.keyword}:wzjc;`
+            }
             // 右弹窗选择专业之后
             if (this.system_code && this.system_code !== '全部') {
                 postParams.system_code = this.system_code
@@ -164,7 +168,7 @@ export default {
             }
             let resData = res.data.data || []
             console.log(resData)
-            resData = resData.filter((v) => v.photos_num)  // TODO:开发时 过滤有图片的列表项
+            resData = resData.filter((v) => v.photos_num) // TODO:开发时 过滤有图片的列表项
             console.log(resData)
             this.list = this.list.concat(resData)
             this.count = res.data.count || 0
@@ -174,6 +178,11 @@ export default {
                 await sleep(1000)
             }
             await this.getList()
+            // list无数据,不执行后续分页查询
+            if (!this.list.length) {
+                this.finished = true
+                return true
+            }
             this.page++
             this.loading = false
             if (this.list.length >= this.count) {

+ 423 - 0
src/views/equipmentFacilities/LowVoltageCabinet.vue

@@ -0,0 +1,423 @@
+<template>
+    <div class='low-voltage-cabinet'>
+        <!-- 顶部条 -->
+        <van-nav-bar :title='title' left-arrow @click-left='backPage' @click-right='handleRightClick'>
+            <template #right>
+                <i class='iconfont wanda-scan'></i>
+            </template>
+        </van-nav-bar>
+        <!-- 搜索框 -->
+        <div class='equipment-search-container'>
+            <van-search class='equipment-search' v-model='keyword' placeholder='请输入编号' @search='onSearch'></van-search>
+        </div>
+        <!-- 配电室 -->
+        <div class='switch-room-container' v-if='1'>
+            <div class='switch-room' v-for='ii in 3' :key='ii'>
+                <div class='title'>商业楼/B1层/配电室/3#</div>
+                <!-- 一个低压柜信息 -->
+                <div class='info-container'>
+                    <div class='info' v-for='i in mock' :key='i'>
+                        <div class='name'>1AAAA1</div>
+                        <div class='specification'>
+                            <div class='label'>出线规格:</div>
+                            <div class='value'>1250A密集母线槽</div>
+                        </div>
+                        <div class='loop'>
+                            <div class='label'>控制回路:</div>
+                            <div class='value'>步行街公共空调用电2AP1d</div>
+                        </div>
+                        <div class='floor'>
+                            <div class='label'>
+                                <i class='iconfont wanda-dingwei1' style='color:#C3C7CB;'></i>
+                                <span>楼层:</span>
+                            </div>
+                            <div class='value'>1F~3F</div>
+                        </div>
+                        <div class='divider'></div>
+                    </div>
+                    <!-- 加载更多 -->
+                    <div class='load-more' @click='mock=5'>加载更多</div>
+                </div>
+            </div>
+        </div>
+        <!-- 点击头部筛选,出现的右侧弹窗 -->
+        <van-popup class='m-popup-container' v-model='showPopup' position='right'>
+            <div class='m-popup'>
+                <!-- 系统 -->
+                <div class='system'>
+                    <h1 class='title'>配电室</h1>
+                    <div class='system-btn-container'>
+                        <div class='system-btn' v-for='(item,index) in systemList' :key='index'>
+                            <van-button class='m-btn' :class='item.active' @click='changeSwitchRoom(item)'>{{item.text}}</van-button>
+                        </div>
+                    </div>
+                </div>
+                <div class='footer'>
+                    <van-button size='large' color='#025BAA' plain type='info' @click='reset'>重置</van-button>
+                    <van-button size='large' color='#025BAA' type='info' @click='confirm'>确定</van-button>
+                </div>
+            </div>
+        </van-popup>
+        <!-- 无数据 -->
+        <van-empty class='m-empty' v-if='finished &&!list.length' description='暂无数据'>
+            <template #image>
+                <img class='no-data' src='../../assets/images/search_null.png' alt />
+            </template>
+        </van-empty>
+    </div>
+</template>
+<script>
+/**
+ * 配电室低压柜及出线明细
+ */
+import Vue from 'vue'
+import { NavBar, Search, List, Cell, Icon, Popup, Button, Empty } from 'vant'
+Vue.use(NavBar).use(Search).use(List).use(Cell).use(Icon).use(Popup).use(Button).use(Empty)
+import { mapGetters } from 'vuex'
+
+import { querySmsLocation } from '@/api/equipmentList'
+import { queryPic } from '@/api/public'
+import ImagePreview from '@/components/ImagePreview'
+import { sleep } from '@/utils/util'
+import { cloneDeep } from 'lodash'
+export default {
+    name: 'LowVoltageCabinet',
+    props: {},
+    components: { ImagePreview },
+    data() {
+        return {
+            mock: 2,
+            title: '配电室低压柜及出线明细',
+            keyword: '',
+            page: 1,
+            size: 20, //TODO: size1500
+            list: [],
+            loading: false,
+            finished: false,
+            showPopup: false,
+            systemList: [
+                { text: '全部', smsxt: '全部', active: 'active' },
+                { text: '供电系统', smsxt: '1001', active: '' },
+                { text: '暖通系统', smsxt: '1002', active: '' },
+                { text: '消防系统', smsxt: '1003', active: '' },
+                { text: '弱电系统', smsxt: '1004', active: '' },
+                { text: '给排水系统', smsxt: '1005', active: '' },
+                { text: '电梯系统', smsxt: '1006', active: '' },
+                { text: '燃气系统', smsxt: '1007', active: '' },
+                { text: '土建系统', smsxt: '1008', active: '' },
+            ],
+        }
+    },
+    computed: {
+        ...mapGetters(['plazaId', 'smsxt', 'categoryId']),
+    },
+    created() {},
+    beforeMount() {},
+    mounted() {},
+    methods: {
+        backPage() {
+            this.$router.go(-1)
+        },
+        /**
+         * 点击右侧筛选
+         */
+        handleRightClick() {
+            this.showPopup = true
+            // 设置选中的专业系统
+        },
+        onSearch() {
+            // 初始化数据,查询列表
+        },
+        /**
+         * popup 更改配电室
+         */
+        changeSwitchRoom(data) {
+            let systemList = this.systemList
+            systemList.map((item) => {
+                item.active = ''
+                if (item.smsxt === data.smsxt) {
+                    item.active = 'active'
+                }
+            })
+            // 弹窗选中的系统
+            // this.$set(this.modalDataBak, 'system', data.smsxt)
+        },
+        /**
+         * 重置
+         */
+        reset() {
+            // this.modalDataBak = {
+            //     system: '',
+            // }
+            // this.modalData = {
+            //     system: '',
+            // }
+            // this.system_code = this.smsxt
+            this.showPopup = false
+            // 初始化数据,查询列表
+            // this.initData()
+            // this.onLoad()
+        },
+        /**
+         * 弹窗确认
+         */
+        confirm() {
+            // this.modalData = cloneDeep(this.modalDataBak)
+            this.showPopup = false
+            // this.system_code = this.modalData.system
+            // 初始化数据,查询列表
+            // this.initData()
+            // this.onLoad()
+        },
+    },
+}
+</script>
+<style lang='less' scoped>
+.low-voltage-cabinet {
+    width: 100%;
+    height: 100%;
+    background-color: #f5f6f7;
+    // 返回箭头修改
+    /deep/ .van-nav-bar .van-icon {
+        color: #000;
+    }
+    // 搜索
+    .equipment-search-container {
+        width: 100%;
+        height: 55px;
+        // background-color: #fff;
+        text-align: center;
+        .equipment-search {
+            width: 80%;
+            margin: 0 auto;
+            background: none;
+        }
+        .van-search__content {
+            background: #fff;
+            border-radius: 50px;
+        }
+    }
+    // 配电室列表
+    .switch-room-container {
+        width: 100%;
+        // background-color: #fff;
+        min-height: 1px;
+        // TODO:
+        max-height: calc(100% - 100px);
+        overflow: auto;
+        font-size: 14px;
+        font-weight: 400;
+        color: #333333;
+        .switch-room {
+            width: 100%;
+            max-height: 390px;
+            display: flex;
+            flex-direction: column;
+            // 浅蓝色title
+            .title {
+                padding: 0 10px;
+                color: #025baa;
+                height: 45px;
+                background: rgba(2, 91, 170, 0.1);
+                font-size: 16px;
+                font-weight: 500;
+                color: #025baa;
+                line-height: 45px;
+            }
+            // 每个配电室出线明细信息
+            .info-container {
+                width: 100%;
+                flex: 1;
+                overflow: auto;
+                // 每个配电室出线明细
+                .info {
+                    width: 100%;
+                    padding: 15px;
+                    position: relative;
+                    background-color: #fff;
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #666666;
+                    .name {
+                        font-size: 16px;
+                        height: 20px;
+                        line-height: 20px;
+                        font-weight: 500;
+                        color: #333333;
+                    }
+                    .specification,
+                    .loop,
+                    .floor {
+                        margin-top: 8px;
+                        width: 100%;
+                        display: flex;
+                        height: auto;
+                        .label {
+                            width: 70px;
+                            min-width: 70px;
+                            max-width: 70px;
+                        }
+                        .value {
+                            flex: 1;
+                        }
+                    }
+                    .floor .label > span {
+                        display: inline-block;
+                        margin-left: 5px;
+                    }
+
+                    // 底部1px边框
+                    .divider {
+                        width: calc(100% - 30px);
+                        height: 1px;
+                        left: 15px;
+                        bottom: 0;
+                        position: absolute;
+                        background: #e6e6e6;
+                    }
+                }
+                .load-more {
+                    width: 80px;
+                    height: 25px;
+                    line-height: 25px;
+                    text-align: center;
+                    margin: 10px auto;
+                    color: #025baa;
+                    background: #e5eef6;
+                }
+            }
+        }
+    }
+    // 空状态
+    .m-empty {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        /deep/ .van-empty__image {
+            display: flex;
+            justify-content: center;
+            align-items: flex-end;
+            img {
+                width: auto;
+                height: auto;
+            }
+        }
+    }
+    // 筛选弹窗
+    .m-popup-container {
+        width: 80%;
+        height: 100%;
+        padding: 55px 20px 10px 20px;
+        .m-popup {
+            width: 100%;
+            height: calc(100% - 80px);
+            display: flex;
+            flex-direction: column;
+            .title {
+                font-size: 16px;
+                font-weight: 500;
+                color: #333333;
+                margin-bottom: 15px;
+            }
+            // 配电室
+            .system {
+                width: 100%;
+                height: auto;
+                // 专业系统按钮
+                .system-btn-container {
+                    display: flex;
+                    width: 100%;
+                    flex-wrap: wrap;
+                    flex-flow: wrap;
+                    .system-btn {
+                        width: 100% !important;
+                        min-width: 100% !important;
+                        max-width: 100% !important;
+                        height: 40px;
+                        box-sizing: border-box;
+                        padding: 10px 10px 10px 0;
+                        .m-btn {
+                            width: 100%;
+                            height: 32px !important;
+                            text-align: center;
+                            background: #eff0f1;
+                            border-radius: 2px;
+                        }
+                    }
+                }
+                .active {
+                    background-color: #025baa !important;
+                    color: #fff;
+                }
+            }
+            // 设备设施
+            .sbss {
+                flex: 1;
+                display: flex;
+                flex-direction: column;
+                overflow: auto;
+                .title {
+                    width: 100%;
+                    height: 25px;
+                }
+                .system-btn-container {
+                    width: 100%;
+                    height: 40px;
+                    flex: 1;
+                    overflow: auto;
+                    .system-btn {
+                        width: 100% !important;
+                        box-sizing: border-box;
+                        background: #eff0f1 !important;
+                        margin: 10px 0 10px 0;
+                        .m-btn {
+                            display: block !important;
+                            width: 100% !important;
+                            height: 32px !important;
+                            text-align: center;
+                            background: #eff0f1;
+                            border-radius: 2px;
+                        }
+                    }
+                }
+                .active {
+                    background-color: #025baa !important;
+                    color: #fff;
+                }
+                .load-more {
+                    width: 80px;
+                    height: 25px;
+                    line-height: 25px;
+                    text-align: center;
+                    margin: 0 auto;
+                    color: #025baa;
+                    background: #e5eef6;
+                }
+            }
+            .divider {
+                border-bottom: 1px solid #e6e6e6;
+                margin: 20px 0;
+            }
+            .footer {
+                position: absolute;
+                bottom: 30px;
+                right: 0;
+                width: 100%;
+                height: 35px;
+                display: flex;
+                justify-content: space-around;
+                .van-button {
+                    width: 40%;
+                    height: 100%;
+                    max-width: 40%;
+                    min-width: 40%;
+                }
+            }
+        }
+    }
+}
+</style>

+ 12 - 2
src/views/equipmentFacilities/index.vue

@@ -71,7 +71,7 @@ export default {
                     //供电
                     { text: '供电系统原理图', dataType: 'img', typecode: '2010', count: '无' },
                     { text: '机房平面布置图', dataType: 'room' },
-                    { text: '配电室低压柜及出现明细' },
+                    { text: '配电室低压柜及出线明细', dataType: 'dyg' },
                     { text: '楼层分布', dataType: 'floor', value: ' ' },
                     { text: '电井控制商铺范围', dataType: 'electricWell' },
                 ],
@@ -298,6 +298,10 @@ export default {
                 case 'electricWell':
                     this.hanldeElectricWell(item)
                     break
+                // 配电室低压柜及出线明细
+                case 'dyg':
+                    this.hanldeDyg(item)
+                    break
                 default:
                     break
             }
@@ -375,6 +379,12 @@ export default {
             this.$router.push({ name: 'EngineRoomPicture', params: {} })
         },
         /**
+         * 配电室低压柜及出线明细
+         */
+        hanldeDyg() {
+            this.$router.push({ name: 'LowVoltageCabinet', params: {} })
+        },
+        /**
          * 跳转 楼层分布
          */
         handleFloor(item) {
@@ -382,7 +392,7 @@ export default {
             this.$router.push({ name: 'SystemFloor', params: { title } })
         },
         /**
-         *
+         * 分水器支路分布图
          */
         handleFbt(item) {
             console.log(item)

+ 1 - 1
src/views/overview/index.vue

@@ -4,7 +4,7 @@
         <!-- <ImagePreview1 class='overview-img-preview' :visible.sync='showImgPreview' :imgList='imgList' /> -->
         <!-- 轮播 -->
         <div class='my-swipe'>
-            <van-swipe :autoplay='0' indicator-color='white' v-show='imgList.length'>
+            <van-swipe :autoplay='3000' indicator-color='white' v-show='imgList.length'>
                 <van-swipe-item v-for='(image, index) in imgList' :key='index'>
                     <span class='type-name' v-show='image.typename'>{{ image.typename }}</span>
                     <van-image fit='contain' :src='image.url' />