baigl #77

Merged
baigl merged 6 commits from baigl into main 2024-12-02 15:36:15 +08:00
3 changed files with 36 additions and 28 deletions
Showing only changes of commit 81f704b2a5 - Show all commits

View File

@ -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({

View File

@ -16,14 +16,11 @@ const useClassTaskStore = defineStore('classTask',{
{value: 6, label: "复合题"},
], // 习题查询条件 - 题型
entpCourseWorkGroupList: [{
Key: -1,
Key: 0,
Value: '不限',
}, {
Key: 1,
Value: '真题',
}, {
Key: 0,
Value: '非真题',
}
], // 习题查询条件 - 题源
entpCourseWorkYearList: [

View File

@ -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) => {