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 1/2] =?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(/<!--BA--><div class="quizPutTag" contenteditable="true">(?:&nbsp;)?<\/div><!--EA-->/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(/<!--BA--><div class="quizPutTag" contenteditable="true">(?:&nbsp;)?<\/div><!--EA-->/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 2/2] =?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',
 
   }