Kaynağa Gözat

feat: 接口调试

zhangjie 10 ay önce
ebeveyn
işleme
b5caed4066

+ 1 - 0
src/components/SecpSelect.vue

@@ -63,6 +63,7 @@
         :exam-id="filter.examId"
         :print-plan-id="filter.printPlanId"
         :course-id="filter.courseId"
+        :open-college-id="filter.openCollegeId"
         placeholder="试卷编号"
         clearable
       ></paper-number-select>

+ 9 - 0
src/components/base/PaperNumberSelect.vue

@@ -29,6 +29,7 @@ export default {
     examId: { type: String, default: "" },
     courseId: { type: String, default: "" },
     printPlanId: { type: [String, Array], default: "" },
+    openCollegeId: { type: String, default: "" },
   },
   data() {
     return {
@@ -71,6 +72,13 @@ export default {
         this.$emit("change", {});
       }
     },
+    openCollegeId(val, oldval) {
+      if (val !== oldval) {
+        this.search();
+        this.$emit("input", "");
+        this.$emit("change", {});
+      }
+    },
   },
   async created() {
     this.search();
@@ -85,6 +93,7 @@ export default {
         examId: this.examId,
         printPlanId: this.printPlanId,
         courseId: this.courseId,
+        openCollegeId: this.openCollegeId,
       };
       const res = await conditionListPaperNumber(objFilterNull(data));
       this.optionList = res;

+ 4 - 2
src/modules/admin/components/school/SchoolSetPaper.vue

@@ -91,7 +91,9 @@ export default {
       const data = await schoolSetPaperInfo(this.school.id);
       this.paperInfo = data.result;
       this.modalForm.pdfSize = data.result[0]?.value || [];
-      this.modalForm.cardSize = data.result[1]?.value || "";
+      this.modalForm.cardSize = data.result[1]?.value
+        ? data.result[1].value[0]
+        : "";
     },
     async confirm() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
@@ -101,7 +103,7 @@ export default {
       this.loading = true;
 
       this.paperInfo[0].value = this.modalForm.pdfSize;
-      this.paperInfo[1].value = this.modalForm.cardSize;
+      this.paperInfo[1].value = [this.modalForm.cardSize];
       let datas = { param: this.paperInfo, schoolId: this.school.id };
       const res = await schoolSetPaperUpdate(datas).catch(() => {});
       this.loading = false;

+ 2 - 0
src/modules/base/api.js

@@ -53,12 +53,14 @@ export const conditionListPaperNumber = ({
   examId,
   courseId,
   printPlanId,
+  openCollegeId,
 }) => {
   return $postParam("/api/admin/basic/condition/list_paper_number", {
     semesterId,
     examId,
     courseId,
     printPlanId,
+    openCollegeId,
   });
 };
 // clazz

+ 1 - 1
src/modules/course/api.js

@@ -20,7 +20,7 @@ export const documentDownload = (id) => {
 };
 // 文档管理-文档批量下载
 export const documentBatchDownload = (datas) => {
-  return $postParam("/api/admin/mark/archive/document/download", datas, {
+  return $postParam("/api/admin/mark/archive/document/download_batch", datas, {
     responseType: "blob",
   });
 };

+ 1 - 5
src/modules/course/components/CourseDocumentDetail.vue

@@ -18,11 +18,7 @@
       </div>
       <div class="box-justify mb-2">
         <div>
-          <el-button
-            v-if="checkPrivilege('button', 'batchDownload')"
-            type="primary"
-            :loading="bloading"
-            @click="toBatchDownload"
+          <el-button type="primary" :loading="bloading" @click="toBatchDownload"
             >批量下载</el-button
           >
         </div>

+ 1 - 1
src/modules/exam/api.js

@@ -41,7 +41,7 @@ export const markWaitTaskListPage = (datas) => {
   return $postParam("/api/admin/work/mark/task/ready", datas);
 };
 export const markWaitTaskCount = () => {
-  return $postParam("/api/admin/mark/task/ready_count", {});
+  return $postParam("/api/admin/work/mark/task/ready_count", {});
 };
 // 已办任务数量
 export const auditedTaskCount = () => {

+ 1 - 1
src/modules/exam/components/PaperApproveTable.vue

@@ -331,7 +331,7 @@ export default {
       this.loading = true;
       const datas = {
         htmlContent: this.getHtmlContent(),
-        examTaskId: this.instance.id,
+        examTaskId: this.instance.examTaskId,
       };
       const res = await downloadByApi(() => {
         return downloadExamTaskApproveForm(datas);

+ 1 - 0
src/modules/exam/components/WaitTaskMark.vue

@@ -92,6 +92,7 @@ export default {
   },
   mounted() {
     window.addEventListener("focus", this.updateList);
+    this.getList();
   },
   beforeDestroy() {
     window.removeEventListener("focus", this.updateList);

+ 1 - 1
src/modules/login/views/Login.vue

@@ -217,7 +217,7 @@ export default {
       this.schoolInfo = data;
       this.loginModel.schoolCode = data.schoolCode;
       // 测试
-      if (!data.cardSize) data.cardSize = "8K";
+      data.cardSize = data.cardSize ? data.cardSize[0] : "A3";
       this.$ls.set("schoolInfo", data);
     },
     async submit(name) {

+ 1 - 0
src/modules/login/views/LoginOpen.vue

@@ -44,6 +44,7 @@ export default {
         this.$ls.set("schoolId", curSchool.id, this.GLOBAL.authTimeout);
         this.$ls.set("schoolName", curSchool.name, this.GLOBAL.authTimeout);
         const res = await getSchoolInfo(curSchool.code);
+        res.cardSize = res.cardSize ? res.cardSize[0] : "A3";
         this.$ls.set("schoolLogo", res.logo);
         this.$ls.set("schoolInfo", res);
       }

+ 1 - 1
src/modules/mark/api.js

@@ -193,7 +193,7 @@ export const scoreListPage = (datas) => {
   return $postParam("/api/admin/mark/archive/score/list", datas);
 };
 export const scoreTotalAnalysisDownload = (datas) => {
-  return $postParam("/api/admin/mark/archive/score/download", datas, {
+  return $postParam("/api/admin/mark/archive/score/list/export", datas, {
     responseType: "blob",
   });
 };

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

@@ -1,6 +1,6 @@
 <template>
   <div class="score-archive">
-    <div class="part-box part-box-filter">
+    <div class="part-box part-box-filter part-box-flex">
       <el-form ref="FilterForm" label-position="left" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
           <secp-select
@@ -21,9 +21,10 @@
 
       <div class="part-box-action">
         <el-button
-          v-if="checkPrivilege('button', 'ObjectiveCalculate')"
+          v-if="checkPrivilege('button', 'aggregateAnalysis')"
           type="primary"
           :loading="loading"
+          icon="el-icon-document"
           @click="exportTotalAnalysis"
           >总量分析</el-button
         >
@@ -31,6 +32,7 @@
           v-if="checkPrivilege('button', 'ObjectiveCalculate')"
           type="primary"
           :loading="loading"
+          icon="el-icon-document"
           @click="batchAnalysisReport"
           >批量下载分析报告</el-button
         >

+ 4 - 1
src/views/404.vue

@@ -27,8 +27,11 @@ export default {
 .not-found-content {
   color: #333;
   background: transparent;
-  width: 280px;
+  width: 400px;
   height: 230px;
+  left: 50%;
+  margin-left: -200px;
+
   h1 {
     font-size: 150px;
     line-height: 1;