zhangjie 9 місяців тому
батько
коміт
c2028f7b97

+ 2 - 2
src/modules/base/views/ExamStudentManage.vue

@@ -235,12 +235,12 @@
         ></el-table-column>
         <el-table-column
           prop="examPlace"
-          label="考点(校区)"
+          label="校区(考点)"
           width="160"
         ></el-table-column>
         <el-table-column
           prop="examRoom"
-          label="考场(考试教室)"
+          label="考试教室(考场)"
           width="160"
         ></el-table-column>
         <el-table-column

+ 3 - 0
src/modules/mark/components/markParam/MarkParamStructure.vue

@@ -568,6 +568,9 @@ export default {
           if (!item.mainTitle) {
             errorFields.push("大题名称");
           }
+          if (!item.questionType) {
+            errorFields.push("题型");
+          }
           if (!item.mainNumber) {
             errorFields.push("大题号");
           }

+ 6 - 1
src/modules/target/components/training-plan/TrainingPlanCourse.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="training-plan-matrix">
     <div class="part-box part-box-pad">
-      <div class="box-justify mb-2">
+      <div
+        v-if="checkPrivilege('link', 'canEditRequirement')"
+        class="box-justify mb-2"
+      >
         <div></div>
         <el-button
           type="primary"
@@ -20,6 +23,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="checkPrivilege('link', 'canEditRequirement')"
           class-name="action-column"
           label="操作"
           width="140"
@@ -53,6 +57,7 @@
 
     <!-- AddTrainingPlanCourse -->
     <add-training-plan-course
+      v-if="checkPrivilege('link', 'canEditRequirement')"
       ref="AddTrainingPlanCourse"
       :row-data="rowData"
       @modified="getList"

+ 1 - 0
src/modules/target/components/training-plan/TrainingPlanMatrix.vue

@@ -19,6 +19,7 @@
             <template slot-scope="scope">
               <el-checkbox
                 v-model="scope.row.targetList[cindex].enable"
+                :disabled="!checkPrivilege('link', 'canEditRequirement')"
                 @change="matrixChange"
               ></el-checkbox>
             </template>

+ 7 - 1
src/modules/target/components/training-plan/TrainingPlanRequirement.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="training-plan-requirement">
     <div class="part-box part-box-pad">
-      <div class="box-justify mb-2">
+      <div
+        v-if="checkPrivilege('link', 'canEditRequirement')"
+        class="box-justify mb-2"
+      >
         <div></div>
         <el-button
           type="primary"
@@ -21,6 +24,7 @@
         <el-table-column prop="content" label="内容" min-width="300">
         </el-table-column>
         <el-table-column
+          v-if="checkPrivilege('link', 'canEditRequirement')"
           class-name="action-column"
           label="操作"
           width="180"
@@ -54,12 +58,14 @@
 
     <!-- ModifyTrainingPlanRequirement -->
     <modify-training-plan-requirement
+      v-if="checkPrivilege('link', 'canEditRequirement')"
       ref="ModifyTrainingPlanRequirement"
       :instance="curRow"
       @modified="getList"
     ></modify-training-plan-requirement>
     <!-- ModifyTrainingPlanRequirementPredict -->
     <modify-training-plan-requirement-predict
+      v-if="checkPrivilege('link', 'canEditRequirement')"
       ref="ModifyTrainingPlanRequirementPredict"
       :row-data="rowData"
       @modified="predictChange"

+ 9 - 1
src/modules/target/components/training-plan/TrainingPlanTarget.vue

@@ -12,6 +12,7 @@
             clearable
             maxlength="999"
             show-word-limit
+            :disabled="!checkPrivilege('link', 'canEditRequirement')"
             @blur="descriptionChange"
           ></el-input>
         </el-form-item>
@@ -19,7 +20,10 @@
     </div>
 
     <div class="part-box part-box-pad">
-      <div class="box-justify mb-2">
+      <div
+        v-if="checkPrivilege('link', 'canEditRequirement')"
+        class="box-justify mb-2"
+      >
         <div></div>
         <el-button
           type="primary"
@@ -40,6 +44,7 @@
         <el-table-column prop="detail" label="目标分解详情" min-width="300">
         </el-table-column>
         <el-table-column
+          v-if="checkPrivilege('link', 'canEditRequirement')"
           class-name="action-column"
           label="操作"
           width="120"
@@ -65,6 +70,7 @@
 
     <!-- ModifyTrainingPlanTarget -->
     <modify-training-plan-target
+      v-if="checkPrivilege('link', 'canEditRequirement')"
       ref="ModifyTrainingPlanTarget"
       :instance="curRow"
       @modified="getList"
@@ -135,6 +141,8 @@ export default {
       this.deletePageLastItem();
     },
     async descriptionChange() {
+      if (!this.checkPrivilege("link", "canEditRequirement")) return;
+
       await updateTrainingPlanDescription({
         id: this.rowData.id,
         description: this.modalForm.description,