소스 검색

科目代码相关公共组件1

zhangjie 1 년 전
부모
커밋
788693af85
35개의 변경된 파일72개의 추가작업 그리고 82개의 파일을 삭제
  1. 2 2
      src/modules/analysis/components/SelectAnalysisPaper.vue
  2. 2 2
      src/modules/analysis/views/DataInitManage.vue
  3. 4 4
      src/modules/base/components/ModifyExamStudent.vue
  4. 2 2
      src/modules/base/components/course-simple/AddClazzSimpleDialog.vue
  5. 1 1
      src/modules/base/views/ApproveRecordManage.vue
  6. 1 1
      src/modules/base/views/CardManage.vue
  7. 2 2
      src/modules/base/views/ExamStudentManage.vue
  8. 3 3
      src/modules/base/views/PrintPlanPushManage.vue
  9. 1 1
      src/modules/course/views/CourseDocumentManage.vue
  10. 1 1
      src/modules/course/views/TargetReportManage.vue
  11. 1 1
      src/modules/course/views/TargetScoreManage.vue
  12. 6 14
      src/modules/exam/components/ModifyExamTask.vue
  13. 1 1
      src/modules/exam/views/DataTaskManage.vue
  14. 1 1
      src/modules/exam/views/DownloadManage.vue
  15. 1 1
      src/modules/exam/views/ExamTaskManage.vue
  16. 1 1
      src/modules/exam/views/PdfBuildManage.vue
  17. 1 1
      src/modules/exam/views/TaskApplyManage.vue
  18. 1 1
      src/modules/exam/views/TaskPaperManage.vue
  19. 2 2
      src/modules/exam/views/TaskReviewManage.vue
  20. 2 2
      src/modules/mark/components/markParam/MarkParamGroup.vue
  21. 1 1
      src/modules/mark/views/MarkEntrance.vue
  22. 1 1
      src/modules/mark/views/MarkManage.vue
  23. 1 1
      src/modules/mark/views/MarkSetting.vue
  24. 1 1
      src/modules/mark/views/ScoreCheck.vue
  25. 2 2
      src/modules/mark/views/ScoreManage.vue
  26. 5 5
      src/modules/print/components/PrintPlanBkDetail.vue
  27. 4 4
      src/modules/print/components/PrintPlanDetail.vue
  28. 3 3
      src/modules/print/views/BusinessDataDetail.vue
  29. 3 3
      src/modules/print/views/BusinessDataExport.vue
  30. 3 3
      src/modules/print/views/PlanLinkPaper.vue
  31. 4 4
      src/modules/print/views/PrintTaskManage.vue
  32. 2 2
      src/modules/stmms/components/markParam/MarkPaperGroup.vue
  33. 1 1
      src/modules/stmms/components/markParam/MarkParamMarker.vue
  34. 4 6
      src/modules/stmms/views/ScoreArchive.vue
  35. 1 1
      src/modules/stmms/views/SyncManage.vue

+ 2 - 2
src/modules/analysis/components/SelectAnalysisPaper.vue

@@ -44,7 +44,7 @@
         </el-form-item>
         <el-form-item label="课程:">
           <course-select
-            v-model="filter.courseCode"
+            v-model="filter.courseId"
             placeholder="课程"
             :semester-id="filter.semesterId"
             :exam-id="filter.examId"
@@ -178,7 +178,7 @@ const initFilter = {
   semesterId: "",
   examId: "",
   collegeId: "",
-  courseCode: "",
+  courseId: "",
   teacherName: "",
 };
 

+ 2 - 2
src/modules/analysis/views/DataInitManage.vue

@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="课程:">
             <course-select
-              v-model="filter.courseCode"
+              v-model="filter.courseId"
               placeholder="课程"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
@@ -124,7 +124,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 4 - 4
src/modules/base/components/ModifyExamStudent.vue

@@ -32,9 +32,9 @@
           @change="examChange"
         ></exam-select>
       </el-form-item>
-      <el-form-item prop="courseCode" label="课程:">
+      <el-form-item prop="courseId" label="课程:">
         <course-common-select
-          v-model="modalForm.courseCode"
+          v-model="modalForm.courseId"
           placeholder="课程"
           clearable
         ></course-common-select>
@@ -152,7 +152,7 @@ const initModalForm = {
   id: null,
   semesterId: "",
   examId: "",
-  courseCode: "",
+  courseId: "",
   studentName: "",
   studentCode: "",
   college: "",
@@ -248,7 +248,7 @@ export default {
             trigger: "change",
           },
         ],
