Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/basic/view/campus.vue

@@ -173,7 +173,7 @@
         </el-dialog>
 
         <!-- 导入弹窗 -->
-        <el-dialog title="导入窗口" width="460px" :visible.sync="impDialog">
+        <el-dialog title="导入窗口" width="520px" :visible.sync="impDialog">
           <el-form>
             <el-row>
               <el-form-item style="margin-left:20px">
@@ -192,17 +192,37 @@
                   :auto-upload="false"
                   :multiple="false"
                 >
-                  <el-button size="small" slot="trigger" type="primary">
+                  <el-button
+                    icon="el-icon-search"
+                    size="small"
+                    slot="trigger"
+                    type="primary"
+                  >
                     选择文件
                   </el-button>
                   &nbsp;
-                  <el-button size="small" type="primary" @click="submitUpload">
+                  <el-button
+                    icon="el-icon-check"
+                    size="small"
+                    type="primary"
+                    @click="submitUpload"
+                  >
                     确认上传
                   </el-button>
-                  <el-button size="small" type="danger" @click="removeFile">
+                  <el-button
+                    icon="el-icon-refresh"
+                    size="small"
+                    type="primary"
+                    @click="removeFile"
+                  >
                     清空文件
                   </el-button>
-                  <el-button size="small" type="info" @click="exportFile">
+                  <el-button
+                    icon="el-icon-download"
+                    size="small"
+                    type="primary"
+                    @click="exportFile"
+                  >
                     下载模板
                   </el-button>
                   <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
