소스 검색

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

fujunwen 4 년 전
부모
커밋
ef7e6cb2a0

BIN
src/assets/images/icons/arrow.png


BIN
src/assets/images/icons/grey.png


+ 0 - 1
src/components/floorMap/index.vue

@@ -236,7 +236,6 @@ export default {
         },
         // 查看浮层设备详情
         handleClickEquipDetail: debounce(function (row, column, event) {
-            window.vmm = this
             // 设备状态为停用或已拆除时,弹出消息
             if (this.statusDisabled.includes(row?.sb_status)) {
                 let message = `当前设备状态为“${row.sb_status}”,请复核现场情况,如有需要请前往编辑器删除。` // `当前设备为“${row.sb_status}”状态,请前往编辑器重新编辑`

+ 1 - 17
src/components/menuList.vue

@@ -13,7 +13,7 @@
             <div
                 v-for='(item, index) in list'
                 :key='index'
-                :class='{ "is-active": item.state,"hide-home-page":item.hideHomePage }'
+                :class='{ "is-active": item.state }'
                 @click='clickEventAcitve(item, index)'
             >{{ item.name }}</div>
         </div>
@@ -48,8 +48,6 @@ export default {
         return {
             state: '',
             list: [
-                // { name: '', state: false, route: 'homepage' }, 
-                //TODO: 显示首页 liujiandong用户路由跳转处理
                 { name: '首页', state: false, route: 'homepage' },  
                 { name: '项目概况', state: false, route: 'overview' },
                 { name: '楼层功能', state: false, route: 'floorFunc' }, //楼层功能
@@ -81,11 +79,6 @@ export default {
         $route: 'handleRoute'
     },
     created() {
-        console.log('menulist created,',this.$store.state.userInfo)
-        // 非liujiandong用户,隐藏首页入口
-        if(this.$store.state.userInfo.username !== 'liujiandong'){
-            this.$set(this.list,0,{ name: '', state: false, route: 'homepage', hideHomePage: true })
-        }
         this.currentTime()
     },
     mounted() {
@@ -263,16 +256,7 @@ export default {
             margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
-            // TODO: 取消隐藏 首页菜单,
-            /* &:first-child {
-                display: none;
-            } */
-        }
-        // 改为动态根据 : 用户不是liujiandong时,隐藏首页
-        .hide-home-page{
-            display: none;
         }
-
         .is-active {
             color: #025baa;
             font-weight: bolder;

+ 2 - 10
src/router/index.js

@@ -34,20 +34,12 @@ const routes = [
         path: "/home",
         name: "home",
         component: () => import("../views/index"),
-        redirect: "/home/homepage",
+        // TODO: 1.默认跳转到项目概览
+        redirect: "/home/overview",
         children: [{
                 path: "homepage",
                 name: "项目首页",
                 component: () => import("../views/homepage"),
-                // TODO: 注释重定向到预览页面,liujiandong用户 路由跳转处理
-                // redirect: "/home/overview",
-                beforeEnter (to,from,next){
-                    if (store.state.userInfo.username !== 'liujiandong') {
-                        next('/home/overview')
-                    } else {
-                        next()
-                    }
-                }
             },
             //概览
             {

+ 1 - 0
src/store/index.js

@@ -220,6 +220,7 @@ export default new Vuex.Store({
                                     commit('SETPLAZENAME', res.treeData[0].cname)
                                 }
                                 router.push({
+                                    // TODO: 1.默认跳转到项目概览
                                     path: './home/overview',
                                     query: {
                                         plazaId: res.treeData[0].ccode,

+ 0 - 1
src/views/equipment/index.vue

@@ -272,7 +272,6 @@ export default {
         },
     },
     mounted() {
-        window._vm = this
         // if (Object.keys(this.floorObj).length > 0) {
         //     this.floorInfo = this.floorObj
         // }