Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2024-11-22 11:07:11 +08:00
commit f08b5a8bee
3 changed files with 18 additions and 2 deletions

View File

@ -285,6 +285,7 @@ const t = function(name, time) {
edusubject: userStore.edusubject, // this.userStore.edusubject, edusubject: userStore.edusubject, // this.userStore.edusubject,
evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id, evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id,
status: "1", status: "1",
edituserid: userStore.userId,
orderby: 'concat(worktype,timestamp) DESC', orderby: 'concat(worktype,timestamp) DESC',
} }

View File

@ -740,6 +740,10 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
let titleSubjList = ''; // + let titleSubjList = ''; // +
const newSubjListparams = []; // list const newSubjListparams = []; // list
// 线线()
item.title = item.title.replace(/<!--BA--><div class="quizPutTag" contenteditable="true">(?:&nbsp;)?<\/div><!--EA-->/g, '_____');
if(item.worktype == '复合题') { if(item.worktype == '复合题') {
// [] // []
newList = [{text:""}]; newList = [{text:""}];
@ -951,7 +955,6 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
workAnswerArr.forEach(it => selList.push(it)); workAnswerArr.forEach(it => selList.push(it));
} }
else if( item.worktype == '填空题' || item.worktype == '判断题'){ else if( item.worktype == '填空题' || item.worktype == '判断题'){
item.title = item.title.replace(/<!--BA--><div class="quizPutTag" contenteditable="true">(?:&nbsp;)?<\/div><!--EA-->/g, '_____');
// //
workAnswerArr.forEach((it,id)=>{ workAnswerArr.forEach((it,id)=>{
const s = { const s = {

View File

@ -111,6 +111,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval
import { listEvaluation } from '@/api/subject' import { listEvaluation } from '@/api/subject'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
import { getBindlist } from '@/api/education/knowledgePoint'
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
import { processList } from '@/hooks/useProcessList' import { processList } from '@/hooks/useProcessList'
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
@ -155,6 +156,7 @@ const entpCourseWorkPointList = ref([
{label: '不限', value: []}, {label: '不限', value: []},
]); // - ]); // -
const knowledgePointProps = ref({value: 'thirdId', label: 'title'}); const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
//const knowledgePointProps = ref({value: 'thirdId', label: 'knowTitle'});
const entpCourseWorkYearList =ref([ const entpCourseWorkYearList =ref([
{label: '不限', value: '-1'}, {label: '不限', value: '-1'},
{label: '2024', value: '2024'}, {label: '2024', value: '2024'},
@ -358,8 +360,18 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
/** /**
* 3知识点 * 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) => { listEvaluation({ itemkey: "subject", pageSize: 10, edustage: userStore.edustage, edusubject: userStore.edusubject }).then((res) => {
const evalId = res.rows const evalId = res.rows