From 944dff1b00e7ff4f4e0ea8d8ed6e2a0d53b5f5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Wed, 27 Nov 2024 14:15:00 +0800
Subject: [PATCH 1/2] 1
---
.../newClassTaskAssign/questionUpload/quesItem/index.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 @@
-
+
@@ -252,8 +252,7 @@
温馨提示：这里 - 号删除的是最后一道题目哟！
-
- 识别
+
From 81f704b2a50a2082998c710e62d89c4a703887db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 27 Nov 2024 15:48:22 +0800
Subject: [PATCH 2/2] 1
---
.../src/api/education/entpCourseWork.js | 10 ++++
src/renderer/src/store/modules/classTask.js | 5 +-
.../newClassTaskAssign/myQuestion/index.vue | 49 ++++++++++---------
3 files changed, 36 insertions(+), 28 deletions(-)
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) => {