diff --git a/src/api/index.js b/src/api/index.js
index 4b82e93..6c6798d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -12,6 +12,7 @@ export default {
     getUserAllRoleByToken : `users/users/role/getUserAllRoleByToken`,
     getSchoolIdByToken : `users/users/data/user/getSchoolIdByToken`,
     deleteProfile : `users/users/userInfo/deleteProfile`,
+    refreshPageNotification : `nakadai/message/refreshPageNotification`,
     
     platformLogList: `nakadai/nakadai/log/platformLogList`,
     logNotification: `nakadai/nakadai/log/logNotification`,
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 3d76b27..6b863d0 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -74,6 +74,7 @@
 import { mapState, mapMutations, mapActions } from "vuex";
 import util from "@/libs/util";
 import Setting from "@/setting";
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -119,24 +120,65 @@ export default {
         }
       }).catch(res => { })
     },
+
+
+    // socket连接成功
+    open () {
+      console.log("socket连接成功");
+    },
+    // socket连接失败
+    error () {
+      console.log("连接错误");
+    },
+    // 接收消息
+    getMessage (msg) {
+      console.log("==websocket接收数据==");
+      console.log(JSON.parse(msg.data));
+
+      const { content } = JSON.parse(msg.data)
+      // 1赛事、2创业、3考核、4模型。-号拼接携带id
+      if (content == 1) {
+        Bus.$emit('matchSocket')
+      } else if (content == 2) {
+        Bus.$emit('activitySocket')
+      } else if (content == 4) {
+        Bus.$emit('modelSocket')
+      } else {
+        this.getNotice()
+      }
+    },
+    // 关闭socket
+    close () {
+      console.log("socket已经关闭");
+    },
+    initSocket ({ id, account }) {
+      // 实例化socket
+      // this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`)
+      this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
+      // 监听socket连接
+      this.socket.onopen = this.open;
+      // 监听socket错误信息
+      this.socket.onerror = this.error;
+      // 监听socket消息
+      this.socket.onmessage = this.getMessage;
+    },
+
     // 获取消息
     getNotice () {
-      if (!Setting.isDev) {
-        this.noticeTimer = setInterval(() => {
-          this.$get(this.api.messageNotificationList, {
-            type: 2
-          }).then(res => {
-            this.notices = res.notificationList
-          }).catch(res => { });
-        }, 5000)
-      }
+      this.$get(this.api.messageNotificationList, {
+        type: 2
+      }).then(res => {
+        this.notices = res.notificationList
+      }).catch(res => { });
     },
     // 前往评论列表
-    toComment (item) {
+    async toComment (item) {
+      await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${item.notifyId}`) // 该通知置为已读
       this.$router.push(`/station/preview?courseId=${item.cid}&commentId=${item.commentId}&notifyId=${item.notifyId}`)
     },
     getUserDetail () { // 获取用户详情
       this.$get(this.api.queryUserInfoDetails).then(res => {
+        this.initSocket(res.result.userAccount)
         let { hrUserInfo } = res.result
         if (hrUserInfo) {
           const { userAvatars, userName, userId } = hrUserInfo
diff --git a/src/pages/activity/list/index.vue b/src/pages/activity/list/index.vue
index 97ca1ed..07d8107 100644
--- a/src/pages/activity/list/index.vue
+++ b/src/pages/activity/list/index.vue
@@ -141,11 +141,11 @@ import { mapState, mapMutations } from "vuex";
 import { Loading } from "element-ui";
 import Setting from "@/setting"
 import util from "@/libs/util"
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
       timer: null,
-      redisTimer: null,
       token: util.local.get(Setting.tokenKey),
       statusList: ["待报名", "取消报名", "马上报名", "报名截止", "已结束"],
       endList: ["报名开始", "报名截止", "报名截止", "项目开始", "项目结束"],
@@ -200,14 +200,18 @@ export default {
     }
   },
   mounted () {
+    // websocket实时刷新
+    Bus.$on('activitySocket', () => {
+      this.getData()
+    })
+
     this.getData()
     this.$once('hook:beforeDestroy', function () {
       this.clearTimer()
-      clearInterval(this.redisTimer)
     })
   },
   methods: {
-    getList () {
+    getData () {
       this.clearTimer()
       const { form } = this
       const data = {
@@ -278,14 +282,6 @@ export default {
       })
       this.timerList = []
     },
-    getData () {
-      // this.loadIns = Loading.service()
-      this.getList()
-      if (!Setting.isDev) {
-        clearInterval(this.redisTimer)
-        this.redisTimer = setInterval(this.getRedis, 1000)
-      }
-    },
     initData () {
       this.page = 1
       this.getData()
diff --git a/src/pages/activity/manage/list/index.vue b/src/pages/activity/manage/list/index.vue
index 87e1026..d3e63f8 100644
--- a/src/pages/activity/manage/list/index.vue
+++ b/src/pages/activity/manage/list/index.vue
@@ -179,6 +179,7 @@ import util from "@/libs/util";
 import Setting from "@/setting";
 import { mapMutations } from "vuex";
 import { Loading } from 'element-ui'
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -249,7 +250,6 @@ export default {
         playingStages: []
       },
       timer: null,
-      redisTimer: null,
       pickerOptions: {
         shortcuts: [{
           text: '此刻',
@@ -287,17 +287,21 @@ export default {
     }
   },
   mounted () {
+    // websocket实时刷新
+    Bus.$on('activitySocket', () => {
+      this.getData()
+    })
+
     this.getData()
     this.$once('hook:beforeDestroy', function () {
       clearInterval(this.timer)
-      clearInterval(this.redisTimer)
     })
   },
   methods: {
     ...mapMutations('activity', [
       'setPage'
     ]),
-    getList () {
+    getData () {
       // const load = Loading.service()
       const { form } = this
       this.$post(this.api.activityList, {
@@ -318,33 +322,12 @@ export default {
           this.page--
           this.getData()
         }
-      }).catch(res => {
-        // load.close()
-      })
-    },
-    getData () {
-      this.getList()
+      }).catch(res => { })
     },
     initData () {
       this.page = 1;
       this.getData();
     },
-    // 获取redis缓存
-    getRedis () {
-      this.$post(this.api.getRedisCacheActivity).then(({ data }) => {
-        if (data) {
-          localStorage.getItem('activityTimestamp') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
-          localStorage.setItem('activityTimestamp', data)
-        }
-      }).catch(res => { })
-    },
-    getData () {
-      this.getList()
-      // if (!Setting.isDev) {
-      clearInterval(this.redisTimer)
-      this.redisTimer = setInterval(this.getRedis, 1000)
-      // }
-    },
     add () {
       this.$router.push("add");
     },
@@ -397,7 +380,7 @@ export default {
       if (date == "0000-00-00 00:00:00") return "---";
       return date;
     },
-    switchOff (val, row) {
+    async switchOff (val, row) {
       this.$post(this.api.disabledEventsActivity, {
         activityId: row.id,
         isOpen: val,
@@ -405,6 +388,8 @@ export default {
       }).then(res => { }).catch(err => {
         row.schoolOpen = val ? 0 : 1
       })
+
+      await this.$post(`${this.api.refreshPageNotification}?content=2`)
     },
   }
 };
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 7027242..1aff188 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -1,410 +1,510 @@
 <template>
-    <div class="page">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool mul">
-            <ul class="filter">
-                <li>
-                    <label>创建时间</label>
-                    <el-radio-group v-model="form.month" @change="initData">
-                        <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
-                    </el-radio-group>
-                    <el-date-picker v-model="date" @blur='pickerInput' align="right" unlink-panels type="daterange" style="width: 300px;margin-left: 10px;" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
-                </li>
-                <li>
-                    <label>发布类型</label>
-                    <el-select v-model="form.type" clearable placeholder="请选择发布类型" @change="initData">
-                        <el-option v-for="(item,index) in typeList" :key="index" :label="item.name" :value="item.value"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>实验状态</label>
-                    <el-select v-model="form.status" clearable placeholder="请选择实验状态" @change="initData">
-                        <el-option v-for="(item,index) in statusList" :key="index" :label="item.name" :value="item.value"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>课程</label>
-                    <el-select v-model="curriculumId" placeholder="请选择" @change="initData">
-                        <el-option label="不限" value=""></el-option>
-                        <el-option
-                            v-for="item in curriculumList"
-                            :key="item.cid"
-                            :label="item.curriculumName"
-                            :value="item.cid"
-                        ></el-option>
-                    </el-select>
-                </li>
-            </ul>
-        </div>
-        <div class="tool mul">
-            <ul class="filter">
-                <li>
-                    <el-input placeholder="请输入实验班级/项目名称/考核名称" prefix-icon="el-icon-search" v-model.trim="keyWord" clearable style="width: 300px"></el-input>
-                </li>
-            </ul>
-            <div>
-                <div>
-                    <el-button v-auth type="info" round @click="add" >创建考核</el-button>
-                    <el-button v-auth type="primary" round @click="delAllData">批量删除</el-button>
-                </div>
-            </div>
+  <div class="page">
+    <h6 class="p-title">筛选</h6>
+    <div class="tool mul">
+      <ul class="filter">
+        <li>
+          <label>创建时间</label>
+          <el-radio-group v-model="form.month"
+                          @change="initData">
+            <el-radio v-for="(item,index) in dateList"
+                      :key="index"
+                      :label="item.id"
+                      border>{{ item.name }}</el-radio>
+          </el-radio-group>
+          <el-date-picker v-model="date"
+                          @blur='pickerInput'
+                          align="right"
+                          unlink-panels
+                          type="daterange"
+                          style="width: 300px;margin-left: 10px;"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd"
+                          clearable></el-date-picker>
+        </li>
+        <li>
+          <label>发布类型</label>
+          <el-select v-model="form.type"
+                     clearable
+                     placeholder="请选择发布类型"
+                     @change="initData">
+            <el-option v-for="(item,index) in typeList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.value"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>实验状态</label>
+          <el-select v-model="form.status"
+                     clearable
+                     placeholder="请选择实验状态"
+                     @change="initData">
+            <el-option v-for="(item,index) in statusList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.value"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>课程</label>
+          <el-select v-model="curriculumId"
+                     placeholder="请选择"
+                     @change="initData">
+            <el-option label="不限"
+                       value=""></el-option>
+            <el-option v-for="item in curriculumList"
+                       :key="item.cid"
+                       :label="item.curriculumName"
+                       :value="item.cid"></el-option>
+          </el-select>
+        </li>
+      </ul>
+    </div>
+    <div class="tool mul">
+      <ul class="filter">
+        <li>
+          <el-input placeholder="请输入实验班级/项目名称/考核名称"
+                    prefix-icon="el-icon-search"
+                    v-model.trim="keyWord"
+                    clearable
+                    style="width: 300px"></el-input>
+        </li>
+      </ul>
+      <div>
+        <div>
+          <el-button v-auth
+                     type="info"
+                     round
+                     @click="add">创建考核</el-button>
+          <el-button v-auth
+                     type="primary"
+                     round
+                     @click="delAllData">批量删除</el-button>
         </div>
+      </div>
+    </div>
 
-        <el-table v-loading="listLoading" ref="table" :data="listData" class="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
-            <el-table-column type="selection" :selectable="row => row.status !== 1" width="50" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (pageNum - 1) * pageSize + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="className" label="实验班级" align="center" min-width="120px" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="experimentalName" label="考核名称" align="center" min-width="120px" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="projectName" label="项目名称" min-width="200" show-overflow-tooltip align="center"></el-table-column>
-            <el-table-column prop="experimenterNum" label="实验人数" align="center"></el-table-column>
-            <el-table-column prop="experimentDuration" label="实验时长" align="center"></el-table-column>
-            <el-table-column label="邀请码" align="center">
-                <template slot-scope="scope">
-                    <span>{{ scope.row.isEnableCode == 1 ? scope.row.invitationCode : "" }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="type" label="发布类型" align="center">
-                <template slot-scope="scope">
-                    <span>{{ types[scope.row.type] }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="createTime" width="150" label="创建时间" align="center">
-            </el-table-column>
-            <el-table-column prop="startTime" width="150" label="起始时间" align="center">
-                <template slot-scope="scope">
-                    <span>{{ transferTime(scope.row.startTime) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column prop="stopTime" width="150" label="结束时间" align="center">
-                <template slot-scope="scope">
-                    <span>{{ transferTime(scope.row.stopTime) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="倒计时" align="center">
-                <template slot-scope="scope">
-                    <span>{{ timeFilter(scope.row) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="实验状态" align="center">
-                <template slot-scope="scope">
-                    <span>
-                        {{ status[scope.row.status] }}
-                    </span>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" width="170" align="center">
-                <template slot-scope="scope">
-                    <template v-if="scope.row.status == 0 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
-                        <el-button v-auth v-if="scope.row.type == 1" type="text" @click="start(scope.row)">启动</el-button>
-                        <el-button v-auth type="text" @click="edit(scope.row)">修改</el-button>
-                    </template>
-                    <template v-else-if="scope.row.status == 1 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
-                        <el-button v-auth type="text" @click="finish(scope.row)">提前结束</el-button>
-                    </template>
-                    <template v-else-if="scope.row.status == 2">
-                        <el-button v-auth type="text" @click="show(scope.row)">查看成绩</el-button>
-                    </template>
-                    <el-button v-auth v-if="(scope.row.status == 0 || scope.row.status == 2) && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="delData(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="pageNum"></el-pagination>
-        </div>
+    <el-table v-loading="listLoading"
+              ref="table"
+              :data="listData"
+              class="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id">
+      <el-table-column type="selection"
+                       :selectable="row => row.status !== 1"
+                       width="50"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + (pageNum - 1) * pageSize + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="className"
+                       label="实验班级"
+                       align="center"
+                       min-width="120px"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="experimentalName"
+                       label="考核名称"
+                       align="center"
+                       min-width="120px"
+                       show-overflow-tooltip></el-table-column>
+      <el-table-column prop="projectName"
+                       label="项目名称"
+                       min-width="200"
+                       show-overflow-tooltip
+                       align="center"></el-table-column>
+      <el-table-column prop="experimenterNum"
+                       label="实验人数"
+                       align="center"></el-table-column>
+      <el-table-column prop="experimentDuration"
+                       label="实验时长"
+                       align="center"></el-table-column>
+      <el-table-column label="邀请码"
+                       align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isEnableCode == 1 ? scope.row.invitationCode : "" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="type"
+                       label="发布类型"
+                       align="center">
+        <template slot-scope="scope">
+          <span>{{ types[scope.row.type] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime"
+                       width="150"
+                       label="创建时间"
+                       align="center">
+      </el-table-column>
+      <el-table-column prop="startTime"
+                       width="150"
+                       label="起始时间"
+                       align="center">
+        <template slot-scope="scope">
+          <span>{{ transferTime(scope.row.startTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="stopTime"
+                       width="150"
+                       label="结束时间"
+                       align="center">
+        <template slot-scope="scope">
+          <span>{{ transferTime(scope.row.stopTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="倒计时"
+                       align="center">
+        <template slot-scope="scope">
+          <span>{{ timeFilter(scope.row) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="实验状态"
+                       align="center">
+        <template slot-scope="scope">
+          <span>
+            {{ status[scope.row.status] }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作"
+                       width="170"
+                       align="center">
+        <template slot-scope="scope">
+          <template v-if="scope.row.status == 0 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
+            <el-button v-auth
+                       v-if="scope.row.type == 1"
+                       type="text"
+                       @click="start(scope.row)">启动</el-button>
+            <el-button v-auth
+                       type="text"
+                       @click="edit(scope.row)">修改</el-button>
+          </template>
+          <template v-else-if="scope.row.status == 1 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
+            <el-button v-auth
+                       type="text"
+                       @click="finish(scope.row)">提前结束</el-button>
+          </template>
+          <template v-else-if="scope.row.status == 2">
+            <el-button v-auth
+                       type="text"
+                       @click="show(scope.row)">查看成绩</el-button>
+          </template>
+          <el-button v-auth
+                     v-if="(scope.row.status == 0 || scope.row.status == 2) && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))"
+                     type="text"
+                     @click="delData(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="pageNum"></el-pagination>
     </div>
+  </div>
 </template>
 
 <script>
 import { mapState } from "vuex";
 import util from "@/libs/util";
 export default {
-    data() {
-        return {
-            typeList: [
-                {
-                    value: "",
-                    name: "不限"
-                }, {
-                    value: 1,
-                    name: "手动发布"
-                }, {
-                    value: 2,
-                    name: "定时发布"
-                }
-            ],
-            types: ["", "手动发布", "定时发布"],
-            statusList: [
-                {
-                    value: "",
-                    name: "不限"
-                }, {
-                    value: 0,
-                    name: "待开始"
-                }, {
-                    value: 1,
-                    name: "进行中"
-                }, {
-                    value: 2,
-                    name: "已结束"
-                }
-            ],
-            status: ["待开始", "进行中", "已结束"],
-            dateList: [
-                {
-                    id: "",
-                    name: "不限"
-                }, {
-                    id: 1,
-                    name: "近一个月"
-                }, {
-                    id: 3,
-                    name: "近三个月"
-                }, {
-                    id: 6,
-                    name: "近六个月"
-                }
-            ],
-            date: [],
-            curriculumList: [],
-            curriculumId: "",
-            keyWord: "", // 搜索框筛选条件
-            searchTimer: null,
-            form: {
-                type: "",
-                status: "",
-                startTime: "",
-                endTime: "",
-                month: ""
-            },
-            pageNum: +this.$route.query.page || 1, // 当前页数
-            pageSize: 10, // 每页10条
-            total: 0, // 总数
-            listData: [], // 表格数据
-            multipleSelection: [], // 多选
-            listLoading:false,// 列表加载
-            ticker: null, // 倒计时定时器
-        };
+  data () {
+    return {
+      typeList: [
+        {
+          value: "",
+          name: "不限"
+        }, {
+          value: 1,
+          name: "手动发布"
+        }, {
+          value: 2,
+          name: "定时发布"
+        }
+      ],
+      types: ["", "手动发布", "定时发布"],
+      statusList: [
+        {
+          value: "",
+          name: "不限"
+        }, {
+          value: 0,
+          name: "待开始"
+        }, {
+          value: 1,
+          name: "进行中"
+        }, {
+          value: 2,
+          name: "已结束"
+        }
+      ],
+      status: ["待开始", "进行中", "已结束"],
+      dateList: [
+        {
+          id: "",
+          name: "不限"
+        }, {
+          id: 1,
+          name: "近一个月"
+        }, {
+          id: 3,
+          name: "近三个月"
+        }, {
+          id: 6,
+          name: "近六个月"
+        }
+      ],
+      date: [],
+      curriculumList: [],
+      curriculumId: "",
+      keyWord: "", // 搜索框筛选条件
+      searchTimer: null,
+      form: {
+        type: "",
+        status: "",
+        startTime: "",
+        endTime: "",
+        month: ""
+      },
+      pageNum: +this.$route.query.page || 1, // 当前页数
+      pageSize: 10, // 每页10条
+      total: 0, // 总数
+      listData: [], // 表格数据
+      multipleSelection: [], // 多选
+      listLoading: false,// 列表加载
+      ticker: null, // 倒计时定时器
+    };
+  },
+  computed: {
+    ...mapState("user", [
+      'roleName'
+    ])
+  },
+  watch: {
+    "form.month": function (val) {
+      if (val) {
+        let unit = 24 * 60 * 60 * 1000;
+        this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
+      } else {
+        this.date = [];
+      }
     },
-    computed: {
-        ...mapState("user", [
-            'roleName'
-        ])
+    date: function (val) {
+      if (val) {
+        this.form.startTime = val[0];
+        this.form.endTime = val[1];
+      } else {
+        this.form.startTime = "";
+        this.form.endTime = "";
+        this.form.month = '';
+      }
+      this.initData();
     },
-    watch: {
-        "form.month": function(val) {
-            if (val) {
-                let unit = 24 * 60 * 60 * 1000;
-                this.date = [util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() - unit * 30 * val)), util.formatDate("yyyy-MM-dd", new Date(new Date().getTime() + unit))];
-            } else {
-                this.date = [];
-            }
-        },
-        date: function(val) {
-            if (val) {
-                this.form.startTime = val[0];
-                this.form.endTime = val[1];
-            } else {
-                this.form.startTime = "";
-                this.form.endTime = "";
-                this.form.month = '';
+    keyWord: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    // 页面离开的时候销毁手机和邮箱验证码定时器
+    this.$once("hook:beforeDestroy", function () {
+      clearInterval(this.ticker);
+      this.ticker = null;
+    });
+    this.getData(1);
+    this.getschoolCourse();
+  },
+  methods: {
+    pickerInput () {
+      this.form.month = '6'
+    },
+    beginTimer () {
+      clearInterval(this.ticker)
+      this.ticker = setInterval(() => {
+        for (let i = 0; i < this.listData.length; i++) {
+          const item = this.listData[i];
+          if (item.countDown > 0) {
+            item.countDown--;
+          } else {
+            if (item.status == 0 && item.type == 2) { // 待开始-定时发布
+              item.status = 1;
+              item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
+              // }
+            } else if (item.status == 1) {
+              // item.status = 2;
             }
-            this.initData();
-        },
-        keyWord: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+          }
+          this.$set(this.listData, i, item);
         }
+      }, 1000);
     },
-    mounted() {
-        // 页面离开的时候销毁手机和邮箱验证码定时器
-        this.$once("hook:beforeDestroy", function() {
-            clearInterval(this.ticker);
-            this.ticker = null;
-        });
-        this.getData(1);
-        this.getschoolCourse();
+    timeFilter (countDown) {
+      if (countDown.countDown > 0) {
+        let h = Math.floor(countDown.countDown / (60 * 60));
+        let m = Math.floor(countDown.countDown % (60 * 60) / 60);
+        let s = Math.floor(countDown.countDown % (60 * 60) % 60);
+        return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`;
+      } else {
+        if (countDown.status == 1) {
+          countDown.status = 2
+        }
+        return "00:00:00";
+      }
     },
