浏览代码

修复了刷新就跳登录界面 和 菜单不能保持展开

linan-0110 5 年之前
父节点
当前提交
7a6825d6ed
共有 4 个文件被更改,包括 16 次插入41 次删除
  1. 4 28
      src/router/index.js
  2. 11 11
      src/views/Home/Home.vue
  3. 1 0
      src/views/Login/Login.vue
  4. 0 2
      src/views/deviceManagement/DeviceInfo.vue

+ 4 - 28
src/router/index.js

@@ -6,10 +6,7 @@ import App from '../App.vue'
 import Login from '../views/Login/Login.vue'
 import LoginMiddle from '../views/LoginMiddle/LoginMiddle.vue'
 import Home from '../views/Home/Home.vue'
-// import Aa from '../views/A/Aa.vue'
-// import Ab from '../views/A/Ab.vue'
-// import Ac from '../views/A/Ac.vue'
-// import Ad from '../views/A/Ad.vue'
+
 
 Vue.use(VueRouter)
 
@@ -39,28 +36,7 @@ const routes = [
 		path: '/home',
 		name: 'home',
 		component: Home,
-		children: [
-			// {
-			// 	path: '/home1_1',
-			// 	name: 'home1_1',
-			// 	component: Aa
-			// },
-			// {
-			// 	path: '/home1_2',
-			// 	name: 'home1_2',
-			// 	component: Ab
-			// },
-			// {
-			// 	path: '/home1_3',
-			// 	name: 'home1_3',
-			// 	component: Ac
-			// },
-			// {
-			// 	path: '/home1_4',
-			// 	name: 'home1_4',
-			// 	component: Ad
-			// }
-		]
+		children: []
 	},
 	{
 		path: '*',
@@ -75,8 +51,8 @@ const router = new VueRouter({
 })
 // 判断下是否需要登录
 router.beforeEach((to,from,next)=>{
-    // console.log(store.getters.token,to)
-    if(store.getters.token == null && to.path !== '/login'){
+	// console.log(store.getters.token,to)
+    if(store.getters.token == null && !localStorage.getItem("token") && to.path !== '/login'){
         next({
             path:'/login',
             query: {redirect:to.fullPath}

+ 11 - 11
src/views/Home/Home.vue

@@ -3,13 +3,6 @@
         <header class="header">
             <div class="left">慧牧科技</div>
             <div class="right">
-                <!-- <el-button-group>
-                    <el-button type="primary" size="mini" icon="el-icon-arrow-left">登录</el-button>
-                    <el-button type="primary" size="mini">
-                        切换
-                        <i class="el-icon-arrow-right el-icon--right"></i>
-                    </el-button>
-                </el-button-group>-->
                 <a href>15968681777</a>
                 <a href>登录中</a>
                 <a href>退出账号</a>
@@ -24,6 +17,9 @@
                         @open="handleOpen"
                         @close="handleClose"
                         :collapse="menuCollapse"
+                        :unique-opened="true"
+                        :default-openeds="defaultUnfoldedMenu"
+                        select="1-1"
                     >
                         <div v-for="(item) in menuData " :key="item.index">
                             <el-submenu
@@ -55,7 +51,7 @@
                         </div>
                     </el-menu>
                 </el-col>
-                <el-col class="main_right">
+                <el-col :span="20" class="main_right">
                     <div class="warp">
                         <router-view />
                     </div>
@@ -74,10 +70,14 @@ export default {
         return {
             // 菜单配置
             menuData,
-            menuCollapse: false //是否水平折叠收起菜单
+            menuCollapse: false, //是否水平折叠收起菜单
+            defaultUnfoldedMenu: [menuData[0].index] // 默认展开第一项
         };
     },
     created() {
+        console.log(localStorage.getItem("defaultUnfoldedMenu"))
+        console.log(this.defaultUnfoldedMenu)
+        this.defaultUnfoldedMenu = [localStorage.getItem("defaultUnfoldedMenu")]
     },
     mounted() {},
     methods: {
@@ -85,6 +85,7 @@ export default {
         // 菜单展开
         handleOpen(key, keyPath) {
             console.log(key, keyPath);
+            localStorage.setItem("defaultUnfoldedMenu", "" + key)
         },
         // 菜单收取
         handleClose(key, keyPath) {
@@ -92,10 +93,10 @@ export default {
         },
         // 点击菜单项
         onClickMenu(e) {
-            console.log(e.$attrs.routerName);
             // 如果要跳转的路由和当前路由一致就 return
             if (this.$router.history.current.name == e.$attrs.routerName)
                 return;
+                console.log(e)
             this.$router.push({
                 path: "/" + e.$attrs.routerName
             });
@@ -141,7 +142,6 @@ export default {
                 width: 100%;
                 height: 800px;
                 margin: 15px;
-                flex: 1;
             }
         }
     }

+ 1 - 0
src/views/Login/Login.vue

@@ -79,6 +79,7 @@ export default {
                 data: this.form,
                 success: res => {
                     console.log("登录结果", res);
+                    localStorage.setItem("token", res.token)
                     this.login(res.token);
                     // 显示一个dialog 让用户选择组
                     this.doOrganizationChoose();

+ 0 - 2
src/views/deviceManagement/DeviceInfo.vue

@@ -177,7 +177,6 @@ export default {
             this.isShowDialog = true;
         },
         loadTypeList(pid = -1) {
-			console.log('111')
             this.fetch({
                 api: "/device/device-type/list-parent",
                 method: "GET",
@@ -207,7 +206,6 @@ export default {
                     }
                 }
 			});
-			console.log('333')
         },
         isCamera(hid) {
             if (hid === 4 || hid === 5 || hid === 6) return true;