From acb8394bc3c971f7623f2b68b36d05d9c613c831 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 28 Oct 2021 18:34:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/header/index.vue      |  2 +-
 src/pages/account/login/index.vue |  5 +++
 src/pages/ass/list/index.vue      | 64 +++++++++++++++----------------
 src/plugins/requests/index.js     |  2 +-
 src/setting.js                    |  4 +-
 src/styles/common.scss            |  3 +-
 6 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 76ef10f..0280d32 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -2,7 +2,7 @@
     <div class="header">
         <div v-if="this.$route.path=='/setting/person'" class="goBack" @click="back"><i class="el-icon-arrow-left"></i>返回</div>
         <template v-else>
-            <div>
+            <div style="line-height: 60px">
                 <img class="logo" :src="logoUrl" />
                 <span class="title">{{title}}</span>
             </div>
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 3de444f..a38d3ec 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -198,6 +198,11 @@ export default {
                 util.successMsg("绑定成功");
                 this.loginForm.phone = this.phone;
                 this.phoneVisible = false;
+
+                util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
+                let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
+                this.$router.replace(redirect);
+                util.successMsg("登录成功");
             }).catch(res => {
             });
         }
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index b4a156c..be1376c 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -3,7 +3,7 @@
     <div>
         <div class="page">
             <h6 class="p-title">筛选</h6>
-            <div class="tool">
+            <div class="tool mul">
                 <ul class="filter">
                     <li>
                         <label>考核时间</label>
@@ -22,6 +22,7 @@
                             format="yyyy-MM-dd"
                             value-format="yyyy-MM-dd"
                             clearable
+                            style="width: 300px"
                         ></el-date-picker>
                     </li>
                     <li>
@@ -34,11 +35,6 @@
                             ></el-option>
                         </el-select>
                     </li>
-
-                </ul>
-            </div>
-            <div class="tool">
-                <ul class="filter">
                     <li>
                         <label>实验班级</label>
                         <el-select size="small" v-model="form.classId" @change="initData">
@@ -47,7 +43,7 @@
                                 v-for="(item,index) in classList"
                                 :key="index"
                                 :label="item.className"
-                                :value="item.value"
+                                :value="item.id"
                             ></el-option>
                         </el-select>
                     </li>
@@ -63,7 +59,6 @@
                             ></el-option>
                         </el-select>
                     </li>
-
                 </ul>
             </div>
 
@@ -279,34 +274,32 @@ export default {
                 pageSize: this.pageSize
             };
             this.$post(this.api.pageStuAssessment, data).then(res => {
-                if (res.status === 200 && res.list && res.list.length) {
-                    this.listData = res.list;
-                    this.totals = res.total;
-                    this.listData.forEach(i => {
-                        if (i.status === 2) { // 已结束
-                            i.countDown = 0;
-                        } else {
-                            if (i.type === 2) { // 定时发布
-                                if (i.status === 0) {
-                                    // 待开始
-                                    i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
-                                } else if (i.status === 1) {
-                                    // 进行中
-                                    i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
-                                }
-                            } else if (i.type === 1) { // 手动发布
-                                if (i.status === 0) {
-                                    // 待开始
-                                    i.countDown = 0;
-                                } else if (i.status === 1) {
-                                    // 进行中
-                                    i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
-                                }
+                this.listData = res.list;
+                this.totals = res.total;
+                this.listData.forEach(i => {
+                    if (i.status === 2) { // 已结束
+                        i.countDown = 0;
+                    } else {
+                        if (i.type === 2) { // 定时发布
+                            if (i.status === 0) {
+                                // 待开始
+                                i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
+                            } else if (i.status === 1) {
+                                // 进行中
+                                i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
+                            }
+                        } else if (i.type === 1) { // 手动发布
+                            if (i.status === 0) {
+                                // 待开始
+                                i.countDown = 0;
+                            } else if (i.status === 1) {
+                                // 进行中
+                                i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
                             }
                         }
-                    });
-                    this.beginTimer();
-                }
+                    }
+                });
+                this.beginTimer();
             }).catch(err => {});
         },
         initData() {
@@ -432,4 +425,7 @@ export default {
 .el-radio.is-bordered + .el-radio.is-bordered {
     margin-left: 0;
 }
+.el-radio-group {
+    white-space: nowrap;
+}
 </style>
\ No newline at end of file
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 72d5fcc..98a109f 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -31,7 +31,7 @@ service.interceptors.request.use(config => {
 service.interceptors.response.use(
     response => {
         const res = response.data;
-        if (res.status == 200 || res.status == 10000) {
+        if (res.status == 200 || res.status == 10000 || res.status == 30001) {
             return Promise.resolve(res).catch(e => {});
         } else if (!res.status) {
             return Promise.resolve(res).catch(e => {});
diff --git a/src/setting.js b/src/setting.js
index ea23d99..1a575f4 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -42,9 +42,9 @@ if (isHh) {
     title = "职站";
 } else if (isDev) {
     // 本地
-    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://39.108.250.202:9000/"; // 中台测试服
     // host = "http://192.168.31.137:9000/"; // 赓
-    host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.125:9000/"; // 坤
     systemPath = "http://192.168.31.154/";
     defaultSubSystem = "http://39.108.250.202/pyTrials/#/";
diff --git a/src/styles/common.scss b/src/styles/common.scss
index c8ce49c..33eb16b 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -42,6 +42,7 @@
 }
 
 .filter {
+  width: 100vw;
   display: inline-flex;
   align-items: center;
   flex: 1;
@@ -52,7 +53,7 @@
     margin-right: 30px;
 
     label {
-      margin-right: 10px;
+      margin-right: 6px;
       font-size: 14px;
       line-height: 14px;
       color: rgba(0, 0, 0, .65);