From 94e609164a91bc0812cb18c911ea925443755146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 22 Nov 2024 09:41:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=8F=81=E4=BC=98?= =?UTF-8?q?=E7=BD=91=E5=A1=AB=E7=A9=BA=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newClassTaskAssign/myQuestion/index.vue | 7 ++++--- .../questionUpload/quesItem/index.vue | 12 ++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue index 33ce1e6..e915dfa 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue @@ -120,7 +120,7 @@ import { useRouter, useRoute } from 'vue-router' import { listEntpcoursework } from '@/api/education/entpCourseWork' import { listEvaluationclue } from '@/api/classTask' -import { delEntpcoursework } from "@/api/education/entpCourseWork"; +import { delEntpcoursework, updateEntpcoursework } from "@/api/education/entpCourseWork"; import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue"; @@ -284,7 +284,7 @@ const t = function(name, time) { edustage: userStore.edustage, // this.userStore.edustage, edusubject: userStore.edusubject, // this.userStore.edusubject, evalid: props.bookobj.levelSecondId, // this.activeParams.lession.id, - + status: "1", orderby: 'concat(worktype,timestamp) DESC', } @@ -424,7 +424,8 @@ const onSubmitExamSingleCallback=(callback) =>{ /** 删除题目按钮操作 */ const handleDelete = async(item, index) => { - await useHandleData(delEntpcoursework, item.id, `确认删除编号为【${index+1}】的题目？` ); + //await useHandleData(delEntpcoursework, item.id, `确认删除编号为【${index+1}】的题目？` ); + await useHandleData(updateEntpcoursework, {id:item.id, status:'0'}, `确认删除编号为【${index+1}】的题目？` ); debounceQueryData(); } 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 cbcb771..856350e 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -55,6 +55,7 @@ popper-class="my-popper" @change="onchange" style="width:90%" + filterable /> @@ -145,8 +146,7 @@ - + + + - @@ -952,6 +952,7 @@ 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 = { @@ -1000,6 +1001,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{ const pointArr = item.evalnodeid.split(','); if (curKnowledgePointList.value.length > 0 && pointArr.length > 0) { pointArr.forEach(element => { + element = element.trim(); let point = []; if (getCurKnowledgePointToForm(point, element, curKnowledgePointList.value)) { point = point.reverse(); @@ -1337,8 +1339,10 @@ const submitForm=(formName) =>{ const workType = questForm.worktype.replace('(主观题)', ''); // 需要对题目的单引号(设置字体)进行转义(因查询语句中模糊查询title_like单引号会报错) - const title = questForm.title.replace(/'/g, "\\'"); - console.log(questForm,'???????????????????????') + const title = this.form.title + .replace(/'/g, "\\'") + .replace(/_{3,}/g, "
"); + console.log(questForm,'???????????????????????'); let param = { id: questForm.id, // id thirdid: 0, // 第三方题库id SID From 5ac33bd1ca253b668b31eea9ebc4857ba5e9b46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 22 Nov 2024 09:53:15 +0800 Subject: [PATCH 2/7] 1 --- .../newClassTaskAssign/questionUpload/quesItem/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 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 856350e..f8e6452 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -491,7 +491,7 @@ const questForm = reactive({ method: '', submitIndex: 0, // 该题对应原试题集合中的序号([单题上传]时为0, [扫描上传]为集合中的序号) submitType: 0, // 该题的上传方法 - status: 1, // 该题的状态 + status: '1', // 该题的状态 list:[ { text:"" @@ -1339,7 +1339,7 @@ const submitForm=(formName) =>{ const workType = questForm.worktype.replace('(主观题)', ''); // 需要对题目的单引号(设置字体)进行转义(因查询语句中模糊查询title_like单引号会报错) - const title = this.form.title + const title = questForm.title .replace(/'/g, "\\'") .replace(/_{3,}/g, "
"); console.log(questForm,'???????????????????????'); From dcd1a3bb05ac7d9736782305b1181ec21f3bdeb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 22 Nov 2024 09:54:05 +0800 Subject: [PATCH 3/7] 1 --- .../newClassTaskAssign/questionUpload/quesItem/index.vue | 1 - 1 file changed, 1 deletion(-) 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 f8e6452..3e90189 100644 --- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue +++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue @@ -55,7 +55,6 @@ popper-class="my-popper" @change="onchange" style="width:90%" - filterable /> From cbb6a10c1d40b9665464e01adeee39cbace9fd9e Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 22 Nov 2024 09:58:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=9C=80=E5=A4=A7=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/index.js b/src/main/index.js index 18df801..c223604 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -137,7 +137,7 @@ function createMainWindow() { // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口 // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见 - // mainWindow.maximize(); + mainWindow.maximize(); // 第三步： 开启remote服务 remote.enable(mainWindow.webContents) } From cefc29df6a08bdc4852a20f145a6a7f1c1a89b92 Mon Sep 17 00:00:00 2001 From: zhuhao <979263092@qq.com> Date: Fri, 22 Nov 2024 09:58:50 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b81d424..5867aac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aix-win-ws", - "version": "2.5.3", + "version": "2.5.4", "description": "", "main": "./out/main/index.js", "author": "上海交大重庆人工智能研究院", From 3b6878ece5aee6d84cc2b2d8fe4be91a62a0b331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 22 Nov 2024 10:48:37 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../questionUpload/quesItem/index.vue | 5 ++++- .../newClassTaskAssign/searchQuestion/index.vue | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 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 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 From c4c1115abbd5b3d1ff334e89ecf6510f0afa56b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com> Date: Fri, 22 Nov 2024 11:03:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=94=A8=E6=88=B7id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/classTask/newClassTaskAssign/myQuestion/index.vue | 1 + 1 file changed, 1 insertion(+) 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', }