-    methods: {
-        pickerInput(){
-            this.form.month = '6'
-        },
-        beginTimer() {
-          clearInterval(this.ticker)
-            this.ticker = setInterval(() => {
-              for (let i = 0; i < this.listData.length; i++) {
-                  const item = this.listData[i];
-                  if (item.countDown > 0) {
-                      item.countDown--;
-                  } else {
-                      if (item.status == 0 && item.type == 2) { // 待开始-定时发布
-                          item.status = 1;
-                          item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
-                          // }
-                      } else if (item.status == 1) {
-                          // item.status = 2;
-                      }
-                  }
-                  this.$set(this.listData, i, item);
+    getData (counddown) {
+      this.listLoading = true;
+      let data = {
+        ...this.form,
+        keyWord: this.keyWord,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        curriculumId: this.curriculumId
+      };
+      this.$post(this.api.pageByCondition, data).then(res => {
+        this.listData = res.list;
+        this.total = 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;
               }
-            }, 1000);
-        },
-        timeFilter(countDown) {
-            if (countDown.countDown > 0) {
-                let h = Math.floor(countDown.countDown / (60 * 60));
-                let m = Math.floor(countDown.countDown % (60 * 60) / 60);
-                let s = Math.floor(countDown.countDown % (60 * 60) % 60);
-                return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`;
-            } else {
-               if(countDown.status == 1){
-                   countDown.status = 2
-               }
-                return "00:00:00";
             }
-        },
-        getData(counddown) {
-            this.listLoading = true;
-            let data = {
-                ...this.form,
-                keyWord: this.keyWord,
-                pageNum: this.pageNum,
-                pageSize: this.pageSize,
-                curriculumId: this.curriculumId
-            };
-            this.$post(this.api.pageByCondition, data).then(res => {
-                this.listData = res.list;
-                this.total = 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;
-                            }
-                        }
-                    }
-                });
-                counddown && this.beginTimer()
-                this.listLoading = false;
-            }).catch(err => {
-                this.listLoading = false;
-            });
-        },
-        initData() {
+          }
+        });
+        counddown && this.beginTimer()
+        this.listLoading = false;
+      }).catch(err => {
+        this.listLoading = false;
+      });
+    },
+    initData () {
+      this.$refs.table.clearSelection();
+      this.pageNum = 1;
+      this.getData();
+    },
+    getschoolCourse () { // 获取课程下拉框数据
+      this.$get(this.api.schoolCourse).then(res => {
+        this.curriculumList = res.data;
+      }).catch(err => {
+        console.log(err);
+      });
+    },
+    add () {
+      this.$router.push("add");
+    },
+    edit (row) {
+      this.$router.push(`add?id=${row.id}`);
+    },
+    show (row) {
+      this.$router.push(`/achievement/teach?id=${row.id}&projectName=${row.projectName}&permissions=1`)
+    },
+    start (row) {
+      this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => {
+        util.successMsg("启动成功！");
+        this.getData(1);
+      }).catch(err => {
+        console.log(err);
+      });
+    },
+    finish (row) {
+      this.$confirm("确定要提前结束吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        let data = {
+          id: row.id,
+          endTime: util.formatDate("yyyy-MM-dd hh:mm:ss", new Date()),
+          status: 2
+        };
+        this.$post(`${this.api.collectPaper}?id=${row.id}`).then(async res => {
+          util.successMsg("提前结束成功！");
+          this.getData();
+          // await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`)
+        }).catch(err => {
+          console.log(err);
+        });
+      }).catch(() => {
+      });
+    },
+    delData (row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(this.api.deleteAssessment, [row.id]).then(res => {
+          util.successMsg("删除成功");
+          this.getData();
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    delAllData () {
+      if (this.multipleSelection.length) {
+        let ids = this.multipleSelection.map(item => {
+          return item.id;
+        });
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+
+          this.$post(this.api.deleteAssessment, ids).then(res => {
+            this.multipleSelection = [];
             this.$refs.table.clearSelection();
-            this.pageNum = 1;
+            util.successMsg("删除成功");
             this.getData();
-        },
-        getschoolCourse() { // 获取课程下拉框数据
-            this.$get(this.api.schoolCourse).then(res => {
-                this.curriculumList = res.data;
-            }).catch(err => {
-                console.log(err);
-            });
-        },
-        add() {
-            this.$router.push("add");
-        },
-        edit(row) {
-            this.$router.push(`add?id=${row.id}`);
-        },
-        show(row) {
-            this.$router.push(`/achievement/teach?id=${row.id}&projectName=${row.projectName}&permissions=1`)
-        },
-        start(row) {
-            this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => {
-                util.successMsg("启动成功！");
-                this.getData(1);
-            }).catch(err => {
-                console.log(err);
-            });
-        },
-        finish(row) {
-            this.$confirm("确定要提前结束吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                let data = {
-                    id: row.id,
-                    endTime: util.formatDate("yyyy-MM-dd hh:mm:ss", new Date()),
-                    status: 2
-                };
-                this.$post(`${this.api.collectPaper}?id=${row.id}`).then(res => {
-                    util.successMsg("提前结束成功！");
-                    this.getData();
-                }).catch(err => {
-                    console.log(err);
-                });
-            }).catch(() => {
-            });
-        },
-        delData(row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(this.api.deleteAssessment, [row.id]).then(res => {
-                    util.successMsg("删除成功");
-                    this.getData();
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        delAllData() {
-            if (this.multipleSelection.length) {
-                let ids = this.multipleSelection.map(item => {
-                    return item.id;
-                });
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    
-                    this.$post(this.api.deleteAssessment, ids).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                    if(this.multipleSelection.length === this.listData.length && this.pageNum>1) {
-                        this.handleCurrentChange(this.pageNum - 1)
-                    }
-                }).catch(() => {
-                });
-            } else {
-                util.errorMsg("请先选择数据 ！");
-            }
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        handleCurrentChange(val) {
-            this.pageNum = val
-            this.$router.push(`list?page=${val}`)
-            this.getData();
-        },
-        transferTime(date) {
-            if (date == "0000-00-00 00:00:00" || !date) return "---";
-            return date;
-        }
+          }).catch(res => {
+          });
+          if (this.multipleSelection.length === this.listData.length && this.pageNum > 1) {
+            this.handleCurrentChange(this.pageNum - 1)
+          }
+        }).catch(() => {
+        });
+      } else {
+        util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+    },
+    handleCurrentChange (val) {
+      this.pageNum = val
+      this.$router.push(`list?page=${val}`)
+      this.getData();
+    },
+    transferTime (date) {
+      if (date == "0000-00-00 00:00:00" || !date) return "---";
+      return date;
     }
+  }
 };
 </script>
 
