diff --git a/src/renderer/src/api/education/entpCourseWork.js b/src/renderer/src/api/education/entpCourseWork.js index 04582ba..25f61e2 100644 --- a/src/renderer/src/api/education/entpCourseWork.js +++ b/src/renderer/src/api/education/entpCourseWork.js @@ -9,6 +9,16 @@ export function listEntpcoursework(query) { }) } + +// 查询entpcoursework列表 +export function listEntpcourseworkLocal(query) { + return request({ + url: '/education/entpcoursework/local/list', + method: 'get', + params: query + }) +} + // 查询entpcoursework详细 export function getEntpcoursework(id) { return request({ diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js index 4fda976..c5f8b31 100644 --- a/src/renderer/src/store/modules/classTask.js +++ b/src/renderer/src/store/modules/classTask.js @@ -16,14 +16,11 @@ const useClassTaskStore = defineStore('classTask',{ {value: 6, label: "复合题"}, ], // 习题查询条件 - 题型 entpCourseWorkGroupList: [{ - Key: -1, + Key: 0, Value: '不限', }, { Key: 1, Value: '真题', - }, { - Key: 0, - Value: '非真题', } ], // 习题查询条件 - 题源 entpCourseWorkYearList: [ diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue index 90f71da..e605b51 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue @@ -118,7 +118,7 @@ import { Search } from '@element-plus/icons-vue' import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue' import { useRouter, useRoute } from 'vue-router' -import { listEntpcoursework } from '@/api/education/entpCourseWork' +import { listEntpcoursework, listEntpcourseworkLocal } from '@/api/education/entpCourseWork' import { listEvaluationclue } from '@/api/classTask' import { delEntpcoursework, updateEntpcoursework } from "@/api/education/entpCourseWork"; @@ -247,31 +247,32 @@ function Apis(key) { const client = new Apis('/paht'); const t = function(name, time) { return new Promise(resolve => { - const queryForm = { - // 题类 - worktype: entpCourseWorkQueryParams.worktype.label == '不限' ? '' : entpCourseWorkQueryParams.worktype.label, - // 题源 TODO 估计后端没做相应的查询处理 web端也没有返回 - // workgroup: entpCourseWorkQueryParams.workgroup, - // 年份 TODO 估计后端没做相应的查询处理 web端也没有返回 - // yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'', - // 关键字 - title: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'', + const queryForm = { + // 题类 + worktype: entpCourseWorkQueryParams.worktype.label, + // 题源 TODO 估计后端没做相应的查询处理 web端也没有返回 + workgroup: entpCourseWorkQueryParams.workgroup, + // 年份 TODO 估计后端没做相应的查询处理 web端也没有返回 + yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'', + // 关键字 + keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'', + // 课程相关参数 + edustage: userStore.edustage, // this.userStore.edustage, + edusubject: userStore.edusubject, // this.userStore.edusubject, + eid: props.bookobj.levelSecondId, // this.activeParams.lession.id, + status: "1", + editUserId: userStore.userId, + //orderby: 'concat(worktype,timestamp) DESC', - // 分页参数 - pageNum: paginationParams.pageNum, - pageSize: paginationParams.pageSize, - // 课程相关参数 - edustage: userStore.edustage, // this.userStore.edustage, - edusubject: userStore.edusubject, // this.userStore.edusubject, - evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id, - status: "1", - edituserid: userStore.userId, - orderby: 'concat(worktype,timestamp) DESC', + // 分页参数 + pageNum: paginationParams.pageNum, + pageSize: paginationParams.pageSize, + } + //const entpcourseworkres = listEntpcoursework(queryForm); + const entpcourseworkres = listEntpcourseworkLocal(queryForm); + - } - const entpcourseworkres = listEntpcoursework(queryForm); - - resolve(entpcourseworkres); + resolve(entpcourseworkres); }) } const handleQueryFromEntpCourseWork= async (queryType) => { diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue index 92f804e..22036a4 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -152,7 +152,7 @@