From eb66e79c8eea938b65fc6f958aa71d90363d336b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 18 Apr 2022 16:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E3=80=81=E8=80=83=E6=A0=B8?=
 =?UTF-8?q?=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/log.png              | Bin 0 -> 426 bytes
 src/assets/img/login/school.png     | Bin 0 -> 594 bytes
 src/components/log/index.vue        |  66 ++++++
 src/layouts/header/index.vue        |  94 +++++++-
 src/pages/account/login/index.vue   | 331 +++++++++++++++++-----------
 src/pages/ass/list/index.vue        |  12 +-
 src/pages/log/list/index.vue        |  70 ++----
 src/pages/station/preview/index.vue |   1 -
 src/store/modules/user.js           |   7 +-
 9 files changed, 380 insertions(+), 201 deletions(-)
 create mode 100644 src/assets/img/log.png
 create mode 100644 src/assets/img/login/school.png
 create mode 100644 src/components/log/index.vue

diff --git a/src/assets/img/log.png b/src/assets/img/log.png
new file mode 100644
index 0000000000000000000000000000000000000000..f862a88bf516d0e25496059d53a69e2bd50ed365
GIT binary patch
literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$WJyFpR5(wal%Y?<P!NZ|n*fIcg~1_^I6^`_At7XDfdmYmkW4_@y}ivqf<%%{
zZwL|s!BN8>FoQur@E8<^9_cF`>$1{qr}}c2FZa9OU4=M&-A8D-@1hW{5%w_hHCQU{
z5vT!bK)s0L>VyYo+2uq&()ujOO7i|M0xbg_;0d8ZUEbsJ$w7&N6xO3e1tZVXfwHhV
zR?PIE1g37TxgcL35jIASN(pI*_iIuCC~+}AtR(ruj*6U1^MS_hb+OVNJ)>c1gKJ@Q
znQu;k#lFN``-i3dNl6zs?&$?M!phy`dt`Krh$^rKd;)X88&;NzrA2r&CCrS?*DAuQ
zn-83$bVh>)rA35&P<-4CX=k7{ZK14>zmS0*0|!`H8S3s3;bMG{(M=+5iP)woH+@**
z@XR>B5v4>oK1>3AbpRnmxd-CoEfe9TpfbuO!hFsyx_fdtU(XPBfCYpeN*gOzKL*aK
U-lF<(djJ3c07*qoM6N<$f{^gExBvhE

literal 0
HcmV?d00001

diff --git a/src/assets/img/login/school.png b/src/assets/img/login/school.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ab22c8d2f61554135537b44a15906562ba66388
GIT binary patch
literal 594
zcmV-Y0<HatP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px%3`s;mR5(w~ls#xuaTLYRc`qMmg{ny)AVMr5p|QTFLk9=J3_6I4NFgees#9@s
zC{j1;DB|Ga2M!KG#a3)VHwSSP(KLynB(beSq1ZmNh)^-_9eF`IG)<$>!T)rZ|L>lA
zIQJ4;^teSFbOhyRSB{2ugo^w3cGov+x*_Oe?OVnG1}N_$z*PXfAYRJF1b;TBY&-sA
zJ#-B;Q*rhf2F^ej0FV|rPI^zRWbA_^vs80(B69$aL6`zLRbMPlXS3Oc4`tzVy$_yu
z6Tn$X6DG|k2U5FVwHqU!U)X7Ob>~EP5MrNz7Y9?(%YQ%`19Sq?I8Ec7m5e;v%#T8K
z<vf6M08c?G+3A?QHd<-EZn+Kb0)Y_$RY{ZK@b-t9MAwoJeP8|B6GC7Z)F8kxp<D2H
z+J*P}P&zi&Vs@eG2nL4WVHm(+-(-kpQ!y|JAy4ACm5OGIRp*T>y=@D!Q_*IFPjgOx
z!_`%Qi{YU8pm*P{FMb?MlQ;eew2@Cf$S`o*PRIH?Dhg~1M%o2%rsiCyFbZl2;xhoN
ze%<O(&8d)>wvy4&^@{SdO9{ga+!gqpKuExRGeba63#eRPj{gc8_Xr*VQISxlJd>m)
zAOrBeor+v5)SN32N1Dy3J8gHZRIQ(M<z`7H0Js$9VCuP_bpLO8VL9$Kj7xrP1iZ%`
gm-cV3!~X~R4Us$N@uvPvj{pDw07*qoM6N<$f>(P0QUCw|

literal 0
HcmV?d00001

diff --git a/src/components/log/index.vue b/src/components/log/index.vue
new file mode 100644
index 0000000..96d0c9e
--- /dev/null
+++ b/src/components/log/index.vue
@@ -0,0 +1,66 @@
+<template>
+  <!-- 更新日志 -->
+  <div class="timeline">
+      <div class="item" v-for="(item, i) in list" :key="i">
+          <span class="date">{{ item.updateTime }}</span>
+          <div class="right">
+              <h6>{{ item.versionName }}</h6>
+              <img v-if="item.coverUrl" :src="item.coverUrl" alt="" class="cover">
+              <ul class="detail">
+                  <li v-for="(item, i) in item.logContents" :key="i">
+                      <p class="name"><img :src="require('@/assets/img/' + funcList.find(e => e.id === item.type).icon + '.png')" alt=""> {{ funcList.find(e => e.id === item.type).name }}</p>
+                      <div class="val">
+                          <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
+                      </div>
+                  </li>
+              </ul>
+          </div>
+      </div>
+  </div>
+</template>
+
+<script>
+import Setting from '@/setting'
+export default {
+    data() {
+      return {
+        list: [],
+        funcList: [
+            {
+                id: 0,
+                name: '新功能',
+                icon: 'func'
+            },
+            {
+                id: 1,
+                name: '修复',
+                icon: 'bug'
+            },
+            {
+                id: 2,
+                name: '优化',
+                icon: 'optimize'
+            }
+        ]
+      };
+    },
+    mounted() {
+      this.getData()
+    },
+    methods: {
+      getData() {
+          this.$get(`${this.api.platformLogList}?platformId=${Setting.platformId}&port=1&versionName=`).then(({ logList }) => {
+            logList.map((e, i) => {
+              e.logContents.map(n => {
+                n.content = n.content.split('\n')
+              })
+            })
+            this.list = logList
+          }).catch(res => {})
+      },
+    }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index f0f0892..7c8d8be 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -24,6 +24,10 @@
                 </div>
             </div>
         </div>
+
+        <el-dialog title="更新日志" :visible.sync="logVisible" :close-on-click-modal="false" custom-class="user-dia" append-to-body width="1000px">
+            <log></log>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -31,34 +35,45 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import Setting from "@/setting";
 import util from "@/libs/util";
 import navbar from "../navbar";
+import log from '@/components/log'
 export default {
     data() {
         return {
             token: util.local.get(Setting.tokenKey),
-            isIndex: Setting.whiteList.find(e => e === this.$route.path) // 是否是在白名单页面
+            isIndex: Setting.whiteList.find(e => e === this.$route.path), // 是否是在白名单页面
+            logVisible: false
         };
     },
     components: {
-        navbar
+        navbar,
+        log
     },
     computed: {
         ...mapState("user", [
-            "title", "logoUrl", "avatar", "userName", 'customerName'
+            "title", "logoUrl", "avatar", "userName", 'customerName', 'logView'
         ])
     },
     mounted() {
-        if (this.token) {
-            this.getSystemDetail();
-            this.getUserInfo();
-        }
+      if (this.token) {
+        this.getSystemDetail();
+        this.getUserInfo();
+        this.logView || this.getLogStatus() // logView为false才需要查询接口
+      }
     },
     methods: {
         ...mapMutations("user", [
-            'SET_CUSTOMERNAME'
+            'SET_CUSTOMERNAME', 'SET_LOG'
         ]),
         ...mapActions("user", [
             "logout", "setTitle", "setLogoUrl", "setAvatar", "setUserName"
         ]),
+        // 获取日志状态
+        getLogStatus() {
+            this.$get(this.api.logNotification).then(({ notification }) => {
+              this.SET_LOG() // 把查看日志状态设置为true
+              if (notification) this.logVisible = true // 返回true，则显示日志弹框
+            }).catch(res => {})
+        },
         getSystemDetail () {
             this.$get(this.api.logoDetail).then(res => {
                 if (res.data) {
@@ -192,4 +207,67 @@ $height: 64px;
         }
     }
 }
+/deep/.timeline {
+    display: flex;
+    flex-direction: column;
+    .item {
+        display: flex;
+        justify-content: center;
+        margin-bottom: 30px;
+    }
+    .date {
+        width: 350px;
+        margin-right: 50px;
+        text-align: right;
+        color: #6a6a6a;
+        font-size: 14px;
+    }
+    .right {
+        flex: 1;
+    }
+    h6 {
+        margin-bottom: 15px;
+        font-size: 18px;
+        color: #333;
+        line-height: 1;
+    }
+    .cover {
+        max-width: 400px;
+        margin: 10px 0 20px;
+    }
+    .detail {
+        li {
+            margin-bottom: 20px;
+        }
+        .name {
+            display: flex;
+            align-items: center;
+            margin-bottom: 5px;
+            font-size: 14px;
+            img {
+                width: 20px;
+                margin-right: 8px;
+            }
+        }
+        .val {
+            font-size: 15px;
+            line-height: 1.8;
+            white-space: pre-wrap;
+            p {
+              position: relative;
+              color: #505050;
+              &:before {
+                content: '';
+                display: inline-block;
+                width: 5px;
+                height: 5px;
+                margin: 0 15px 0 8px;
+                vertical-align: middle;
+                border-radius: 20px;
+                background-color: $main-color;
+              }
+            }
+        }
+    }
+}
 </style>
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 1a95c76..45f82f3 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -7,11 +7,21 @@
                     <li v-for="(item,index) in tabList" :key="index" :class="{active: form.distinguish == item.id}" @click="typeClick(item)">{{item.label}}</li>
                 </ul>
                 <el-form :model="form" :rules="loginRules" ref="form" style="margin-top: 20px">
+                    <el-form-item prop="school">
+                        <label class="school"></label>
+                        <el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校">
+                            <el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item v-if="form.distinguish == '1'" prop="account">
                         <label class="account"></label>
-                        <el-input v-model.trim="form.account" placeholder="请输入账号"></el-input>
+                        <el-input v-model.trim="form.account" placeholder="请输入学号"></el-input>
                     </el-form-item>
                     <el-form-item v-if="form.distinguish == '2'" prop="account">
+                        <label class="account"></label>
+                        <el-input v-model.trim="form.account" placeholder="请输入工号"></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="form.distinguish == '3'" prop="account">
                         <label class="account"></label>
                         <el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱"></el-input>
                     </el-form-item>
@@ -29,12 +39,12 @@
                         <el-input
                             placeholder="请输入验证码"
                             v-model.trim="form.code"
-                            @keyup.enter.native="submitFormLogin"
+                            @keyup.enter.native="submit"
                         >
                         </el-input>
                         <img @click="getVerImg" :src="verificationIMG" class="ver-img" alt="">
                     </el-form-item>
-                    <el-button class="submit" type="primary" @click="submitFormLogin">登录</el-button>
+                    <el-button class="submit" type="primary" @click="submit">登录</el-button>
                 </el-form>
             </div>
         </div>
@@ -72,6 +82,23 @@
                 </li>
             </ul>
         </el-dialog>
+        <el-dialog title="请选择您要登录的用户" :visible.sync="userVisible" :close-on-click-modal="false" custom-class="user-dia" width="500px">
+            <p class="tips">该手机号已绑定以下用户信息</p>
+            <ul class="users">
+              <li>
+                <span>中山大学，孙逸仙，工号8814</span>
+                <i class="el-icon-right"></i>
+              </li>
+              <li>
+                <span>中山大学，孙逸仙，工号8814</span>
+                <i class="el-icon-right"></i>
+              </li>
+              <li>
+                <span>中山大学，孙逸仙，工号8814</span>
+                <i class="el-icon-right"></i>
+              </li>
+            </ul>
+        </el-dialog>
         <v-footer ref="footer"></v-footer>
     </div>
 </template>
@@ -82,20 +109,23 @@ import { mapMutations, mapActions } from "vuex";
 import util from "@/libs/util";
 import Setting from "@/setting";
 import axios from "axios"
-
 export default {
     data: function() {
         return {
             tabList: [
                 {
                     id: '1',
-                    label: '账号'
-                },{
+                    label: '学生学号登录'
+                }, {
                     id: '2',
+                    label: '老师工号登录'
+                }, {
+                    id: '3',
                     label: '手机号/邮箱'
                 }
             ],
             verificationIMG: "",
+            schoolList: [],
             form: {
                 account: "",
                 password: "",
@@ -118,7 +148,8 @@ export default {
             phoneBtnText: "发送验证码",
             selectVisible: false,
             selectedRole: '',
-            token: ''
+            token: '',
+            userVisible: false
         };
     },
     components: {
@@ -128,6 +159,7 @@ export default {
         this.getVerImg();
     },
     mounted() {
+        // this.getSchool()
         // 页面离开的时候销毁手机和邮箱验证码定时器
         this.$once("hook:beforeDestroy", function() {
             clearInterval(this.phoneTimer);
@@ -141,15 +173,28 @@ export default {
         ...mapActions("user", [
             "setInfo"
         ]),
+        getSchool() {
+            this.$get(this.api.querySchool, {
+                provinceId: '',
+                cityId: ''
+            }).then(res => {
+                this.schoolList = res.list
+            }).catch(res => {})
+        },
         getVerImg() { // 获取验证码图片
             this.form.random = Math.floor(Math.random() * 999999999);
             this.verificationIMG = this.api.verification + "?random=" + `${this.form.random}`;
         },
         typeClick(tab) { // 切换标签
-            this.form.distinguish = tab.id
+            const { id } = tab
+            this.form.distinguish = id
             this.form.account = "";
             this.$refs.form.clearValidate();
-            this.loginRules.account[0].message = tab.id === "1" ? "请输入账号" : "请输入手机号/邮箱";
+            this.loginRules.account[0].message = id === '1' ?
+              '请输入学号' :
+              id === '2' ?
+                '请输入工号' :
+                '请输入手机号/邮箱'
         },
         // 刷新官网
         reloadIndex() {
@@ -160,45 +205,37 @@ export default {
             util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
             util.cookies.remove('serverLogin')
             this.reloadIndex()
-            // 查询是否有更新日志，如果返回了true，则直接跳转到日志页
-            this.$get(this.api.logNotification).then(res => {
-              const history = this.$route.query.redirect
-              const redirect = res.notification ?
-                '/log' :
-                history ?
-                  decodeURIComponent(history) :
-                  '/station'
-              util.successMsg('登录成功')
-              this.$router.replace(redirect)
-            }).catch(res => {})
+            util.successMsg('登录成功')
+            this.$router.replace('/station')
         },
-        submitFormLogin() { // 提交登录
+        submit() { // 提交登录
             this.$refs.form.validate(valid => {
                 if (valid) {
                     this.form.distinguish = Number(this.form.distinguish);
-                    this.$post(this.api.logins, this.form).then((res) => {
-                        if (res && res.status == 30001) {
+                    this.$post(this.api.logins, this.form).then(({ status, data, message }) => {
+                        if (status == 30001) {
                             this.phoneVisible = true
                             this.getVerImg()
                             this.form.code = ''
-                        } else if (res.status == 200) {
-                            this.token = res.data.token
+                        } else if (status == 200) {
+                            const { token } = data
+                            this.token = token
                             // 查询是否是客户，如果是客户，则弹出选择端的页面去选择跳转到哪个端
                             axios.get(this.api.isClient, {
                                 headers: {
-                                    token: res.data.token
+                                    token
                                 }
                             }).then(res => {
                                 // 如果是客户
-                                if (res.data.customer) {
-                                    this.SET_CUSTOMERNAME(res.data.customerName)
+                                if (data.customer) {
+                                    this.SET_CUSTOMERNAME(data.customerName)
                                     this.selectVisible = true
                                 } else {
                                     this.setLogin()
                                 }
                             }).catch(res => {})
                         } else {
-                            util.errorMsg(res.message)
+                            util.errorMsg(message)
                         }
                     }).catch(res => {
                         this.getVerImg()
@@ -213,10 +250,12 @@ export default {
             if (val === 1) {
                 this.setLogin()
             } else {
+                // 从学生端登录到教师端的标识，教师端需要使用
                 util.cookies.set('serverLogin', true, {
-                  expires: new Date(Date.now() + 15 * 60 * 1000)
+                  expires: new Date(Date.now() + 15 * 60 * 1000) // 15分钟后过期
                 })
                 this.reloadIndex()
+                // 跳转到教师端的重定向页面
                 location.href = process.env.NODE_ENV === 'development' ?
                   'http://192.168.31.125:8081/#/redirect?auth=' + btoa(this.token) :
                   `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
@@ -287,103 +326,110 @@ export default {
 .wrap {
     min-height: 100%;
     background-color: #F3F6FA;
-    .login{
-        min-height: calc(100vh - 43px);
-        padding-top: calc((100vh - 584px) / 2);
-        background: url(../../../assets/img/shapes/shape1.png) (0 123px)/auto no-repeat,
-                    url(../../../assets/img/shapes/shape2.png) (35px 238px)/auto no-repeat,
-                    url(../../../assets/img/shapes/shape3.png) (0 485px)/auto no-repeat,
-                    url(../../../assets/img/shapes/shape4.png) (right 50%)/auto no-repeat,
-                    url(../../../assets/img/shapes/shape5.png) (right 80%)/auto no-repeat,
-                    url(../../../assets/img/shapes/shape6.png) (right bottom)/auto no-repeat;
-        .form{
-            width: 436px;
-            padding: 38px 38px 60px;
-            margin: 0 auto 0;
-            border-radius: 6px;
-            background-color: #fff;
-            .title{
-                margin-bottom: 25px;
-                font-size: 26px;
-                color: #0B1D30;
-                letter-spacing: 4px;
-            }
-            .tab{
-                display: flex;
-                align-items: center;
-                margin-bottom: 24px;
-                border-bottom: 2px solid #E1E6F2;
-                li{
-                    padding: 18px 0;
-                    margin-bottom: -1px;
-                    font-size: 18px;
-                    color: #555;
-                    cursor: pointer;
-                    border-bottom: 4px solid transparent;
-                    &:first-child{
-                        margin-right: 50px;
-                    }
-                    &.active{
-                        color: $main-color;;
-                        border-bottom-color: $main-color;
-                    }
+}
+.login{
+    min-height: calc(100vh - 43px);
+    padding-top: calc((100vh - 584px) / 2);
+    background: url(../../../assets/img/shapes/shape1.png) (0 123px)/auto no-repeat,
+                url(../../../assets/img/shapes/shape2.png) (35px 238px)/auto no-repeat,
+                url(../../../assets/img/shapes/shape3.png) (0 485px)/auto no-repeat,
+                url(../../../assets/img/shapes/shape4.png) (right 50%)/auto no-repeat,
+                url(../../../assets/img/shapes/shape5.png) (right 80%)/auto no-repeat,
+                url(../../../assets/img/shapes/shape6.png) (right bottom)/auto no-repeat;
+    .form{
+        width: 436px;
+        padding: 38px 38px 60px;
+        margin: 0 auto 0;
+        border-radius: 6px;
+        background-color: #fff;
+        .title{
+            margin-bottom: 25px;
+            font-size: 26px;
+            color: #0B1D30;
+            letter-spacing: 4px;
+        }
+        .tab{
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 24px;
+            border-bottom: 2px solid #E1E6F2;
+            li{
+                padding: 18px 0;
+                margin-bottom: -1px;
+                font-size: 18px;
+                color: #555;
+                cursor: pointer;
+                border-bottom: 4px solid transparent;
+                &:last-child{
+                    margin-right: 0;
+                }
+                &.active{
+                    color: $main-color;;
+                    border-bottom-color: $main-color;
                 }
             }
-            .label{
-                margin-bottom: 10px;
-                color: #105CB2;
-            }
-            /deep/.el-form-item{
-                margin-bottom: 20px;
-            }
-            /deep/.el-input__inner{
-                position: relative;
-                height: 52px;
-                padding: 0 20px 0 34px;
-                line-height: 50px;
-                background-color: #FBFBFB;
-                border: 1px solid #E1E6F2;
-                border-radius: 4px !important;
-            }
-            .account,.password,.code{
-                z-index: 1;
-                position: absolute;
-                top: 17px;
-                left: 11px;
-                width: 18px;
-                height: 18px;
-                background: url(../../../assets/img/login/account.png) 0 0/100% 100% no-repeat;
-            }
-            .password{
-                top: 18px;
-                background-image: url(../../../assets/img/login/password.png);
-            }
-            .code{
-                top: 18px;
-                background-image: url(../../../assets/img/login/code.png);
-            }
-            .ver-img{
-                position: absolute;
-                top: 1px;
-                right: 1px;
-            }
-            /deep/.el-form-item__error{
-                top: 105%;
-                left: auto;
-                right: 0;
-                color: #FFA94E;
-            }
-            .submit{
-                width: 100%;
-                height: 48px;
-                margin-top: 30px;
-                line-height: 48px;
-                padding: 0;
-                font-size: 20px;
-                background-color: $main-color;
-                border-radius: 4px;
-                border: 0;
-            }
+        }
+        .label{
+            margin-bottom: 10px;
+            color: #105CB2;
+        }
+        /deep/.el-form-item{
+            margin-bottom: 20px;
+        }
+        /deep/.el-input__inner{
+            position: relative;
+            height: 52px;
+            padding: 0 20px 0 34px;
+            line-height: 50px;
+            background-color: #FBFBFB;
+            border: 1px solid #E1E6F2;
+            border-radius: 4px !important;
+        }
+        .el-select {
+          width: 100%;
+        }
+        label {
+            z-index: 1;
+            position: absolute;
+            top: 17px;
+            left: 11px;
+            width: 18px;
+            height: 18px;
+            background: url(../../../assets/img/login/account.png) 0 0/100% 100% no-repeat;
+        }
+        .school{
+            background-image: url(../../../assets/img/login/school.png);
+        }
+        .password{
+            top: 18px;
+            background-image: url(../../../assets/img/login/password.png);
+        }
+        .code{
+            top: 18px;
+            background-image: url(../../../assets/img/login/code.png);
+        }
+        .ver-img{
+            position: absolute;
+            top: 1px;
+            right: 1px;
+        }
+        /deep/.el-form-item__error{
+            top: 105%;
+            left: auto;
+            right: 0;
+            color: #FFA94E;
+        }
+        .submit{
+            width: 100%;
+            height: 48px;
+            margin-top: 30px;
+            line-height: 48px;
+            padding: 0;
+            font-size: 20px;
+            background-color: $main-color;
+            border-radius: 4px;
+            border: 0;
         }
     }
 }
@@ -400,12 +446,6 @@ export default {
         }
     }
 }
-.tips {
-    margin: 0 0 10px 5px;
-    font-size: 14px;
-    text-align: center;
-    color: #666;
-}
 .port {
     display: flex;
     justify-content: center;
@@ -439,6 +479,35 @@ export default {
 /deep/.select-dia {
     margin-top: calc((100vh - 383px) / 2) !important;
 }
+/deep/.user-dia {
+  .tips {
+    margin-bottom: 20px;
+    text-align: center;
+    color: #666;
+  }
+  .users {
+    li {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 0 15px;
+      margin-bottom: 10px;
+      line-height: 40px;
+      font-size: 14px;
+      background-color: #ebeef5;
+      cursor: pointer;
+      &:last-child {
+        margin-bottom: 0;
+      }
+      &:hover {
+        background-color: #d3e0ff;
+      }
+      i {
+        font-size: 16px;
+      }
+    }
+  }
+}
 @media (max-height: 680px) {
     .wrap .login {
         padding: 40px 0;
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 1210221..df964f5 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -63,6 +63,10 @@
                         ></el-option>
                     </el-select>
                 </li>
+                <li>
+                    <label>搜索：</label>
+                    <el-input placeholder="请输入考核名称" v-model="form.keyWord" clearable></el-input>
+                </li>
             </ul>
         </div>
         <div class="page">
@@ -164,6 +168,7 @@ export default {
             listData: [],
             date: [],
             form: {
+                keyWord: '',
                 month: "",
                 startTime: "",
                 endTime: "",
@@ -171,7 +176,6 @@ export default {
                 curriculumId: "",
                 classId: ""
             },
-            keyword: "",
             dateList: [
                 {
                     id: "",
@@ -237,7 +241,7 @@ export default {
             }
             this.initData();
         },
-        keyword: function(val) {
+        'form.keyWord': function(val) {
             clearTimeout(this.searchTimer);
             this.searchTimer = setTimeout(() => {
                 this.initData();
@@ -380,8 +384,8 @@ export default {
             });
         },
         getClassData() {
-            this.$post(this.api.myClassByStudent).then(res => {
-                this.classList = res.data;
+            this.$post(this.api.myClassByStudent).then(({ data }) => {
+                this.classList = data.filter(e => e)
             }).catch(err => {
             });
         },
diff --git a/src/pages/log/list/index.vue b/src/pages/log/list/index.vue
index a51f6fb..91502a4 100644
--- a/src/pages/log/list/index.vue
+++ b/src/pages/log/list/index.vue
@@ -4,68 +4,27 @@
             <img width="450" src="@/assets/img/update.png" alt="">
             <p>给用户带来更好的服务与体验是我们不断优化和迭代产品的动力。</p>
         </div>
-        <div class="timeline">
-            <div class="item" v-for="(item, i) in listData" :key="i">
-                <span class="date">{{ item.updateTime }}</span>
-                <div class="right">
-                    <h6>{{ item.versionName }}</h6>
-                    <img v-if="item.coverUrl" :src="item.coverUrl" alt="" class="cover">
-                    <ul class="detail">
-                        <li v-for="(item, i) in item.logContents" :key="i">
-                            <p class="name"><img :src="require('@/assets/img/' + funcList.find(e => e.id === item.type).icon + '.png')" alt=""> {{ funcList.find(e => e.id === item.type).name }}</p>
-                            <div class="val">
-                                <p class="" v-for="(item, i) in item.content" :key="i">{{ item }}</p>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
+        <log-list></log-list>
     </div>
 </template>
 
 <script>
-import Setting from '@/setting'
+import logList from '@/components/log'
 export default {
     name: 'log',
     data() {
         return {
-            platformList: Setting.platformList,
-            listData: [],
-            funcList: [
-                {
-                    id: 0,
-                    name: '新功能',
-                    icon: 'func'
-                },
-                {
-                    id: 1,
-                    name: '修复',
-                    icon: 'bug'
-                },
-                {
-                    id: 2,
-                    name: '优化',
-                    icon: 'optimize'
-                }
-            ]
+            
         }
     },
+    components: {
+        logList
+    },
     mounted() {
-        this.getData()
+      
     },
     methods: {
-        getData() {
-            this.$get(`${this.api.platformLogList}?platformId=${Setting.platformId}&port=1&versionName=`).then(res => {
-              const { logList } = res
-              logList.map((e, i) => {
-                e.logContents.map(n => {
-                  n.content = n.content.split('\n')
-                })
-              })
-              this.listData = logList
-            }).catch(res => {})
-        },
+        
     }
 };
 </script>
@@ -84,12 +43,13 @@ export default {
           color: #e9e9e9;
         }
     }
-    .timeline {
-        display: flex;
-        flex-direction: column;
-        width: 1000px;
-        margin: 0 auto;
-    }
+}
+    
+/deep/.timeline {
+    display: flex;
+    flex-direction: column;
+    width: 1000px;
+    margin: 0 auto;
     .item {
         display: flex;
         justify-content: center;
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index b72733f..dda5217 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -280,7 +280,6 @@ export default {
         },
         goSystem() { // 进入实验系统
             const id = this.systemIds
-            let href = ''
             let token = util.local.get(Setting.tokenKey);
             let roleId = this.roleId == 4 ? 0 : 1;
             let userName = window.btoa(encodeURIComponent(this.userName));
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 990877c..1a1bb7b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -3,7 +3,6 @@ import util from "@/libs/util";
 import { post, get, del, put } from "@/plugins/requests/index.js";
 import api from "@/api";
 import addRoutes from "@/libs/route/addRoutes";
-
 /**
  * 用户信息
  * */
@@ -20,7 +19,8 @@ export default {
         customerName: '',
         schoolId: '',
         roleId: '',
-        dataTime: ''
+        dataTime: '',
+        logView: false // 是否查询过日志状态，如果有，则不再调接口
     },
     mutations: {
         SET_INFO: (state, info) => {
@@ -50,6 +50,9 @@ export default {
         SET_ACTIVE_TAB: (state, activeTab) => {
             state.activeTab = activeTab;
         },
+        SET_LOG: (state) => {
+            state.logView = true
+        },
     },
     actions: {
         login({ state, commit }, userInfo) {