@@ -329,6 +349,7 @@ export default {
   data() {
     return {
       isSuperAdmin: false,
+      paginationShow: false,
       rootOrgList: [],
       formSearch: {
         parentId: null,

src/modules/basic/view/course.vue

@@ -210,7 +210,7 @@
         </el-dialog>
 
         <!-- 导入弹窗 -->
-        <el-dialog title="导入窗口" width="420px" :visible.sync="impDialog">
+        <el-dialog title="导入窗口" width="520px" :visible.sync="impDialog">
           <el-form>
             <el-row>
               <el-form-item style="margin-left:20px">
@@ -229,17 +229,37 @@
                   :auto-upload="false"
                   :multiple="false"
                 >
-                  <el-button size="small" slot="trigger" type="primary">
+                  <el-button
+                    size="small"
+                    slot="trigger"
+                    type="primary"
+                    icon="el-icon-search"
+                  >
                     选择文件
                   </el-button>
                   &nbsp;
-                  <el-button size="small" type="success" @click="submitUpload">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="submitUpload"
+                    icon="el-icon-check"
+                  >
                     确认上传
                   </el-button>
-                  <el-button size="small" type="danger" @click="removeFile">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="removeFile"
+                    icon="el-icon-refresh"
+                  >
                     清空文件
                   </el-button>
-                  <el-button size="small" type="info" @click="exportFile">
+                  <el-button
+                    size="small"
+                    type="primary"
+                    @click="exportFile"
+                    icon="el-icon-download"
+                  >
                     下载模板
                   </el-button>
                   <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>
@@ -347,18 +367,18 @@
         <el-dialog
           title="添加关联专业"
           :visible.sync="addRelationDialog"
-          width="420px"
+          width="380px"
+          @close="() => this.$refs.addRelationForm.clearValidate()"
         >
           <el-form
             :inline="true"
             inline-message
             :model="addRelationForm"
             ref="addRelationForm"
-            label-width="100px"
             :rules="addRelationRules"
           >
             <el-row>
-              <el-form-item label="专业" class="pull-left" prop="specialtyId">
+              <el-form-item label="专业" prop="specialtyId">
                 <el-select
                   class="input"
                   remote

src/modules/basic/view/exam_site.vue

@@ -53,7 +53,7 @@
                   icon="el-icon-arrow-left"
                   @click="back"
                 >
-                  退回
+                  返回
                 </el-button>
               </el-form-item>
             </el-row>
@@ -64,7 +64,7 @@
             title="考点信息"
             width="450px"
             :visible.sync="examSiteDialog"
-            @before-close="dialogBeforeClose"
+            @close="dialogBeforeClose"
           >
             <el-form
               :inline="true"
@@ -76,7 +76,7 @@
               label-width="90px"
             >
               <el-row>
-                <el-form-item label="学习中心" label-width="120px" prop="code">
+                <el-form-item label="学习中心" label-width="120px">
                   <el-input
                     class="pull_length"
                     v-model="orgName"

src/modules/basic/view/specially.vue

@@ -227,11 +227,13 @@
       <!-- 添加关联 -->
       <el-dialog
         title="添加关联课程"
-        width="500px"
+        width="380px"
         :visible.sync="addRelationDialog"
+        @close="() => this.$refs.addRelationForm.clearValidate()"
       >
         <el-form
           :inline="true"
+          inline-message
           :model="addRelationForm"
           ref="addRelationForm"
           :rules="addRelationRules"
@@ -257,6 +259,8 @@
                 />
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row class="d-flex justify-content-center">
             <el-button type="primary" @click="submitAddRelationForm">
               保 存
             </el-button>
@@ -328,7 +332,7 @@
       </div>
 
       <!-- 导入弹窗 -->
-      <el-dialog title="导入窗口" width="420px" :visible.sync="impDialog">
+      <el-dialog title="导入窗口" width="520px" :visible.sync="impDialog">
         <el-form>
           <el-row>
             <el-form-item style="margin-left:20px">
@@ -347,17 +351,37 @@
                 :auto-upload="false"
                 :multiple="false"
               >
-                <el-button size="small" slot="trigger" type="primary">
+                <el-button
+                  size="small"
+                  slot="trigger"
+                  type="primary"
+                  icon="el-icon-search"
+                >
                   选择文件
                 </el-button>
                 &nbsp;
-                <el-button size="small" type="success" @click="submitUpload">
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="submitUpload"
+                  icon="el-icon-check"
+                >
                   确认上传
                 </el-button>
-                <el-button size="small" type="danger" @click="removeFile">
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="removeFile"
+                  icon="el-icon-refresh"
+                >
                   清空文件
                 </el-button>
-                <el-button size="small" type="info" @click="exportFile">
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="exportFile"
+                  icon="el-icon-download"
+                >
                   下载模板
                 </el-button>
                 <div slot="tip" class="el-upload__tip">只能上传xlsx文件</div>

src/modules/basic/view/user.vue

@@ -214,6 +214,7 @@
         <el-dialog title="编辑用户" width="450px" :visible.sync="updateDialog">
           <el-form
             :inline="true"
+            inline-message
             :model="userForm"
             ref="updateForm"
             :rules="rules"
@@ -551,20 +552,21 @@ export default {
           }
         ],
         mobile: [
-          {
-            message: "请输入联系方式",
-            trigger: "blur"
-          }
+          // {
+          //   message: "请输入联系方式",
+          //   trigger: "blur"
+          // }
         ],
         rootOrgId: [
           {
             validator: validateRootOrg,
-            trigger: "blur,change"
+            trigger: "blur"
           }
         ],
         orgId: [],
         roleIds: [
           {
+            required: true,
             validator: validateRoles,
             trigger: "blur,change"
           }

src/modules/examwork/view/offlineExam.vue

@@ -258,6 +258,8 @@ export default {
                 type: "success",
                 message: "新增成功"
               });
+              this.examId = response.data.id;
+              this.form.id = this.examId;
               this.$router.push({
                 path: "/examwork/offlineExam/" + response.data.id
               });

src/modules/examwork/view/onlineExam.vue

@@ -955,6 +955,8 @@ export default {
                 type: "success",
                 message: "新增成功"
               });
+              this.examId = response.data.id;
+              this.form.id = this.examId;
               this.$router.push({
                 path: "/examwork/onlineExam/" + response.data.id
               });

src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -582,7 +582,7 @@ export default {
       );
     },
     importOrgSettings() {
-      this.fileList = [];
+      this.removeFile();
       this.orgSettingsImportDialog = true;
     },
 
@@ -595,8 +595,7 @@ export default {
         message: "上传成功",
         type: "success"
       });
-      this.fileLoading = false;
-      this.studentImportDialog = false;
+      this.orgSettingsImportDialog = false;
       this.resetPageAndSearch();
     },
     uploadError(response, file, fileList) {
@@ -611,12 +610,13 @@ export default {
           type: "error"
         });
       }
