bug修改

src/modules/grading/Grading.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="grading home">
-    <view-header key="1" :show-reset-pwd="false" v-if="IS_ADMIN">
+    <view-header
+      key="1"
+      :show-reset-pwd="false"
+      v-if="IS_ADMIN || IS_SUPER_ADMIN"
+    >
       <div class="grading-subnav" slot="navSub">
         <div class="grading-title">
           <h1>{{ curSubject.name }}</h1>

src/modules/inspection/InspectionActionLogs.vue

@@ -192,7 +192,7 @@ export default {
       this.filter.workId = this.works[0].id;
       this.subjects = this.works[0].subjects;
       this.filter.subject = this.subjects[0].subject;
-      this.getList();
+      this.toSearch();
     },
     async getActionTypeList() {
       this.actionTypes = await logTypeList();

src/modules/main/OrgManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="org-manage home">
-    <view-header class="home-header"></view-header>
+    <view-header class="home-header" :show-reset-pwd="false"></view-header>
     <div class="home-body">
       <div class="home-main">
         <div class="part-box-head">

src/modules/main/StudentScore.vue

@@ -211,6 +211,10 @@ export default {
         return;
       }
       const data = await studentScoreList(this.filter);
+      if (!data.length) {
+        this.$Message.error("无此考生");
+        return;
+      }
       data.map(student => {
         student.scores.map(score => {
           score.title = score.subjectName;
@@ -222,7 +226,7 @@ export default {
     },
     toPage(page) {
       this.current = page;
-      this.curStudent = this.students[page - 1];
+      this.curStudent = this.students[page - 1] || {};
     },
     workChange() {
       this.filter.subject = null;

src/modules/main/WorkManage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="work home">
-    <view-header class="home-header"></view-header>
+    <view-header class="home-header" :show-reset-pwd="false"></view-header>
 
     <div class="home-body">
       <div class="home-main">

src/modules/main/components/ModifyOrg.vue

@@ -151,7 +151,20 @@ export default {
     open() {
       this.modalIsShow = true;
     },
+    checkName() {
+      if (this.isEdit) return true;
+      if (this.modalForms[0].name === this.modalForms[1].name) {
+        this.$Message.error("机构名称和项目经理不可相同！");
+        return;
+      }
+      if (this.modalForms[0].loginName === this.modalForms[1].loginName) {
+        this.$Message.error("机构账号和项目账号不可相同！");
+        return;
+      }
+      return true;
+    },
     async submit() {
+      if (!this.checkName()) return;
       const validAll = this.modalForms.map((item, index) => {
         return this.$refs[`modalFormComp${index}`][0].validate();
       });

src/modules/mark/MarkHome.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="mark-home home">
-    <view-header key="1" :show-reset-pwd="false" v-if="IS_ADMIN">
+    <view-header
+      key="1"
+      :show-reset-pwd="false"
+      v-if="IS_ADMIN || IS_SUPER_ADMIN"
+    >
       <div class="grading-subnav" slot="navSub">
         <div class="grading-title">
           <h1>{{ curSubject.name }}</h1>

src/modules/mark/components/MarkAction.vue

@@ -144,7 +144,7 @@
         </div>
       </div>
     </div>
-    <div class="action-mark-input">
+    <div class="action-mark-input" v-if="rights.levelList">
       <Form
         ref="ManualScoreForm"
         label-position="left"
@@ -447,8 +447,8 @@ export default {
     updateScoreList() {
       let scores = [];
       if (this.curLevel.levelType === "ADMITED") {
-        const { minScore, maxScore } = this.curLevel;
-        for (let i = minScore; i <= maxScore; i++) {
+        const { minScore, maxScore, intervalScore } = this.curLevel;
+        for (let i = minScore; i <= maxScore; i += intervalScore) {
           scores.push(i);
         }
       } else {