From 28d2a2b6fbd1eb9b9b0748a57a0691093f901929 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 7 Jan 2025 11:29:51 +0800
Subject: [PATCH] fix

---
 src/api/index.js                       |   4 +-
 src/pages/account/login/index.vue      | 328 -------------------------
 src/pages/account/redirect/index.vue   |   5 +-
 src/pages/achievement/info/course.vue  |  26 --
 src/pages/achievement/list/project.vue |  14 +-
 src/pages/achievement/show/index.vue   |  29 ++-
 src/pages/match/add/set.vue            |   8 +-
 src/pages/match/manage/matchSignup.vue |   2 +-
 src/pages/match/manage/trialReport.vue |  32 ++-
 src/pages/resourse/list/index.vue      |   4 +-
 src/pages/student/list/index.vue       |  16 +-
 src/router/permission.js               |   4 +-
 src/router/routes.js                   |   2 +-
 src/store/modules/user.js              |  17 +-
 14 files changed, 78 insertions(+), 413 deletions(-)
 delete mode 100644 src/pages/account/login/index.vue

diff --git a/src/api/index.js b/src/api/index.js
index 1e2f242..b985551 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -127,8 +127,8 @@ export default {
   reportDetail: `occupationlab/occupationlab/achievement/reportDetail`, // 查看实验报告
   schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
   spliceClass: `occupationlab/occupationlab/achievement/spliceClass`,
-  exportLabReport: `occupationlab/occupationlab/achievement/exportLabReport`,
-  exportBankExperimentReport: `occupationlab/occupationlab/achievement/exportBankExperimentReport`,
+  exportLabReport: `${host}occupationlab/occupationlab/achievement/exportLabReport`,
+  exportBankExperimentReport: `${host}occupationlab/occupationlab/achievement/exportBankExperimentReport`,
   editExperimentalData: 'occupationlab/occupationlab/experimentalReport/editExperimentalData',
   practiceActivity: 'occupationlab/occupationlab/achievement/practiceActivity',
   practiceByProduct: `occupationlab/occupationlab/achievement/practiceByProduct`,
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
deleted file mode 100644
index 2f86ab2..0000000
--- a/src/pages/account/login/index.vue
+++ /dev/null
@@ -1,328 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="main">
-      <div class="box">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="账号登录" name="1"></el-tab-pane>
-          <el-tab-pane label="手机号/邮箱登录" name="2"></el-tab-pane>
-          <el-form :model="loginForm" :rules="loginRules" ref="loginForm" style="margin-top: 20px">
-            <el-form-item v-if="activeName === '1'" prop="account">
-              <el-input v-model.trim="loginForm.account" placeholder="请输入账号"></el-input>
-            </el-form-item>
-            <el-form-item v-if="activeName === '2'" prop="account">
-              <el-input v-model.trim="loginForm.account" placeholder="请输入手机号/邮箱"></el-input>
-            </el-form-item>
-            <el-form-item prop="password">
-              <el-input type="password" placeholder="请输入密码" v-model.trim="loginForm.password">
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="code">
-              <el-input placeholder="请输入验证码" v-model.trim="loginForm.code" @keyup.enter.native="submitFormLogin">
-              </el-input>
-              <img @click="getVerImg" :src="verificationIMG" class="verification" alt="">
-            </el-form-item>
-            <el-button class="submit" type="primary" @click="submitFormLogin">马上登录</el-button>
-          </el-form>
-        </el-tabs>
-      </div>
-    </div>
-
-    <el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" width="30%">
-      <div style='padding: 0 13px 20px 13px;'>
-        依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台
-      </div>
-      <el-form ref="form" label-width="60px">
-        <el-form-item label="手机号">
-          <el-input style="width: 100%;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
-        </el-form-item>
-        <el-form-item label="验证码">
-          <div style="display: flex;">
-            <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-            <el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{
-              phoneBtnText }}
-            </el-button>
-          </div>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="phoneVisible = false">取 消</el-button>
-        <el-button type="primary" @click="phoneSubmit">确 定</el-button>
-      </span>
-    </el-dialog>
-    <v-footer class="footer"></v-footer>
-  </div>
-</template>
-
-<script>
-import { mapActions, mapMutations } from "vuex";
-import vFooter from "@/layouts/footer";
-import util from "@/libs/util";
-import Setting from "@/setting";
-
-export default {
-  data: function () {
-    return {
-      activeName: "1",
-      loginForm: {
-        account: "",
-        password: "",
-        code: "", // 验证码
-        random: "", // 随机数
-        distinguish: 1, // 区分手机号账号登录,1为账号登录,2为手机号或邮箱登录
-        type: 0, // 平台端区分：0->教师端 1->学生端 2->无端
-        platform: Setting.platformId
-      },
-      loginRules: {
-        account: [{ required: true, message: "请输入账号", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        code: [{ required: true, message: "请输入验证码", trigger: "blur" }]
-      },
-      verificationIMG: "",
-      phoneVisible: false, // 绑定手机号对话框
-      phone: "",
-      phoneCode: "",
-      phoneDisabled: false,
-      phoneTimer: null,
-      phoneBtnText: "发送验证码"
-    };
-  },
-  components: {
-    vFooter
-  },
-  created () {
-    this.getVerImg();
-  },
-  mounted () {
-    // 页面离开的时候销毁手机和邮箱验证码定时器
-    this.$once("hook:beforeDestroy", function () {
-      clearInterval(this.phoneTimer);
-      this.phoneTimer = null;
-    });
-  },
-  methods: {
-    ...mapMutations("user", [
-      "SET_ROLENAME", 'SET_FROM'
-    ]),
-    getVerImg () { // 获取验证码图片
-      this.loginForm.random = Math.floor(Math.random() * 999999999);
-      this.verificationIMG = this.api.verification + "?random=" + `${this.loginForm.random}`;
-    },
-    handleClick (tab, event) { // 切换标签
-      this.loginForm.account = "";
-      this.$refs.loginForm.clearValidate();
-      this.loginRules.account[0].message = tab.index === "1" ? "请输入账号" : "请输入手机号/邮箱";
-    },
-    submitFormLogin () { // 提交登录
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loginForm.distinguish = Number(this.activeName);
-          this.$post(this.api.logins, this.loginForm).then(res => {
-            if (res && res.status == 30001) {
-              this.phoneVisible = true;
-            }
-            this.getVerImg()
-            this.loginForm.code = ''
-            util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
-            this.SET_FROM(false)
-            this.getRole()
-            this.queryCustomer()
-          }).catch(res => {
-            this.getVerImg()
-            this.loginForm.code = ''
-          })
-        } else {
-          return util.errorMsg("请检查表单数据");
-        }
-      });
-    },
-    // 获取当前用户角色
-    getRole () {
-      this.$post(`${this.api.getUserAllRoleByToken}?platformId=${Setting.platformId}`).then(res => {
-        this.SET_ROLENAME(res)
-      }).catch(err => { })
-    },
-    queryCustomer () { // 查询是否是客户
-      const path = '/product/list' // 默认路径
-      this.$get(`${this.api.getUserRolesPermissionMenu}?platformId=${Setting.platformId}`).then(res => {
-        const list = res.permissionMenu[0].children
-        this.$router.push(list.find(e => e.path === path) ? path : list[0].path)
-      }).catch(err => { })
-    },
-    phoneCountdown () {
-      let count = 60;
-      if (!this.phoneTimer) {
-        this.phoneDisabled = true;
-        this.phoneTimer = setInterval(() => {
-          console.log("倒计时中");
-          if (count > 0) {
-            count--;
-            this.phoneBtnText = `${count}秒后重试`;
-          } else {
-            this.phoneDisabled = false;
-            clearInterval(this.phoneTimer);
-            this.phoneTimer = null;
-            this.phoneBtnText = `发送验证码`;
-          }
-        }, 1000);
-      }
-    },
-    sendPhoneCode () {
-      if (!this.phone) return util.warningMsg("请输入手机号");
-      if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
-      let data = {
-        platform: Setting.platformId,
-        phone: this.phone,
-        types: 2
-      };
-      this.$post(this.api.sendPhoneOrEmailCode, data).then(res => {
-        if (res.message.opener) {
-          this.phoneCountdown();
-          this.phoneOpener = res.message.opener;
-        } else {
-          util.errorMsg(res.message);
-        }
-      }).catch(res => { });
-    },
-    phoneSubmit () {
-      if (!this.phone) return util.warningMsg("请输入手机号");
-      if (!/^1[3456789]\d{9}$/.test(this.phone)) return util.warningMsg("请输入正确的手机号");
-      if (!this.phoneCode) return util.warningMsg("请输入验证码");
-      let data = {
-        phone: this.phone,
-        types: 2,
-        code: this.phoneCode,
-        opener: this.phoneOpener,
-        platform: Setting.platformId,
-        account: this.loginForm.account
-      };
-      this.$post(this.api.bindPhoneOrEmail, data).then(res => {
-        util.successMsg("绑定成功");
-        this.loginForm.phone = this.phone;
-        this.phoneVisible = false;
-
-        util.local.set(Setting.tokenKey, res.token, Setting.tokenExpires);
-        let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
-        this.$router.replace(redirect);
-        util.successMsg("登录成功");
-        this.queryCustomer();
-      }).catch(res => {
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.wrap {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  background-image: url(../../../assets/img/login-bg.png);
-  background-size: 100%;
-
-  .header {
-    width: 100%;
-    height: 60px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: #fff;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 18px;
-
-    .logo {
-      width: 150px;
-      margin-left: 20px;
-
-      &.hh {
-        width: 220px;
-      }
-    }
-  }
-
-  /deep/ .main {
-    position: absolute;
-    left: 50%;
-    top: 42px;
-    transform: translate(-50%, 0);
-    width: 1200px;
-    height: 82%;
-    margin-top: 60px;
-    background-image: url(../../../assets/img/login-input.png);
-    box-shadow: 0px 0px 79px 0px rgba(11, 15, 65, 0.36);
-    overflow: hidden;
-
-    .box {
-      width: 548px;
-      position: absolute;
-      left: 50%;
-      top: 50px;
-      transform: translate(-50%, 0);
-
-      .el-tabs__nav-scroll {
-        display: flex;
-        justify-content: center;
-      }
-
-      .el-tabs__nav-wrap::after {
-        background-color: #fff;
-        opacity: 0;
-
-        .el-tabs__active-bar {
-          background-color: #000;
-          border-radius: 2px;
-        }
-
-        .el-tabs__item {
-          padding: 0 90px;
-          color: #999;
-
-          &:hover {
-            color: #000;
-          }
-
-          &.is-active {
-            color: #333;
-            font-weight: bold;
-          }
-        }
-      }
-
-      .el-input__inner {
-        height: 80px;
-        line-height: 80px;
-        border: 1px solid rgba(220, 220, 220, 1);
-        border-radius: 2px;
-      }
-
-      .verification {
-        position: absolute;
-        top: 1px;
-        right: 1px;
-        width: 160px;
-        height: 78px;
-        cursor: pointer;
-      }
-
-      .submit {
-        width: 100%;
-        height: 88px;
-        margin-bottom: 50px;
-        font-weight: bold;
-        background: linear-gradient(90deg, rgba(94, 206, 253, 1), rgba(91, 67, 231, 1));
-        box-shadow: 0px 7px 27px 0px rgba(50, 129, 255, 0.51);
-        border-radius: 10px;
-      }
-    }
-  }
-
-  .footer {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/account/redirect/index.vue b/src/pages/account/redirect/index.vue
index 5c1de42..7b5dac7 100644
--- a/src/pages/account/redirect/index.vue
+++ b/src/pages/account/redirect/index.vue
@@ -16,14 +16,13 @@ export default {
     localStorage.removeItem('opened')
     localStorage.removeItem('review_token')
     localStorage.removeItem('reviewPath')
-    this.token ? this.setLogin() : this.$router.replace('/login')
+    this.token ? this.setLogin() : this.$store.dispatch('user/logout')
   },
   methods: {
     ...mapMutations("user", [
-      "SET_ROLENAME", 'SET_FROM'
+      "SET_ROLENAME"
     ]),
     setLogin () {
-      this.SET_FROM(true)
       Util.session.set(Setting.tokenKey, window.atob(decodeURI(this.token)))
       this.getOss()
       this.getRole()
diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue
index 7f69f3b..92cc7ff 100644
--- a/src/pages/achievement/info/course.vue
+++ b/src/pages/achievement/info/course.vue
@@ -71,8 +71,6 @@
             </div>
             <div>
               <el-button type="primary" @click="exportData">导出成绩列表</el-button>
-              <!-- <el-button type="primary"
-                     @click="exportReport">导出成绩详情</el-button> -->
             </div>
           </div>
           <el-table :data="listData" class="table" ref="table" :key="curTab" header-align="center"
@@ -351,30 +349,6 @@ export default {
         util.downloadFileDirect(`${practice ? '练习' : '考核'}成绩列表.xlsx`, new Blob([res.data]))
       }).catch(res => { })
     },
-    // 导出实验报告
-    exportReport () {
-      // 没选择数据，则导出全部
-      const list = this.multipleSelection.length ? this.multipleSelection : this.listDataAll
-      list.forEach(async e => {
-        if (e.reportId) {
-          try {
-            const { report, userScores } = await this.$get(`${this.api.reportDetail}?reportId=${e.reportId}`)
-            userScores.map((e, i) => {
-              if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            })
-            for (const i in report) {
-              if (report[i] && typeof report[i] === 'string') report[i] = report[i].replace(/<[^>]+>/g, '')
-            }
-            report.purpose = report.purpose.replace(/<[^>]+>/g, '')
-            const res = await this.$post(this.api[userScores.find(e => e.lcRuleRecords) ? 'exportBankExperimentReport' : 'exportLabReport'], {
-              ...report,
-              experimentalData: userScores
-            })
-            util.downloadFileDirect(`${e.userName}的实验报告.docx`, new Blob([res]))
-          } catch (e) { }
-        }
-      })
-    },
     handleDelete (row) { // 删除
       this.$confirm("确定要删除吗？", "提示", {
         type: "warning"
diff --git a/src/pages/achievement/list/project.vue b/src/pages/achievement/list/project.vue
index ea21a07..9333030 100644
--- a/src/pages/achievement/list/project.vue
+++ b/src/pages/achievement/list/project.vue
@@ -210,19 +210,12 @@ export default {
         ...this.form,
         mallId: cur.mallId || '',
         systemId: cur.systemId || '',
-        courseType: this.$parent.active === 'tab2' ? 1 : 0,
+        courseType: this.$parent.active === 'tab2' ? 0 : 1,
         pageNum: this.page,
         pageSize: this.pageSize,
       };
-      this.$post(this.api.getAchievementInfo, data).then(res => {
-        let list = []
-        if (this.$parent.active === 'tab3' && !permissions) {
-          list = res.page
-          this.total = res.total
-        } else {
-          list = res.page.records
-          this.total = res.page.total
-        }
+      this.$post(this.api.getAchievementInfo, data).then(({ page }) => {
+        const list = page.records
         list.map(e => {
           // isAdmin表示这个项目是不是内置的项目，如果为1 表示内置的项目，删除的前提条件就是这个项目删除了isdel=1以及courseDel=1 同时课程管理也移除了这个项目才能删除， 所以要系统内置的项目要满足这三个条件(1.为内置 2.中台删除了、3、课程里面也移除了)才能删除。是isAdmin为0就说明不是内置项目，为当前用户自己创建的项目，所以条件就是isDel为1直接删
           e.canDel = permissions ?
@@ -230,6 +223,7 @@ export default {
             (e.isAdmin === 0 && e.isDel === 1) || (e.isAdmin === 1 && e.isDel === 1 && e.courseDel === 1)
         })
         this.listData = list
+        this.total = page.total
         this.$nextTick(() => {
           this.loading = false
         });
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index f54bc4c..ea3b7df 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -139,11 +139,16 @@
 </template>
 
 <script>
-import util from "@/libs/util";
+import Setting from '@/setting'
+import Util from '@/libs/util'
+import Axios from 'axios'
 export default {
   data () {
     return {
       reportId: this.$route.query.reportId,
+      headers: {
+        token: Util.session.get(Setting.tokenKey)
+      },
       title: "实验报告",
       form: {
         className: "",
@@ -253,16 +258,20 @@ export default {
         if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
       }
       if (form.purpose) form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-      this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-        ...form,
-        experimentalData: list
-      }).then(res => {
-        console.log(res)
-        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
-        this.exporting = false
-      }).catch(res => {
+
+      try {
+        const res = await Axios.post(this.api[this.isLc ? 'exportBankExperimentReport' : 'exportLabReport'], {
+          ...form,
+          experimentalData: list
+        }, {
+          headers: this.headers,
+          responseType: 'blob'
+        })
+        const name = res.headers['content-disposition']
+        Util.downloadFileDirect(name ? decodeURI(name) : `实验报告.docx`, new Blob([res.data]))
+      } finally {
         this.exporting = false
-      })
+      }
     },
   }
 };
diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue
index 1456b65..c075f55 100644
--- a/src/pages/match/add/set.vue
+++ b/src/pages/match/add/set.vue
@@ -36,7 +36,7 @@
 
         <div class="inline-input">
           <!-- 选择系统 -->
-          <el-select v-if="courseSystem" v-model="systemId" placeholder="请选择系统" @change="getProject">
+          <el-select v-if="courseSystem" v-model="systemId" placeholder="请选择系统" clearable @change="getProject">
             <el-option v-for="(item, i) in services" :key="i" :label="item.systemName" :value="item.systemId">
             </el-option>
           </el-select>
@@ -243,7 +243,8 @@ export default {
       })
       this.services = data
       if (data.length) {
-        this.systemId = this.form.systemId || data[0].systemId
+        // this.systemId = this.form.systemId || ''
+        this.systemId = ''
         this.getProject()
         this.loadIns = Loading.service()
       }
@@ -298,7 +299,8 @@ export default {
           const { data } = await this.$get(this.api.getProjectListOfSystem, {
             pageNum: this.page,
             pageSize: this.pageSize,
-            systemId: this.systemId
+            systemId: this.systemId,
+            type: this.isTheory ? 3 : 1
           })
           if (this.isTheory) {
             data.records.forEach(e => {
diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue
index 7b562f7..a01f533 100644
--- a/src/pages/match/manage/matchSignup.vue
+++ b/src/pages/match/manage/matchSignup.vue
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import Util from "@/libs/util";
+import Util from '@/libs/util'
 import axios from 'axios'
 import Setting from "@/setting";
 export default {
diff --git a/src/pages/match/manage/trialReport.vue b/src/pages/match/manage/trialReport.vue
index 4919479..529d200 100644
--- a/src/pages/match/manage/trialReport.vue
+++ b/src/pages/match/manage/trialReport.vue
@@ -139,11 +139,16 @@
 </template>
 
 <script>
-import util from "@/libs/util";
+import Setting from '@/setting'
+import Util from '@/libs/util'
+import Axios from 'axios'
 export default {
   data () {
     return {
       reportId: this.$route.query.reportId,
+      headers: {
+        token: Util.session.get(Setting.tokenKey)
+      },
       title: "实验报告",
       form: {
         className: "",
@@ -216,7 +221,7 @@ export default {
       this.expData = list
       this.loading = false
     },
-    exportPage () {
+    async exportPage () {
       this.exporting = true
       const form = Object.assign(this.form, this.infoData)
       const list = JSON.parse(JSON.stringify(this.expData))
@@ -225,23 +230,26 @@ export default {
         if (item && item.runThePicture) e.runThePicture = item.runThePicture
         if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
         e.id = i + 1
-        // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
         if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
       })
       for (const i in form) {
         if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
       }
       form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-      this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-        ...form,
-        experimentalData: list
-      }).then(res => {
-        console.log(res)
-        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
-        this.exporting = false
-      }).catch(res => {
+
+      try {
+        const res = await Axios.post(this.api[this.isLc ? 'exportBankExperimentReport' : 'exportLabReport'], {
+          ...form,
+          experimentalData: list
+        }, {
+          headers: this.headers,
+          responseType: 'blob'
+        })
+        const name = res.headers['content-disposition']
+        Util.downloadFileDirect(name ? decodeURI(name) : `实验报告.docx`, new Blob([res.data]))
+      } finally {
         this.exporting = false
-      })
+      }
     },
   }
 };
diff --git a/src/pages/resourse/list/index.vue b/src/pages/resourse/list/index.vue
index c3fb175..49f1938 100644
--- a/src/pages/resourse/list/index.vue
+++ b/src/pages/resourse/list/index.vue
@@ -85,10 +85,12 @@
       <el-table-column prop="editor" label="编辑人" width="130" align="center"></el-table-column>
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="scope">
+          <template v-if="scope.row.isDownload || active">
           <el-button type="text" @click="edit(scope.row)">编辑</el-button>
           <el-button type="text" @click="download(scope.row)">下载</el-button>
+        </template>
           <el-button type="text" @click="preview(scope.row)">预览</el-button>
-          <el-button type="text" @click="del(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.isDownload || active" type="text" @click="del(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index 41249a5..d643f69 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -1009,8 +1009,20 @@ export default {
     async exportData () {
       if (this.listData.length) {
         this.exporting = true
-        // 有选择数据，则导出已选择的，否则导出全部
-        const res = await axios.post(this.api.excelExportStudentList, this.multipleSelection.length ? this.multipleSelection : [], {
+        // 有选择数据，则导出已选择的，否则传当前列表参数进去导
+        let data = {
+          architectureId: this.architectureId,
+          level: this.orgLevel,
+          keyWord: this.keyWord,
+          pageNum: this.page,
+          pageSize: this.pageSize
+        }
+        if (this.multipleSelection.length) {
+          data = {
+            studentList: this.multipleSelection
+          }
+        }
+        const res = await axios.post(this.api.excelExportStudentList, data, {
           headers: this.headers,
           responseType: 'blob'
         })
diff --git a/src/router/permission.js b/src/router/permission.js
index 8aae291..c75215c 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -8,8 +8,8 @@ router.beforeEach((to, from, next) => {
   document.title = Setting.titleSuffix
   const role = util.session.get(Setting.tokenKey)
   if (!role && !whiteList.includes(to.path)) {
-    store.dispatch('user/logout')
+    Setting.isDev || store.dispatch('user/logout')
   } else {
     next()
   }
-});
\ No newline at end of file
+})
\ No newline at end of file
diff --git a/src/router/routes.js b/src/router/routes.js
index f76e722..756ac84 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -12,7 +12,7 @@ const frameIn = [
   // 默认路由配置
   {
     path: "/",
-    redirect: "/login"
+    redirect: "/redirect"
   },
   {
     path: "/",
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1da967a..a48f28a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -18,7 +18,6 @@ export default {
     dataTime: "",
     roleName: '',
     schoolId: '',
-    fromClient: false, // 是否从学生端登录
     logView: false // 是否查询过日志状态，如果有，则不再调接口
   },
   mutations: {
@@ -44,9 +43,6 @@ export default {
     SET_ROLENAME: (state, roleName) => {
       state.roleName = roleName
     },
-    SET_FROM: (state, fromClient) => {
-      state.fromClient = fromClient
-    },
     SET_SCHOOLID: (state, schoolId) => {
       state.schoolId = schoolId
     },
@@ -85,14 +81,11 @@ export default {
         post(api.logout).then(() => {
           util.local.remove(Setting.storeKey)
           util.local.remove(Setting.tokenKey)
-          if (state.fromClient) {
-            util.cookies.remove('serverLogin')
-            location.href = Setting.isDev
-              ? `http://${location.hostname}:8082/#/`
-              : `${location.origin}/#/login`
-          } else {
-            location.reload()
-          }
+          util.session.remove(Setting.tokenKey)
+          window.opener && window.opener.location.reload()
+          location.href = Setting.isDev
+            ? `http://${location.hostname}:8082/#/`
+            : `${location.origin}/#/login`
           resolve()
         }).catch(error => {
           reject(error)