diff --git a/src/pages/expSystem/backstage/model.vue b/src/pages/expSystem/backstage/model.vue
index 796b318..46948b2 100644
--- a/src/pages/expSystem/backstage/model.vue
+++ b/src/pages/expSystem/backstage/model.vue
@@ -120,6 +120,7 @@
 <script>
 import org from "./modelType"
 import Setting from '@/setting'
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -136,7 +137,6 @@ export default {
       schoolModels: [],
       systemModels: [],
       submiting: false,
-      timer: null
     };
   },
   components: {
@@ -151,13 +151,15 @@ export default {
     }
   },
   mounted () {
-    this.$once('hook:beforeDestroy', function () {
-      clearInterval(this.timer)
+    // websocket实时刷新
+    Bus.$on('modelSocket', () => {
+      this.getData()
     })
   },
   methods: {
-    getList () {
+    getData () {
       const curNode = this.$refs.tree.$refs.tree.getCurrentNode() // 获取当前选中的分类
+      console.log("🚀 ~ file: model.vue:162 ~ getData ~ this.$refs.tree:", this.$refs.tree)
       if (curNode) {
         this.isTopLevel = !curNode.level
         // 如果是首级，要调另一个接口
@@ -186,22 +188,6 @@ export default {
         }
       }
     },
-    getData () {
-      clearInterval(this.timer)
-      this.getList()
-      if (!Setting.isDev) {
-        this.timer = setInterval(this.getRedis, 1000)
-      }
-    },
-    // 获取redis缓存
-    getRedis () {
-      this.$post(this.api.modelRedis).then(({ data }) => {
-        if (data) {
-          localStorage.getItem('modelAdmin') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
-          localStorage.setItem('modelAdmin', data)
-        }
-      }).catch(res => { })
-    },
     initData () {
       this.page = 1
       this.getData()
diff --git a/src/pages/expSystem/backstage/sourceModel.vue b/src/pages/expSystem/backstage/sourceModel.vue
index 34c1ea1..7f5e157 100644
--- a/src/pages/expSystem/backstage/sourceModel.vue
+++ b/src/pages/expSystem/backstage/sourceModel.vue
@@ -129,6 +129,7 @@
 <script>
 import org from "./sourceType"
 import Setting from '@/setting'
+import Bus from '@/libs/bus'
 export default {
   data () {
     return {
@@ -141,7 +142,6 @@ export default {
       total: 0,
       multipleSelection: [],
       isSystem: 0, // 中台内置
-      timer: null
     };
   },
   components: {
@@ -156,13 +156,14 @@ export default {
     }
   },
   mounted () {
-    this.$once('hook:beforeDestroy', function () {
-      clearInterval(this.timer)
+    // websocket实时刷新
+    Bus.$on('modelSocket', () => {
+      this.getData()
     })
   },
   methods: {
     // 获取列表
-    async getList () {
+    async getData () {
       const curNode = this.$refs.tree.$refs.tree.getCurrentNode() || {}// 获取当前选中的分类
       this.isTopLevel = !curNode.level
       let res
@@ -174,7 +175,6 @@ export default {
         founder: 0
       }
       if (curNode.level) data.categoryId = curNode.id
-      console.log("🚀 ~ file: sourceModel.vue:177 ~ getList ~ this.isSystem:", this.isSystem)
       // 系统内置
       if (this.isSystem) {
         // 如果是首级，要调另一个接口
@@ -191,22 +191,6 @@ export default {
       this.listData = res.data.records
       this.total = res.data.total
     },
-    getData () {
-      clearInterval(this.timer)
-      this.getList()
-      if (!Setting.isDev) {
-        this.timer = setInterval(this.getRedis, 1000)
-      }
-    },
-    // 获取redis缓存
-    getRedis () {
-      this.$post(this.api.modelRedis).then(({ data }) => {
-        if (data) {
-          localStorage.getItem('modelAdmin') !== data && this.getList() // 本地缓存跟redis返回的不一样，就查询列表
-          localStorage.setItem('modelAdmin', data)
-        }
-      }).catch(res => { })
-    },
     // 分类点击回调
     catetoryClick (school) {
       this.isSystem = school
@@ -272,7 +256,8 @@ export default {
           type: "warning"
         }).then(() => {
           // 本校跟系统的禁用接口不一样，系统的禁用启用接口分为两个
-          this.$post(this.api[isSystem ? (off ? 'demoHiddenOpen' : 'demoHiddenClose') : 'disableModelDemo'], list).then(res => {
+          this.$post(this.api[isSystem ? (off ? 'demoHiddenOpen' : 'demoHiddenClose') : 'disableModelDemo'], list).then(async res => {
+            await this.$post(`${this.api.refreshPageNotification}?content=4`)
             this.$refs.table.clearSelection()
             this.$message.success(`${off ? '启用' : '禁用'}成功`)
             this.getData()
@@ -285,7 +270,7 @@ export default {
       }
     },
     // 本校禁用
-    switchOff (val, row) {
+    async switchOff (val, row) {
       this.$post(this.api.disableModelDemo, [{
         isOpen: val,
         modelId: row.id,
@@ -295,6 +280,8 @@ export default {
       }).catch(res => {
         this.getList()
       })
+
+      await this.$post(`${this.api.refreshPageNotification}?content=4`)
     },
     // 系统内置禁用
     switchOffSystem (val, row) {
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index e84988a..f82a1ec 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -209,7 +209,7 @@ import util from "@/libs/util";
 import Setting from "@/setting";
 import { mapMutations } from "vuex";
 import { Loading } from 'element-ui'
-
+import Bus from '@/libs/bus'
 export default {
   name: "match",
   data () {
@@ -266,7 +266,6 @@ export default {
         playingStages: []
       },
       timer: null,
-      redisTimer: null,
       pickerOptions: {
         shortcuts: [{
           text: '此刻',
@@ -304,17 +303,20 @@ export default {
     }
   },
   mounted () {
+    // websocket实时刷新
+    Bus.$on('matchSocket', () => {
+      this.getData()
+    })
     this.getData()
     this.$once('hook:beforeDestroy', function () {
       clearInterval(this.timer)
-      clearInterval(this.redisTimer)
     })
   },
   methods: {
     ...mapMutations('match', [
       'setPage'
     ]),
-    getList () {
+    getData () {
       // const load = Loading.service()
       const { form } = this
       this.$post(this.api.competitionPageConditionQueryByOccupationlab, {
@@ -366,9 +368,6 @@ export default {
         // load.close()
       })
     },
-    getData () {
-      this.getList()
-    },
     initData () {
       this.page = 1;
       this.getData();
@@ -379,13 +378,6 @@ export default {
         data && this.getList()
       }).catch(res => { })
     },
-    getData () {
-      this.getList()
-      if (!Setting.isDev) {
-        clearInterval(this.redisTimer)
-        this.redisTimer = setInterval(this.getRedis, 1000)
-      }
-    },
     add () {
       this.$router.push("/match/add");
     },
@@ -466,7 +458,7 @@ export default {
       if (date == "0000-00-00 00:00:00") return "---";
       return date;
     },
-    switchOff (val, row) {
+    async switchOff (val, row) {
       this.$post(this.api.disabledEventsCompetition, {
         competitionId: row.id,
         isOpen: val,
@@ -474,6 +466,8 @@ export default {
       }).then(res => {
         util.successMsg(val == 1 ? '禁用成功' : '启用成功')
       }).catch(err => { })
+
+      await this.$post(`${this.api.refreshPageNotification}?content=1`)
     },
   }
 };
diff --git a/src/pages/match/preview/index.vue b/src/pages/match/preview/index.vue
index 2fcf80c..b1dd233 100644
--- a/src/pages/match/preview/index.vue
+++ b/src/pages/match/preview/index.vue
@@ -1,112 +1,150 @@
 <template>
-    <div class="match">
-      <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
-      <div class="center">
-        <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name" route="matchPreview"></breadcrumb>
-        <div class="match-inner">
-          <div class="flex-between">
-              <el-tabs v-model="curType" @tab-click="typeChange">
-                  <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
-              </el-tabs>
-              <div class="status wait">等待报名</div>
-          </div>
-          <div class="info">
-            <h6 class="title">{{ form.name }}</h6>
-            <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
+  <div class="match">
+    <div class="banner"
+         :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
+    <div class="center">
+      <breadcrumb ref="breadcrumb"
+                  :data="'全部赛事/' + form.name"
+                  route="list"></breadcrumb>
+      <div class="match-inner">
+        <div class="flex-between">
+          <el-tabs v-model="curType"
+                   @tab-click="typeChange">
+            <el-tab-pane v-for="(item, index) in typeList"
+                         :key="index"
+                         :label="item.name"
+                         :name="item.id"></el-tab-pane>
+          </el-tabs>
+          <div class="status wait">等待报名</div>
+        </div>
+        <div class="info">
+          <h6 class="title">{{ form.name }}</h6>
+          <div class="meta">最近编辑时间：{{ form.updateTime }}</div>
+        </div>
+
+        <div class="l-title"
+             id="part1"><img src="@/assets/img/label.png"
+               alt=""> 竞赛信息</div>
+        <div v-if="form.description"
+             class="texts ql-editor"
+             v-html="form.description"></div>
+        <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
+          <h6 class="p-title">附件下载</h6>
+          <ul class="files">
+            <li v-for="(item, i) in form.competitionAnnexList"
+                :key="i">
+              <el-link v-if="item.canPreview"
+                       class="m-r-10"
+                       type="primary"
+                       @click="previewFile(item)">{{ item.fileName }}</el-link>
+              <span v-else
+                    class="file-name">{{ item.fileName }}</span>
+              <el-link type="primary"
+                       :underline="false"
+                       @click="download(item)">下载</el-link>
+            </li>
+          </ul>
+        </template>
+        <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无数据</p>
+            </div>
           </div>
+        </template>
 
-          <div class="l-title" id="part1"><img src="@/assets/img/label.png" alt=""> 竞赛信息</div>
-          <div v-if="form.description" class="texts ql-editor" v-html="form.description"></div>
-          <template v-if="form.competitionAnnexList && form.competitionAnnexList.length">
-            <h6 class="p-title">附件下载</h6>
-            <ul class="files">
-              <li v-for="(item, i) in form.competitionAnnexList" :key="i">
-                <el-link v-if="item.canPreview" class="m-r-10" type="primary" @click="previewFile(item)">{{ item.fileName }}</el-link>
-                <span v-else class="file-name">{{ item.fileName }}</span>
-                <el-link type="primary" :underline="false" @click="download(item)">下载</el-link>
-              </li>
-            </ul>
-          </template>
-          <template v-if="!form.description && (!form.competitionAnnexList || !form.competitionAnnexList.length )">
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
-                  </div>
-              </div>
-          </template>
+        <template v-if="form.releaseType && form.competitionStage.length">
+          <div class="l-title"><img src="@/assets/img/label.png"
+                 alt=""> 赛程、规则与内容</div>
+          <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
+          <div v-for="(rule, i) in form.competitionStage"
+               :key="i"
+               class="rule">
+            <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
+            <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
+            <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
+            <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
+            <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
+            <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
+            <template v-if="rule.method === 2">
+              <p>线下地点：{{ rule.offlineAddress }}</p>
+              <p>比赛内容：{{ rule.contentDescription }}</p>
+              <p>评分规则：{{ rule.scoreRule }}</p>
+            </template>
 
-          <template v-if="form.releaseType && form.competitionStage.length">
-            <div class="l-title"><img src="@/assets/img/label.png" alt=""> 赛程、规则与内容</div>
-            <h6 class="rule-title">共{{ form.competitionStage.length }}个竞赛阶段，同一个团队每个成员只能参加一个阶段赛项</h6>
-            <div v-for="(rule, i) in form.competitionStage" :key="i" class="rule">
-              <p style="font-size: 16px;color: #333;">{{ rule.stageName }}</p>
-              <p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p>
-              <p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p>
-              <p v-if="!rule.method">课程系统：{{ rule.systemName }}</p>
-              <p v-if="rule.onlineButton">线上地点：{{ rule.onlineAddress }}</p>
-              <p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p>
-              <template v-if="rule.method === 2">
-                <p>线下地点：{{ rule.offlineAddress }}</p>
-                <p>比赛内容：{{ rule.contentDescription }}</p>
-                <p>评分规则：{{ rule.scoreRule }}</p>
-              </template>
-              
-              <template v-if="form.completeCompetitionSetup.competitionType">
-                <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
-                <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
-              </template>
-              <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
-              <div v-if="form.rule === 1" class="flex">
-                <p>晋级规则：</p>
-                <div>
-                  <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
-                  <p v-if="rule.percentageLimit">本阶段成绩排名前{{ rule.percentageLimit }}%，可晋级下一阶段比赛</p>
-                  <p v-if="rule.scoreLimit">本阶段成绩{{ rule.scoreLimit }}分，可晋级下一阶段比赛</p>
-                </div>
+            <template v-if="form.completeCompetitionSetup.competitionType">
+              <p>团队参赛人数限制：{{ rule.teamNumLimit || '不限制' }}</p>
+              <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
+            </template>
+            <p>阶段比赛结束后{{ rule.resultAnnouncementTime }}小时，公布阶段比赛成绩。</p>
+            <div v-if="form.rule === 1"
+                 class="flex">
+              <p>晋级规则：</p>
+              <div>
+                <p v-if="rule.peopleLimit">本阶段成绩排名前{{ rule.peopleLimit }}队，可晋级下一阶段比赛</p>
+                <p v-if="rule.percentageLimit">本阶段成绩排名前{{ rule.percentageLimit }}%，可晋级下一阶段比赛</p>
+                <p v-if="rule.scoreLimit">本阶段成绩{{ rule.scoreLimit }}分，可晋级下一阶段比赛</p>
               </div>
             </div>
-          </template>
+          </div>
+        </template>
 
-          <!-- 进展 -->
-          <div class="l-title" id="part2"><img src="@/assets/img/label.png" alt=""> 竞赛进展</div>
-          <ul class="progress" v-if="progress.length">
-              <li v-for="(item,index) in progress" :key="index" :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
-                  <i class="dot"></i>
-                  <p class="name">{{item.title}}</p>
-                  <p class="desc">{{item.description}}</p>
-              </li>
-              <img class="rocket" src="@/assets/img/rocket.png" alt="">
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无数据</p>
-                  </div>
-              </div>
-          </template>
-          
-          <!-- 公告 -->
-          <div class="l-title" id="part3"><img src="@/assets/img/label.png" alt=""> 通知公告</div>
-          <ul class="notice-list" v-if="notices.length">
-            <li v-for="(item, i) in notices" :key="i" @click="toNotice(item)">
-              <h6>{{ item.announcementTitle }}</h6>
-              <p class="meta">{{ item.updateTime }}</p>
-              <div class="des" v-html="item.announcementText"></div>
-            </li>
-          </ul>
-          <template v-else>
-              <div class="empty">
-                  <div>
-                      <img src="@/assets/img/none.png" alt="">
-                      <p>暂无通知公告</p>
-                  </div>
-              </div>
-          </template>
-        </div>
+        <!-- 进展 -->
+        <div class="l-title"
+             id="part2"><img src="@/assets/img/label.png"
+               alt=""> 竞赛进展</div>
+        <ul class="progress"
+            v-if="progress.length">
+          <li v-for="(item,index) in progress"
+              :key="index"
+              :class="item.status == 0 ? 'not' : (item.status == 1 ? 'ing' : 'done')">
+            <i class="dot"></i>
+            <p class="name">{{item.title}}</p>
+            <p class="desc">{{item.description}}</p>
+          </li>
+          <img class="rocket"
+               src="@/assets/img/rocket.png"
+               alt="">
+        </ul>
+        <template v-else>
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无数据</p>
+            </div>
+          </div>
+        </template>
+
+        <!-- 公告 -->
+        <div class="l-title"
+             id="part3"><img src="@/assets/img/label.png"
+               alt=""> 通知公告</div>
+        <ul class="notice-list"
+            v-if="notices.length">
+          <li v-for="(item, i) in notices"
+              :key="i"
+              @click="toNotice(item)">
+            <h6>{{ item.announcementTitle }}</h6>
+            <p class="meta">{{ item.updateTime }}</p>
+            <div class="des"
+                 v-html="item.announcementText"></div>
+          </li>
+        </ul>
+        <template v-else>
+          <div class="empty">
+            <div>
+              <img src="@/assets/img/none.png"
+                   alt="">
+              <p>暂无通知公告</p>
+            </div>
+          </div>
+        </template>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -114,210 +152,214 @@ import util from "@/libs/util";
 import breadcrumb from '@/components/breadcrumb'
 import Const from '@/const/match'
 export default {
-    name: "match",
-    data() {
-        return {
-          rules: Const.rules,
-          methods: Const.methods,
-          teamCalculationMethods: Const.teamCalculationMethods,
-          curType: '1',
-          typeList: [
-              {
-                  id: '1',
-                  name: '竞赛信息'
-              },
-              {
-                  id: '2',
-                  name: '竞赛进展'
-              },
-              {
-                  id: '3',
-                  name: '通知公告'
-              }
-          ],
-          form: util.local.get('match'),
-          progress: [],
-          notices: [],
-        };
+  name: "match",
+  data () {
+    return {
+      rules: Const.rules,
+      methods: Const.methods,
+      teamCalculationMethods: Const.teamCalculationMethods,
+      curType: '1',
+      typeList: [
+        {
+          id: '1',
+          name: '竞赛信息'
+        },
+        {
+          id: '2',
+          name: '竞赛进展'
+        },
+        {
+          id: '3',
+          name: '通知公告'
+        }
+      ],
+      form: util.local.get('match'),
+      progress: [],
+      notices: [],
+    };
+  },
+  components: {
+    breadcrumb
+  },
+  mounted () {
+    this.handleAnnex()
+    if (this.form.id) {
+      this.getProgress()
+      this.getNotice()
+    }
+  },
+  methods: {
+    // 处理附件
+    handleAnnex () {
+      const list = this.form.competitionAnnexList
+      if (list) {
+        list.map(e => {
+          const { filePath } = e
+          e.canPreview = util.canPreview(filePath.substr(filePath.lastIndexOf('.') + 1)) // 判断是否能够预览
+        })
+        this.$forceUpdate()
+      }
     },
-    components: {
-        breadcrumb
+    getProgress () { // 获取竞赛进展
+      this.$get(this.api.getCompetitionProgress, {
+        competitionId: this.form.id
+      }).then(res => {
+        this.progress = res.competitionProgressList.reverse()
+      }).catch(err => { });
     },
-    mounted() {
-      this.handleAnnex()
-      if (this.form.id) {
-        this.getProgress()
-        this.getNotice()
-      }
+    // 公告列表
+    getNotice () {
+      this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
+        const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
+        records.map(e => {
+          e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
+        })
+        this.notices = records
+      }).catch(res => { })
     },
-    methods: {
-      // 处理附件
-      handleAnnex() {
-        const list = this.form.competitionAnnexList
-        if (list) {
-          list.map(e => {
-            const { filePath } = e
-            e.canPreview = util.canPreview(filePath.substr(filePath.lastIndexOf('.') + 1)) // 判断是否能够预览
-          })
-          this.$forceUpdate()
-        }
-      },
-      getProgress() { // 获取竞赛进展
-          this.$get(this.api.getCompetitionProgress, {
-            competitionId: this.form.id
-          }).then(res => {
-              this.progress = res.competitionProgressList.reverse()
-          }).catch(err => {});
-      },
-      // 公告列表
-      getNotice() {
-        this.$post(`${this.api.queryAnnouncementByCompetitionId}?pageNum=1&pageSize=1000&competitionId=${this.form.id}`).then(({ data }) => {
-          const records = data.records.filter(e => e.status) // 只显示已发布的（status 0草稿 1为已发布）
-          records.map(e => {
-            e.announcementText = e.announcementText.replace(/<img.*?(?:>|\/>)/gi, '')
-          })
-          this.notices = records
-        }).catch(res => {})
-      },
-      // 预览附件
-      previewFile(item) {
-        const { filePath } = item
-        const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
-        window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
-      },
-      // 下载附件
-      download(item) {
-        util.downloadFile(item.fileName, item.filePath)
-      },
-      // tab切换
-      typeChange() {
-        document.querySelector(`#part${this.curType}`).scrollIntoView()
-      },
-    }
+    // 预览附件
+    previewFile (item) {
+      const { filePath } = item
+      const suffix = filePath.substr(filePath.lastIndexOf('.') + 1)
+      window.open((util.isDoc(suffix) || suffix === 'pdf' ? 'https://view.officeapps.live.com/op/view.aspx?src=' : '') + item.filePath)
+    },
+    // 下载附件
+    download (item) {
+      util.downloadFile(item.fileName, item.filePath)
+    },
+    // tab切换
+    typeChange () {
+      document.querySelector(`#part${this.curType}`).scrollIntoView()
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
+/deep/.breadcrumb .el-breadcrumb__item .is-link {
+    color: #007eff;
+}
 .match {
-  padding-bottom: 20px;
-  background-color: #F3F6FA;
-  .banner{
-    width: 100%;
-    height: 350px;
-    color: #fff;
-    background-size: 100% 350px;
-    background-repeat: no-repeat;
-    box-sizing: border-box;
-  }
-  .center {
-    width: 1000px;
-    margin: 40px auto 0;
-  }
-  .match-inner {
-    min-height: calc(100vh - 465px);
-    padding: 30px 40px 20px;
-    background-color: #fff;
-    box-sizing: border-box;
-  }
-  /deep/.el-tabs {
-    .el-tabs__item.is-active, .el-tabs__item:hover {
-      color: #007EFF;
+    padding-bottom: 20px;
+    background-color: #f3f6fa;
+    .banner {
+        width: 100%;
+        height: 350px;
+        color: #fff;
+        background-size: 100% 350px;
+        background-repeat: no-repeat;
+        box-sizing: border-box;
     }
-    .el-tabs__active-bar {
-      background-color: #007EFF;
+    .center {
+        width: 1000px;
+        margin: 40px auto 0;
     }
-  }
-  .p-title {
-    border-left-color: #007EFF;
-  }
-  .l-title{
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    font-size: 18px;
-    color: #333;
-    img{
-      margin-right: 5px;
+    .match-inner {
+        min-height: calc(100vh - 465px);
+        padding: 30px 40px 20px;
+        background-color: #fff;
+        box-sizing: border-box;
     }
-  }
-  .status {
-      padding: 0 16px;
-      margin-left: 20px;
-      line-height: 34px;
-      font-size: 14px;
-      color: #fff;
-      background-color: #52C41A;
-      border-radius: 4px;
-      cursor: pointer;
-      &.wait {
-          background-color: #FAAD14;
-      }
-      &.signing {
-          background-color: #007EFF;
-      }
-      &.signed {
-          background-color: #52C41A;
-      }
-      &.finish {
-          background-color: #ccc;
-      }
+    /deep/.el-tabs {
+        .el-tabs__item.is-active,
+        .el-tabs__item:hover {
+            color: #007eff;
+        }
+        .el-tabs__active-bar {
+            background-color: #007eff;
+        }
     }
-  .title{
-      width: 67%;
-      margin: 0 auto;
-      font-size: 28px;
-      text-align: center;
-      color: #0B1D30;
-  }
-  .info .meta{
-      padding: 16px 0;
-      font-size: 12px;
-      color: #999;
-      text-align: center;
-  }
-  .texts {
-    margin-bottom: 30px;
-    font-size: 14px;
-    line-height: 1.6;
-    text-indent: 2em;
-    overflow: hidden;
-    /deep/img{
-        max-width: 100%;
+    .p-title {
+        border-left-color: #007eff;
     }
-  }
-  .files {
-    margin-bottom: 30px;
-    li {
-      display: flex;
-      align-items: center;
-      margin: 10px 0;
+    .l-title {
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        font-size: 18px;
+        color: #333;
+        img {
+            margin-right: 5px;
+        }
+    }
+    .status {
+        padding: 0 16px;
+        margin-left: 20px;
+        line-height: 34px;
+        font-size: 14px;
+        color: #fff;
+        background-color: #52c41a;
+        border-radius: 4px;
+        cursor: pointer;
+        &.wait {
+            background-color: #faad14;
+        }
+        &.signing {
+            background-color: #007eff;
+        }
+        &.signed {
+            background-color: #52c41a;
+        }
+        &.finish {
+            background-color: #ccc;
+        }
     }
-    .file-name {
-      margin-right: 10px;
-      font-size: 12px;
+    .title {
+        width: 67%;
+        margin: 0 auto;
+        font-size: 28px;
+        text-align: center;
+        color: #0b1d30;
     }
-  }
-  .el-link.el-link--primary {
-    color: #007EFF !important;
-    &:after {
-      border-color: #007EFF;
+    .info .meta {
+        padding: 16px 0;
+        font-size: 12px;
+        color: #999;
+        text-align: center;
+    }
+    .texts {
+        margin-bottom: 30px;
+        font-size: 14px;
+        line-height: 1.6;
+        text-indent: 2em;
+        overflow: hidden;
+        /deep/img {
+            max-width: 100%;
+        }
+    }
+    .files {
+        margin-bottom: 30px;
+        li {
+            display: flex;
+            align-items: center;
+            margin: 10px 0;
+        }
+        .file-name {
+            margin-right: 10px;
+            font-size: 12px;
+        }
+    }
+    .el-link.el-link--primary {
+        color: #007eff !important;
+        &:after {
+            border-color: #007eff;
+        }
     }
-  }
 }
-.progress{
+.progress {
     position: relative;
     width: 95%;
     padding: 50px 0;
     margin: 40px auto 80px;
     text-align: left;
-    &:before{
+    &:before {
         content: '';
         position: absolute;
         top: 0;
         left: 50%;
         width: 2px;
         height: 100%;
-        background-color: #E1E6F2;
+        background-color: #e1e6f2;
     }
     &:after {
         content: '';
@@ -325,27 +367,27 @@ export default {
         top: -10px;
         left: 430px;
         border: 8px solid transparent;
-        border-bottom-color: #E1E6F2;
+        border-bottom-color: #e1e6f2;
     }
     .rocket {
         position: absolute;
         bottom: -50px;
         left: 425px;
     }
-    li{
+    li {
         position: relative;
         width: 400px;
         margin-bottom: 42px;
-        .dot{
+        .dot {
             position: absolute;
             top: 12px;
             left: 431px;
             width: 15px;
             height: 15px;
-            background-color: #DCDCDC;
+            background-color: #dcdcdc;
             border-radius: 50%;
         }
-        .name{
+        .name {
             display: inline-block;
             padding: 0 19px;
             margin-bottom: 16px;
@@ -354,27 +396,28 @@ export default {
             font-size: 16px;
             color: #fff;
             border-radius: 20px;
-            background-color: #C4C4C4;
+            background-color: #c4c4c4;
         }
-        .desc{
+        .desc {
             position: relative;
             color: #333;
             font-size: 14px;
         }
-        &.ing, &.done {
+        &.ing,
+        &.done {
             .dot {
                 top: 8px;
-                background-color: #007EFF;
+                background-color: #007eff;
             }
             .name {
-                background-color: #007EFF;
+                background-color: #007eff;
             }
         }
         &.ing {
             .dot {
                 width: 27px;
                 height: 27px;
-                border: 6px solid #E2F1FB;
+                border: 6px solid #e2f1fb;
             }
         }
         &:nth-child(odd) {
@@ -395,16 +438,17 @@ export default {
                     border: 18px solid transparent;
                     border-top-width: 6px;
                     border-bottom-width: 6px;
-                    border-left-color: #C4C4C4;
+                    border-left-color: #c4c4c4;
                 }
             }
             .desc {
                 text-align: right;
             }
-            &.ing, &.done {
+            &.ing,
+            &.done {
                 .name {
                     &:before {
-                        border-left-color: #007EFF;
+                        border-left-color: #007eff;
                     }
                 }
             }
@@ -430,7 +474,7 @@ export default {
                     border: 18px solid transparent;
                     border-top-width: 6px;
                     border-bottom-width: 6px;
-                    border-right-color: #C4C4C4;
+                    border-right-color: #c4c4c4;
                 }
             }
             .desc {
@@ -444,91 +488,92 @@ export default {
                     left: auto;
                     right: -18px;
                     border: 9px solid transparent;
-                    border-left-color: #E6E6E6;
+                    border-left-color: #e6e6e6;
                 }
             }
-            
-            &.ing, &.done {
+
+            &.ing,
+            &.done {
                 .name {
                     &:after {
-                        border-right-color: #007EFF;
+                        border-right-color: #007eff;
                     }
                 }
             }
         }
-        &:last-child{
+        &:last-child {
             margin-bottom: 0;
         }
     }
 }
 .notice-list {
-  text-align: left;
-  li {
-    padding: 16px;
-    margin-bottom: 12px;
-    transition: all 0.3s;
-    cursor: pointer;
-    border-radius: 6px;
-    background-color: #fff;
-    border-bottom: 1px dashed #ebebeb;
-    &:last-child {
-      border-bottom: 0;
+    text-align: left;
+    li {
+        padding: 16px;
+        margin-bottom: 12px;
+        transition: all 0.3s;
+        cursor: pointer;
+        border-radius: 6px;
+        background-color: #fff;
+        border-bottom: 1px dashed #ebebeb;
+        &:last-child {
+            border-bottom: 0;
+        }
     }
-  }
-  h6 {
-    font-size: 20px;
-    font-weight: 500;
-    color: #0B1D30;
-    &:hover {
-      color: #007EFF;
+    h6 {
+        font-size: 20px;
+        font-weight: 500;
+        color: #0b1d30;
+        &:hover {
+            color: #007eff;
+        }
+    }
+    .meta {
+        margin: 10px 0;
+        font-size: 14px;
+        color: #666;
+    }
+    .des {
+        font-size: 14px;
+        color: #333;
+        line-height: 24px;
+        display: -webkit-box;
+        display: -moz-box;
+        -webkit-box-orient: vertical;
+        -moz-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        -moz-line-clamp: 2;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
-  }
-  .meta {
-    margin: 10px 0;
-    font-size: 14px;
-    color: #666;
-  }
-  .des {
-    font-size: 14px;
-    color: #333;
-    line-height: 24px;
-    display: -webkit-box;
-    display:-moz-box;
-    -webkit-box-orient: vertical;
-    -moz-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    -moz-line-clamp: 2;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
 }
-.empty{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 50px 0;
-  text-align: center;
-  img{
-    width: 471px;
-  }
-  p{
-    margin-top: 40px;
-    font-size: 18px;
-    color: rgba(0, 0, 0, 0.25);
-  }
+.empty {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    padding: 50px 0;
+    text-align: center;
+    img {
+        width: 471px;
+    }
+    p {
+        margin-top: 40px;
+        font-size: 18px;
+        color: rgba(0, 0, 0, 0.25);
+    }
 }
 .rule-title {
-  margin-bottom: 10px;
-  font-size: 16px;
+    margin-bottom: 10px;
+    font-size: 16px;
 }
 .rule {
-  padding: 15px;
-  margin-bottom: 15px;
-  border: 1px solid #dfdfdf;
-  p {
-    font-size: 14px;
-    line-height: 30px;
-    color: #6e6e6e;
-  }
+    padding: 15px;
+    margin-bottom: 15px;
+    border: 1px solid #dfdfdf;
+    p {
+        font-size: 14px;
+        line-height: 30px;
+        color: #6e6e6e;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 9b22cdf..406b758 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -37,20 +37,51 @@
           <div class="des"
                v-html="form.mall.productIntroduction"></div>
           <div class="fields">
-            <div class="field"><img src="@/assets/img/product/1.png"
-                   alt=""> 适用专业：{{ form.goodsRes.professionalName }}</div>
+            <div class="field">
+              <img src="@/assets/img/product/1.png"
+                   alt=""> 适用专业：
+              <el-tooltip class="text"
+                          effect="dark"
+                          :visible-arrow="false"
+                          :content="form.goodsRes.professionalName"
+                          placement="bottom">
+                <div>
+                  {{ form.goodsRes.professionalName }}
+                </div>
+              </el-tooltip>
+            </div>
             <div v-if="form.mall.applicationScenario"
-                 class="field"><span class="label"><img src="@/assets/img/product/2.png"
-                     alt=""> 适用场景：</span>{{ form.mall.applicationScenario }}</div>
+                 class="field">
+              <img src="@/assets/img/product/2.png"
+                   alt=""> 适用场景：
+              <div class="text">{{ form.mall.applicationScenario }}</div>
+            </div>
             <div v-if="form.mall.matchingCourse"
-                 class="field"><span class="label"><img src="@/assets/img/product/3.png"
-                     alt=""> 匹配课程：</span>{{ form.mall.matchingCourse }}</div>
+                 class="field">
+              <img src="@/assets/img/product/3.png"
+                   alt=""> 匹配课程：
+              <el-tooltip class="text"
+                          effect="dark"
+                          :visible-arrow="false"
+                          :content="form.mall.matchingCourse"
+                          placement="bottom">
+                <div class="text">
+                  {{ form.mall.matchingCourse }}
+                </div>
+              </el-tooltip>
+            </div>
             <div v-if="form.mall.courseHours"
-                 class="field"><span class="label"><img src="@/assets/img/product/4.png"
-                     alt=""> 预计课时：</span>{{ form.mall.courseHours }}</div>
+                 class="field">
+              <img src="@/assets/img/product/4.png"
+                   alt=""> 预计课时：
+              <div class="text">{{ form.mall.courseHours }}</div>
+            </div>
             <div v-if="form.goodsRes.typeName"
-                 class="field"><span class="label"><img src="@/assets/img/product/5.png"
-                     alt=""> 产品类型：</span>{{ form.goodsRes.typeName }}</div>
+                 class="field">
+              <img src="@/assets/img/product/5.png"
+                   alt=""> 产品类型：
+              <div class="text">{{ form.goodsRes.typeName }}</div>
+            </div>
           </div>
           <button v-if="!form.goodsRes.logoOfOurSchool"
                   class="btn"
@@ -391,11 +422,24 @@ export default {
             @include mul-ellipsis(3);
         }
         .field {
+            display: inline-flex;
+            align-items: center;
+            margin: 0 20px 10px 0;
             font-size: 14px;
             color: #2e2d31;
+            &:last-child {
+                margin-right: 0;
+            }
             .label {
                 color: #333;
             }
+            .text {
+                max-width: 160px;
+                @include ellipsis;
+            }
+            img {
+                margin-right: 5px;
+            }
         }
         .fields {
             display: flex;
@@ -404,10 +448,6 @@ export default {
             height: 60px;
             margin: 10px 0 10px;
             overflow: hidden;
-            .field {
-                margin-right: 40px;
-                margin-bottom: 10px;
-            }
         }
         .btn {
             width: 119px;
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index b102c71..8399021 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -681,7 +681,6 @@ export default {
             this.active = 4
             const el = document.getElementById('comment' + this.commentId)
             el && el.scrollIntoView(false)
-            await this.$post(`${this.api.noticeRead}?isRead=1&notifyId=${this.notifyId}`) // 从消息通知点进来的则加载完后调已读接口
             this.commentId = ''
           }
         })
@@ -951,6 +950,7 @@ export default {
       util.cookies.set('curriculumName', escape(this.curriculumName))
       util.cookies.set('systemId', id)
       util.cookies.set('fromManager', 1)
+      util.cookies.set('isSubmit', '', -1)
       // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
       location.href = process.env.NODE_ENV === 'development' ?
         `http://${location.hostname}:8085/#/` :
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index f307572..c87161a 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -1,27 +1,31 @@
 <template>
-    <div class="flex">
-      <div class="page" style="width: 320px">
-        <div class="m-b-20">
-            <h6 class="p-title">学生</h6>
-            <el-radio-group v-model="studentType" @change="changeStudentType">
-                <div class="m-b-20">
-                    <el-radio :label="1">所有学生</el-radio>
-                </div>
-                <div>
-                    <el-radio :label="2">未加入班级的学生</el-radio>
-                </div>
-            </el-radio-group>
+  <div class="flex">
+    <div class="page"
+         style="width: 320px">
+      <div class="m-b-20">
+        <h6 class="p-title">学生</h6>
+        <el-radio-group v-model="studentType"
+                        @change="changeStudentType">
+          <div class="m-b-20">
+            <el-radio :label="1">所有学生</el-radio>
+          </div>
+          <div>
+            <el-radio :label="2">未加入班级的学生</el-radio>
+          </div>
+        </el-radio-group>
+      </div>
+      <el-divider></el-divider>
+      <div>
+        <div class="flex-between m-b-20">
+          <h6 class="p-title"
+              style="margin-bottom: 0">学生组织架构</h6>
+          <el-button v-auth="'学生组织架构添加'"
+                     type="text"
+                     @click="handleAdd">添加</el-button>
         </div>
-        <el-divider></el-divider>
-        <div>
-            <div class="flex-between m-b-20">
-                <h6 class="p-title" style="margin-bottom: 0">学生组织架构</h6>
-                <el-button v-auth="'学生组织架构添加'" type="text" @click="handleAdd">添加</el-button>
-            </div>
 
-            <div style="height: 504px; max-height: 504px; overflow: auto">
-                <org-tree
-                    v-if="treeVisible"
+        <div style="height: 504px; max-height: 504px; overflow: auto">
+          <org-tree v-if="treeVisible"
                     default-expand-all
                     ref="orgTree"
                     node-key="id"
@@ -31,218 +35,310 @@
                     :expand-on-click-node="false"
                     @node-click="handleNodeClick"
                     :current-node-key="architectureId"
-                    :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
-                >
-                    <span class="custom-tree-node" slot-scope="{ node, data }">
-                        <span class="name" :title="node.label">{{ node.label }}</span>
-                        <span>
-                            <el-button
-                                v-auth="'学生组织架构编辑'"
-                                type="text"
-                                icon="el-icon-edit-outline"
-                                @click="() => handleEdit(node, data)">
-                            </el-button>
-                            <el-button
-                                v-auth="'学生组织架构添加'"
-                                v-if="node.level < 3"
-                                type="text"
-                                icon="el-icon-circle-plus-outline"
-                                @click="() => handleAdd(node, data)">
-                            </el-button>
-                        </span>
-                    </span>
-                </org-tree>
-            </div>
-        </div>
-
-        <el-dialog
-            :title="orgTitle"
-            :visible.sync="orgVisible"
-            :close-on-click-modal="false"
-            width="50%"
-            @close="handleClose"
-        >
-            <el-form v-if="orgVisible" ref="orgForm" :model="orgForm" :rules="rules" label-width="100px">
-                <el-form-item :label="labelName" prop="organizationName">
-                    <el-input v-model.trim="orgForm.organizationName" placeholder="请输入"></el-input>
-                </el-form-item>
-                <el-form-item label="上级部门">
-                    <el-cascader
-                        v-if="showCascader"
-                        v-model="cascaderValue"
-                        :props="cascaderProps"
-                        @change="handleChangeCascader"
-                        clearable
-                        style="width: 100%"
-                    >
-                    </el-cascader>
-                    <span v-else>{{ orgForm.parentName }}</span>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button v-if="isAddOrg" @click="handleClose">取 消</el-button>
-                <el-button v-if="!isAddOrg" type="danger" plain @click="handleDel">删除</el-button>
-                <el-button type="primary" @click="orgSubmit">确 定</el-button>
+                    :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}">
+            <span class="custom-tree-node"
+                  slot-scope="{ node, data }">
+              <span class="name"
+                    :title="node.label">{{ node.label }}</span>
+              <span>
+                <el-button v-auth="'学生组织架构编辑'"
+                           type="text"
+                           icon="el-icon-edit-outline"
+                           @click="() => handleEdit(node, data)">
+                </el-button>
+                <el-button v-auth="'学生组织架构添加'"
+                           v-if="node.level < 3"
+                           type="text"
+                           icon="el-icon-circle-plus-outline"
+                           @click="() => handleAdd(node, data)">
+                </el-button>
+              </span>
             </span>
-        </el-dialog>
-
-      </div>
-      <div class="page flex-1 m-l-20">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool">
-            <ul class="filter">
-                <li>
-                    <el-input style="width: 250px;" placeholder="请输入学生姓名/学号" prefix-icon="el-icon-search" v-model="keyWord" clearable></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button type="info" v-auth @click="addStudent">新增学生</el-button>
-                <el-button type="primary" v-auth @click="batchImport">批量导入</el-button>
-                <el-button type="primary" v-auth @click="delAllSelection">批量删除</el-button>
-            </div>
+          </org-tree>
         </div>
+      </div>
 
-        <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-            <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="userName" label="学生姓名" align="center" min-width="100"></el-table-column>
-            <el-table-column prop="workNumber" label="学生学号" align="center" min-width="100"></el-table-column>
-            <el-table-column prop="className" label="班级" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="countries" label="账号角色" align="center" width="100">
-                <template slot-scope="scope">学生</template>
-            </el-table-column>
-            <el-table-column prop="loginNumber" label="登录次数" align="center" width="100"></el-table-column>
-            <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="180"></el-table-column>
-            <el-table-column label="操作" align="center" width="300">
-                <template slot-scope="scope">
-                    <el-button v-auth v-if="isRemove" type="text" @click="removeStudent(scope.row)">移除</el-button>
-                    <el-button v-auth type="text" @click="editStudent(scope.row,true)">查看</el-button>
-                    <el-button v-auth type="text" @click="editStudent(scope.row,false)">编辑</el-button>
-                    <el-button v-auth type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                    <el-button v-auth type="text" @click="handleDelete(scope.row)">删除</el-button>
-                    <el-switch
-                        v-auth="'禁用'"
-                        v-model="scope.row.isEnable"
-                        :active-value="1"
-                        :inactive-value="0"
-                        style="margin: 0 5px"
-                        @change="switchOff(scope.row)"
-                    ></el-switch>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+      <el-dialog :title="orgTitle"
+                 :visible.sync="orgVisible"
+                 :close-on-click-modal="false"
+                 width="50%"
+                 @close="handleClose">
+        <el-form v-if="orgVisible"
+                 ref="orgForm"
+                 :model="orgForm"
+                 :rules="rules"
+                 label-width="100px">
+          <el-form-item :label="labelName"
+                        prop="organizationName">
+            <el-input v-model.trim="orgForm.organizationName"
+                      placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="上级部门">
+            <el-cascader v-if="showCascader"
+                         v-model="cascaderValue"
+                         :props="cascaderProps"
+                         @change="handleChangeCascader"
+                         clearable
+                         style="width: 100%">
+            </el-cascader>
+            <span v-else>{{ orgForm.parentName }}</span>
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button v-if="isAddOrg"
+                     @click="handleClose">取 消</el-button>
+          <el-button v-if="!isAddOrg"
+                     type="danger"
+                     plain
+                     @click="handleDel">删除</el-button>
+          <el-button type="primary"
+                     @click="orgSubmit">确 定</el-button>
+        </span>
+      </el-dialog>
+
+    </div>
+    <div class="page flex-1 m-l-20">
+      <h6 class="p-title">筛选</h6>
+      <div class="tool">
+        <ul class="filter">
+          <li>
+            <el-input style="width: 250px;"
+                      placeholder="请输入学生姓名/学号"
+                      prefix-icon="el-icon-search"
+                      v-model="keyWord"
+                      clearable></el-input>
+          </li>
+        </ul>
+        <div>
+          <el-button type="info"
+                     v-auth
+                     @click="addStudent">新增学生</el-button>
+          <el-button type="primary"
+                     v-auth
+                     @click="batchImport">批量导入</el-button>
+          <el-button type="primary"
+                     v-auth
+                     @click="delAllSelection">批量删除</el-button>
         </div>
+      </div>
 
-        <el-dialog
-            class="dialog"
-            width="60%"
-            :title="isDetail ? '查看学生' : (isAdd ? '新增学生' : '编辑学生')"
-            :visible.sync="studentVisible"
-            :close-on-click-modal="false"
-            @close="closeStudent"
-        >
-            <el-form ref="form" :model="form" :rules="rules" :disabled="isDetail" label-width="100px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item prop="workNumber" label="学生学号">
-                            <el-input v-model="form.workNumber" placeholder="学生学号" @blur="workNumberChange"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="userName" label="学生姓名">
-                            <el-input v-model="form.userName" placeholder="请输入学生姓名"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="roleId" label="账号角色">
-                            学生
-                        </el-form-item>
+      <el-table :data="listData"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                @selection-change="handleSelectionChange"
+                :row-key="getRowKeys">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="userName"
+                         label="学生姓名"
+                         align="center"
+                         min-width="100"></el-table-column>
+        <el-table-column prop="workNumber"
+                         label="学生学号"
+                         align="center"
+                         min-width="100"></el-table-column>
+        <el-table-column prop="className"
+                         label="班级"
+                         align="center"
+                         min-width="200"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="countries"
+                         label="账号角色"
+                         align="center"
+                         width="100">
+          <template slot-scope="scope">学生</template>
+        </el-table-column>
+        <el-table-column prop="loginNumber"
+                         label="登录次数"
+                         align="center"
+                         width="100"></el-table-column>
+        <el-table-column prop="lastLoginTime"
+                         label="上次登录时间"
+                         align="center"
+                         width="180"></el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="300">
+          <template slot-scope="scope">
+            <el-button v-auth
+                       v-if="isRemove"
+                       type="text"
+                       @click="removeStudent(scope.row)">移除</el-button>
+            <el-button v-auth
+                       type="text"
+                       @click="editStudent(scope.row,true)">查看</el-button>
+            <el-button v-auth
+                       type="text"
+                       @click="editStudent(scope.row,false)">编辑</el-button>
+            <el-button v-auth
+                       type="text"
+                       @click="resetPassword(scope.row)">重置密码</el-button>
+            <el-button v-auth
+                       type="text"
+                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-switch v-auth="'禁用'"
+                       v-model="scope.row.isEnable"
+                       :active-value="1"
+                       :inactive-value="0"
+                       style="margin: 0 5px"
+                       @change="switchOff(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       @current-change="currentChange"
+                       :current-page="page"
+                       layout="total, prev, pager, next"
+                       :total="total"></el-pagination>
+      </div>
 
-                        <el-form-item prop="phone" label="手机号">
-                            <el-input v-model="form.phone" placeholder="可用于登录平台，以及找回密码" maxlength="11"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="email" label="邮箱">
-                            <el-input v-model="form.email" placeholder="可用于登录平台，以及找回密码"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="uniqueIdentification" label="唯一标识">
-                            <el-input disabled v-model="form.uniqueIdentification"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item prop="classId" label="所在班级">
-                            <el-input
-                                placeholder="输入关键字进行过滤"
-                                v-model="filterText"
-                                style="margin-bottom: 10px"
-                            >
-                            </el-input>
-                            <div style="max-height: 245px; border: 1px solid #DCDFE6; border-radius: 4px; padding: 10px 10px 10px 0px; overflow: auto">
-                                <org-tree
-                                    v-if="showTree && treeVisible"
-                                    ref="classTree"
-                                    show-checkbox
-                                    node-key="id"
-                                    highlight-current
-                                    default-expand-all
-                                    lazy
-                                    :load="loadClassTree"
-                                    :default-checked-keys="defaultCheckedKeys"
-                                    :filter-node-method="filterNode"
-                                    :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
-                                >
-                                    <span class="custom-tree-node" slot-scope="{ node, data }">
-                                        <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
-                                        <span>
-                                            <el-button
-                                                v-auth="'学生组织架构添加'"
-                                                v-if="node.level < 3"
-                                                type="text"
-                                                icon="el-icon-circle-plus-outline"
-                                                @click="() => handleAdd(node, data)">
-                                            </el-button>
-                                        </span>
-                                    </span>
-                                </org-tree>
-                            </div>
-                            <p style="color: #C0C4CC;">提示：需创建班级后才可以勾选</p>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button type="primary" :disabled="disableds" @click="saveData(0)">保存</el-button>
-                <el-button v-if="isAdd" type="primary" :disabled="disableds" @click="saveData(1)">保存并继续添加</el-button>
-                <el-button size="small" @click="closeStudent">取消</el-button>
-            </span>
-        </el-dialog>
+      <el-dialog class="dialog"
+                 width="60%"
+                 :title="isDetail ? '查看学生' : (isAdd ? '新增学生' : '编辑学生')"
+                 :visible.sync="studentVisible"
+                 :close-on-click-modal="false"
+                 @close="closeStudent">
+        <el-form ref="form"
+                 :model="form"
+                 :rules="rules"
+                 :disabled="isDetail"
+                 label-width="100px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item prop="workNumber"
+                            label="学生学号">
+                <el-input v-model="form.workNumber"
+                          placeholder="学生学号"
+                          @blur="workNumberChange"></el-input>
+              </el-form-item>
+              <el-form-item prop="userName"
+                            label="学生姓名">
+                <el-input v-model="form.userName"
+                          placeholder="请输入学生姓名"></el-input>
+              </el-form-item>
+              <el-form-item prop="roleId"
+                            label="账号角色">
+                学生
+              </el-form-item>
 
-        <el-dialog title="批量导入" :visible.sync="importVisible" width="24%" :close-on-click-modal="false">
-            <div style="text-align: center">
-                <div style="margin-bottom: 10px;">
-                    <el-button type="primary" @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
+              <el-form-item prop="phone"
+                            label="手机号">
+                <el-input v-model="form.phone"
+                          placeholder="可用于登录平台，以及找回密码"
+                          maxlength="11"></el-input>
+              </el-form-item>
+              <el-form-item prop="email"
+                            label="邮箱">
+                <el-input v-model="form.email"
+                          placeholder="可用于登录平台，以及找回密码"></el-input>
+              </el-form-item>
+              <el-form-item prop="uniqueIdentification"
+                            label="唯一标识">
+                <el-input disabled
+                          v-model="form.uniqueIdentification"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item prop="classId"
+                            label="所在班级">
+                <el-input placeholder="输入关键字进行过滤"
+                          v-model="filterText"
+                          style="margin-bottom: 10px">
+                </el-input>
+                <div style="max-height: 245px; border: 1px solid #DCDFE6; border-radius: 4px; padding: 10px 10px 10px 0px; overflow: auto">
+                  <org-tree v-if="showTree && treeVisible"
+                            ref="classTree"
+                            show-checkbox
+                            node-key="id"
+                            highlight-current
+                            default-expand-all
+                            lazy
+                            :load="loadClassTree"
+                            :default-checked-keys="defaultCheckedKeys"
+                            :filter-node-method="filterNode"
+                            :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}">
+                    <span class="custom-tree-node"
+                          slot-scope="{ node, data }">
+                      <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
+                      <span>
+                        <el-button v-auth="'学生组织架构添加'"
+                                   v-if="node.level < 3"
+                                   type="text"
+                                   icon="el-icon-circle-plus-outline"
+                                   @click="() => handleAdd(node, data)">
+                        </el-button>
+                      </span>
+                    </span>
+                  </org-tree>
                 </div>
-                <el-upload
-                    name="file"
-                    accept=".xls,.xlsx"
-                    :on-remove="handleRemove"
-                    :on-error="uploadError"
-                    :on-success="uploadSuccess"
-                    :before-remove="beforeRemove"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :action="this.api.importStudent"
-                    :file-list="uploadList"
-                    :headers="headers"
-                >
-                    <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
-                </el-upload>
-                <el-link v-if="uploadFaild" type="primary" @click="showFaild">部分数据导入失败，查看失败原因</el-link>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button size="small" @click="importVisible = false">取 消</el-button>
-                <el-button size="small" type="primary" @click="uploadSure">确 定</el-button>
-            </span>
-        </el-dialog>
-      </div>
+                <p style="color: #C0C4CC;">提示：需创建班级后才可以勾选</p>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer"
+              v-if="!isDetail">
+          <el-button type="primary"
+                     :disabled="disableds"
+                     @click="saveData(0)">保存</el-button>
+          <el-button v-if="isAdd"
+                     type="primary"
+                     :disabled="disableds"
+                     @click="saveData(1)">保存并继续添加</el-button>
+          <el-button size="small"
+                     @click="closeStudent">取消</el-button>
+        </span>
+      </el-dialog>
+
+      <el-dialog title="批量导入"
+                 :visible.sync="importVisible"
+                 width="24%"
+                 :close-on-click-modal="false">
+        <div style="text-align: center">
+          <div style="margin-bottom: 10px;">
+            <el-button type="primary"
+                       @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
+          </div>
+          <el-upload name="file"
+                     accept=".xls,.xlsx"
+                     :on-remove="handleRemove"
+                     :on-error="uploadError"
+                     :on-success="uploadSuccess"
+                     :before-remove="beforeRemove"
+                     :limit="1"
+                     :on-exceed="handleExceed"
+                     :action="this.api.importStudent"
+                     :file-list="uploadList"
+                     :headers="headers">
+            <el-button type="primary"
+                       class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
+          </el-upload>
+          <el-link v-if="uploadFaild"
+                   type="primary"
+                   @click="showFaild">部分数据导入失败，查看失败原因</el-link>
+        </div>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button size="small"
+                     @click="importVisible = false">取 消</el-button>
+          <el-button size="small"
+                     type="primary"
+                     @click="uploadSure">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>
@@ -251,768 +347,769 @@ import Setting from "@/setting";
 import OrgTree from "@/components/org-tree/src/tree";
 import { mapState } from "vuex";
 export default {
-    components: { OrgTree },
-    data() {
-        let that = this;
-        return {
-            isRemove: false, // 是否可以移除
-            currentClassId: "", // 当前班级id
-            studentType: 1, //类型:必填一个(1.所有学生 2.未加入班级学生)
-            architectureId: "", // 架构id
-            orgLevel: "", // 架构层级 层级(1.专业 2.年级 3.班级)
-            orgVisible: false, // 学生组织架对话框
-            orgTitle: "", // 对话框标题
-            labelName: "部门名称", //
-            isAddOrg: true, // 添加组织
-            showCascader: true, // 是否显示上级部门级联组件
-            orgForm: {
-                organizationName: ""
-            },
-            cascaderValue: [], // 上级部门
-            cascaderLevel: 1,
-            cascaderProps: {
-                checkStrictly: true,
-                label: "organizationName",
-                value: "id",
-                lazy: true,
-                lazyLoad(node, resolve) {
-                  console.log(55, that.cascaderValue)
-                    let level = 1;
-                    let parentId = "";
-                    if (node.data && node.data.level && node.data.id) {
-                        level = node.data.level + 1;
-                        parentId = node.data.id;
-                    }
-                    that.$post(`${that.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                        const { status, treeList } = res;
-                        const isGrade = that.labelName === '年级' // 编辑的该层级是否是年级（年级只能更换到组织下，所以年级班级都要禁选）
-                        const deepLevel = that.cascaderLevel // 最深层级
-                        if (status === 200 && treeList.length) {
-                            treeList.forEach(i => {
-                                i.leaf = i.level === 2;
-                                if (deepLevel === 3 || (isGrade && i.leaf) || (deepLevel === 2 && i.leaf)) i.disabled = true
-                            });
-                            return resolve(treeList);
-                        } else {
-                            return resolve([]);
-                        }
-                    });
-                }
-            }, // 部门级联数据
-            treeVisible: true,
-            treeNode: {},
-            treeResolve: [],
-            isDetail: false,
-            keyWord: "",
-            originForm: {},
-            form: {
-                userName: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                account: "",
-                classId: ""
-            },
-            rules: {
-                organizationName: [
-                    { required: true, message: "请输入名称", trigger: "blur" }
-                ],
-                userName: [
-                    { required: true, message: "请输入学生姓名", trigger: "blur" }
-                ],
-                workNumber: [
-                    { required: true, message: "请输入学号", trigger: 'blur' },
-                    {
-                        pattern: /^[A-Za-z0-9]*$/,
-                        message: "请输入正确的学号",
-                        trigger: "blur"
-                    }
-                ],
-                phone: [
-                    {
-                        pattern: /^1[3456789]\d{9}$/,
-                        message: "请输入正确的手机号",
-                        trigger: "blur"
-                    }
-                ],
-                email: [
-                    {
-                        pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ]
-            },
-            listData: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [],
+  components: { OrgTree },
+  data () {
+    let that = this;
+    return {
+      isRemove: false, // 是否可以移除
+      currentClassId: "", // 当前班级id
+      studentType: 1, //类型:必填一个(1.所有学生 2.未加入班级学生)
+      architectureId: "", // 架构id
+      orgLevel: "", // 架构层级 层级(1.专业 2.年级 3.班级)
+      orgVisible: false, // 学生组织架对话框
+      orgTitle: "", // 对话框标题
+      labelName: "部门名称", //
+      isAddOrg: true, // 添加组织
+      showCascader: true, // 是否显示上级部门级联组件
+      orgForm: {
+        organizationName: ""
+      },
+      cascaderValue: [], // 上级部门
+      cascaderLevel: 1,
+      cascaderProps: {
+        checkStrictly: true,
+        label: "organizationName",
+        value: "id",
+        lazy: true,
+        lazyLoad (node, resolve) {
+          console.log(55, that.cascaderValue)
+          let level = 1;
+          let parentId = "";
+          if (node.data && node.data.level && node.data.id) {
+            level = node.data.level + 1;
+            parentId = node.data.id;
+          }
+          that.$post(`${that.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
+            const { status, treeList } = res;
+            const isGrade = that.labelName === '年级' // 编辑的该层级是否是年级（年级只能更换到组织下，所以年级班级都要禁选）
+            const deepLevel = that.cascaderLevel // 最深层级
+            if (status === 200 && treeList.length) {
+              treeList.forEach(i => {
+                i.leaf = i.level === 2;
+                if (deepLevel === 3 || (isGrade && i.leaf) || (deepLevel === 2 && i.leaf)) i.disabled = true
+              });
+              return resolve(treeList);
+            } else {
+              return resolve([]);
+            }
+          });
+        }
+      }, // 部门级联数据
+      treeVisible: true,
+      treeNode: {},
+      treeResolve: [],
+      isDetail: false,
+      keyWord: "",
+      originForm: {},
+      form: {
+        userName: "",
+        phone: "",
+        uniqueIdentification: "",
+        workNumber: "",
+        email: "",
+        account: "",
+        classId: ""
+      },
+      rules: {
+        organizationName: [
+          { required: true, message: "请输入名称", trigger: "blur" }
+        ],
+        userName: [
+          { required: true, message: "请输入学生姓名", trigger: "blur" }
+        ],
+        workNumber: [
+          { required: true, message: "请输入学号", trigger: 'blur' },
+          {
+            pattern: /^[A-Za-z0-9]*$/,
+            message: "请输入正确的学号",
+            trigger: "blur"
+          }
+        ],
+        phone: [
+          {
+            pattern: /^1[3456789]\d{9}$/,
+            message: "请输入正确的手机号",
+            trigger: "blur"
+          }
+        ],
+        email: [
+          {
+            pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
+            message: "请输入正确的邮箱",
+            trigger: "blur"
+          }
+        ]
+      },
+      listData: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      multipleSelection: [],
+
+      isAdd: true,
+      studentVisible: false,
+      workNumberReapeat: false,
+      phoneRepeat: false,
+      emailRepeat: false,
+      showTree: true, // 是否显示所在班级树
+      defaultCheckedKeys: [],
+      filterText: "", // 通过关键字过滤树节点
 
-            isAdd: true,
-            studentVisible: false,
-            workNumberReapeat: false,
-            phoneRepeat: false,
-            emailRepeat: false,
-            showTree: true, // 是否显示所在班级树
-            defaultCheckedKeys: [],
-            filterText: "", // 通过关键字过滤树节点
+      importVisible: false,
+      uploadList: [],
+      uploadFaild: false,
+      exportCode: "",
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
+      disableds: false,
+      submiting: false // 新增编辑防抖标识
+    };
+  },
+  computed: {
+    ...mapState("user", [
+      'schoolId'
+    ])
+  },
+  mounted () {
+    this.originForm = JSON.parse(JSON.stringify(this.form))
+    this.getData();
+  },
+  watch: {
+    keyWord: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        if (this.studentType) {
+          this.initData();
+        } else {
+          this.getOrgStudentData();
+        }
 
-            importVisible: false,
-            uploadList: [],
-            uploadFaild: false,
-            exportCode: "",
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            disableds:false,
-            submiting: false // 新增编辑防抖标识
+      }, 500);
+    },
+    filterText (val) {
+      this.$refs.classTree.filter(val);
+    }
+  },
+  methods: {
+    handleNodeClick (data) { // 点击树节点查询列表数据
+      if (data.level === 3) {
+        this.isRemove = true;
+        this.currentClassId = data.id;
+      } else {
+        this.isRemove = false;
+        this.currentClassId = "";
+      }
+      this.$refs.table.clearSelection();
+      this.studentType = null;
+      this.architectureId = data.id;
+      this.orgLevel = data.level;
+      util.debounce(this.getOrgStudentData(), 1000);
+    },
+    handleAdd (node, data) { // 添加部门
+      this.orgVisible = true;
+      this.orgTitle = "新增";
+      this.isAddOrg = true;
+      if (data) {
+        if (data.level === 1) {
+          this.labelName = "年级";
+        } else if (data.level === 2) {
+          this.labelName = "班级名称";
+        }
+        this.showCascader = false;
+        this.orgForm = {
+          organizationName: "",
+          parentName: data.organizationName,
+          parentId: data.id,
+          level: data.level + 1
         };
+      } else {
+        this.labelName = "部门名称";
+        this.orgForm = {
+          organizationName: "",
+          parentId: 0,
+          level: 1
+        };
+      }
     },
-    computed: {
-        ...mapState("user", [
-            'schoolId'
-        ])
+    // 获取一共有多少级子级
+    getDeep (data) {
+      let list = data
+      let level = 1
+      while (list.childNodes.length) {
+        list = list.childNodes[0]
+        ++level
+      }
+      return level
     },
-    mounted() {
-        this.originForm = JSON.parse(JSON.stringify(this.form))
-        this.getData();
+    handleEdit (node, data) { // 编辑部门
+      this.orgVisible = true;
+      this.orgForm = data;
+      this.orgTitle = "编辑";
+      this.isAddOrg = false;
+      if (data.level === 1) {
+        this.labelName = "专业名称";
+      } else if (data.level === 2) {
+        this.labelName = "年级";
+      } else if (data.level === 3) {
+        this.labelName = "班级名称";
+      }
+      if (data.ids.includes(",")) {
+        let tempArr = data.ids.split(",").map(i => Number(i));
+        tempArr.splice(tempArr.length - 1, 1);
+        this.cascaderValue = tempArr;
+      }
+      this.cascaderLevel = this.getDeep(node)
     },
-    watch: {
-        keyWord: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                if (this.studentType) {
-                    this.initData();
-                } else {
-                    this.getOrgStudentData();
-                }
-
-            }, 500);
-        },
-        filterText(val) {
-            this.$refs.classTree.filter(val);
-        }
+    handleChangeCascader (value) {
+      // console.log(JSON.stringify(value));
+      // console.log(JSON.stringify(this.cascaderValue));
     },
-    methods: {
-        handleNodeClick(data) { // 点击树节点查询列表数据
-            if (data.level === 3) {
-                this.isRemove = true;
-                this.currentClassId = data.id;
-            } else {
-                this.isRemove = false;
-                this.currentClassId = "";
-            }
-            this.$refs.table.clearSelection();
-            this.studentType = null;
-            this.architectureId = data.id;
-            this.orgLevel = data.level;
-            util.debounce(this.getOrgStudentData(), 1000);
-        },
-        handleAdd(node, data) { // 添加部门
-            this.orgVisible = true;
-            this.orgTitle = "新增";
-            this.isAddOrg = true;
-            if (data) {
-                if (data.level === 1) {
-                    this.labelName = "年级";
-                } else if (data.level === 2) {
-                    this.labelName = "班级名称";
-                }
-                this.showCascader = false;
-                this.orgForm = {
-                    organizationName: "",
-                    parentName: data.organizationName,
-                    parentId: data.id,
-                    level: data.level + 1
-                };
-            } else {
-                this.labelName = "部门名称";
-                this.orgForm = {
-                    organizationName: "",
-                    parentId: 0,
-                    level: 1
-                };
-            }
-        },
-        // 获取一共有多少级子级
-        getDeep(data) {
-            let list = data
-            let level = 1
-            while (list.childNodes.length) {
-                list = list.childNodes[0]
-                ++level
-            }
-            return level
-        },
-        handleEdit(node, data) { // 编辑部门
-            this.orgVisible = true;
-            this.orgForm = data;
-            this.orgTitle = "编辑";
-            this.isAddOrg = false;
-            if (data.level === 1) {
-                this.labelName = "专业名称";
-            } else if (data.level === 2) {
-                this.labelName = "年级";
-            } else if (data.level === 3) {
-                this.labelName = "班级名称";
-            }
-            if (data.ids.includes(",")) {
-                let tempArr = data.ids.split(",").map(i => Number(i));
-                tempArr.splice(tempArr.length - 1, 1);
-                this.cascaderValue = tempArr;
-            }
-            this.cascaderLevel = this.getDeep(node)
-        },
-        handleChangeCascader(value) {
-            // console.log(JSON.stringify(value));
-            // console.log(JSON.stringify(this.cascaderValue));
-        },
-        handleDel() { // 删除部门
-            let { level, id } = this.orgForm;
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteOrg}?id=${id}&level=${level}`).then(res => {
-                    util.successMsg("删除成功");
-                    this.handleClose();
-                    this.handleRefresh();
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        orgSubmit() { // 提交组织架构新增/编辑
-            this.$refs.orgForm.validate((valid) => {
-                if (valid) {
-                    const cas = this.cascaderValue
-                    if (cas && cas.length) {
-                        this.orgForm.parentId = cas[cas.length - 1];
-                        this.orgForm.level = cas.length + 1;
-                    }
-                    if (this.isAddOrg) {
-                        // 添加
-                        this.$post(this.api.saveOrg, this.orgForm).then(res => {
-                            util.successMsg("新增成功！");
-                            this.handleClose();
-                            this.handleRefresh();
-                        }).catch(err => {
-                        });
-                    } else {
-                        if (cas.length === 1 && this.labelName === '班级名称') return util.errorMsg('请选择年级！')
-                        // 编辑
-                        this.$post(this.api.updateOrg, this.orgForm).then(res => {
-                            util.successMsg("编辑成功！");
-                            this.handleClose();
-                            this.handleRefresh();
-                            this.getOrgStudentData()
-                        }).catch(err => {
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleRefresh() { // 刷新树节点
-            this.treeVisible = false;
-            setTimeout(() => {
-                this.treeVisible = true;
-            }, 500);
-            this.treeNode.childNodes.splice(0);
-            this.loadNodeTree(this.treeNode, this.treeResolve);
-        },
-        handleClose() { // 关闭
-            this.orgVisible = false;
-            this.showCascader = true;
-            this.cascaderValue = [];
-            this.orgForm = {
-                organizationName: ""
-            };
-        },
-        loadNodeTree(node, resolve) { // 懒加载树结构
-            let level = 1;
-            let parentId = "";
-            if (node.level === 0) {
-                this.treeNode = node;
-                this.treeResolve = resolve;
-                this.getOrgTreeData(resolve, level, parentId);
-            } else if (node.level > 2) {
-                return resolve([]);
-            } else {
-                if (node.data && node.data.level && node.data.id) {
-                    this.getOrgTreeData(resolve, node.data.level + 1, node.data.id, node.data.ids);
-                }
-            }
-        },
-        getOrgTreeData(resolve, level, parentId, ids) { // 获取组织架构树数据
-            this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                let { status, treeList } = res;
-                if (status === 200 && treeList.length) {
-                    let result = [];
-                    treeList.forEach(i => {
-                        if (i.level === 3) {
-                            i.leaf = true;
-                        } else {
-                            i.leaf = false;
-                        }
-                        i.ids = ids ? `${ids},${i.id}` : `${i.id}`; // 给树结构添加唯一标识
-                        result.push(i);
-                    });
-                    return resolve(result);
-                } else {
-                    return resolve([]);
-                }
-            }).catch(err => {
-            });
-        },
-        getOrgStudentData() { // 根据组织架构筛选学生列表
-            let params = {
-                architectureId: this.architectureId,
-                level: this.orgLevel,
-                keyWord: this.keyWord,
-                pageNum: this.page,
-                pageSize: this.pageSize
-            };
-            this.$post(this.api.organizationalStudentList, params).then(res => {
-                this.listData = res.page;
-                this.total = res.total;
+    handleDel () { // 删除部门
+      let { level, id } = this.orgForm;
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteOrg}?id=${id}&level=${level}`).then(res => {
+          util.successMsg("删除成功");
+          this.handleClose();
+          this.handleRefresh();
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    orgSubmit () { // 提交组织架构新增/编辑
+      this.$refs.orgForm.validate((valid) => {
+        if (valid) {
+          const cas = this.cascaderValue
+          if (cas && cas.length) {
+            this.orgForm.parentId = cas[cas.length - 1];
+            this.orgForm.level = cas.length + 1;
+          }
+          if (this.isAddOrg) {
+            // 添加
+            this.$post(this.api.saveOrg, this.orgForm).then(res => {
+              util.successMsg("新增成功！");
+              this.handleClose();
+              this.handleRefresh();
             }).catch(err => {
             });
-        },
-        getData() { // 学生列表
-            let data = {
-                type: this.studentType,
-                keyWord: this.keyWord,
-                pageNum: this.page,
-                pageSize: this.pageSize
-            };
-            this.$post(this.api.studentList, data).then(res => {
-                this.listData = res.page;
-                this.total = res.total;
+          } else {
+            if (cas.length === 1 && this.labelName === '班级名称') return util.errorMsg('请选择年级！')
+            // 编辑
+            this.$post(this.api.updateOrg, this.orgForm).then(res => {
+              util.successMsg("编辑成功！");
+              this.handleClose();
+              this.handleRefresh();
+              this.getOrgStudentData()
             }).catch(err => {
             });
-        },
-        currentChange(val) { // 切换页码
-            this.page = val;
-            if (this.studentType) {
-                this.getData();
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    handleRefresh () { // 刷新树节点
+      this.treeVisible = false;
+      setTimeout(() => {
+        this.treeVisible = true;
+      }, 500);
+      this.treeNode.childNodes.splice(0);
+      this.loadNodeTree(this.treeNode, this.treeResolve);
+    },
+    handleClose () { // 关闭
+      this.orgVisible = false;
+      this.showCascader = true;
+      this.cascaderValue = [];
+      this.orgForm = {
+        organizationName: ""
+      };
+    },
+    loadNodeTree (node, resolve) { // 懒加载树结构
+      let level = 1;
+      let parentId = "";
+      if (node.level === 0) {
+        this.treeNode = node;
+        this.treeResolve = resolve;
+        this.getOrgTreeData(resolve, level, parentId);
+      } else if (node.level > 2) {
+        return resolve([]);
+      } else {
+        if (node.data && node.data.level && node.data.id) {
+          this.getOrgTreeData(resolve, node.data.level + 1, node.data.id, node.data.ids);
+        }
+      }
+    },
+    getOrgTreeData (resolve, level, parentId, ids) { // 获取组织架构树数据
+      this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
+        let { status, treeList } = res;
+        if (status === 200 && treeList.length) {
+          let result = [];
+          treeList.forEach(i => {
+            if (i.level === 3) {
+              i.leaf = true;
             } else {
-                this.getOrgStudentData();
+              i.leaf = false;
             }
-        },
-        getRowKeys(row) { // 表格key
-            return row.accountId;
-        },
-        handleSelectionChange(val) { // 多选
-            this.multipleSelection = val;
-        },
-        changeStudentType() {
-            this.isRemove = false;
-            this.initData();
-        },
-        initData() {
+            i.ids = ids ? `${ids},${i.id}` : `${i.id}`; // 给树结构添加唯一标识
+            result.push(i);
+          });
+          return resolve(result);
+        } else {
+          return resolve([]);
+        }
+      }).catch(err => {
+      });
+    },
+    getOrgStudentData () { // 根据组织架构筛选学生列表
+      let params = {
+        architectureId: this.architectureId,
+        level: this.orgLevel,
+        keyWord: this.keyWord,
+        pageNum: this.page,
+        pageSize: this.pageSize
+      };
+      this.$post(this.api.organizationalStudentList, params).then(res => {
+        this.listData = res.page;
+        this.total = res.total;
+      }).catch(err => {
+      });
+    },
+    getData () { // 学生列表
+      let data = {
+        type: this.studentType,
+        keyWord: this.keyWord,
+        pageNum: this.page,
+        pageSize: this.pageSize
+      };
+      this.$post(this.api.studentList, data).then(res => {
+        this.listData = res.page;
+        this.total = res.total;
+      }).catch(err => {
+      });
+    },
+    currentChange (val) { // 切换页码
+      this.page = val;
+      if (this.studentType) {
+        this.getData();
+      } else {
+        this.getOrgStudentData();
+      }
+    },
+    getRowKeys (row) { // 表格key
+      return row.accountId;
+    },
+    handleSelectionChange (val) { // 多选
+      this.multipleSelection = val;
+    },
+    changeStudentType () {
+      this.$refs.orgTree.setCurrentKey(null)
+      this.isRemove = false;
+      this.initData();
+    },
+    initData () {
+      this.$refs.table.clearSelection();
+      this.page = 1;
+      this.getData();
+    },
+    delAllSelection () { // 批量删除
+      if (this.multipleSelection.length) {
+        this.$confirm("确定要删除选中用户吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          let ids = this.multipleSelection.map(item => {
+            return item.accountId;
+          });
+          this.$post(`${this.api.delStudent}?accountIds=${ids.toString()}`).then(res => {
+            this.multipleSelection = [];
             this.$refs.table.clearSelection();
-            this.page = 1;
-            this.getData();
-        },
-        delAllSelection() { // 批量删除
-            if (this.multipleSelection.length) {
-                this.$confirm("确定要删除选中用户吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.accountId;
-                    });
-                    this.$post(`${this.api.delStudent}?accountIds=${ids.toString()}`).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        if (this.studentType) {
-                            this.getData();
-                        } else {
-                            this.getOrgStudentData();
-                        }
-                    }).catch(res => {
-                    });
-                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
-                        this.handleCurrentChange(this.page - 1)
-                    }
-                }).catch(() => {
-                });
+            util.successMsg("删除成功");
+            if (this.studentType) {
+              this.getData();
             } else {
-                util.errorMsg("请先选择数据 ！");
+              this.getOrgStudentData();
             }
-        },
-        handleDelete(row) { // 删除
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.delStudent}?accountIds=${row.accountId}`).then(res => {
-                    util.successMsg("删除成功");
-                    if (this.studentType) {
-                        this.getData();
-                    } else {
-                        this.getOrgStudentData();
-                    }
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        removeStudent(row) { // 移除
-            this.$confirm("确定要移除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.removeStudent}?classId=${this.currentClassId}&stuAccountId=${row.accountId}`).then(res => {
-                    util.successMsg("移除成功");
-                    if (this.studentType) {
-                        this.getData();
-                    } else {
-                        this.getOrgStudentData();
-                    }
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        resetPassword(row) { // 重置密码
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => {
-                    util.successMsg("重置成功");
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        switchOff(row) { // 更新状态
-            let isEnable = row.isEnable === 0 ? 0 : 1;
-            this.$get(`${this.api.updateAccountEnable}?id=${row.accountId}&isEnable=${isEnable}`).then(res => {
-                util.successMsg("更新状态成功");
-                if (this.studentType) {
-                    this.getData();
-                } else {
-                    this.getOrgStudentData();
-                }
-            }).catch(res => {
-            });
-        },
-        addStudent() { // 添加学生
-            this.isAdd = true;
+          }).catch(res => {
+          });
+          if (this.multipleSelection.length === this.listData.length && this.page > 1) {
+            this.handleCurrentChange(this.page - 1)
+          }
+        }).catch(() => {
+        });
+      } else {
+        util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleDelete (row) { // 删除
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.delStudent}?accountIds=${row.accountId}`).then(res => {
+          util.successMsg("删除成功");
+          if (this.studentType) {
+            this.getData();
+          } else {
+            this.getOrgStudentData();
+          }
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    removeStudent (row) { // 移除
+      this.$confirm("确定要移除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.removeStudent}?classId=${this.currentClassId}&stuAccountId=${row.accountId}`).then(res => {
+          util.successMsg("移除成功");
+          if (this.studentType) {
+            this.getData();
+          } else {
+            this.getOrgStudentData();
+          }
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    resetPassword (row) { // 重置密码
+      this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
+        this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => {
+          util.successMsg("重置成功");
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    switchOff (row) { // 更新状态
+      let isEnable = row.isEnable === 0 ? 0 : 1;
+      this.$get(`${this.api.updateAccountEnable}?id=${row.accountId}&isEnable=${isEnable}`).then(res => {
+        util.successMsg("更新状态成功");
+        if (this.studentType) {
+          this.getData();
+        } else {
+          this.getOrgStudentData();
+        }
+      }).catch(res => {
+      });
+    },
+    addStudent () { // 添加学生
+      this.isAdd = true;
+      this.showTree = true;
+      this.studentVisible = true;
+    },
+    editStudent (row, isDetail) { // 编辑/查看
+      this.isAdd = false;
+      this.isDetail = isDetail;
+      this.showTree = false;
+      this.studentVisible = true;
+      this.$post(`${this.api.getStudentInfoByAccountId}?stuAccountId=${row.accountId}`).then(res => {
+        this.form = res.data;
+        this.showTree = true;
+      }).catch(res => { });
+    },
+    // 组合账号
+    renderAccount () {
+      const form = this.form
+      // 平台id-端id-schoolId-workNumber组成账号
+      form.account = `${Setting.platformId}-1-${this.schoolId}-${form.workNumber}`
+    },
+    workNumberChange () {
+      const form = this.form
+      const { workNumber } = form
+      // 只有输入了学号并且是新增才需要根据学号查询其他信息
+      if (workNumber && this.isAdd && /^[A-Za-z0-9]*$/.test(workNumber)) {
+        this.$post(`${this.api.getDetailByAccount}?workNumber=${workNumber}&platformId=${Setting.platformId}&type=1`).then(({ data }) => {
+          if (data) {
             this.showTree = true;
-            this.studentVisible = true;
-        },
-        editStudent(row, isDetail) { // 编辑/查看
-            this.isAdd = false;
-            this.isDetail = isDetail;
-            this.showTree = false;
-            this.studentVisible = true;
-            this.$post(`${this.api.getStudentInfoByAccountId}?stuAccountId=${row.accountId}`).then(res => {
-                this.form = res.data;
-                this.showTree = true;
-            }).catch(res => {});
-        },
-        // 组合账号
-        renderAccount() {
-          const form = this.form
-          // 平台id-端id-schoolId-workNumber组成账号
-          form.account = `${Setting.platformId}-1-${this.schoolId}-${form.workNumber}`
-        },
-        workNumberChange() {
-            const form = this.form
-            const { workNumber } = form
-            // 只有输入了学号并且是新增才需要根据学号查询其他信息
-            if (workNumber && this.isAdd && /^[A-Za-z0-9]*$/.test(workNumber)) {
-                this.$post(`${this.api.getDetailByAccount}?workNumber=${workNumber}&platformId=${Setting.platformId}&type=1`).then(({ data }) => {
-                  if (data) {
-                    this.showTree = true;
-                    const classId = data.classList.map(e => e.id).toString();
-                    this.form = data
-                    this.form.classId = classId
-                    this.renderAccount()
-                    // 无指定范围的classId为1，即没有班级，如果没有班级则直接清空班级选择
-                    if (classId === '1') {
-                      this.$refs.classTree.setCheckedKeys([])
-                    } else {
-                      this.defaultCheckedKeys = classId.split(",").map(i => Number(i))
-                    }
-                    this.$refs.form.clearValidate()
-                  } else {
-                    // 如果该学号没有对应的学生，则清空所有信息，除了学号
-                    this.form = JSON.parse(JSON.stringify(this.originForm))
-                    this.form.workNumber = workNumber
-                    this.renderAccount()
-                    this.$refs.classTree.setCheckedKeys([])
-                  }
-              }).catch(res => {})
+            const classId = data.classList.map(e => e.id).toString();
+            this.form = data
+            this.form.classId = classId
+            this.renderAccount()
+            // 无指定范围的classId为1，即没有班级，如果没有班级则直接清空班级选择
+            if (classId === '1') {
+              this.$refs.classTree.setCheckedKeys([])
             } else {
-              this.renderAccount()
+              this.defaultCheckedKeys = classId.split(",").map(i => Number(i))
             }
-        },
-        phoneChange() {
-            let regex = /^1[3456789]\d{9}$/;
-            if (regex.test(this.form.phone)) {
-                let url = "";
-                if (this.isAdd && !this.form.accountId) {
-                    url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.phoneRepeat = false;
-                    }
-                }).catch(err => {
-                    this.phoneRepeat = true;
-                });
-            } else {
-              this.phoneRepeat = false
-            }
-        },
-        emailChange() {
-            let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-            if (regex.test(this.form.email)) {
-                let url = "";
-                if (this.isAdd && !this.form.accountId) {
-                    url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.emailRepeat = false;
-                    }
-                }).catch(err => {
-                    this.emailRepeat = true;
-                });
+            this.$refs.form.clearValidate()
+          } else {
+            // 如果该学号没有对应的学生，则清空所有信息，除了学号
+            this.form = JSON.parse(JSON.stringify(this.originForm))
+            this.form.workNumber = workNumber
+            this.renderAccount()
+            this.$refs.classTree.setCheckedKeys([])
+          }
+        }).catch(res => { })
+      } else {
+        this.renderAccount()
+      }
+    },
+    phoneChange () {
+      let regex = /^1[3456789]\d{9}$/;
+      if (regex.test(this.form.phone)) {
+        let url = "";
+        if (this.isAdd && !this.form.accountId) {
+          url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
+        } else {
+          url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
+        }
+        this.$post(url).then(res => {
+          if (res.status === 200) {
+            this.phoneRepeat = false;
+          }
+        }).catch(err => {
+          this.phoneRepeat = true;
+        });
+      } else {
+        this.phoneRepeat = false
+      }
+    },
+    emailChange () {
+      let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
+      if (regex.test(this.form.email)) {
+        let url = "";
+        if (this.isAdd && !this.form.accountId) {
+          url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
+        } else {
+          url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
+        }
+        this.$post(url).then(res => {
+          if (res.status === 200) {
+            this.emailRepeat = false;
+          }
+        }).catch(err => {
+          this.emailRepeat = true;
+        });
+      } else {
+        this.emailRepeat = false
+      }
+    },
+    filterNode (value, data) {
+      if (!value) return true;
+      return data.organizationName.indexOf(value) !== -1;
+    },
+    loadClassTree (node, resolve) { // 懒加载所在班级树结构
+      let level = 1;
+      let parentId = "";
+      if (node.level === 0) {
+        this.treeNode = node;
+        this.treeResolve = resolve;
+        this.getClassTreeData(resolve, level, parentId);
+      } else if (node.level > 2) {
+        return resolve([]);
+      } else {
+        if (node.data && node.data.level && node.data.id) {
+          this.getClassTreeData(resolve, node.data.level + 1, node.data.id);
+        }
+      }
+    },
+    getClassTreeData (resolve, level, parentId) { // 获取组织架构树数据
+      this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
+        let { status, treeList } = res;
+        if (status === 200 && treeList.length) {
+          let result = [];
+          treeList.forEach(i => {
+            i.disabled = i.level < 3;
+            if (i.level === 3) {
+              i.leaf = true;
+              // 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked
+              // i.checked = this.form.classId.includes(i.id.toString());
+              if (this.form.classId) {
+                this.defaultCheckedKeys = this.form.classId.split(",").map(i => Number(i));
+              }
+              i.showCheckbox = true;
             } else {
-              this.emailRepeat = false
+              i.leaf = false;
+              i.showCheckbox = false;
             }
-        },
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.organizationName.indexOf(value) !== -1;
-        },
-        loadClassTree(node, resolve) { // 懒加载所在班级树结构
-            let level = 1;
-            let parentId = "";
-            if (node.level === 0) {
-                this.treeNode = node;
-                this.treeResolve = resolve;
-                this.getClassTreeData(resolve, level, parentId);
-            } else if (node.level > 2) {
-                return resolve([]);
-            } else {
-                if (node.data && node.data.level && node.data.id) {
-                    this.getClassTreeData(resolve, node.data.level + 1, node.data.id);
-                }
+            result.push(i);
+          });
+          return resolve(result);
+        } else {
+          return resolve([]);
+        }
+      }).catch(err => {
+      });
+    },
+    saveData (type) { // 提交新增/编辑学生
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.submiting) return false
+          let nodes = this.$refs.classTree.getCheckedNodes();
+          let tempArr = [];
+          nodes.forEach(i => {
+            if (i.level === 3) {
+              tempArr.push(i.id);
             }
-        },
-        getClassTreeData(resolve, level, parentId) { // 获取组织架构树数据
-            this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                let { status, treeList } = res;
-                if (status === 200 && treeList.length) {
-                    let result = [];
-                    treeList.forEach(i => {
-                        i.disabled = i.level < 3;
-                        if (i.level === 3) {
-                            i.leaf = true;
-                            // 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked
-                            // i.checked = this.form.classId.includes(i.id.toString());
-                            if (this.form.classId) {
-                                this.defaultCheckedKeys = this.form.classId.split(",").map(i => Number(i));
-                            }
-                            i.showCheckbox = true;
-                        } else {
-                            i.leaf = false;
-                            i.showCheckbox = false;
-                        }
-                        result.push(i);
-                    });
-                    return resolve(result);
+          });
+          this.form.classId = tempArr.toString() || 1
+          if (this.form.accountId) {
+            this.submiting = true
+            this.$post(this.api.modifyStudent, this.form).then(res => {
+              util.successMsg("编辑成功！");
+              if (type) {
+                this.resetStudent();
+              } else {
+                this.closeStudent();
+                if (this.studentType) {
+                  this.getData();
                 } else {
-                    return resolve([]);
+                  this.getOrgStudentData();
                 }
-            }).catch(err => {
-            });
-        },
-        saveData(type) { // 提交新增/编辑学生
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    let nodes = this.$refs.classTree.getCheckedNodes();
-                    let tempArr = [];
-                    nodes.forEach(i => {
-                        if (i.level === 3) {
-                            tempArr.push(i.id);
-                        }
-                    });
-                    this.form.classId = tempArr.toString() || 1
-                    if (this.form.accountId) {
-                        this.submiting = true
-                        this.$post(this.api.modifyStudent, this.form).then(res => {
-                            util.successMsg("编辑成功！");
-                            if (type) {
-                                this.resetStudent();
-                            } else {
-                                this.closeStudent();
-                                if (this.studentType) {
-                                    this.getData();
-                                } else {
-                                    this.getOrgStudentData();
-                                }
-                            }
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        }).catch(res => {
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        })
-                    } else {
-                        if (this.workNumberReapeat) return util.warningMsg("该学生学号已存在");
-                        if (this.phoneRepeat) return util.warningMsg("该手机号已存在");
-                        if (this.emailRepeat) return util.warningMsg("该邮箱已存在");
-                        this.submiting = true
-                        this.form.uniqueIdentification = new Date().getTime();
-                        this.$post(this.api.addStudent, this.form).then(res => {
-                            util.successMsg("新增成功！");
-                            if (type) {
-                                this.resetStudent();
-                            } else {
-                                this.closeStudent();
-                                if (this.studentType) {
-                                    this.getData();
-                                } else {
-                                    this.getOrgStudentData();
-                                }
-                            }
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        }).catch(res => {
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        })
-                    }
+              }
+              setTimeout(() => {
+                this.submiting = false
+              }, 2000)
+            }).catch(res => {
+              setTimeout(() => {
+                this.submiting = false
+              }, 2000)
+            })
+          } else {
+            if (this.workNumberReapeat) return util.warningMsg("该学生学号已存在");
+            if (this.phoneRepeat) return util.warningMsg("该手机号已存在");
+            if (this.emailRepeat) return util.warningMsg("该邮箱已存在");
+            this.submiting = true
+            this.form.uniqueIdentification = new Date().getTime();
+            this.$post(this.api.addStudent, this.form).then(res => {
+              util.successMsg("新增成功！");
+              if (type) {
+                this.resetStudent();
+              } else {
+                this.closeStudent();
+                if (this.studentType) {
+                  this.getData();
                 } else {
-                    return false;
+                  this.getOrgStudentData();
                 }
-            });
-        },
-        // 判重重置
-        resetRepeat() {
-          this.workNumberReapeat = false
-          this.phoneRepeat = false
-          this.emailRepeat = false
-        },
-        resetStudent() { // 重置新增学生对话框
-            this.$refs.form.clearValidate();
-            this.form = {
-                userName: "",
-                account: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                classId: ""
-            };
-            this.$refs.classTree.setCheckedKeys([])
-            this.resetRepeat()
-            if (this.studentType) {
-                this.getData();
-            } else {
-                this.getOrgStudentData();
-            }
-        },
-        closeStudent() { // 关闭新增学生对话框
-            this.$refs.form.clearValidate();
-            this.form = {
-                userName: "",
-                account: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                classId: ""
-            };
-            this.defaultCheckedKeys = [];
-            this.isDetail = false;
-            this.showTree = false;
-            this.studentVisible = false;
-            this.resetRepeat()
-        },
-        batchImport() { // 批量导入
-            this.importVisible = true;
-            this.uploadList = [];
-            this.uploadFaild = false;
-        },
-        downLoad() { // 模板下载
-            location.href = this.api.studentTemplate;
-        },
-        handleExceed(files, fileList) { // 上传文件
-            util.warningMsg(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
-            );
-        },
-        showFaild() { // 下载失败文件
-            location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`;
-        },
-        uploadSuccess(res, file, fileList) {
-            this.uploadFaild = false;
-            if (res.status === 200) {
-                if (res.data.exportCode) {
-                    this.exportCode = res.data.exportCode;
-                    this.uploadFaild = true;
-                }
-                util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
-                this.handleRefresh();
-                util.successMsg(`本次上传有${res.data.failureNum}个错误信息录入`);
-
-                this.getClassTreeData('','1','')
-            } else {
-                res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
-            }
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            this.uploadList = fileList;
-            this.uploadFaild = false;
-        },
-        uploadSure() {
-            this.importVisible = false;
-            this.studentType = 1;
-            this.keyWord = "";
-            this.handleClose();
-            this.handleRefresh();
-            this.initData();
+              }
+              setTimeout(() => {
+                this.submiting = false
+              }, 2000)
+            }).catch(res => {
+              setTimeout(() => {
+                this.submiting = false
+              }, 2000)
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    // 判重重置
+    resetRepeat () {
+      this.workNumberReapeat = false
+      this.phoneRepeat = false
+      this.emailRepeat = false
+    },
+    resetStudent () { // 重置新增学生对话框
+      this.$refs.form.clearValidate();
+      this.form = {
+        userName: "",
+        account: "",
+        phone: "",
+        uniqueIdentification: "",
+        workNumber: "",
+        email: "",
+        classId: ""
+      };
+      this.$refs.classTree.setCheckedKeys([])
+      this.resetRepeat()
+      if (this.studentType) {
+        this.getData();
+      } else {
+        this.getOrgStudentData();
+      }
+    },
+    closeStudent () { // 关闭新增学生对话框
+      this.$refs.form.clearValidate();
+      this.form = {
+        userName: "",
+        account: "",
+        phone: "",
+        uniqueIdentification: "",
+        workNumber: "",
+        email: "",
+        classId: ""
+      };
+      this.defaultCheckedKeys = [];
+      this.isDetail = false;
+      this.showTree = false;
+      this.studentVisible = false;
+      this.resetRepeat()
+    },
+    batchImport () { // 批量导入
+      this.importVisible = true;
+      this.uploadList = [];
+      this.uploadFaild = false;
+    },
+    downLoad () { // 模板下载
+      location.href = this.api.studentTemplate;
+    },
+    handleExceed (files, fileList) { // 上传文件
+      util.warningMsg(
+        `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+      );
+    },
+    showFaild () { // 下载失败文件
+      location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`;
+    },
+    uploadSuccess (res, file, fileList) {
+      this.uploadFaild = false;
+      if (res.status === 200) {
+        if (res.data.exportCode) {
+          this.exportCode = res.data.exportCode;
+          this.uploadFaild = true;
         }
+        util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
+        this.handleRefresh();
+        util.successMsg(`本次上传有${res.data.failureNum}个错误信息录入`);
+
+        this.getClassTreeData('', '1', '')
+      } else {
+        res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
+      }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove (file, fileList) {
+      this.uploadList = fileList;
+      this.uploadFaild = false;
+    },
+    uploadSure () {
+      this.importVisible = false;
+      this.studentType = 1;
+      this.keyWord = "";
+      this.handleClose();
+      this.handleRefresh();
+      this.initData();
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .custom-tree-node {
-  display: inline-flex;
-  align-items: center;
+    display: inline-flex;
+    align-items: center;
 }
 .name {
-  display: inline-block;
-  max-width: 160px;
-  margin-right: 20px;
-  overflow: hidden;
-  text-overflow: ellipsis;
+    display: inline-block;
+    max-width: 160px;
+    margin-right: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index be0456c..512ac51 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -26,7 +26,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.152:9000/"; // 榕
+    // host = "http://192.168.31.152:9000/"; // 榕
     // host = 'http://192.168.31.51:9000/'; // 赓
 }