-      this.fileLoading = false;
     },
     //清空文件
     removeFile() {
-      // this.fileList = [];
-      this.$refs.upload.clearFiles();
+      this.fileList = [];
+      if (this.$refs.upload) {
+        this.$refs.upload.clearFiles();
+      }
     },
     //确定上传
     submitUpload() {
@@ -648,7 +648,6 @@ export default {
             message: "上传文件必须为xlsx格式",
             type: "error"
           });
-          this.fileList = [];
           return false;
         }
       }

src/modules/examwork/view/practiceExam.vue

@@ -457,6 +457,8 @@ export default {
                 type: "success",
                 message: "新增成功"
               });
+              this.examId = response.data.id;
+              this.form.id = this.examId;
               this.$router.push({
                 path: "/examwork/practiceExam/" + response.data.id
               });

src/modules/examwork/view/printExam.vue

@@ -218,6 +218,8 @@ export default {
                 type: "success",
                 message: "新增成功"
               });
+              this.examId = response.data.id;
+              this.form.id = this.examId;
               this.$router.push({
                 path: "/examwork/printExam/" + response.data.id
               });

src/modules/examwork/view/traditionExam.vue

@@ -211,6 +211,8 @@ export default {
                 type: "success",
                 message: "新增成功"
               });
+              this.examId = response.data.id;
+              this.form.id = this.examId;
               this.$router.push({
                 path: "/examwork/traditionExam/" + response.data.id
               });
