bugfix

src/modules/base/components/ModifyMajor.vue

@@ -25,11 +25,11 @@
         ></el-input>
       </el-form-item>
       <el-form-item prop="collegeId" label="所属机构：">
-        <org-select
+        <college-select
           v-model="modalForm.collegeId"
           style="width:100%;"
           placeholder="所属机构"
-        ></org-select>
+        ></college-select>
       </el-form-item>
     </el-form>
     <div slot="footer">

src/modules/base/views/ApproveRecordManage.vue

@@ -132,6 +132,7 @@
 
     <!-- ModifyTaskApply -->
     <modify-task-apply
+      v-if="checkPrivilege('link', 'preview')"
       ref="ModifyTaskApply"
       edit-type="PREVIEW"
       :instance="curExamTask"

src/modules/base/views/CourseSimpleManage.vue

@@ -80,6 +80,7 @@
 
     <!-- ModifyCourseSimple -->
     <modify-course-simple
+      v-if="checkPrivilege('button', 'add')"
       ref="ModifyCourseSimple"
       :instance="curCourse"
       @modified="getList"

src/modules/base/views/ExamManage.vue

@@ -127,12 +127,14 @@
     <!-- modify-exam -->
     <modify-exam
       ref="ModifyExam"
+      v-if="checkPrivilege('link', 'edit')"
       :instance="curExam"
       @modified="examModified"
     ></modify-exam>
     <!-- modify-exam-config -->
     <modify-exam-config
       ref="ModifyExamConfig"
+      v-if="checkPrivilege('link', 'Set')"
       :exam="curExam"
     ></modify-exam-config>
   </div>

src/modules/base/views/RoleManage.vue

@@ -113,6 +113,7 @@
     </div>
     <!-- ModifyRole -->
     <modify-role
+      v-if="checkPrivilege('button', 'add') || checkPrivilege('link', 'edit')"
       ref="ModifyRole"
       :instance="curRole"
       @modified="getList"

src/modules/exam/views/TaskApplyManage.vue

@@ -208,6 +208,7 @@
 
     <!-- ModifyTaskApply -->
     <modify-task-apply
+      v-if="checkPrivilege('link', 'edit') || checkPrivilege('link', 'preview')"
       ref="ModifyTaskApply"
       :edit-type="editType"
       :instance="curExamTask"

src/modules/exam/views/TaskPaperManage.vue

@@ -185,6 +185,7 @@
 
     <!-- ModifyTaskPaper -->
     <modify-task-paper
+      v-if="checkPrivilege('link', 'edit') || checkPrivilege('link', 'preview')"
       :instance="curPaper"
       :edit-type="editType"
       ref="ModifyTaskPaper"
@@ -192,6 +193,7 @@
     ></modify-task-paper>
     <!-- PublishPrintTask -->
     <publish-print-task
+      v-if="checkPrivilege('link', 'publish')"
       :instance="curPaper"
       ref="PublishPrintTask"
     ></publish-print-task>

src/modules/exam/views/TaskReviewManage.vue

@@ -207,6 +207,10 @@
 
     <!-- ModifyTaskApply -->
     <modify-task-apply
+      v-if="
+        checkPrivilege('link', 'notReviewEdit') ||
+          checkPrivilege('link', 'reviewPreview')
+      "
       ref="ModifyTaskApply"
       :edit-type="editType"
       :instance="curExamTask"

src/modules/print/router.js

@@ -4,7 +4,6 @@ import BusinessDataExport from "./views/BusinessDataExport.vue";
 import BusinessDataDetail from "./views/BusinessDataDetail.vue";
 import PlanLinkPaper from "./views/PlanLinkPaper.vue";
 import PrintTaskManage from "./views/PrintTaskManage.vue";
-import PrintProgressManage from "./views/PrintProgressManage.vue";
 
 export default [
   {
@@ -31,10 +30,5 @@ export default [
     path: "/print/print-task-manage",
     name: "PrintTaskManage",
     component: PrintTaskManage
-  },
-  {
-    path: "/print/print-progress-manage",
-    name: "PrintProgressManage",
-    component: PrintProgressManage
   }
 ];

src/modules/print/views/PrintPlanManage.vue

@@ -183,6 +183,11 @@
 
     <!-- ModifyPrintPlan -->
     <modify-print-plan
+      v-if="
+        checkPrivilege('link', 'preview') ||
+          checkPrivilege('link', 'edit') ||
+          checkPrivilege('button', 'add')
+      "
       ref="ModifyPrintPlan"
       :instance="curPrintPlan"
       :edit-type="editType"

src/modules/print/views/PrintProgressManage.vue

@@ -1,15 +0,0 @@
-<template>
-  <div class="PrintProgressManage">
-    PrintProgressManage
-  </div>
-</template>
-
-<script>
-export default {
-  name: "PrintProgressManage",
-  data() {
-    return {};
-  },
-  methods: {}
-};
-</script>

src/modules/stmms/views/ScoreArchive.vue

@@ -171,6 +171,7 @@
 
     <!-- image-preview -->
     <simple-image-preview
+      v-if="checkPrivilege('link', 'Preview')"
       :cur-image="curImage"
       @on-prev="toPrevImage"
       @on-next="toNextImage"

src/modules/stmms/views/UploadStructure.vue

@@ -117,6 +117,7 @@
     </div>
 
     <UploadPaperAnswerDialog
+      v-if="checkPrivilege('link', 'Upload')"
       ref="UploadPaperAnswerDialog"
       :instance="curTask"
       @modified="delayUpdateList"

src/plugins/axios.js

@@ -146,9 +146,13 @@ const errorDataCallback = response => {
 
   const error = response.data;
   let message = error.message || error.error || "请求错误";
-  const unauthCodes = [401, 403];
+  const unauthStatus = [401, 403];
+  const unauthDataCodes = [401001];
 
-  if (unauthCodes.includes(response.status)) {
+  if (
+    unauthStatus.includes(response.status) &&
+    !unauthDataCodes.includes(error.code)
+  ) {
     if (unauthMsgBoxIsShow) return error;
 
     const exposeMsgs = ["系统授权信息已过期，请联系系统管理员激活!"];
@@ -158,7 +162,6 @@ const errorDataCallback = response => {
       : "身份验证失效，请重新登录";
     MessageBox.confirm(message, "重新登陆?", {
       type: "warning",
-
       closeOnClickModal: false,
       closeOnPressEscape: false,
       showClose: false,