zhangjie 2 周之前
父节点
当前提交
6e7f691a72

+ 9 - 7
src/modules/admin/components/school/SchoolSetTarget.vue

@@ -26,8 +26,8 @@
         </span>
       </el-form-item>
       <el-form-item label="综合成绩:">
-        <el-checkbox v-model="modalForm.showTotalScore"
-          >报告显示综合成绩</el-checkbox
+        <el-checkbox v-model="modalForm.comprehensiveScoreShow"
+          >报告显示综合成绩</el-checkbox
         >
       </el-form-item>
     </el-form>
@@ -56,7 +56,11 @@ export default {
     return {
       loading: false,
       info: {},
-      modalForm: { schoolId: "", attachmentId: "", showTotalScore: true },
+      modalForm: {
+        schoolId: "",
+        attachmentId: "",
+        comprehensiveScoreShow: true,
+      },
       cachedModalForm: null,
       rules: {
         attachmentId: [
@@ -91,10 +95,8 @@ export default {
     async initData() {
       this.modalForm.schoolId = this.school.id;
       const data = await schoolSetCourseTargetQuery(this.school.id);
-      if (data && data.value) {
-        this.info = data;
-        this.modalForm.attachmentId = data.id;
-      }
+      this.modalForm.attachmentId = data.result[0]?.id;
+      this.modalForm.comprehensiveScoreShow = data.result[1]?.value === "true";
       this.cachedModalForm = JSON.parse(JSON.stringify(this.modalForm));
     },
     checkConfigChanged() {

+ 1 - 1
src/modules/exam/components/createExamAndPrintTask/CreateExamAndPrintTask.vue

@@ -110,7 +110,7 @@ const initExamTask = {
   courseId: "",
   courseCode: "",
   courseName: "",
-  className: "",
+  classDesc: "",
   paperNumber: "",
   cardRuleId: "",
   teachingRoomId: "",

+ 1 - 1
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -89,7 +89,7 @@
           <el-col :span="12">
             <el-form-item label="班级:">
               <el-input
-                v-model.trim="examTask.className"
+                v-model.trim="examTask.classDesc"
                 placeholder="请输入班级"
                 :maxlength="50"
                 clearable

+ 6 - 0
src/modules/exam/components/createExamAndPrintTask/SelectTikuPaperDialog.vue

@@ -128,6 +128,9 @@ export default {
       },
     };
   },
+  mounted() {
+    this.checkTkAuth();
+  },
   methods: {
     visibleChange() {
       this.filter = {
@@ -155,6 +158,9 @@ export default {
       const res = await tikuPaperListQuery(datas);
       this.dataList = res.records;
       this.total = res.total;
+      if (this.dataList.length) {
+        this.showTkTips = true;
+      }
     },
     toPage(page) {
       this.current = page;

+ 1 - 1
src/modules/exam/components/taskApply/ModifyTaskApply.vue

@@ -69,7 +69,7 @@ const initExamTask = {
   id: null,
   examId: "",
   examName: "",
-  className: "",
+  classDesc: "",
   examModel: "",
   category: "",
   semesterId: "",

+ 1 - 1
src/modules/exam/components/taskApply/TaskInfo.vue

@@ -57,7 +57,7 @@
         <el-col :span="12">
           <el-form-item label="班级:">
             <span>
-              {{ examRoomInfo.className }}
+              {{ examRoomInfo.classDesc }}
             </span>
           </el-form-item>
         </el-col>

+ 3 - 3
src/modules/print/views/PrintTaskManage.vue

@@ -87,7 +87,7 @@
           </el-form-item>
           <el-form-item label="班级:" label-width="55px">
             <el-input
-              v-model.trim="filter.className"
+              v-model.trim="filter.classDesc"
               placeholder="请输入班级"
               :maxlength="50"
               clearable
@@ -289,7 +289,7 @@
           width="160"
         ></el-table-column>
         <el-table-column
-          prop="className"
+          prop="classDesc"
           label="班级"
           width="160"
         ></el-table-column>
@@ -559,7 +559,7 @@ export default {
         examEndTime: "",
         printStartTime: "",
         printEndTime: "",
-        className: "",
+        classDesc: "",
       },
       searchfilter: {},
       current: 1,

+ 3 - 6
src/modules/target/components/target-statistics/DetailTargetStatistics.vue

@@ -364,7 +364,7 @@
             </el-table-column>
           </el-table-column>
           <el-table-column
-            v-if="showOverallScore"
+            v-if="comprehensiveScoreShow"
             label="综合成绩"
             prop="score"
             align="center"
@@ -498,16 +498,12 @@ export default {
       courseSuggest: [],
       downloading: false,
       // 是否显示综合成绩
-      showOverallScore: true,
+      comprehensiveScoreShow: true,
     };
   },
   beforeDestroy() {
     this.clearSetTs();
   },
-  created() {
-    const schoolInfo = this.$ls.get("schoolInfo", {});
-    this.showOverallScore = schoolInfo.showOverallScore;
-  },
   methods: {
     cancel() {
       this.modalIsShow = false;
@@ -549,6 +545,7 @@ export default {
     buildData(data) {
       this.commonInfo = data.commonInfo;
       this.courseBasicInfo = data.courseBasicInfo;
+      this.comprehensiveScoreShow = data.comprehensiveScoreShow;
 
       const courseSuggest = data.courseSuggest
         ? JSON.parse(data.courseSuggest)