diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue index e915dfa..234693f 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue @@ -285,6 +285,7 @@ const t = function(name, time) { edusubject: userStore.edusubject, // this.userStore.edusubject, evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id, status: "1", + edituserid: userStore.userId, orderby: 'concat(worktype,timestamp) DESC', } 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 3e90189..52d87fc 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -740,6 +740,10 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{ let titleSubjList = ''; // 主观题的题目 (这里是 背景资料+题目组合的,主观题要处理一下) const newSubjListparams = []; // 主观题的题目list + // 将菁优网的填空下划线标签转为下划线(上传时需再重新替换回来) + item.title = item.title.replace(/
(?: )?<\/div>/g, '_____'); + + if(item.worktype == '复合题') { // 同步更新[基础题]的初始结构 newList = [{text:""}]; @@ -951,7 +955,6 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{ workAnswerArr.forEach(it => selList.push(it)); } else if( item.worktype == '填空题' || item.worktype == '判断题'){ - item.title = item.title.replace(/
(?: )?<\/div>/g, '_____'); // 处理选项 () workAnswerArr.forEach((it,id)=>{ const s = { diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue index 5fc2515..e3655b0 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue @@ -111,6 +111,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval import { listEvaluation } from '@/api/subject' import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; +import { getBindlist } from '@/api/education/knowledgePoint' import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' import { processList } from '@/hooks/useProcessList' import { useGetHomework } from '@/hooks/useGetHomework' @@ -155,6 +156,7 @@ const entpCourseWorkPointList = ref([ {label: '不限', value: []}, ]); // 习题查询条件 - 知识点 const knowledgePointProps = ref({value: 'thirdId', label: 'title'}); +//const knowledgePointProps = ref({value: 'thirdId', label: 'knowTitle'}); const entpCourseWorkYearList =ref([ {label: '不限', value: '-1'}, {label: '2024', value: '2024'}, @@ -358,8 +360,18 @@ const handleQueryFromEntpCourseWork= async (queryType) => { /** * 3、知识点 */ - const getEntpCourseWorkPointList = () => { + const getEntpCourseWorkPointList = async () => { // 更新考点 + + // const res = await getBindlist({ eid: props.bookobj.levelSecondId }); + // if (!res.data || res.data.length < 1) { + // ElMessage.warning('当前章节下无知识点'); + // entpCourseWorkPointList.value = []; + // } + // else { + // entpCourseWorkPointList.value = res.data; + // } + // 拿到当前章节下得所有知识点 listEvaluation({ itemkey: "subject", pageSize: 10, edustage: userStore.edustage, edusubject: userStore.edusubject }).then((res) => { const evalId = res.rows