@@ -239,4 +241,4 @@ export default {
 .input >>> .el-input__inner {
   -webkit-appearance: button;
 }
-</style>
+</style>

src/modules/marking/views/Marking.vue

@@ -203,7 +203,7 @@
           <small class="marktitle titlefont marksign">
             <el-button type="success" @click="backIndex" size="small">
               <!-- <v-icon name="sign-out-alt" scale="0.5"/> -->
-              <span class="titlefont">退回</span>
+              <span class="titlefont">返回</span>
             </el-button>
           </small>
         </span>

src/modules/portal/views/home/Home.vue

@@ -51,7 +51,12 @@
     </el-container>
 
     <!-- 添加用户信息弹出框 -->
-    <el-dialog title="个人信息" width="400px" :visible.sync="userDialog">
+    <el-dialog
+      title="个人信息"
+      width="400px"
+      :visible.sync="userDialog"
+      @close="() => this.$refs.passForm.clearValidate()"
+    >
       <el-tabs value="first">
         <el-tab-pane label="用户权限" name="first">
           <el-form :inline="true" label-position="right" label-width="90px">
@@ -72,17 +77,18 @@
         <el-tab-pane label="修改密码" name="second">
           <el-form
             :inline="true"
+            inline-message
             :model="passForm"
             ref="passForm"
             :rules="passRules"
             label-position="right"
-            label-width="90px"
+            label-width="80px"
           >
             <el-row>
-              <el-form-item label="密码" label-width="120px" prop="pass">
+              <el-form-item label="密码" prop="pass">
                 <el-input
                   type="password"
-                  class="pull_length"
+                  style="width: 150px"
                   v-model="passForm.pass"
                   auto-complete="off"
                   placeholder="请输入密码"
@@ -90,14 +96,10 @@
               </el-form-item>
             </el-row>
             <el-row>
-              <el-form-item
-                label="确认密码"
-                label-width="120px"
-                prop="checkPass"
-              >
+              <el-form-item label="确认密码" prop="checkPass">
                 <el-input
                   type="password"
-                  class="pull_length"
+                  style="width: 150px"
                   v-model="passForm.checkPass"
                   auto-complete="off"
                   placeholder="请输入确认密码"

src/modules/print/view/ExamStructure.vue

@@ -99,7 +99,6 @@
                 icon="el-icon-delete"
                 @click="removeStructure(scope.row)"
                 :disabled="!hasPermit"
-                plain
                 >删除
               </el-button>
             </template>

src/modules/print/view/ProjectStatistic.vue

@@ -139,7 +139,6 @@
                 v-if="scope.row.btnType == 'OTHER'"
                 @click="removeOtherSetting(scope.row)"
                 :disabled="!hasPermit"
-                plain
                 >删除
               </el-button>
             </template>

src/plugins/axios.js

@@ -82,6 +82,15 @@ _axiosWithoutResponseInterceptors.interceptors.request.use(
     if (config.url.includes("/login") === false) {
       if (!wk_token) {
         const user = JSON.parse(window.sessionStorage.getItem("user"));
+        if (!user) {
+          Vue.prototype.$alert("登录失效,请重新登录！", "提示", {
+            confirmButtonText: "确定",
+            callback: () => {
+              router.push("/login/" + "?orgId=" + wk_orgId);
+            }
+          });
+          return;
+        }
         wk_token = user.token;
         wk_key = user.key;
         wk_orgId = user.rootOrgId;
@@ -128,7 +137,7 @@ _axios.interceptors.response.use(
 
     // 登录失效 跳转登录页面
     if (status == 403 || status == 401) {
-      Vue.prototype.$alert("登录失效,请重新登录！", "提示", {
+      Vue.prototype.$alert("登录失效，请重新登录！", "提示", {
         confirmButtonText: "确定",
         callback: () => {
           router.push("/login/" + "?orgId=" + wk_orgId);
@@ -143,6 +152,11 @@ _axios.interceptors.response.use(
         }
       });
       return Promise.reject(error);
+    } else if (status == 502) {
+      Vue.prototype.$alert("服务器异常！", "提示", {
+        confirmButtonText: "确定"
+      });
+      return Promise.reject(error);
     }
 
     if (status != 200) {
@@ -176,6 +190,53 @@ _axios.interceptors.response.use(
   }
 );
 
+// Add a response interceptor
+_axiosWithoutResponseInterceptors.interceptors.response.use(
+  response => {
+    return response;
+  },
+  error => {
+    if (!error.response) {
+      Vue.prototype.$notify({
+        showClose: true,
+        message: "网络连接异常，请检查网络设置。",
+        type: "error"
+      });
+      return Promise.reject(error);
+    }
+    // 这里是返回状态码不为200时候的错误处理
+    let status = error.response.status;
+
+    // 登录失效 跳转登录页面
+    if (status == 403 || status == 401) {
+      Vue.prototype.$alert("登录失效，请重新登录！", "提示", {
+        confirmButtonText: "确定",
+        callback: () => {
+          router.push("/login/" + "?orgId=" + wk_orgId);
+        }
+      });
+      return Promise.reject(error);
+    } else if (status == 405) {
+      Vue.prototype.$alert("没有权限！", "提示", {
+        confirmButtonText: "确定",
+        callback: () => {
+          router.push("/login/" + "?orgId=" + wk_orgId);
+        }
+      });
+      return Promise.reject(error);
+    } else if (status == 502) {
+      Vue.prototype.$alert("服务器异常！", "提示", {
+        confirmButtonText: "确定"
+      });
+      return Promise.reject(error);
+    }
+
+    if (status != 200) {
+      return Promise.reject(error);
+    }
+  }
+);
+
 Plugin.install = function(Vue) {
   Vue.$http = _axiosWithoutResponseInterceptors;
   Object.defineProperties(Vue.prototype, {

src/plugins/vueLifecylceLogs.js

@@ -45,7 +45,7 @@ const injectMethods = [
   { name: "destroyed", style: "color: red; font-weight: bold" }
 ];
 
-const injecRoutertMethods = [
+const injectRouterMethods = [
   { name: "beforeRouteEnter", style: ["background: #aaa", "color: #0000aa;"] },
   { name: "beforeRouteUpdate", style: ["background: #aaa", "color: #0000aa;"] },
   { name: "beforeRouteLeave", style: ["background: #aaa", "color: #0000aa;"] }
@@ -63,6 +63,12 @@ for (const m of injectMethods) {
     if (!componentNameMatch(this.$options.name)) {
       if (!startLogging) {
         startLogging = true;
+        if (groupCollapsed) {
+          console.groupCollapsed("Vue lifecyle logs");
+        } else {
+          console.group("Vue lifecyle logs");
+        }
+
         loggingTime = Date.now();
       }
       console.log(
@@ -73,7 +79,7 @@ for (const m of injectMethods) {
   };
 }
 
-for (const m of injecRoutertMethods) {
+for (const m of injectRouterMethods) {
   lifeCycleMixins[m.name] = function(to, from, next) {
     if (!startLogging) {
       startLogging = true;

vue.config.js

@@ -51,6 +51,7 @@ module.exports = {
     proxy
   },
   configureWebpack: {
+    devtool: "source-map",
     plugins: [
       // Ignore all locale files of moment.js
       new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)