-        courseCode: [
+        courseId: [
           {
             required: true,
             message: "请选择课程",

+ 2 - 2
src/modules/base/components/course-simple/AddClazzSimpleDialog.vue

@@ -13,7 +13,7 @@
     <el-form ref="FilterForm" label-position="left" inline label-width="0px">
       <el-form-item>
         <course-common-select
-          v-model="filter.courseCode"
+          v-model="filter.courseId"
           placeholder="请选择课程"
           clearable
         ></course-common-select>
@@ -90,7 +90,7 @@ export default {
       dataList: [],
       filter: {
         clazzName: "",
-        courseCode: "",
+        courseId: "",
       },
       multipleSelection: [],
     };

+ 1 - 1
src/modules/base/views/ApproveRecordManage.vue

@@ -175,7 +175,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         status: "",
         teachingRoomId: "",

+ 1 - 1
src/modules/base/views/CardManage.vue

@@ -268,7 +268,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         title: "",
         cardType: "",

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

@@ -9,7 +9,7 @@
         ></secp-select>
         <el-form-item label="课程(代码):">
           <course-common-select
-            v-model="filter.courseCode"
+            v-model="filter.courseId"
             placeholder="课程(代码)"
             clearable
           ></course-common-select>
@@ -275,7 +275,7 @@ export default {
         examId: "",
       },
       filter: {
-        courseCode: "",
+        courseId: "",
         teacher: "",
         college: "",
         major: "",

+ 3 - 3
src/modules/base/views/PrintPlanPushManage.vue

@@ -21,7 +21,7 @@
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
               ref="CourseSelect"
-              v-model="filter.courseCode"
+              v-model="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               placeholder="课程(代码)"
@@ -34,7 +34,7 @@
               v-model="filter.paperNumber"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -264,7 +264,7 @@ export default {
         examId: "",
         orgId: "",
         syncStatus: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         startTime: "",
         endTime: "",

+ 1 - 1
src/modules/course/views/CourseDocumentManage.vue

@@ -87,7 +87,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 1 - 1
src/modules/course/views/TargetReportManage.vue

@@ -91,7 +91,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 1 - 1
src/modules/course/views/TargetScoreManage.vue

@@ -91,7 +91,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 6 - 14
src/modules/exam/components/ModifyExamTask.vue

@@ -38,11 +38,11 @@
           ></exam-select>
           <span v-else>{{ modalForm.examName }}</span>
         </el-form-item>
-        <el-form-item prop="courseCode" label="课程(代码):">
+        <el-form-item prop="courseId" label="课程(代码):">
           <base-course-select
             v-if="editable"
             ref="CourseSelect"
-            v-model.trim="modalForm.courseCode"
+            v-model.trim="modalForm.courseId"
             placeholder="请选择"
             clearable
             class="width-full"
@@ -83,14 +83,6 @@
           </span>
         </el-form-item>
         <el-form-item label="命题老师:">
-          <!-- <question-teacher-user-select
-            v-if="editType !== 'PREVIEW' && modalIsShow"
-            ref="QuestionTeacherSelect"
-            v-model="modalForm.userId"
-            class="width-full"
-            :course-code="modalForm.courseCode"
-            placeholder="请选择"
-          ></question-teacher-user-select> -->
           <div class="box-justify">
             <span>{{ modalForm.userName | defaultFieldFilter }}</span>
             <el-button
@@ -120,7 +112,7 @@
       v-if="editType !== 'PREVIEW'"
       ref="SelectQuestionTeacher"
       :users="teachers"
-      :course-code="modalForm.courseCode"
+      :course-id="modalForm.courseId"
       @modified="userSelected"
     ></select-question-teacher>
   </div>
@@ -136,7 +128,7 @@ const initModalForm = {
   semesterName: "",
   examId: "",
   examName: "",
-  courseCode: "",
+  courseId: "",
   courseName: "",
   specialty: "",
   paperNumber: "",
@@ -199,7 +191,7 @@ export default {
             trigger: "change",
           },
         ],
-        courseCode: [
+        courseId: [
           {
             required: true,
             message: "请选择课程",
@@ -282,7 +274,7 @@ export default {
       }
     },
     toSelectTeacher() {
-      if (!this.modalForm.courseCode) {
+      if (!this.modalForm.courseId) {
         this.$message.error("请选择课程");
         return;
       }

+ 1 - 1
src/modules/exam/views/DataTaskManage.vue

@@ -230,7 +230,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         type: "",
         status: "",

+ 1 - 1
src/modules/exam/views/DownloadManage.vue

@@ -162,7 +162,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         orgId: "",
         userParam: "",

+ 1 - 1
src/modules/exam/views/ExamTaskManage.vue

@@ -248,7 +248,7 @@ export default {
         examId: "",
         status: "",
         cardRuleId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         userName: "",
         createName: "",

+ 1 - 1
src/modules/exam/views/PdfBuildManage.vue

@@ -223,7 +223,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         status: "",
         result: "",

+ 1 - 1
src/modules/exam/views/TaskApplyManage.vue

@@ -241,7 +241,7 @@ export default {
         auditStatus: "",
         reviewStatus: "",
         cardRuleId: "",
-        courseCode: "",
+        courseId: "",
         userName: "",
         paperNumber: "",
         startTime: "",

+ 1 - 1
src/modules/exam/views/TaskPaperManage.vue

@@ -235,7 +235,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         cardRuleId: "",
         makeMethod: "",

+ 2 - 2
src/modules/exam/views/TaskReviewManage.vue

@@ -27,7 +27,7 @@
             <question-teacher-select
               ref="QuestionTeacherSelect"
               v-model="filter.userId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="命题老师"
             ></question-teacher-select>
           </el-form-item>
@@ -282,7 +282,7 @@ export default {
         examId: "",
         userId: "",
         cardRuleId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         startTime: null,
         endTime: null,

+ 2 - 2
src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -100,7 +100,7 @@
     <!-- ModifyMarkGroup -->
     <modify-mark-group
       ref="ModifyMarkGroup"
-      :course-code="basicInfo.courseCode"
+      :course-id="basicInfo.courseId"
       :instance="curGroupInfo"
       :disabled-question-nos="disabledQuestionNos"
       :paper-structure="subjectiveQuestionList"
@@ -191,7 +191,7 @@ export default {
       this.paperList = [];
       const data = await examStructureFindJpg({
         examId: this.basicInfo.examId,
-        courseCode: this.basicInfo.courseCode,
+        courseId: this.basicInfo.courseId,
         paperNumber: this.basicInfo.paperNumber,
         paperType: this.basicInfo.paperType,
       });

+ 1 - 1
src/modules/mark/views/MarkEntrance.vue

@@ -109,7 +109,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
       },
       current: 1,

+ 1 - 1
src/modules/mark/views/MarkManage.vue

@@ -174,7 +174,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         progressStatus: null,
       },

+ 1 - 1
src/modules/mark/views/MarkSetting.vue

@@ -212,7 +212,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         groupStatus: null,
       },

+ 1 - 1
src/modules/mark/views/ScoreCheck.vue

@@ -110,7 +110,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         progressStatus: null,
       },

+ 2 - 2
src/modules/mark/views/ScoreManage.vue

@@ -21,7 +21,7 @@
           </el-form-item>
           <el-form-item label="课程:">
             <course-select
-              v-model="filter.courseCode"
+              v-model="filter.courseId"
               placeholder="课程"
               filterable
               clearable
@@ -159,7 +159,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 5 - 5
src/modules/print/components/PrintPlanBkDetail.vue

@@ -43,7 +43,7 @@
           </el-form-item>
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               placeholder="课程(代码)"
@@ -56,7 +56,7 @@
               v-model="filter.paperNumber"
               :print-plan-id="filter.printPlanIdList"
               :exam-id="filter.examId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -261,7 +261,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         userName: "",
         capusName: "",
@@ -282,7 +282,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanId: this.plan.id,
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         userName: "",
         capusName: "",
@@ -354,7 +354,7 @@ export default {
           return {
             examDetailId: item.examDetailId,
             examId: item.examId,
-            courseCode: item.courseCode,
+            courseId: item.courseId,
             courseName: item.courseName,
             paperNumber: item.paperNumber,
             totalSubjects: item.totalSubjects,

+ 4 - 4
src/modules/print/components/PrintPlanDetail.vue

@@ -19,7 +19,7 @@
         >
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
@@ -33,7 +33,7 @@
               v-model="filter.paperNumber"
               :print-plan-id="filter.printPlanIdList"
               :exam-id="filter.examId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -195,7 +195,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanIdList: [],
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         userName: "",
       },
@@ -211,7 +211,7 @@ export default {
         semesterId: this.plan.semesterId,
         examId: this.plan.examId,
         printPlanIdList: [this.plan.id],
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         userName: "",
       };

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

@@ -30,7 +30,7 @@
           </el-form-item>
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
@@ -45,7 +45,7 @@
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -188,7 +188,7 @@ export default {
     return {
       filter: {
         printPlanIdList: [],
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         examPlace: "",
         examRoom: "",

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

@@ -31,7 +31,7 @@
           </el-form-item>
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
@@ -46,7 +46,7 @@
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -320,7 +320,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanIdList: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         examPlace: "",
         examRoom: "",

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

@@ -42,7 +42,7 @@
           </el-form-item>
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanIdList"
@@ -198,7 +198,7 @@ export default {
         semesterId: "",
         examId: "",
         printPlanIdList: [],
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         relateType: "",
         cardRuleId: "",
@@ -237,7 +237,7 @@ export default {
     },
     printPlanChange() {
       this.filter.paperNumber = "";
-      this.filter.courseCode = "";
+      this.filter.courseId = "";
     },
     toEdit(row) {
       this.curRow = row;

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

@@ -30,7 +30,7 @@
           </el-form-item>
           <el-form-item label="课程(代码):" label-width="110px">
             <course-select
-              v-model.trim="filter.courseCode"
+              v-model.trim="filter.courseId"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanId"
@@ -45,7 +45,7 @@
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
               :print-plan-id="filter.printPlanId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
               placeholder="试卷编号"
               clearable
             ></paper-number-select>
@@ -504,7 +504,7 @@ export default {
         printPlanId: "",
         printHouseId: "",
         status: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         examPlace: "",
         examRoom: "",
@@ -579,7 +579,7 @@ export default {
     },
     printPlanChange() {
       this.filter.paperNumber = "";
-      this.filter.courseCode = "";
+      this.filter.courseId = "";
       this.filter.examRoom = "";
       this.filter.examPlace = "";
     },

+ 2 - 2
src/modules/stmms/components/markParam/MarkPaperGroup.vue

@@ -108,7 +108,7 @@
     <!-- ModifyMarkerQuestion -->
     <modify-marker-question
       ref="ModifyMarkerQuestion"
-      :course-code="datas.basicPaperInfo.courseCode"
+      :course-id="datas.basicPaperInfo.courseId"
       :instance="curGroupInfo"
       :disabled-question-ids="disabledQuestionIds"
       :paper-structure="subjectiveQuestionList"
@@ -190,7 +190,7 @@ export default {
       this.paperList = [];
       const data = await examStructureFindJpg({
         examId: this.datas.basicPaperInfo.examId,
-        courseCode: this.datas.basicPaperInfo.courseCode,
+        courseId: this.datas.basicPaperInfo.courseId,
         paperNumber: this.datas.basicPaperInfo.paperNumber,
         paperType: this.datas.basicPaperInfo.paperType,
       });

+ 1 - 1
src/modules/stmms/components/markParam/MarkParamMarker.vue

@@ -73,7 +73,7 @@
     <!-- ModifyMarkerQuestion -->
     <modify-marker-question
       ref="ModifyMarkerQuestion"
-      :course-code="markParamInfos.basicPaperInfo.courseCode"
+      :course-id="markParamInfos.basicPaperInfo.courseId"
       :instance="curGroupInfo"
       :disabled-question-ids="disabledQuestionIds"
       :paper-structure="subjectiveQuestionList"

+ 4 - 6
src/modules/stmms/views/ScoreArchive.vue

@@ -17,7 +17,7 @@
           </el-form-item>
           <el-form-item label="课程:">
             <course-select
-              v-model="filter.courseCode"
+              v-model="filter.courseId"
               placeholder="课程"
               filterable
               clearable
@@ -31,7 +31,7 @@
               placeholder="班级"
               :semester-id="filter.semesterId"
               :exam-id="filter.examId"
-              :course-code="filter.courseCode"
+              :course-id="filter.courseId"
             ></class-select>
           </el-form-item>
         </template>
@@ -69,9 +69,7 @@
             type="primary"
             icon="el-icon-download"
             :loading="exportLoading"
-            :disabled="
-              !filter.semesterId || !filter.examId || !filter.courseCode
-            "
+            :disabled="!filter.semesterId || !filter.examId || !filter.courseId"
             @click="toExport"
             >成绩导出</el-button
           >
@@ -226,7 +224,7 @@ export default {
         semesterId: "",
         examId: "",
         clazzId: "",
-        courseCode: "",
+        courseId: "",
       },
       current: 1,
       size: this.GLOBAL.pageSize,

+ 1 - 1
src/modules/stmms/views/SyncManage.vue

@@ -192,7 +192,7 @@ export default {
       filter: {
         semesterId: "",
         examId: "",
-        courseCode: "",
+        courseId: "",
         paperNumber: "",
         result: "",
         type: "",