Browse Source

rename similar api name

Michael Wang 3 years ago
parent
commit
e893c3a5ab

+ 6 - 3
src/api/importInspectPage.ts

@@ -1,7 +1,7 @@
 import { httpApp } from "@/plugins/axiosApp";
 import { httpApp } from "@/plugins/axiosApp";
 import { AdminPageSettingForImport, CommonResponse, Task } from "@/types";
 import { AdminPageSettingForImport, CommonResponse, Task } from "@/types";
 
 
-export async function getInspectedSetting(studentId?: string) {
+export async function getInspectedSettingOfImportInspect(studentId?: string) {
   const form = new FormData();
   const form = new FormData();
   studentId && form.append("studentId", studentId);
   studentId && form.append("studentId", studentId);
   return httpApp.post<AdminPageSettingForImport>(
   return httpApp.post<AdminPageSettingForImport>(
@@ -11,14 +11,17 @@ export async function getInspectedSetting(studentId?: string) {
 }
 }
 
 
 /** 查看单个学生的复核任务 */
 /** 查看单个学生的复核任务 */
-export async function getSingleInspectedTask(studentId: string) {
+export async function getSingleInspectedTaskOfImportInspect(studentId: string) {
   const form = new FormData();
   const form = new FormData();
   studentId && form.append("studentId", studentId);
   studentId && form.append("studentId", studentId);
   return httpApp.post<Task>("/admin/exam/inspected/import/getTask", form);
   return httpApp.post<Task>("/admin/exam/inspected/import/getTask", form);
 }
 }
 
 
 /** 保存复核任务 */
 /** 保存复核任务 */
-export async function saveInspectedTask(studentId: string, isTag: string) {
+export async function saveInspectedTaskOfImportInspect(
+  studentId: string,
+  isTag: string
+) {
   const form = new FormData();
   const form = new FormData();
   form.append("studentId", studentId);
   form.append("studentId", studentId);
   form.append("isTag", isTag);
   form.append("isTag", isTag);

+ 1 - 1
src/api/inspectPage.ts

@@ -86,7 +86,7 @@ export async function getInspectedTaskStatus({
 }
 }
 
 
 /** 批量复核设置 */
 /** 批量复核设置 */
-export async function getInspectedSetting(subjectCode?: string) {
+export async function getAdminPageSetting(subjectCode?: string) {
   const form = new FormData();
   const form = new FormData();
   subjectCode && form.append("subjectCode", subjectCode);
   subjectCode && form.append("subjectCode", subjectCode);
   return httpApp.post<AdminPageSetting>(
   return httpApp.post<AdminPageSetting>(

+ 6 - 6
src/api/libraryInspectPage.ts

@@ -2,7 +2,7 @@ import { httpApp } from "@/plugins/axiosApp";
 import { CommonResponse, HistoryQueryParams, Question, Task } from "@/types";
 import { CommonResponse, HistoryQueryParams, Question, Task } from "@/types";
 
 
 /** 清理复核任务 */
 /** 清理复核任务 */
-export async function clearInspectedTask(
+export async function clearInspectedTaskOfLibraryInspect(
   subjectCode?: string,
   subjectCode?: string,
   groupNumber?: string
   groupNumber?: string
 ) {
 ) {
@@ -13,7 +13,7 @@ export async function clearInspectedTask(
 }
 }
 
 
 /** 批量复核历史 */
 /** 批量复核历史 */
-export async function getLibraryInspectedHistory({
+export async function getLibraryInspectedHistoryOfLibraryInspect({
   subjectCode,
   subjectCode,
   order = "markerTime",
   order = "markerTime",
   sort = "DESC",
   sort = "DESC",
@@ -35,7 +35,7 @@ export async function getLibraryInspectedHistory({
 }
 }
 
 
 /** 批量复核得到单个学生的复核任务 */
 /** 批量复核得到单个学生的复核任务 */
-export async function getOneOfInspectedTask(
+export async function getOneOfInspectedTaskOfLibraryInspect(
   subjectCode?: string,
   subjectCode?: string,
   groupNumber?: string
   groupNumber?: string
 ) {
 ) {
@@ -46,7 +46,7 @@ export async function getOneOfInspectedTask(
 }
 }
 
 
 /** 批量复核得到任务总数 */
 /** 批量复核得到任务总数 */
-export async function getInspectedTaskStatus(
+export async function getInspectedTaskStatusOfLibraryInspect(
   subjectCode: string,
   subjectCode: string,
   groupNumber: string
   groupNumber: string
 ) {
 ) {
@@ -60,7 +60,7 @@ export async function getInspectedTaskStatus(
 }
 }
 
 
 /** 保存复核任务 */
 /** 保存复核任务 */
-export async function saveInspectedTask(libraryId: string) {
+export async function saveInspectedTaskOfLibraryInspect(libraryId: string) {
   const form = new FormData();
   const form = new FormData();
   form.append("libraryId", libraryId);
   form.append("libraryId", libraryId);
   return httpApp.post<CommonResponse>(
   return httpApp.post<CommonResponse>(
@@ -70,7 +70,7 @@ export async function saveInspectedTask(libraryId: string) {
 }
 }
 
 
 /** 复核任务打回问题 */
 /** 复核任务打回问题 */
-export async function rejectInspectedTask(
+export async function rejectInspectedTaskOfLibraryInspect(
   libraryId: string,
   libraryId: string,
   questionList: Array<Question>
   questionList: Array<Question>
 ) {
 ) {

+ 1 - 1
src/api/studentTrackPage.ts

@@ -2,7 +2,7 @@ import { httpApp } from "@/plugins/axiosApp";
 import { Task } from "@/types";
 import { Task } from "@/types";
 
 
 /** 查看单个学生的试卷轨迹 */
 /** 查看单个学生的试卷轨迹 */
-export async function getSingleStudentTask(studentId: string) {
+export async function getSingleStudentTaskOfStudentTrack(studentId: string) {
   const form = new FormData();
   const form = new FormData();
   studentId && form.append("studentId", studentId);
   studentId && form.append("studentId", studentId);
   return httpApp.post<Task>("/admin/exam/track/student", form);
   return httpApp.post<Task>("/admin/exam/track/student", form);

+ 17 - 14
src/features/library/inspect/LibraryInspect.vue

@@ -7,7 +7,7 @@
         :subjectCode="subjectCode"
         :subjectCode="subjectCode"
         :groupNumber="groupNumber"
         :groupNumber="groupNumber"
         orderTimeField="inspectTime"
         orderTimeField="inspectTime"
-        :getHistory="getLibraryInspectedHistory"
+        :getHistory="getLibraryInspectedHistoryOfLibraryInspect"
       />
       />
       <mark-body @error="renderError" />
       <mark-body @error="renderError" />
       <MarkBoardInspect @inspect="saveTaskToServer" @reject="rejectQuestions" />
       <MarkBoardInspect @inspect="saveTaskToServer" @reject="rejectQuestions" />
@@ -26,15 +26,15 @@ import MarkBoardInspect from "./MarkBoardInspect.vue";
 import type { Question } from "@/types";
 import type { Question } from "@/types";
 import { message } from "ant-design-vue";
 import { message } from "ant-design-vue";
 import {
 import {
-  clearInspectedTask,
-  getInspectedTaskStatus,
-  getLibraryInspectedHistory,
-  getOneOfInspectedTask,
-  rejectInspectedTask,
-  saveInspectedTask,
+  clearInspectedTaskOfLibraryInspect,
+  getInspectedTaskStatusOfLibraryInspect,
+  getLibraryInspectedHistoryOfLibraryInspect,
+  getOneOfInspectedTaskOfLibraryInspect,
+  rejectInspectedTaskOfLibraryInspect,
+  saveInspectedTaskOfLibraryInspect,
 } from "@/api/libraryInspectPage";
 } from "@/api/libraryInspectPage";
 import { getPaper } from "@/api/jsonMark";
 import { getPaper } from "@/api/jsonMark";
-import { getInspectedSetting } from "@/api/inspectPage";
+import { getAdminPageSetting } from "@/api/inspectPage";
 import EventBus from "@/plugins/eventBus";
 import EventBus from "@/plugins/eventBus";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 
 
@@ -47,11 +47,11 @@ const { subjectCode, groupNumber, libraryId } = route.query as {
 };
 };
 
 
 async function updateClearTask() {
 async function updateClearTask() {
-  await clearInspectedTask(subjectCode, groupNumber);
+  await clearInspectedTaskOfLibraryInspect(subjectCode, groupNumber);
 }
 }
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(subjectCode);
+  const settingRes = await getAdminPageSetting(subjectCode);
 
 
   const { examType, fileServer, subject, userName, splitConfig } =
   const { examType, fileServer, subject, userName, splitConfig } =
     settingRes.data;
     settingRes.data;
@@ -68,7 +68,10 @@ async function updateSetting() {
   }
   }
 }
 }
 async function updateStatus() {
 async function updateStatus() {
-  const res = await getInspectedTaskStatus(subjectCode, groupNumber);
+  const res = await getInspectedTaskStatusOfLibraryInspect(
+    subjectCode,
+    groupNumber
+  );
   if (res.data.valid) Object.assign(store.status, res.data);
   if (res.data.valid) Object.assign(store.status, res.data);
 }
 }
 async function updateTask() {
 async function updateTask() {
@@ -110,7 +113,7 @@ onMounted(async () => {
 });
 });
 
 
 async function getOneOfStuTask() {
 async function getOneOfStuTask() {
-  return getOneOfInspectedTask(subjectCode, groupNumber);
+  return getOneOfInspectedTaskOfLibraryInspect(subjectCode, groupNumber);
 }
 }
 
 
 let realLibraryId = $computed(
 let realLibraryId = $computed(
@@ -120,7 +123,7 @@ const saveTaskToServer = async () => {
   console.log("save inspect task to server");
   console.log("save inspect task to server");
   const mkey = "save_task_key";
   const mkey = "save_task_key";
   void message.loading({ content: "保存评卷任务...", key: mkey });
   void message.loading({ content: "保存评卷任务...", key: mkey });
-  const res = await saveInspectedTask(realLibraryId);
+  const res = await saveInspectedTaskOfLibraryInspect(realLibraryId);
   if (res.data.success && store.currentTask) {
   if (res.data.success && store.currentTask) {
     void message.success({ content: "复核成功", key: mkey, duration: 2 });
     void message.success({ content: "复核成功", key: mkey, duration: 2 });
     if (!store.historyOpen) {
     if (!store.historyOpen) {
@@ -141,7 +144,7 @@ const rejectQuestions = async (questions: Array<Question>) => {
   if (!store.currentTask) return;
   if (!store.currentTask) return;
   const mkey = "reject_task_key";
   const mkey = "reject_task_key";
   void message.loading({ content: "打回评卷任务...", key: mkey });
   void message.loading({ content: "打回评卷任务...", key: mkey });
-  const res = await rejectInspectedTask(
+  const res = await rejectInspectedTaskOfLibraryInspect(
     store.currentTask.libraryId + "",
     store.currentTask.libraryId + "",
     questions
     questions
   );
   );

+ 2 - 2
src/features/library/inspect/MarkHeader.vue

@@ -95,7 +95,7 @@ import { onMounted } from "vue";
 import { store } from "@/store/store";
 import { store } from "@/store/store";
 import { PoweroffOutlined } from "@ant-design/icons-vue";
 import { PoweroffOutlined } from "@ant-design/icons-vue";
 import { useRoute } from "vue-router";
 import { useRoute } from "vue-router";
-import { clearInspectedTask } from "@/api/libraryInspectPage";
+import { clearInspectedTaskOfLibraryInspect } from "@/api/libraryInspectPage";
 import ZoomPaper from "@/components/ZoomPaper.vue";
 import ZoomPaper from "@/components/ZoomPaper.vue";
 
 
 const route = useRoute();
 const route = useRoute();
@@ -107,7 +107,7 @@ const { subjectCode, groupNumber } = route.query as {
 };
 };
 
 
 async function updateClearTask() {
 async function updateClearTask() {
-  await clearInspectedTask(subjectCode, groupNumber);
+  await clearInspectedTaskOfLibraryInspect(subjectCode, groupNumber);
 }
 }
 
 
 const closeWindow = async () => {
 const closeWindow = async () => {

+ 2 - 2
src/features/library/libraryTrack/LibraryTrack.vue

@@ -18,7 +18,7 @@ import {
   getSingleLibraryTask,
   getSingleLibraryTask,
   getSingleLibraryTaskTrial,
   getSingleLibraryTaskTrial,
 } from "@/api/libraryTrackPage";
 } from "@/api/libraryTrackPage";
-import { getInspectedSetting } from "@/api/inspectPage";
+import { getAdminPageSetting } from "@/api/inspectPage";
 import { getPaper } from "@/api/jsonMark";
 import { getPaper } from "@/api/jsonMark";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 
 
@@ -27,7 +27,7 @@ let libraryId = route.query.libraryId;
 let subjectCode = route.query.subjectCode;
 let subjectCode = route.query.subjectCode;
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(subjectCode as string);
+  const settingRes = await getAdminPageSetting(subjectCode as string);
   const { examType, fileServer, subject, userName, splitConfig } =
   const { examType, fileServer, subject, userName, splitConfig } =
     settingRes.data;
     settingRes.data;
   store.initSetting({
   store.initSetting({

+ 2 - 2
src/features/library/quality/Quality.vue

@@ -24,7 +24,7 @@ import MarkHeader from "./MarkHeader.vue";
 import { useRoute } from "vue-router";
 import { useRoute } from "vue-router";
 import MarkBody from "./MarkBody.vue";
 import MarkBody from "./MarkBody.vue";
 import MarkHistory from "@/features/mark/MarkHistory.vue";
 import MarkHistory from "@/features/mark/MarkHistory.vue";
-import { getInspectedSetting } from "@/api/inspectPage";
+import { getAdminPageSetting } from "@/api/inspectPage";
 import MinimapModal from "@/features/mark/MinimapModal.vue";
 import MinimapModal from "@/features/mark/MinimapModal.vue";
 import PaperModal from "@/features/mark/PaperModal.vue";
 import PaperModal from "@/features/mark/PaperModal.vue";
 import AnswerModal from "@/features/mark/AnswerModal.vue";
 import AnswerModal from "@/features/mark/AnswerModal.vue";
@@ -39,7 +39,7 @@ const { subjectCode, markerId, markerScore } = route.query as {
 };
 };
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(subjectCode);
+  const settingRes = await getAdminPageSetting(subjectCode);
   const { examType, fileServer, subject, userName, splitConfig } =
   const { examType, fileServer, subject, userName, splitConfig } =
     settingRes.data;
     settingRes.data;
   store.initSetting({
   store.initSetting({

+ 6 - 6
src/features/student/importInspect/ImportInspect.vue

@@ -17,9 +17,9 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import { onMounted } from "vue";
 import { onMounted } from "vue";
 import {
 import {
-  getInspectedSetting,
-  getSingleInspectedTask,
-  saveInspectedTask,
+  getInspectedSettingOfImportInspect,
+  getSingleInspectedTaskOfImportInspect,
+  saveInspectedTaskOfImportInspect,
 } from "@/api/importInspectPage";
 } from "@/api/importInspectPage";
 import { store } from "@/store/store";
 import { store } from "@/store/store";
 import MarkHeader from "./MarkHeader.vue";
 import MarkHeader from "./MarkHeader.vue";
@@ -40,7 +40,7 @@ let tagIds: number[] = $ref([]);
 let currentStudentId = $ref(0);
 let currentStudentId = $ref(0);
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(studentId);
+  const settingRes = await getInspectedSettingOfImportInspect(studentId);
   const { examType, fileServer } = settingRes.data;
   const { examType, fileServer } = settingRes.data;
   store.initSetting({ examType, fileServer } as AdminPageSetting);
   store.initSetting({ examType, fileServer } as AdminPageSetting);
   store.status.totalCount = settingRes.data.inspectCount;
   store.status.totalCount = settingRes.data.inspectCount;
@@ -60,7 +60,7 @@ async function updateTask() {
   }
   }
   const mkey = "fetch_task_key";
   const mkey = "fetch_task_key";
   void message.info({ content: "获取任务中...", duration: 1.5, key: mkey });
   void message.info({ content: "获取任务中...", duration: 1.5, key: mkey });
-  let res = await getSingleInspectedTask("" + currentStudentId);
+  let res = await getSingleInspectedTaskOfImportInspect("" + currentStudentId);
   void message.success({
   void message.success({
     content: res.data.studentId ? "获取成功" : "无任务",
     content: res.data.studentId ? "获取成功" : "无任务",
     key: mkey,
     key: mkey,
@@ -104,7 +104,7 @@ onMounted(async () => {
 const saveTaskToServer = async () => {
 const saveTaskToServer = async () => {
   const mkey = "save_task_key";
   const mkey = "save_task_key";
   void message.loading({ content: "标记评卷任务...", key: mkey });
   void message.loading({ content: "标记评卷任务...", key: mkey });
-  const res = await saveInspectedTask(
+  const res = await saveInspectedTaskOfImportInspect(
     currentStudentId + "",
     currentStudentId + "",
     !isCurrentTagged + ""
     !isCurrentTagged + ""
   );
   );

+ 2 - 2
src/features/student/inspect/Inspect.vue

@@ -18,7 +18,7 @@
 import { onMounted, watch } from "vue";
 import { onMounted, watch } from "vue";
 import {
 import {
   clearInspectedTask,
   clearInspectedTask,
-  getInspectedSetting,
+  getAdminPageSetting,
   getInspectedTaskStatus,
   getInspectedTaskStatus,
   getOneOfInspectedTask,
   getOneOfInspectedTask,
   getSingleInspectedTask,
   getSingleInspectedTask,
@@ -67,7 +67,7 @@ async function updateClearTask() {
 }
 }
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(subjectCode);
+  const settingRes = await getAdminPageSetting(subjectCode);
   const { examType, fileServer, subject, userName, splitConfig } =
   const { examType, fileServer, subject, userName, splitConfig } =
     settingRes.data;
     settingRes.data;
   store.initSetting({
   store.initSetting({

+ 4 - 4
src/features/student/studentTrack/StudentTrack.vue

@@ -16,8 +16,8 @@ import { useRoute } from "vue-router";
 import MarkBody from "../inspect/MarkBody.vue";
 import MarkBody from "../inspect/MarkBody.vue";
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
 import CommonMarkBody from "@/features/mark/CommonMarkBody.vue";
 import { message } from "ant-design-vue";
 import { message } from "ant-design-vue";
-import { getSingleStudentTask } from "@/api/studentTrackPage";
-import { getInspectedSetting } from "@/api/inspectPage";
+import { getSingleStudentTaskOfStudentTrack } from "@/api/studentTrackPage";
+import { getAdminPageSetting } from "@/api/inspectPage";
 import { getPaper } from "@/api/jsonMark";
 import { getPaper } from "@/api/jsonMark";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 import { addFileServerPrefixToTask } from "@/utils/utils";
 
 
@@ -26,7 +26,7 @@ let studentId = route.query.studentId;
 let subjectCode = route.query.subjectCode as string;
 let subjectCode = route.query.subjectCode as string;
 
 
 async function updateSetting() {
 async function updateSetting() {
-  const settingRes = await getInspectedSetting(subjectCode);
+  const settingRes = await getAdminPageSetting(subjectCode);
   const { examType, fileServer, subject, userName, splitConfig } =
   const { examType, fileServer, subject, userName, splitConfig } =
     settingRes.data;
     settingRes.data;
   store.initSetting({
   store.initSetting({
@@ -68,7 +68,7 @@ onMounted(async () => {
 });
 });
 
 
 async function getSingleStuTask() {
 async function getSingleStuTask() {
-  return getSingleStudentTask(studentId as string);
+  return getSingleStudentTaskOfStudentTrack(studentId as string);
 }
 }
 
 
 const renderError = () => {
 const renderError = () => {