From 998289be40cfc599e182b104093e5d1120859bda Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 16 Feb 2022 10:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=8F=B0=E7=AD=89=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/breadcrumb/index.vue |  3 +--
 src/layouts/navbar/index.vue        | 10 ++++++---
 src/pages/ass/list/index.vue        |  8 +++----
 src/pages/station/list/index.vue    | 33 ++++++++++-------------------
 src/plugins/requests/index.js       | 12 +++--------
 5 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index 85a3754..3d0eda4 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="breadcrumb">
         <el-breadcrumb separator=">">
-            <el-breadcrumb-item v-for="(item, index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? curRoute : route }">{{item}}</el-breadcrumb-item>
+            <el-breadcrumb-item v-for="(item, index) in pages" :key="index" :to="{ path: index == pages.length - 1 ? '.' : route }">{{item}}</el-breadcrumb-item>
         </el-breadcrumb>
     </div>
 </template>
@@ -26,7 +26,6 @@ export default {
     },
     methods: {
       update(data){
-        console.log(2222,data)
         this.pages = data.split('/')
       }
     }
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 2c0c9fb..fb9e47e 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -64,12 +64,16 @@ export default {
         };
     },
     mounted() {
-        this.menus = this.token ? this.loginedMenu : this.touristMenu
+        this.menus = util.local.get(Setting.tokenKey) ? this.loginedMenu : this.touristMenu
     },
     methods: {
         jump(item) {
-            this.active = item.index
-            this.$router.push(item.index).catch(err => {})
+            if (!util.local.get(Setting.tokenKey) && this.loginedMenu.find(e => e.index === item.index)) {
+                location.reload()
+            } else {
+                this.active = item.index
+                this.$router.push(item.index).catch(err => {})
+            }
         }
     }
 };
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 6e29f53..2271cec 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -71,17 +71,17 @@
                 <el-table-column prop="sysName" label="课程名称" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="experimentalName" label="考核名称" align="center" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="className" label="实验班级" align="center"></el-table-column>
-                <el-table-column prop="experimentalNum" label="实验人数" align="center"></el-table-column>
-                <el-table-column prop="experimentDuration" label="考试时长" align="center"></el-table-column>
+                <el-table-column prop="experimentalNum" width="90" label="实验人数" align="center"></el-table-column>
+                <el-table-column prop="experimentDuration" width="90" label="考试时长" align="center"></el-table-column>
                 <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
                 <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
                 <el-table-column prop="stopTime" label="结束时间" align="center"></el-table-column>
-                <el-table-column label="倒计时" align="center">
+                <el-table-column label="倒计时" width="90" align="center">
                     <template slot-scope="scope">
                         <span>{{ timeFilter(scope.row) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="考核状态" align="center">
+                <el-table-column label="考核状态" width="90" align="center">
                     <template slot-scope="scope">
                         <span class="ellipsis">{{ status[scope.row.status] }}</span>
                     </template>
diff --git a/src/pages/station/list/index.vue b/src/pages/station/list/index.vue
index 3d0fe10..2ca33a1 100644
--- a/src/pages/station/list/index.vue
+++ b/src/pages/station/list/index.vue
@@ -1,6 +1,6 @@
 <template>
     <!--  实验台  -->
-    <div class="box index">
+    <div class="wrap index">
         <div class="search">
             <h6>创新实验，智能教学</h6>
             <div class="input">
@@ -8,11 +8,10 @@
                 <input type="text" placeholder="请输入关键词" v-model="keyword">
             </div>
         </div>
-        <div class="wrap">
+        <div class="station">
             <template v-for="(item,index) in curriculumList">
                 <a class="item" @click="goPreview(item)" :key="index" v-if="!keyword || item.curriculumName.includes(keyword)">
                     <img :src="item.coverUrl" alt="">
-                    <p class="text" v-html="item.curriculumName"></p>
                 </a>
             </template>
         </div>
@@ -79,34 +78,24 @@ export default {
     }
 }
 
-.wrap {
+.station {
     display: flex;
     flex-wrap: wrap;
-    width: 70%;
-    margin: 0 auto;
+    width: 1072px;
     min-height: calc(100vh - 520px);
-    box-sizing: border-box;
-
+    padding: 30px 0;
+    margin: 0 auto;
     .item {
-        width: 16%;
-        margin: 20px;
-        text-align: center;
+        width: 256px;
+        height: 195px;
+        margin: 0 6px 4px;
         cursor: pointer;
-
         &:hover {
             opacity: .9;
         }
-
         img {
-            width: 100px;
-            height: 100px;
-            margin: 0 auto 6px;
-        }
-
-        .text {
-            font-size: 14px;
-            text-align: center;
-            color: #333;
+            width: 100%;
+            height: 100%;
         }
     }
 }
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 98a109f..015d1a8 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -21,7 +21,7 @@ service.interceptors.request.use(config => {
     util.errorMsg({
         message: "退出登陆",
         onClose: function() {
-            router.push({ name: "/login" });
+            router.push({ name: "/index" });
         }
     });
     return Promise.reject(err);
@@ -54,10 +54,7 @@ service.interceptors.response.use(
                     util.errorMsg("登录过期，请重新登录");
                     setTimeout(() => {
                         router.replace({
-                            path: "/login",
-                            query: {
-                                redirect: router.currentRoute.fullPath
-                            }
+                            path: "/index"
                         });
                     }, 1000);
                     break;
@@ -77,10 +74,7 @@ service.interceptors.response.use(
                     // 跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面
                     setTimeout(() => {
                         router.replace({
-                            path: "/login",
-                            query: {
-                                redirect: router.currentRoute.fullPath
-                            }
+                            path: "/index"
                         });
                     }, 1000);
                     break;