feat: 接口调整

src/modules/admin/components/school/SchoolSetPaper.vue

@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item prop="cardSize" label="答题卡规格：">
         <el-radio-group v-model="modalForm.cardSize">
-          <el-radio v-for="item in CARD_SIZE_TYPE" :key="item" :label="item">{{
+          <el-radio v-for="item in sysCardSize" :key="item" :label="item">{{
             item
           }}</el-radio>
         </el-radio-group>
@@ -35,7 +35,6 @@ import {
   schoolSetPaperInfo,
   schoolSetPaperUpdate,
 } from "../../api";
-import { CARD_SIZE_TYPE } from "@/constants/enumerate";
 
 export default {
   name: "school-set-paper",
@@ -55,7 +54,7 @@ export default {
         cardSize: "",
       },
       sysPdfSize: [],
-      CARD_SIZE_TYPE,
+      sysCardSize: [],
       paperInfo: [],
       rules: {
         pdfSize: [
@@ -88,6 +87,7 @@ export default {
     async initData() {
       const paperData = await sysPaperSizeList();
       this.sysPdfSize = paperData.result[0].value;
+      this.sysCardSize = paperData.result[1].value;
       const data = await schoolSetPaperInfo(this.school.id);
       this.paperInfo = data.result;
       this.modalForm.pdfSize = data.result[0]?.value || [];

src/modules/exam/api.js

@@ -22,41 +22,31 @@ export const waitExamTaskListPage = (datas) => {
 export const waitExamTaskCount = () => {
   return $postParam("/api/admin/work/exam/task/ready_count", {});
 };
-// 命题分配待办
-export const waitExamTaskNewListPage = (datas) => {
-  return $postParam("/api/admin/work/exam/task/new", datas);
-};
-export const waitExamTaskNewCount = () => {
-  return $postParam("/api/admin/work/exam/task/new_count", {});
-};
-// 入库审核待办
-export const waitTaskReviewListPage = (datas) => {
-  return $postParam("/api/admin/work/exam/task/submit", datas);
-};
-export const waitTaskReviewCount = () => {
-  return $postParam("/api/admin/work/exam/task/submit_count", {});
-};
 // 阅卷待办
-export const stmmsTaskListPage = (datas) => {
+export const stmmsWaitTaskListPage = (datas) => {
   return $postParam("/api/admin/work/structure/task/ready", datas);
 };
-export const stmmsTaskCount = () => {
+export const stmmsWaitTaskCount = () => {
   return $postParam("/api/admin/work/structure/task/ready_count", {});
 };
 // 教研待办
-export const analysisTaskListPage = (datas) => {
+export const analysisWaitTaskListPage = (datas) => {
   return $postParam("/api/admin/work/grade/task/ready", datas);
 };
-export const analysisTaskCount = () => {
+export const analysisWaitTaskCount = () => {
   return $postParam("/api/admin/work/grade/task/ready_count", {});
 };
-export const auditedTaskCount = () => {
-  return $postParam("/api/admin/exam/task/review_list_audited_count", {});
-};
 // 评卷待办
-export const markTaskCount = () => {
+export const markWaitTaskListPage = (datas) => {
+  return $postParam("/api/admin/work/mark/task/ready", datas);
+};
+export const markWaitTaskCount = () => {
   return $postParam("/api/admin/mark/task/ready_count", {});
 };
+// 已办任务数量
+export const auditedTaskCount = () => {
+  return $postParam("/api/admin/exam/task/review_list_audited_count", {});
+};
 
 // exam-task-manage
 export const examTaskListPage = (datas) => {

src/modules/exam/components/WaitTaskAnalysis.vue

@@ -58,7 +58,7 @@
 
 <script>
 import { mapMutations, mapActions } from "vuex";
-import { analysisTaskListPage } from "../api";
+import { analysisWaitTaskListPage } from "../api";
 import ModifyBaseConfig from "../../analysis/components/ModifyBaseConfig.vue";
 
 export default {
@@ -99,7 +99,7 @@ export default {
         pageNumber: this.current,
         pageSize: this.size,
       };
-      const data = await analysisTaskListPage(datas);
+      const data = await analysisWaitTaskListPage(datas);
       this.dataList = data.records;
       this.total = data.total;
       this.updateWaitTask({ analysis: this.total });

src/modules/exam/components/WaitTaskMark.vue

@@ -76,7 +76,7 @@
 <script>
 import { mapActions, mapMutations } from "vuex";
 import markMinxin from "@/modules/mark/markMinxin";
-import { markTaskListPage } from "@/modules/mark/api";
+import { markWaitTaskListPage } from "../api";
 
 export default {
   name: "wait-task-mark",
@@ -108,7 +108,7 @@ export default {
         pageNumber: this.current,
         pageSize: this.size,
       };
-      const data = await markTaskListPage(datas);
+      const data = await markWaitTaskListPage(datas);
       this.dataList = data.records;
       this.total = data.total;
       this.updateWaitTask({ mark: this.total });

src/modules/exam/components/WaitTaskStmms.vue

@@ -64,7 +64,7 @@
 
 <script>
 import { mapActions, mapMutations } from "vuex";
-import { stmmsTaskListPage } from "../api";
+import { stmmsWaitTaskListPage } from "../api";
 import ModifyMarkParams from "../../mark/components/markParam/ModifyMarkParams";
 
 export default {
@@ -108,7 +108,7 @@ export default {
         pageNumber: this.current,
         pageSize: this.size,
       };
-      const data = await stmmsTaskListPage(datas);
+      const data = await stmmsWaitTaskListPage(datas);
       this.dataList = data.records;
       this.total = data.total;
       this.updateWaitTask({ stmms: this.total });

src/modules/exam/store.js

@@ -1,8 +1,8 @@
 import {
   waitExamTaskCount,
-  stmmsTaskCount,
-  analysisTaskCount,
-  // markTaskCount,
+  stmmsWaitTaskCount,
+  analysisWaitTaskCount,
+  markWaitTaskCount,
   savePreviewLog,
 } from "./api";
 import { calcSum } from "@/plugins/utils";
@@ -88,16 +88,16 @@ const actions = {
       },
       {
         type: "stmms",
-        func: stmmsTaskCount,
+        func: stmmsWaitTaskCount,
       },
       {
         type: "analysis",
-        func: analysisTaskCount,
+        func: analysisWaitTaskCount,
+      },
+      {
+        type: "mark",
+        func: markWaitTaskCount,
       },
-      // {
-      //   type: "mark",
-      //   func: markTaskCount,
-      // },
     ];
     const countAll = task
       .filter((item) => state.waitTypes.includes(item.type))

src/modules/mark/api.js

@@ -135,11 +135,11 @@ export const markMarkerSetTaskCount = (datas) => {
 };
 // mark-detail-task
 export const markDetailTaskListPage = (datas) => {
-  return $postParam("/api/admin/mark/quality/list", datas);
+  return $postParam("/api/admin/mark/task/list", datas);
 };
 // mark-detail-reject
 export const markRejectHistoryListPage = (datas) => {
-  return $postParam("/api/admin/mark/quality/list", datas);
+  return $postParam("/api/admin/mark/reject/list", datas);
 };
 // mark-detail-quality
 export const markQualityListPage = (datas) => {

src/views/Home.vue

@@ -352,7 +352,7 @@ export default {
           return this.checkPrivilege("link", "window", "DataInitManage");
         },
         mark: () => {
-          return this.checkPrivilege("button", "select", "MarkEntrance");
+          return this.checkPrivilege("link", "Marking", "MarkEntrance");
         },
       };
       const waitTypes = Object.keys(filterFunc).filter((k) => filterFunc[k]());