From 4a0e9b0b84c2f3526d85579e218c872d29e770a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Fri, 13 Dec 2024 10:11:33 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=89=B9=E6=94=B9=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/classTask/index.js       |  8 +++
 .../container/classTask/item-dialog-score.vue | 53 +++++++++++++------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/renderer/src/api/classTask/index.js b/src/renderer/src/api/classTask/index.js
index bf03614..4846745 100644
--- a/src/renderer/src/api/classTask/index.js
+++ b/src/renderer/src/api/classTask/index.js
@@ -71,6 +71,14 @@ export function updateClassworkeval(data) {
   })
 }
 
+export function updateClassworkevalList(data) {
+  return request({
+    url: '/education/classworkeval/updateList',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改classworkdata
 export function updateClassworkdata(data) {
   return request({
diff --git a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
index 044f98e..5e59a17 100644
--- a/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
@@ -427,7 +427,7 @@ import useUserStore from '@/store/modules/user'
 import { ref, reactive } from 'vue'
 // import { Plus } from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
-import { updateClassworkeval, updateClassworkdata, getClassworkdata } from '@/api/classTask'
+import { updateClassworkeval, updateClassworkdata, getClassworkdata, updateClassworkevalList } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
@@ -882,22 +882,41 @@ const onSubmit = () => {
   })
 
   // 更新题目批改
-  classWorkFormScore.teacherRating &&
-    classWorkFormScore.teacherRating.map((item, index) => {
-      const queryParams = {
-        id: item.id,
-        teacherRating: item.score, // 教师评分
-        rating: classWorkFormScore.rating, //  评价
-        teacherremark: classWorkFormScore.teacherremark, //评分说明
-        timestamp: getTimeDate() // 时间
-      }
-      console.log(queryParams)
-      updateClassworkeval(queryParams).then((res) => {
-        // if(res.code == 200){
-        // 循环提交能干个啥
-        // }
-      })
-    })
+  const queryList = [];
+  classWorkFormScore.teacherRating && classWorkFormScore.teacherRating.map((item, index) => {
+    const queryParams = {
+      id: item.id,
+      teacherRating: item.score, // 教师评分
+      rating: classWorkFormScore.rating, //  评价
+      teacherremark: classWorkFormScore.teacherremark, //评分说明
+      timestamp: getTimeDate() // 时间
+    }
+    queryList.push(queryParams)
+  })
+  //console.log('queryList->', queryList)
+  updateClassworkevalList(queryList).then((res) => {
+    // if(res.code == 200){
+    // 循环提交能干个啥
+    // }
+  })
+
+  // 更新题目批改
+  // classWorkFormScore.teacherRating &&
+  //   classWorkFormScore.teacherRating.map((item, index) => {
+  //     const queryParams = {
+  //       id: item.id,
+  //       teacherRating: item.score, // 教师评分
+  //       rating: classWorkFormScore.rating, //  评价
+  //       teacherremark: classWorkFormScore.teacherremark, //评分说明
+  //       timestamp: getTimeDate() // 时间
+  //     }
+  //     console.log(queryParams)
+  //     updateClassworkeval(queryParams).then((res) => {
+  //       // if(res.code == 200){
+  //       // 循环提交能干个啥
+  //       // }
+  //     })
+  //   })
   ElMessage({
     type: 'success',
     message: '提交成功!'

From 78ecf6ea55b57580efa8ea68e8c333162221b069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 16 Dec 2024 17:13:56 +0800
Subject: [PATCH 02/10] =?UTF-8?q?[=E6=9F=A5=E8=AF=A2=E8=AF=95=E9=A2=98]=20?=
 =?UTF-8?q?-=20=E5=8D=95=E5=85=83=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/newTask/taskTypeView.vue        | 38 ++++++---
 .../newClassTaskAssign/myQuestion/index.vue   | 23 ++++--
 .../questionUpload/quesItem/index.vue         |  6 +-
 .../searchQuestion/index.vue                  | 78 ++++++++++++-------
 4 files changed, 98 insertions(+), 47 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 0c32397..26db4b8 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -55,6 +55,7 @@
                       <el-col :span="11">
                         <el-form-item label="知识点" label-width="70">
                           <el-cascader
+                            disabled
                             v-model="entpCourseWorkQueryParams.point"
                             clearable
                             style="width: 100%"
@@ -172,7 +173,7 @@
                   <!-- 非习题训练：常规作业、 -->
                   <div v-if="classWorkForm.worktype!='习题训练'">
                     <div :style="{ 'overflow': 'auto'}">
-                      <template v-if="classWorkForm.worktype!='常规作业'">
+                      <!-- <template v-if="classWorkForm.worktype!='常规作业'">
                         <template v-for="(item, index) in workResource.teachResourceList" :key="item">
                           <div v-if="item.worktype==classWorkForm.worktype" style="border-bottom: 1px dotted;display: flex;justify-content: space-between;">
                             <div style="margin-bottom: 5px; padding-left: 15px;display: flex;flex-direction: row;align-items: center;">
@@ -193,7 +194,7 @@
                             </div>
                           </div>
                         </template>
-                      </template>
+                      </template> -->
                       <template v-if="classWorkForm.worktype =='常规作业'">
                         <div v-loading="fileLoading" class="upload-homework">
                           <FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
@@ -285,6 +286,7 @@ import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval
 import { listEvaluation } from '@/api/subject'
 import { listEntpcoursefile } from '@/api/education/entpcoursefile'
 import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
+import { isJson } from "@/utils/comm";
 
 
 import { useGetHomework } from '@/hooks/useGetHomework'
@@ -459,12 +461,13 @@ const client = new Apis('/paht');
  */
  const t = function(name, time) {
    return new Promise(resolve => {
+    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
     const queryForm = {
       // 分页参数
       currentPage: paginationParams.pageNum,
       pageSize: paginationParams.pageSize,
       // 课程相关参数
-      eid: props.bookobj.levelSecondId,
+      eid: evalId,  // 当前单元或章节id
       sectionName: props.bookobj.coursetitle,
       edusubject: userStore.edusubject,
       edustage: userStore.edustage,
@@ -557,9 +560,12 @@ const getQueryFromEvaluationclue = () => {
       }
 
       if (clueres.rows[i].childlist != '') {
-        clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
+        if (isJson(tmpJson)){
+          clueres.rows[i].childArray = JSON.parse(tmpJson);
+          for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+            clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          }
         }
       } else {
         clueres.rows[i].childArray = {};
@@ -990,6 +996,8 @@ const initPageParams = () => {
 
 
 onMounted(async() => {
+  // 知识点
+  getEntpCourseWorkPointList();
 })
 
 // const refreshData = () => {
@@ -1016,9 +1024,9 @@ const debounceQueryData = debounce(() => {
   // 习题资源
   handleQueryFromEntpCourseWork(0);
   // 框架梳理
-  getQueryFromEvaluationclue();
+  //getQueryFromEvaluationclue();
   // 知识点
-  getEntpCourseWorkPointList();
+  //getEntpCourseWorkPointList();
 }, 1000);
 
 watch(() => props.propsformobj.uniquekey, (newVal) => {
@@ -1027,8 +1035,20 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
     classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
   }
 })
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+
+
+//watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
+
+watch([
+  () => props.bookobj.levelFirstId,
+  () => props.bookobj.levelSecondId
+], ([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) => {
   console.log(props.bookobj,'课程选择')
+  // 默认选择一级单元时, 不自动获取试题, 需手动按钮获取试题
+  if (props.bookobj.levelSecondId == '') {
+    workResource.entpCourseWorkList = [];
+    return;
+  }
   debounceQueryData();
 })
 
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 54118ca..f091ce7 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -129,6 +129,7 @@ import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
 import { useHandleData }  from "@/hooks/useHandleData";
 import { processList } from '@/hooks/useProcessList';
+import { isJson } from "@/utils/comm";
 
 
 import { debounce } from '@/utils/comm' 
@@ -254,6 +255,7 @@ function Apis(key) {
 const client = new Apis('/paht');
 const t = function(name, time) {
   return new Promise(resolve => {
+    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
     const queryForm = {
       // 题类
       worktype: entpCourseWorkQueryParams.worktype.label,
@@ -266,7 +268,7 @@ const t = function(name, time) {
       // 课程相关参数
       edustage: userStore.edustage, // this.userStore.edustage,
       edusubject: userStore.edusubject, //  this.userStore.edusubject,
-      eid: props.bookobj.levelSecondId, // this.activeParams.lession.id,
+      eid: evalId,  // 当前单元或章节id
       status: "1",
       editUserId: userStore.userId,
       //orderby: 'concat(worktype,timestamp) DESC',
@@ -326,9 +328,12 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       }
       //console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
       if (clueres.rows[i].childlist != '') {
-        clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
+        if (isJson(tmpJson)){
+          clueres.rows[i].childArray = JSON.parse(tmpJson);
+          for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+            clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          }
         }
       } else {
         clueres.rows[i].childArray = {};
@@ -482,8 +487,16 @@ const debounceQueryData = debounce(() => {
 }, 1000);
 
 
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+watch([
+  () => props.bookobj.levelFirstId,
+  () => props.bookobj.levelSecondId
+], ([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) => {
   console.log(props.bookobj,'课程选择')
+  // 默认选择一级单元时, 不自动获取试题, 需手动按钮获取试题
+  if (props.bookobj.levelSecondId == '') {
+    workResource.entpCourseWorkList = [];
+    return;
+  }
   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 22036a4..73d05c7 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -1703,13 +1703,13 @@ const myMessageShow=(title, msg, status)=>{
  * @return: {*}
  * @param {*} list
  */
-const updateKnowledgePoint = (list) => {
+const formatKnowledgePoint = (list) => {
   list.forEach(item => {
     if (item.title &&  item.title != '') {
       item.knowTitle = item.title;
     }
     if (item.children && Array.isArray(item.children)) {
-      updateKnowledgePoint(item.children);
+      formatKnowledgePoint(item.children);
     }
   });
   return list;
@@ -1733,7 +1733,7 @@ watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
     if (id) {
       listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
         //console.log('listKnowlegepointFormat->', res.rows);
-        curKnowledgePointList.value = updateKnowledgePoint(res.rows);
+        curKnowledgePointList.value = formatKnowledgePoint(res.rows);
       });
     }
   }else{
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
index 9cf6b7e..a8d6f8d 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@@ -117,6 +117,8 @@ 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 { isJson } from "@/utils/comm";
+
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
 import {throttle,debounce } from '@/utils/comm' 
@@ -190,6 +192,8 @@ const workResource = reactive({
 
 onMounted(() => {
   console.log('entpCourseWorkTypeList', entpCourseWorkTypeList);
+  // 知识点 (仅用更新一次)
+  getEntpCourseWorkPointList();
   debounceQueryData(); // 查询习题列表
 })
 
@@ -235,32 +239,33 @@ function Apis(key) {
 const client = new Apis('/paht');
 const t = function(name, time) {
   return new Promise(resolve => {
-  const queryForm = {
-    // 分页参数
-    currentPage: paginationParams.pageNum,
-    pageSize: paginationParams.pageSize,
-    // 课程相关参数
-    eid: props.bookobj.levelSecondId,
-    sectionName: props.bookobj.coursetitle,
-    edusubject: userStore.edusubject,
-    edustage: userStore.edustage,
-    //
-    // 题类
-    worktype: entpCourseWorkQueryParams.worktype.label,
-    workTypeId: entpCourseWorkQueryParams.worktype.value,
-    // 题源
-    workgroup: entpCourseWorkQueryParams.workgroup,
-    // 年份
-    yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
-    // 知识点
-    thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
-    // 关键字
-    keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
+    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
+    const queryForm = {
+      // 分页参数
+      currentPage: paginationParams.pageNum,
+      pageSize: paginationParams.pageSize,
+      // 课程相关参数
+      eid: evalId,  // 当前单元或章节id
+      sectionName: props.bookobj.coursetitle,
+      edusubject: userStore.edusubject,
+      edustage: userStore.edustage,
+      //
+      // 题类
+      worktype: entpCourseWorkQueryParams.worktype.label,
+      workTypeId: entpCourseWorkQueryParams.worktype.value,
+      // 题源
+      workgroup: entpCourseWorkQueryParams.workgroup,
+      // 年份
+      yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
+      // 知识点
+      thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      // 关键字
+      keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
 
-  }
-  const entpcourseworkres = listEntpcourseworkNew(queryForm);
+    }
+    const entpcourseworkres = listEntpcourseworkNew(queryForm);
 
-  resolve(entpcourseworkres);
+    resolve(entpcourseworkres);
   })
 }
 const handleQueryFromEntpCourseWork= async (queryType) => {
@@ -329,9 +334,12 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       }
       //console.log("clueres.rows[i].childlist",clueres.rows[i].childlist);
       if (clueres.rows[i].childlist != '') {
-        clueres.rows[i].childArray = JSON.parse('['+clueres.rows[i].childlist+']');
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
+        if (isJson(tmpJson)){
+          clueres.rows[i].childArray = JSON.parse(tmpJson);
+          for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+            clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          }
         }
       } else {
         clueres.rows[i].childArray = {};
@@ -460,19 +468,29 @@ const  captureScreenshot = (id) => {
 // 防抖
 const debounceQueryData = debounce(() => {
   console.log("防抖 加载数据中...")
+  console.log(props.bookobj,'课程选择')
   // 初始化滚动加载参数
   initPageParams();
   // 习题资源
   handleQueryFromEntpCourseWork(0);
   // 框架梳理
-  getQueryFromEvaluationclue();
+  //getQueryFromEvaluationclue();
   // 知识点
-  getEntpCourseWorkPointList();
+  //getEntpCourseWorkPointList();
 }, 1000);
 
+//watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
 
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+watch([
+  () => props.bookobj.levelFirstId,
+  () => props.bookobj.levelSecondId
+], ([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) => {
   console.log(props.bookobj,'课程选择')
+  // 默认选择一级单元时, 不自动获取试题, 需手动按钮获取试题
+  if (props.bookobj.levelSecondId == '') {
+    workResource.entpCourseWorkList = [];
+    return;
+  }
   debounceQueryData();
 })
 

From 9a2a55c62b739cd0ab62ca555e1a95375d8829a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 16 Dec 2024 17:30:00 +0800
Subject: [PATCH 03/10] 1

---
 src/renderer/src/views/model/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index 4bc6ebb..a10a761 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -402,8 +402,8 @@ const changeBook = async(data) => {
   let cata = parseCataByNode(data.node)
   currentNode.value = data.node
   uploadData.value.levelFirstId = cata[0]
-  uploadData.value.levelSecondId = cata[1]
-  uploadData.value.levelThirdId = cata[2]
+  uploadData.value.levelSecondId = cata[1]==null||cata[1]== undefined ? '' : cata[1]
+  uploadData.value.levelThirdId = cata[2]==null||cata[2]== undefined ? '' : cata[2]
   uploadData.value.textbookId = data.textBook.curBookId
   getModelInfo({cataid: currentNode.value.id}).then(res=>{
     console.log(res)

From 058509b29c670f379ae980e6f23c33bed6db4635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 18 Dec 2024 10:31:20 +0800
Subject: [PATCH 04/10] 1

---
 src/renderer/public/cropImgTest/single.json   | 203 ++++++++++++++++++
 .../src/components/choose-textbook/index.vue  |  14 +-
 .../questionUpload/index.vue                  |   2 +-
 src/renderer/src/views/model/index.vue        |   4 +-
 4 files changed, 219 insertions(+), 4 deletions(-)
 create mode 100644 src/renderer/public/cropImgTest/single.json

diff --git a/src/renderer/public/cropImgTest/single.json b/src/renderer/public/cropImgTest/single.json
new file mode 100644
index 0000000..fdefcd9
--- /dev/null
+++ b/src/renderer/public/cropImgTest/single.json
@@ -0,0 +1,203 @@
+{
+  "words_result": [
+    {
+      "type": "print",
+      "location": {
+        "top": 8,
+        "left": 11,
+        "width": 485,
+        "height": 18
+      },
+      "words": "(1)风华正茂:"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 37,
+        "left": 11,
+        "width": 485,
+        "height": 18
+      },
+      "words": "(2)书生意气:"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 67,
+        "left": 11,
+        "width": 484,
+        "height": 18
+      },
+      "words": "(3)指点江山:"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 96,
+        "left": 11,
+        "width": 485,
+        "height": 18
+      },
+      "words": "(4)峥嵘岁月:"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 125,
+        "left": 10,
+        "width": 180,
+        "height": 17
+      },
+      "words": "[答案](1)风采才华正盛。"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 155,
+        "left": 11,
+        "width": 179,
+        "height": 16
+      },
+      "words": "(2)词中指同学们意气奔放。"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 185,
+        "left": 12,
+        "width": 118,
+        "height": 16
+      },
+      "words": "(3)评论国家大事。"
+    },
+    {
+      "type": "print",
+      "location": {
+        "top": 214,
+        "left": 12,
+        "width": 376,
+        "height": 16
+      },
+      "words": "(4)不寻常的日子。峥嵘,这里是不平凡、 不寻常的意思。"
+    }
+  ],
+  "formula_result": [],
+  "img_direction": 0,
+  "results": [
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 18,
+          "width": 485,
+          "top": 8
+        },
+        "word": "(1)风华正茂:",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 18,
+          "width": 485,
+          "top": 37
+        },
+        "word": "(2)书生意气:",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 18,
+          "width": 484,
+          "top": 67
+        },
+        "word": "(3)指点江山:",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 18,
+          "width": 485,
+          "top": 96
+        },
+        "word": "(4)峥嵘岁月:",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 10,
+          "height": 17,
+          "width": 180,
+          "top": 125
+        },
+        "word": "[答案](1)风采才华正盛。",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 16,
+          "width": 179,
+          "top": 155
+        },
+        "word": "(2)词中指同学们意气奔放。",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 12,
+          "height": 16,
+          "width": 118,
+          "top": 185
+        },
+        "word": "(3)评论国家大事。",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 12,
+          "height": 16,
+          "width": 376,
+          "top": 214
+        },
+        "word": "(4)不寻常的日子。峥嵘,这里是不平凡、 不寻常的意思。",
+        "line_probability": {}
+      }
+    }
+  ],
+  "layouts_num": 0,
+  "results_num": 8,
+  "log_id": 1868923976840586200
+}
\ No newline at end of file
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 7e766f8..0151f5b 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -7,7 +7,7 @@
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
+        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id" :render-content="renderContent"
           :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
           @node-click="handleNodeClick">
           <template #default="{ node }">
@@ -178,6 +178,18 @@ const handleNodeClick = (data) => {
   sessionStore.set('subject.curNode', nodeData)
   emit('nodeClick', curData)
 }
+
+const renderContent = (h, { node, data, store }) => {
+  return h(
+    'span',
+    {
+      style: {
+        color: data.bookId==''||data.bookId=='0' ? '#758CAE' : 'black',
+      },
+    },
+    node.label
+  );
+}
 onMounted( async () => {
   treeLoading.value = true
   try{
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
index 46b94b8..16a48cc 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
@@ -43,7 +43,7 @@
             </div>
             <!-- orc 使用说明 -->
             <div class="import-manual-explain"> 
-              <p>orc 使用说明</p>
+              <p>orc 使用说明（填空题暂无法整题识别）</p>
               <p>1、本地浏览 </p>
               <p>2、获取剪贴板图片 </p>
               <p>3、整题识别：可识别整张图片，自动填充到对应内容。 </p>
diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index a10a761..90e469c 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -402,8 +402,8 @@ const changeBook = async(data) => {
   let cata = parseCataByNode(data.node)
   currentNode.value = data.node
   uploadData.value.levelFirstId = cata[0]
-  uploadData.value.levelSecondId = cata[1]==null||cata[1]== undefined ? '' : cata[1]
-  uploadData.value.levelThirdId = cata[2]==null||cata[2]== undefined ? '' : cata[2]
+  uploadData.value.levelSecondId = cata[1] ?? ''
+  uploadData.value.levelThirdId = cata[2] ?? ''
   uploadData.value.textbookId = data.textBook.curBookId
   getModelInfo({cataid: currentNode.value.id}).then(res=>{
     console.log(res)

From c8729a700801912337a4e0e1c029a545fca1874b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Thu, 19 Dec 2024 15:51:06 +0800
Subject: [PATCH 05/10] =?UTF-8?q?[=E8=AF=95=E9=A2=98=E4=B8=8A=E4=BC=A0]=20?=
 =?UTF-8?q?-=20=E5=85=BC=E5=AE=B9=E4=BC=98=E5=8C=96=E8=8F=81=E4=BC=98?=
 =?UTF-8?q?=E7=BD=91=E9=A2=98=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/public/cropImgTest/single1.json  | 540 ++++++++++++++++++
 src/renderer/public/cropImgTest/single2.json  | 176 ++++++
 .../src/api/education/entpCourseWork.js       |  14 +
 .../src/components/choose-textbook/index.vue  |   2 +-
 src/renderer/src/hooks/useProcessList.js      |  17 +-
 .../questionUpload/index.vue                  |   2 +-
 .../questionUpload/ocrImg2ExamQues.js         | 106 ++--
 .../questionUpload/quesItem/index.vue         | 123 ++--
 src/renderer/src/views/desktop/index.vue      |  10 +-
 src/renderer/src/views/model/index.vue        |   7 +-
 10 files changed, 888 insertions(+), 109 deletions(-)
 create mode 100644 src/renderer/public/cropImgTest/single1.json
 create mode 100644 src/renderer/public/cropImgTest/single2.json

diff --git a/src/renderer/public/cropImgTest/single1.json b/src/renderer/public/cropImgTest/single1.json
new file mode 100644
index 0000000..e8bd920
--- /dev/null
+++ b/src/renderer/public/cropImgTest/single1.json
@@ -0,0 +1,540 @@
+{
+  "img_direction": 0,
+  "results": [
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 96,
+          "height": 33,
+          "width": 943,
+          "top": 15
+        },
+        "word": "11.(2023广东卷,2)党的二十大审议通过了《中国共产党章程(修正案)》,把党的十九大以",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 48,
+          "height": 33,
+          "width": 991,
+          "top": 58
+        },
+        "word": "来习近平新时代中国特色社会主义思想新发展写入党章,以更好反映以习近平同志为核心的",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 48,
+          "height": 32,
+          "width": 741,
+          "top": 101
+        },
+        "word": "党中央推进党的理论创新、实践创新、制度创新成果。这一修改()",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 95,
+          "height": 32,
+          "width": 720,
+          "top": 144
+        },
+        "word": "①全面具体地总结了党的十八大以来党和国家各项事业的伟大成就",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 836,
+          "height": 32,
+          "width": 203,
+          "top": 145
+        },
+        "word": "②为更好坚持和发",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 46,
+          "height": 33,
+          "width": 994,
+          "top": 187
+        },
+        "word": "展中国特色社会主义提供了制度保障和法律依据③更加彰显习近平新时代中国特色社会主",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 50,
+          "height": 32,
+          "width": 325,
+          "top": 229
+        },
+        "word": "义思想的真理力量和实践伟力",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 395,
+          "height": 33,
+          "width": 644,
+          "top": 229
+        },
+        "word": "④适应形势和任务的发展变化,有利于更好发挥党章的规范",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 50,
+          "height": 32,
+          "width": 128,
+          "top": 272
+        },
+        "word": "和指导作用",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 96,
+          "height": 32,
+          "width": 88,
+          "top": 315
+        },
+        "word": "A.①②",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 326,
+          "height": 32,
+          "width": 87,
+          "top": 314
+        },
+        "word": "B.①④",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 555,
+          "height": 31,
+          "width": 84,
+          "top": 316
+        },
+        "word": "C.②③",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 779,
+          "height": 32,
+          "width": 88,
+          "top": 317
+        },
+        "word": "D.③④",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 94,
+          "height": 33,
+          "width": 942,
+          "top": 358
+        },
+        "word": "【试题立意】本题以党的二十大对党章修改为背景,考查对习近平新时代中国特色社会主",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 51,
+          "height": 33,
+          "width": 871,
+          "top": 401
+        },
+        "word": "义思想的理解,引导学生认同习近平新时代中国特色社会主义思想,坚定理论自信。",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 95,
+          "height": 33,
+          "width": 942,
+          "top": 443
+        },
+        "word": "【能力解读】本题主要考查了对党的二十大审议通过了《中国共产党章程(修正案)》的关键",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 52,
+          "height": 33,
+          "width": 821,
+          "top": 487
+        },
+        "word": "信息的获取与加工能力,以及对其所体现道理的辨识与判断、推理与论证能力。",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 272,
+          "height": 27,
+          "width": 181,
+          "top": 542
+        },
+        "word": "筛选加工关键信息",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 795,
+          "height": 27,
+          "width": 113,
+          "top": 542
+        },
+        "word": "辨识与判断",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 63,
+          "height": 29,
+          "width": 602,
+          "top": 586
+        },
+        "word": "党的二十大与时俱进,审议通过了《中国共产党章程(修正案)》 ,使",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 681,
+          "height": 28,
+          "width": 343,
+          "top": 586
+        },
+        "word": "适应形势和任务的发展变化,有利于",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 62,
+          "height": 28,
+          "width": 196,
+          "top": 625
+        },
+        "word": "之随着时代丰富发展",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 680,
+          "height": 29,
+          "width": 297,
+          "top": 624
+        },
+        "word": "更好发挥党章的规范和指导作用",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 59,
+          "height": 28,
+          "width": 606,
+          "top": 674
+        },
+        "word": "《中国共产党章程(修正案)》把党的十九大以来习近平新时代中国",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 681,
+          "height": 30,
+          "width": 344,
+          "top": 692
+        },
+        "word": "更加彰显习近平新时代中国特色社会",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 61,
+          "height": 29,
+          "width": 602,
+          "top": 713
+        },
+        "word": "特色社会主义思想新发展写入党章,以更好反映以习近平同志为",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 682,
+          "height": 29,
+          "width": 295,
+          "top": 731
+        },
+        "word": "主义思想的真理力量和实践伟力",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 61,
+          "height": 29,
+          "width": 541,
+          "top": 751
+        },
+        "word": "核心的党中央推进党的理论创新、实践创新、制度创新成果",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 95,
+          "height": 31,
+          "width": 135,
+          "top": 808
+        },
+        "word": "【误项排除】",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 60,
+          "height": 26,
+          "width": 49,
+          "top": 863
+        },
+        "word": "选项",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 522,
+          "height": 27,
+          "width": 114,
+          "top": 863
+        },
+        "word": "排除的原因",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 122,
+          "height": 29,
+          "width": 902,
+          "top": 906
+        },
+        "word": "材料强调的是把党的十九大以来习近平新时代中国特色社会主义思想新发展写入党章,不涉及总",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 68,
+          "height": 27,
+          "width": 31,
+          "top": 927
+        },
+        "word": "①",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 124,
+          "height": 29,
+          "width": 594,
+          "top": 945
+        },
+        "word": "结党的十八大以来党和国家各项事业的伟大成就,①不符合题意",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 122,
+          "height": 28,
+          "width": 902,
+          "top": 992
+        },
+        "word": "《中国共产党章程(修正案)》是管党治党的总章程、总规矩,是中国共产党最根本的党内法规,不能",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 70,
+          "height": 26,
+          "width": 29,
+          "top": 1012
+        },
+        "word": "②",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 124,
+          "height": 28,
+          "width": 699,
+          "top": 1030
+        },
+        "word": "为更好坚持和发展中国特色社会主义提供制度保障和法律依据,②说法错误",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 97,
+          "height": 30,
+          "width": 108,
+          "top": 1085
+        },
+        "word": "【答案】D",
+        "line_probability": {}
+      }
+    }
+  ],
+  "layouts_num": 0,
+  "results_num": 38,
+  "log_id": 1869631874868290300
+}
\ No newline at end of file
diff --git a/src/renderer/public/cropImgTest/single2.json b/src/renderer/public/cropImgTest/single2.json
new file mode 100644
index 0000000..180f7c5
--- /dev/null
+++ b/src/renderer/public/cropImgTest/single2.json
@@ -0,0 +1,176 @@
+{
+  "img_direction": 0,
+  "results": [
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 14,
+          "height": 58,
+          "width": 727,
+          "top": 2
+        },
+        "word": "(四川成都锦江区校级自主招生)九年级1班在课外活动时,",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 14,
+          "height": 54,
+          "width": 730,
+          "top": 51
+        },
+        "word": "甲、乙、丙三位同学进行乒乓球练习,为确定哪两位同学先打",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 51,
+          "width": 731,
+          "top": 101
+        },
+        "word": "球,甲、乙、丙三位同学用“手心、手背”游戏(游戏时,“手心向",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 47,
+          "width": 731,
+          "top": 151
+        },
+        "word": "上”简称手心;“手背向上”简称手背)来决定.游戏规则是:每",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 10,
+          "height": 42,
+          "width": 731,
+          "top": 201
+        },
+        "word": "人每次同时随机伸出一只手,出手心或手背.若出现“两同一",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 10,
+          "height": 40,
+          "width": 729,
+          "top": 249
+        },
+        "word": "异”(即两手心、一手背或两手背、一手心)的情况,则同出手心",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 9,
+          "height": 38,
+          "width": 729,
+          "top": 297
+        },
+        "word": "或手背的两个人先打球,另一人做裁判;否则继续进行,直到",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 11,
+          "height": 32,
+          "width": 255,
+          "top": 348
+        },
+        "word": "出现“两同一异”为止.",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 10,
+          "height": 34,
+          "width": 726,
+          "top": 393
+        },
+        "word": "(1)请你列出甲、乙、丙三位同学运用“手心、手背”游戏,出手",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 7,
+          "height": 37,
+          "width": 723,
+          "top": 439
+        },
+        "word": "一次出现的所有等可能情况(用A表示手心,用B表示手背);",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 8,
+          "height": 36,
+          "width": 724,
+          "top": 485
+        },
+        "word": "(2)求甲、乙、丙三位同学运用“手心、手背”游戏,出手一次出",
+        "line_probability": {}
+      }
+    },
+    {
+      "chars": [],
+      "words_type": "print",
+      "words": {
+        "words_location": {
+          "left": 6,
+          "height": 34,
+          "width": 257,
+          "top": 529
+        },
+        "word": "现“两同一异”的概率.",
+        "line_probability": {}
+      }
+    }
+  ],
+  "layouts_num": 0,
+  "results_num": 12,
+  "log_id": 1869573563121265400
+}
\ No newline at end of file
diff --git a/src/renderer/src/api/education/entpCourseWork.js b/src/renderer/src/api/education/entpCourseWork.js
index 25f61e2..f243df1 100644
--- a/src/renderer/src/api/education/entpCourseWork.js
+++ b/src/renderer/src/api/education/entpCourseWork.js
@@ -135,4 +135,18 @@ export function getJYPath(url,config) {
     method: config.method||"get",
     params: config.params
   })
+}
+
+
+/**
+ * @desc: 百度识图转发
+ * @return: {*}
+ * @param {*} data
+ */
+export function getOcrContent(data) {
+  return request({
+    url: '/ocr/exam',
+    method: 'post',
+    data: data
+  })
 }
\ No newline at end of file
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 0151f5b..c57f831 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -184,7 +184,7 @@ const renderContent = (h, { node, data, store }) => {
     'span',
     {
       style: {
-        color: data.bookId==''||data.bookId=='0' ? '#758CAE' : 'black',
+        color: data.bookId==''||data.bookId=='0' ? '#A5B3CA' : 'black',
       },
     },
     node.label
diff --git a/src/renderer/src/hooks/useProcessList.js b/src/renderer/src/hooks/useProcessList.js
index bb2b0c3..c9f1e07 100644
--- a/src/renderer/src/hooks/useProcessList.js
+++ b/src/renderer/src/hooks/useProcessList.js
@@ -299,21 +299,28 @@ export const processList = (row, aloneOption=false) => {
           if(!aloneOption && j%2== 0){
             tmp += '</div>';
           }
-          row[i].workdescFormat = tmp
+          row[i].workdescFormat = tmp;
 
           // 处理[答案显示] - 转换ABCD
           let arr2Char = workAnswerArr
             .map((item) => {
               return String.fromCharCode(65 + Number(item))
             })
-            .join('')
-          row[i].workanswerFormat = arr2Char
+            .join('');
+          row[i].workanswerFormat = arr2Char;
         } else if (row[i].worktype == '填空题') {
           // 处理[选项显示] - 填空题中无选项, 故置空
-          row[i].workdescFormat = ''
+          row[i].workdescFormat = '';
 
           // 处理[答案显示] - 逗号连接
-          row[i].workanswerFormat = workAnswerArr.join('、')
+          
+          // 当[答案显示]为 [<div] 开头时，不再需逗号连接(一般为自主上传, 当前答案每个自带div标签) 
+          let linkChar = '、';
+          if (workAnswerArr.length != 0 && workAnswerArr[0].indexOf('<div') == 0) {
+            linkChar = '';
+          }
+          row[i].workanswerFormat = workAnswerArr.join(linkChar);
+
         } else if (row[i].worktype == '判断题') {
           // 处理[选项显示] - 判断题中无选项, 故置空
           row[i].workdescFormat = ''
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
index d2bb800..10f25a7 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue
@@ -127,7 +127,7 @@ const courseObj = reactive({
 const activeAptTab =  ref("人工录入");
 
 // false - 正式百度api    true - 本地json测试
-const OCR_WORK_TEST = false;
+const OCR_WORK_TEST = true;
 // [裁剪]参数
 const cropOption =  reactive({
   img: '', // 裁剪图片的地址 url 地址, base64, blob
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
index b3a8c7a..25c804d 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/ocrImg2ExamQues.js
@@ -2,7 +2,8 @@ import { ElMessageBox, ElMessage } from "element-plus";
 import qs from "qs";
 import axios from 'axios'
 import request from '@/utils/request'
-import { pyOCRAPI } from "@/api/education/entpcoursework";
+import { pyOCRAPI, getOcrContent } from "@/api/education/entpcoursework";
+import useClassTaskStore from '@/store/modules/classTask'
 
 
 const EXAM_JUDGED_DICTIONARY = ["正确", "对", "√", "T", "错误", "错", "×", "F"];
@@ -17,13 +18,10 @@ const baidubceConfig = {
   'client_secret': 'oWb0M0YWMmZPMQIhIUkJX99ddr7h61qf',
 };
 
-export function getOcrContent(data) {
-  return request({
-    url: '/ocr/exam',
-    method: 'post',
-    data: data
-  })
-}
+
+const {
+  entpCourseWorkTypeList
+} = useClassTaskStore();
 
 
 /**
@@ -45,7 +43,7 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
 
   if (isLocalTest) {
     // 临时本地测试（json格式跟百度ocr一致）
-    const response = await fetch('/cropImgTest/single.json');
+    const response = await fetch('/cropImgTest/single2.json');
     const resOcr = await response.json();
     ocrJson = resOcr.results;
     // 识别内容拼接 
@@ -115,7 +113,6 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
         examItem.params.push(obj);
       });
       return examItem;
-
     }
     else if (examType.includes('单选题') || examType.includes('多选题')) {
       /** 单选题/多选题 - 选项 */
@@ -150,10 +147,10 @@ export const ocrImg2ItemByManualUpl = async (isLocalTest = false, imgBase64 = ''
   }
   else if (curItem === 'workanswer') {
     // 该类型下只做[主观题]和[复合题]的处理
-    if (examType.includes('主观题')) {
-      ocrTxt = ocrTxt.replace(/<br \/>/g, '');
-      examItem = ocrTxt;
-    }
+    ocrTxt = ocrTxt.replace(/<br \/>/g, '');
+    examItem = ocrTxt;
+  } else {
+    examItem = ocrTxt;
   }
 
   // 返回转换格式后的识别内容
@@ -174,7 +171,7 @@ export const ocrImg2ExamByManualUpl = async (isLocalTest = false, imgBase64 = ''
 
   if (isLocalTest) {
     // 临时本地测试（json格式跟百度ocr一致）
-    const response = await fetch('/cropImgTest/single.json');
+    const response = await fetch('/cropImgTest/single1.json');
     const resOcr = await response.json();
     ocrJson = resOcr.results;
     // 识别内容拼接 
@@ -234,12 +231,14 @@ const ocrImg2Json = async (urlBase64) => {
     ElMessage.error("未检测到截图图片, 请截取图片后再识别");
     return null;
   }
+
   let base64Code = urlBase64.split(",")[1];
   const resOcr = await getOcrContent({ base64Code: base64Code });
   if (resOcr.code !== 200) {
     ElMessage.error("图片识别错误");
     return null;
   }
+  
   // const resToken = await bdyAPI_getToken();
   // if (resToken.status !== 200) {
   //   ElMessage.error("百度智能云用户标识有误");
@@ -394,8 +393,8 @@ const assembleExam = (eachSub) => {
     }
     // 第一部分[题干-选项] 处理
     titleAndWorkDesc = tmpList[0];
-    // 将4个以上连续的下划线统一替换为5个
-    titleAndWorkDesc = titleAndWorkDesc.replace(/_{4,}/g, '_____');
+    // 将3个以上连续的下划线统一替换为5个
+    titleAndWorkDesc = titleAndWorkDesc.replace(/_{3,}/g, '_____');
 
     // 第二部分[分析-答案] 处理
     let answerAndAnswer = {};
@@ -456,32 +455,35 @@ const assembleExam = (eachSub) => {
     }
   }
 
-  let tmpExam = null;
-  if (answer === '') {
-    /**
-     * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
-     */
-    tmpExam = processExamSingle(titleAndWorkDesc, answer);
-  }
-  else {
-    // 匹配是否存在 1. （1） (1)的存在, 题目与答案都存在则说明题型为复合题(嵌套题)
-    regex = /^(\d+[.．。]|\(\d+\)|（\d+）)/;
-    let answerFind = regex.test(answer);
-    regex = /(\d+[.．。]|\(\d+\)|（\d+）)/;
-    let titleFind = regex.test(titleAndWorkDesc);
-    if (titleFind && answerFind) {
-      /** 
-       * [复合题] - 处理逻辑 
-       */
-      tmpExam = processExamMulti(titleAndWorkDesc, answer);
-    }
-    else {
-      /**
-       * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
-       */
-      tmpExam = processExamSingle(titleAndWorkDesc, answer);
-    }
-  }
+  // 目前暂屏蔽无[复合题], 故所有都算基础题 
+  let tmpExam = processExamSingle(titleAndWorkDesc, answer);
+
+  // let tmpExam = null;
+  // if (answer === '') {
+  //   /**
+  //    * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
+  //    */
+  //   tmpExam = processExamSingle(titleAndWorkDesc, answer);
+  // }
+  // else {
+  //   // 匹配是否存在 1. （1） (1)的存在, 题目与答案都存在则说明题型为复合题(嵌套题)
+  //   regex = /^(\d+[.．。]|\(\d+\)|（\d+）)/;
+  //   let answerFind = regex.test(answer);
+  //   regex = /(\d+[.．。]|\(\d+\)|（\d+）)/;
+  //   let titleFind = regex.test(titleAndWorkDesc);
+  //   if (titleFind && answerFind) {
+  //     /** 
+  //      * [复合题] - 处理逻辑 
+  //      */
+  //     tmpExam = processExamMulti(titleAndWorkDesc, answer);
+  //   }
+  //   else {
+  //     /**
+  //      * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
+  //      */
+  //     tmpExam = processExamSingle(titleAndWorkDesc, answer);
+  //   }
+  // }
 
   if (tmpExam) {
     // 错误信息
@@ -607,13 +609,21 @@ const processExamSingle = function (titleAndWorkDesc, answer) {
      * 主观题
      */
     // [题型] - 格式化
-    examSingle.workType = "主观题";
+    const flagDict = ['单选题', '多选题', '判断题', '填空题'];
+    const another = entpCourseWorkTypeList.filter(item => !flagDict.includes(item.label));
+    if (another.length > 0) {
+      examSingle.workType = another[another.length-1].label;
+      // [题干]-格式化
+      examSingle.title = titleAndWorkDesc;
+    }
 
-    // [题干]-格式化
-    examSingle.title = titleAndWorkDesc;
+    // examSingle.workType = "主观题";
 
-    // [选项] - 格式化 --- 主观题无选项
-    //examSingle.arrWorkDesc = [];
+    // // [题干]-格式化
+    // examSingle.title = titleAndWorkDesc;
+
+    // // [选项] - 格式化 --- 主观题无选项
+    // //examSingle.arrWorkDesc = [];
 
     // [题目答案] - 处理 --- ['qweasd123']
     if (answer !== '') {
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 73d05c7..7342773 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -8,7 +8,7 @@
   <el-form ref="questFormRef" :model="questForm" :rules="MainRules" label-width="80px">
     <el-form-item label="题型" prop="worktype">
       <el-select v-model="questForm.worktype" placeholder="请选择题型" style="width:20%" :disabled="questForm.id==0?false:true">
-        <el-option v-for="item in fromOptions.type" :key="item.value" :label="item.label" :value="item.label"></el-option>
+        <el-option v-for="item in fromOptions.type" :key="item.value" :label="item.label" :value="item.label" :disabled="item.label=='不限'"></el-option>
       </el-select>
       <el-tag v-if="questForm.worktype=='填空题'" type="danger" style=" margin-left: 10px ">温馨提示：填空题题目的填空位置，下划线请连续输入3-10个 _
         符号。eg：今天___好日子。</el-tag>
@@ -103,7 +103,7 @@
     </div>
 
     <!-- 多选题 -->
-    <div v-if="questForm.worktype=='多选题'" class="questForm-item-cover">
+    <div v-else-if="questForm.worktype=='多选题'" class="questForm-item-cover">
       <div v-for="(item,index) in questForm.list" :key='index'>
         <el-form-item 
             :label=Options(1,index) 
@@ -134,7 +134,7 @@
     </div>
 
     <!-- 填空题 -->
-    <div v-if="questForm.worktype=='填空题'" class="questForm-item-cover">
+    <div v-else-if="questForm.worktype=='填空题'" class="questForm-item-cover">
       <div v-for="(item,index) in questForm.list" :key='index'>
         <el-form-item :label=Options(3,index) :prop="`list.${index}.text`"
           :rules="{required: true, message: '填空选项不能为空', trigger: 'blur'}">
@@ -157,7 +157,7 @@
     </div>
 
     <!-- 判断题 -->
-    <div v-if="questForm.worktype=='判断题'" class="questForm-item-cover">
+    <div v-else-if="questForm.worktype=='判断题'" class="questForm-item-cover">
       <div v-for="(item,index) in questForm.list" :key='index'>
         <el-form-item 
             v-if="index==0"
@@ -176,7 +176,7 @@
     </div>
 
     <!-- 主观题 -->
-    <div v-if="questForm.worktype.indexOf('主观题') != -1" class="questForm-item-cover">
+    <div v-else-if="questForm.worktype.indexOf('主观题') != -1" class="questForm-item-cover">
       <el-form-item label="答案">
         <Tinymce v-model="questForm.workanswer" :upFileParams="{
             lessionId: lessionid,
@@ -239,7 +239,7 @@
 
 
     <!-- 复合题 -->
-    <div v-if="questForm.worktype=='复合题'" class="questForm-item-cover">
+    <div v-else-if="questForm.worktype=='复合题'" class="questForm-item-cover">
       <el-form-item label="单项题型" :prop="worktype">
         <el-select v-model="questForm.mulList.worktype" placeholder="请选择题型" style="width:20%">
           <!-- <el-option key="1" label="单选题" value="单选题"></el-option> -->
@@ -350,6 +350,19 @@
       </div>
     </div>
 
+    <!-- 非统一标准名称的解答题 -->
+    <div v-else class="questForm-item-cover">
+      <el-form-item label="答案">
+        <Tinymce v-model="questForm.workanswer" :upFileParams="{
+            lessionId: lessionid,
+            fileAlias: '单题上传',
+          }" />
+      </el-form-item>
+      <div class="item-cropper-btn">
+        <el-button v-show="isCropper" circle @click="cropperFormItem('workanswer')"><el-icon><Search /></el-icon></el-button>
+      </div>
+    </div>
+
     <!-- 答案分析 -->
     <div class="questForm-item-cover">
       <el-form-item label="答案分析" prop="method">
@@ -623,8 +636,9 @@ onMounted(() => {
 
   // 更新第三方题型、题源
   if (entpCourseWorkTypeList.length>0) {
-    const flagDict = ['单选题', '多选题', '判断题', '填空题'];
-    fromOptions.type = entpCourseWorkTypeList.filter(item => flagDict.includes(item.label));
+    //const flagDict = ['单选题', '多选题', '判断题', '填空题'];
+    //fromOptions.type = entpCourseWorkTypeList.filter(item => flagDict.includes(item.label));
+    fromOptions.type = entpCourseWorkTypeList
   }
   if (entpCourseWorkGroupList.length>0) {
     fromOptions.flag = entpCourseWorkGroupList;
@@ -748,8 +762,8 @@ const resetForm = () =>{
 const updateForm= async(item, submitIndex=0, submitType=1) =>{
   console.log(item,'item');
   // 当不存在[状态]，默认为1
-  if (!item.hasOwnProperty('stutus')) {
-    item.stutus = '1';
+  if (!item.hasOwnProperty('status')) {
+    item.status = '1';
   }
   // 当不存在[知识点], 默认为空
   if (!item.hasOwnProperty('evalnodeid')) {
@@ -764,7 +778,6 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
 
   // 将菁优网的填空下划线标签转为下划线(上传时需再重新替换回来)
   item.title = item.title.replace(/<!--BA--><div class="quizPutTag" contenteditable="true">(?:&nbsp;)?<\/div><!--EA-->/g, '_____');
-      
 
   if(item.worktype == '复合题') {
     // 同步更新[基础题]的初始结构
@@ -902,11 +915,14 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
         }],
       },
     ];
-    newList = [];
+
+    // 默认显示一个空选项
+    newList = [{text:""}];
+    
 
     // 兼容题型[主观题]
-    item.worktype = item.worktype.replace(/\(主观题\)/g, '');
-    item.worktype = `${item.worktype}(主观题)`;
+    //item.worktype = item.worktype.replace(/\(主观题\)/g, '');
+    //item.worktype = `${item.worktype}(主观题)`;
     // 无选项
     // 选项答案处理下
     if(isJson(item.workanswer)){
@@ -1008,9 +1024,8 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
 
     lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
     console.log('lessionid', lessionid.value);
-
     // 拿到当前章节下得所有知识点
-    if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
+    if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语' ){
       const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
       const id = res.rows[0]?.id;
       if (id) {
@@ -1083,6 +1098,7 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
   //   status = 1,
   // }
   // emit('update-exam-single', updateStatus);
+  console.log('updateFormone->', questForm)
 };
 
 const updateFormone=(item, submitIndex, submitType, formdataitem)=>{
@@ -1437,14 +1453,9 @@ const submitForm=(formName) =>{
       //param.workdesc = questForm.list.map(item => item.text).join('#&');
       param.workdesc = JSON.stringify(questForm.list.map(item => item.text));
       
-      // 针对[单选题]和[多选题]重新格式化信息
-      if (questForm.worktype === '单选题' || questForm.worktype === '多选题') {
-        //param.workanswer = questForm.checkAnswer.map(item => item).join('#&');
-        param.workanswer = JSON.stringify(questForm.checkAnswer);
-      }
-
-      // 针对[复合题]重新格式化信息
+      // 重新格式化信息
       if(questForm.worktype === '复合题') {
+        // 针对[复合题]重新格式化信息
         let workdesc = [];
         let answer = [];
         // 1.题目: 背景材料(不再需要处理, 直接使用form.title)
@@ -1501,9 +1512,33 @@ const submitForm=(formName) =>{
         param.workdesc = JSON.stringify(workdesc);
         param.workanswer = JSON.stringify(answer);
       }
+      else if (questForm.worktype === '单选题' || questForm.worktype === '多选题') {
+        // 针对[单选题]和[多选题]重新格式化信息
+        //param.workanswer = questForm.checkAnswer.map(item => item).join('#&');
+        param.workanswer = JSON.stringify(questForm.checkAnswer);
+      }
+      // 针对[填空题]重新格式化信息  "<div>什么</div>#&<div>什么哟</div>".replace(/<[^>]*>/g, "")
+      else if(questForm.worktype === '填空题'){
+        //填空答案： 这里填入选项的值（填空值）
+        //param.workanswer = questForm.list.map(item => item.text).join('#&').replace(/<[^>]*>/g, ""); 
+        
+        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
+        param.workdesc = ''; 
+        param.workanswer = JSON.stringify(questForm.list.map(item => item.text)); 
+        
+      }
 
-      // 针对[主观题]重新格式化信息  ([单题上传]时默认为主观题。 [单题纠错]时会在原题型后面增加标识[(主观题)], 故此处更改为判断是否存在 )
-      if(questForm.worktype.indexOf('主观题') !== -1) {
+      // 针对[判断题]重新格式化信息
+      else if(questForm.worktype === '判断题'){
+        //判断题答案： 这里填入选项的值（判断值）
+        //param.workanswer = questForm.list.map(item => item.text).join('#&').replace(/<[^>]*>/g, ""); 
+        
+        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
+        param.workdesc = ''; 
+        param.workanswer = JSON.stringify(questForm.checkAnswer);
+      }
+      else if(questForm.worktype.indexOf('主观题') !== -1) {
+        // warn: 针对[主观题]重新格式化信息  ([单题上传]时默认为主观题。 [单题纠错]时会在原题型后面增加标识[(主观题)], 故此处更改为判断是否存在 )
         // 主观题：只有答案跟题目，答案还不是唯一的，一个具体参考答案类似
         param.workdesc = ''; // 主观题选项为空
         // 主观题 答案直接用的 workanswer 存的时候用数组
@@ -1533,27 +1568,16 @@ const submitForm=(formName) =>{
         // param.workdesc = ''; // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
         // param.workanswer = JSON.stringify(answer).replace(/<[^>]*>/g, "");
       }
-
-      // 针对[填空题]重新格式化信息  "<div>什么</div>#&<div>什么哟</div>".replace(/<[^>]*>/g, "")
-      if(questForm.worktype === '填空题'){
-        //填空答案： 这里填入选项的值（填空值）
-        //param.workanswer = questForm.list.map(item => item.text).join('#&').replace(/<[^>]*>/g, ""); 
-        
-        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
-        param.workdesc = ''; 
-        param.workanswer = JSON.stringify(questForm.list.map(item => item.text)); 
-        
+      else {
+        // 非统一标准解答题(主观题), 统一以[主观题]的格式来处理, 主要用于兼容ocr识别解答题及菁优网第三方非同一解答题
+        param.workdesc = ''; // 主观题选项为空
+        // 主观题 答案直接用的 workanswer 存的时候用数组
+        if (questForm.workanswer && questForm.workanswer != '') {
+          param.workanswer = JSON.stringify([questForm.workanswer]);
+        }
       }
 
-      // 针对[判断题]重新格式化信息
-      if(questForm.worktype === '判断题'){
-        //判断题答案： 这里填入选项的值（判断值）
-        //param.workanswer = questForm.list.map(item => item.text).join('#&').replace(/<[^>]*>/g, ""); 
-        
-        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
-        param.workdesc = ''; 
-        param.workanswer = JSON.stringify(questForm.checkAnswer);
-      }
+      
 
       // 针对不同上传方式, 需要做不同的状态处理(目前只用处理3的情况)
       if (questForm.submitType === 3) {
@@ -1715,18 +1739,21 @@ const formatKnowledgePoint = (list) => {
   return list;
 };
 
-watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
+watch([
+  () => props.bookobj.levelFirstId,
+  () => props.bookobj.levelSecondId
+], async([newLevelSecondId, newLevelFirstId], [oldLevelSecondId, oldLevelFirstId]) => {
   console.log(props.bookobj,'课程选择')
   // props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId
-  lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
+  lessionid.value = props.bookobj.levelSecondId!='' ? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
 
   /**
    * 格式化知识点: 分两种情况
    * 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
    * 2. 其他: 获取当前章节下的所有知识点
    */
-  let id = props.bookobj.levelSecondId;
-  if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
+  let id = lessionid.value;
+  if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语'){
     id = props.bookobj.node.rootid;
     const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
     id = res.rows[0]?.id;
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index cf6351d..b0d989f 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -58,10 +58,10 @@ import { useGetSubject } from '@/hooks/useGetSubject'
 import { sessionStore } from '@/utils/store'
 import { debounce } from 'lodash'
 
-import useUserStore from '@/store/modules/user'
-import useClassTaskStore from '@/store/modules/classTask'
-const userStore = useUserStore()
-const classTaskStore = useClassTaskStore();
+// import useUserStore from '@/store/modules/user'
+// import useClassTaskStore from '@/store/modules/classTask'
+// const userStore = useUserStore()
+// const classTaskStore = useClassTaskStore();
 
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
@@ -217,7 +217,7 @@ onMounted(async ()=>{
   chartInstance = echarts.init(chartDom.value)
 
   // 更新第三方题型题类
-  await classTaskStore.initJYInfo(userStore.user);
+  //await classTaskStore.initJYInfo(userStore.user);
 
   const option = {
 
diff --git a/src/renderer/src/views/model/index.vue b/src/renderer/src/views/model/index.vue
index 90e469c..14de242 100644
--- a/src/renderer/src/views/model/index.vue
+++ b/src/renderer/src/views/model/index.vue
@@ -98,10 +98,13 @@ import progressDialog from '@/views/teachingDesign/container/progress-dialog.vue
 import msgUtils from "@/plugins/modal";
 import * as commUtils from "@/utils/comm";
 import * as Api_server from "@/api/apiService"; // 学科名字文生图
+import useClassTaskStore from '@/store/modules/classTask'
+
 const router = useRouter()
 const userStore = useUserStore().user // 用户信息
 const currentNode = ref({})
 const refs = ref([]);
+const classTaskStore = useClassTaskStore();
 
 const collectRef = (key) => {
   return (el) => {
@@ -513,7 +516,9 @@ const changeClass = async (type, row, other) => {
 }
 
 // 页面加载
-onMounted(() => {
+onMounted(async () => {
+  // 更新第三方题型题类
+  await classTaskStore.initJYInfo(userStore);
 })
 
 </script>

From ff0dd3600cf665ff4e8c372af55804dd38d0a6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 25 Dec 2024 10:06:03 +0800
Subject: [PATCH 06/10] 1

---
 src/renderer/src/hooks/useClassTask.js        |  9 +++++++++
 src/renderer/src/store/modules/classTask.js   |  1 +
 .../components/experimentList.vue             | 18 +++++++++++++-----
 .../components/selectClass.vue                | 19 +++++++++++++++++++
 .../experimentQuestion/index.vue              | 15 ++++++++++++---
 .../classTask/newClassTaskAssign/index.vue    |  1 +
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js
index 934caf6..3668ef6 100644
--- a/src/renderer/src/hooks/useClassTask.js
+++ b/src/renderer/src/hooks/useClassTask.js
@@ -1,5 +1,7 @@
 import { listEntpcoursework,getEvaluationclue } from '@/api/classTask';
 import { processList } from '@/hooks/useProcessList';
+import useClassTaskStore from '@/store/modules/classTask'
+const useClassTaskStores = useClassTaskStore();
 
 const isJson = (str) => {
   if (typeof str == 'string') {
@@ -114,6 +116,13 @@ export const editListItem = (row, courseObj) => {
       }
       else if (row.worktype == '科学实验') {
         if(isJson(row.workcodes)){
+          // 同步更新实验内部的科目信息
+          if (row.worktag && row.worktag.indexOf('-') > -1){
+            const eduInfo = row.worktag.split('-');
+            useClassTaskStores.experimentObj.edustage = eduInfo[0];
+            useClassTaskStores.experimentObj.edusubject = eduInfo[1];
+          }
+          // 更新科学实验内容
           classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
           //
           // console.log('科学实验', classtaskObj);
diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index e93be20..17b008d 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -9,6 +9,7 @@ const useClassTaskStore = defineStore('classTask',{
       edustage: '小学', // 教育阶段
       edusubject: '', // 学科
       experimentList: [], // 实验科目列表
+      updateEduInfo: '小学-数学',    //实际需上传的学段+学科信息(用于上传及回显实验内的学段学科)
     },
     isOpenQuestUploadView: false, // 是否打开习题上传的页面
     classListIds: [],
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
index 9755859..c19db84 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
@@ -36,16 +36,24 @@ const props = defineProps({
 })
 const value = ref('')
 
+const updateLabel = (val) => {
+  value.value = val;
+}
 
-
+const onSelectOption = (option) => {
+  classTaskStore.updateEduInfo = `${classTaskStore.edustage}-${classTaskStore.edusubject}`;
+  console.log('updateEduInfo->', classTaskStore.experimentList.updateEduInfo);
+  console.log(option,'选择的实验课-------')
+  emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
+}
 
 onMounted(() => {
 })
 
-const onSelectOption = (option) => {
-  console.log(option,'选择的实验课-------')
-  emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
-}
+defineExpose({
+  updateLabel
+})
+
 
 </script>
 <style scoped>
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
index 0837584..d076cee 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
@@ -177,10 +177,29 @@ const handleUserEduSubject = (item) => {
     // emit('experlist',checkList.value)
 }
 
+const updateCheckList = () => {
+    const edustage = useClassTaskStore().experimentObj.edustage;
+    if(edustage === '小学'){
+        chooseGrade.value = jsonData.data.primary
+    }else if(edustage === '初中'){
+        chooseGrade.value = jsonData.data.junior
+    }else if(edustage === '高中'){
+        chooseGrade.value = jsonData.data.senior
+    }
+    expList.value = chooseGrade.value
+    const edusubject = useClassTaskStore().experimentObj.edusubject;
+    handleUserEduSubject(edusubject);
+}
+
 
 onMounted(() => {
     getSubject()
 })
+
+defineExpose({
+    updateCheckList
+})
+
 </script>
 <style scoped>
 .custom-button {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
index 6728919..711f49e 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/index.vue
@@ -3,10 +3,10 @@
     <div class="activeExp-header"> 
       <div class="infomation" v-if="isStadium() !== true" >
         <!-- <selectClass v-if="!isSubject" @experlist="getExperimentList" /> -->
-        <selectClass v-if="!isSubject" />
+        <selectClass ref="selectClassRef"/>
       </div>
       <div> 
-        <selectExperiment @selectItem="getExperimentListItem" />
+        <selectExperiment ref="selectExperimentRef" @selectItem="getExperimentListItem" />
       </div>
     </div>
     <div ref="mainDiv" class="activeExp-main" style="overflow: auto">
@@ -19,7 +19,7 @@
 <script setup>
 import { Search } from '@element-plus/icons-vue'
 //import html2canvas from 'html2canvas';
-import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import { onMounted, ref, watch, reactive, getCurrentInstance, nextTick } from 'vue'
 import useUserStore from '@/store/modules/user'
 import useClassTaskStore from '@/store/modules/classTask'
 import selectClass from './components/selectClass.vue' //选择学校和班级
@@ -44,6 +44,8 @@ const props = defineProps({
 // 学科的 实验列
 // const experimentList = ref([]);
 const activeExp = ref({});
+const selectExperimentRef = ref();
+const selectClassRef = ref();
 
 const isStadium = () => {
   let roles = userStore.roles
@@ -82,6 +84,13 @@ const getExperimentListItem = (val) => {
 watch(() => props.expObj.fileurl, (newVal, oldVal) => {
   console.log(props.expObj,'科学实验科目')
   activeExp.value = props.expObj;
+
+  //
+  nextTick(() => {
+    selectClassRef.value.updateCheckList();
+    selectExperimentRef.value.updateLabel(props.expObj.label);
+  })
+  
 })
 
 </script>
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 186bb14..6448666 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -807,6 +807,7 @@ const editWork = async (cform) =>{
   else if (classWorkForm.worktype=='科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
     cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+    cform.worktag = useClassTaskStores.experimentObj.updateEduInfo;
   }
 
   // 3.更新作业任务本身

From d9a0f2f8c3f55d598f8a8140dd071ffa8915c92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 25 Dec 2024 11:20:18 +0800
Subject: [PATCH 07/10] 1

---
 src/renderer/public/cropImgTest/single.json  | 203 -------
 src/renderer/public/cropImgTest/single1.json | 540 -------------------
 src/renderer/public/cropImgTest/single2.json | 176 ------
 3 files changed, 919 deletions(-)
 delete mode 100644 src/renderer/public/cropImgTest/single.json
 delete mode 100644 src/renderer/public/cropImgTest/single1.json
 delete mode 100644 src/renderer/public/cropImgTest/single2.json

diff --git a/src/renderer/public/cropImgTest/single.json b/src/renderer/public/cropImgTest/single.json
deleted file mode 100644
index fdefcd9..0000000
--- a/src/renderer/public/cropImgTest/single.json
+++ /dev/null
@@ -1,203 +0,0 @@
-{
-  "words_result": [
-    {
-      "type": "print",
-      "location": {
-        "top": 8,
-        "left": 11,
-        "width": 485,
-        "height": 18
-      },
-      "words": "(1)风华正茂:"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 37,
-        "left": 11,
-        "width": 485,
-        "height": 18
-      },
-      "words": "(2)书生意气:"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 67,
-        "left": 11,
-        "width": 484,
-        "height": 18
-      },
-      "words": "(3)指点江山:"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 96,
-        "left": 11,
-        "width": 485,
-        "height": 18
-      },
-      "words": "(4)峥嵘岁月:"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 125,
-        "left": 10,
-        "width": 180,
-        "height": 17
-      },
-      "words": "[答案](1)风采才华正盛。"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 155,
-        "left": 11,
-        "width": 179,
-        "height": 16
-      },
-      "words": "(2)词中指同学们意气奔放。"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 185,
-        "left": 12,
-        "width": 118,
-        "height": 16
-      },
-      "words": "(3)评论国家大事。"
-    },
-    {
-      "type": "print",
-      "location": {
-        "top": 214,
-        "left": 12,
-        "width": 376,
-        "height": 16
-      },
-      "words": "(4)不寻常的日子。峥嵘,这里是不平凡、 不寻常的意思。"
-    }
-  ],
-  "formula_result": [],
-  "img_direction": 0,
-  "results": [
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 18,
-          "width": 485,
-          "top": 8
-        },
-        "word": "(1)风华正茂:",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 18,
-          "width": 485,
-          "top": 37
-        },
-        "word": "(2)书生意气:",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 18,
-          "width": 484,
-          "top": 67
-        },
-        "word": "(3)指点江山:",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 18,
-          "width": 485,
-          "top": 96
-        },
-        "word": "(4)峥嵘岁月:",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 10,
-          "height": 17,
-          "width": 180,
-          "top": 125
-        },
-        "word": "[答案](1)风采才华正盛。",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 16,
-          "width": 179,
-          "top": 155
-        },
-        "word": "(2)词中指同学们意气奔放。",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 12,
-          "height": 16,
-          "width": 118,
-          "top": 185
-        },
-        "word": "(3)评论国家大事。",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 12,
-          "height": 16,
-          "width": 376,
-          "top": 214
-        },
-        "word": "(4)不寻常的日子。峥嵘,这里是不平凡、 不寻常的意思。",
-        "line_probability": {}
-      }
-    }
-  ],
-  "layouts_num": 0,
-  "results_num": 8,
-  "log_id": 1868923976840586200
-}
\ No newline at end of file
diff --git a/src/renderer/public/cropImgTest/single1.json b/src/renderer/public/cropImgTest/single1.json
deleted file mode 100644
index e8bd920..0000000
--- a/src/renderer/public/cropImgTest/single1.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-  "img_direction": 0,
-  "results": [
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 96,
-          "height": 33,
-          "width": 943,
-          "top": 15
-        },
-        "word": "11.(2023广东卷,2)党的二十大审议通过了《中国共产党章程(修正案)》,把党的十九大以",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 48,
-          "height": 33,
-          "width": 991,
-          "top": 58
-        },
-        "word": "来习近平新时代中国特色社会主义思想新发展写入党章,以更好反映以习近平同志为核心的",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 48,
-          "height": 32,
-          "width": 741,
-          "top": 101
-        },
-        "word": "党中央推进党的理论创新、实践创新、制度创新成果。这一修改()",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 95,
-          "height": 32,
-          "width": 720,
-          "top": 144
-        },
-        "word": "①全面具体地总结了党的十八大以来党和国家各项事业的伟大成就",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 836,
-          "height": 32,
-          "width": 203,
-          "top": 145
-        },
-        "word": "②为更好坚持和发",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 46,
-          "height": 33,
-          "width": 994,
-          "top": 187
-        },
-        "word": "展中国特色社会主义提供了制度保障和法律依据③更加彰显习近平新时代中国特色社会主",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 50,
-          "height": 32,
-          "width": 325,
-          "top": 229
-        },
-        "word": "义思想的真理力量和实践伟力",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 395,
-          "height": 33,
-          "width": 644,
-          "top": 229
-        },
-        "word": "④适应形势和任务的发展变化,有利于更好发挥党章的规范",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 50,
-          "height": 32,
-          "width": 128,
-          "top": 272
-        },
-        "word": "和指导作用",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 96,
-          "height": 32,
-          "width": 88,
-          "top": 315
-        },
-        "word": "A.①②",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 326,
-          "height": 32,
-          "width": 87,
-          "top": 314
-        },
-        "word": "B.①④",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 555,
-          "height": 31,
-          "width": 84,
-          "top": 316
-        },
-        "word": "C.②③",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 779,
-          "height": 32,
-          "width": 88,
-          "top": 317
-        },
-        "word": "D.③④",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 94,
-          "height": 33,
-          "width": 942,
-          "top": 358
-        },
-        "word": "【试题立意】本题以党的二十大对党章修改为背景,考查对习近平新时代中国特色社会主",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 51,
-          "height": 33,
-          "width": 871,
-          "top": 401
-        },
-        "word": "义思想的理解,引导学生认同习近平新时代中国特色社会主义思想,坚定理论自信。",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 95,
-          "height": 33,
-          "width": 942,
-          "top": 443
-        },
-        "word": "【能力解读】本题主要考查了对党的二十大审议通过了《中国共产党章程(修正案)》的关键",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 52,
-          "height": 33,
-          "width": 821,
-          "top": 487
-        },
-        "word": "信息的获取与加工能力,以及对其所体现道理的辨识与判断、推理与论证能力。",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 272,
-          "height": 27,
-          "width": 181,
-          "top": 542
-        },
-        "word": "筛选加工关键信息",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 795,
-          "height": 27,
-          "width": 113,
-          "top": 542
-        },
-        "word": "辨识与判断",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 63,
-          "height": 29,
-          "width": 602,
-          "top": 586
-        },
-        "word": "党的二十大与时俱进,审议通过了《中国共产党章程(修正案)》 ,使",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 681,
-          "height": 28,
-          "width": 343,
-          "top": 586
-        },
-        "word": "适应形势和任务的发展变化,有利于",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 62,
-          "height": 28,
-          "width": 196,
-          "top": 625
-        },
-        "word": "之随着时代丰富发展",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 680,
-          "height": 29,
-          "width": 297,
-          "top": 624
-        },
-        "word": "更好发挥党章的规范和指导作用",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 59,
-          "height": 28,
-          "width": 606,
-          "top": 674
-        },
-        "word": "《中国共产党章程(修正案)》把党的十九大以来习近平新时代中国",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 681,
-          "height": 30,
-          "width": 344,
-          "top": 692
-        },
-        "word": "更加彰显习近平新时代中国特色社会",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 61,
-          "height": 29,
-          "width": 602,
-          "top": 713
-        },
-        "word": "特色社会主义思想新发展写入党章,以更好反映以习近平同志为",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 682,
-          "height": 29,
-          "width": 295,
-          "top": 731
-        },
-        "word": "主义思想的真理力量和实践伟力",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 61,
-          "height": 29,
-          "width": 541,
-          "top": 751
-        },
-        "word": "核心的党中央推进党的理论创新、实践创新、制度创新成果",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 95,
-          "height": 31,
-          "width": 135,
-          "top": 808
-        },
-        "word": "【误项排除】",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 60,
-          "height": 26,
-          "width": 49,
-          "top": 863
-        },
-        "word": "选项",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 522,
-          "height": 27,
-          "width": 114,
-          "top": 863
-        },
-        "word": "排除的原因",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 122,
-          "height": 29,
-          "width": 902,
-          "top": 906
-        },
-        "word": "材料强调的是把党的十九大以来习近平新时代中国特色社会主义思想新发展写入党章,不涉及总",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 68,
-          "height": 27,
-          "width": 31,
-          "top": 927
-        },
-        "word": "①",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 124,
-          "height": 29,
-          "width": 594,
-          "top": 945
-        },
-        "word": "结党的十八大以来党和国家各项事业的伟大成就,①不符合题意",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 122,
-          "height": 28,
-          "width": 902,
-          "top": 992
-        },
-        "word": "《中国共产党章程(修正案)》是管党治党的总章程、总规矩,是中国共产党最根本的党内法规,不能",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 70,
-          "height": 26,
-          "width": 29,
-          "top": 1012
-        },
-        "word": "②",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 124,
-          "height": 28,
-          "width": 699,
-          "top": 1030
-        },
-        "word": "为更好坚持和发展中国特色社会主义提供制度保障和法律依据,②说法错误",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 97,
-          "height": 30,
-          "width": 108,
-          "top": 1085
-        },
-        "word": "【答案】D",
-        "line_probability": {}
-      }
-    }
-  ],
-  "layouts_num": 0,
-  "results_num": 38,
-  "log_id": 1869631874868290300
-}
\ No newline at end of file
diff --git a/src/renderer/public/cropImgTest/single2.json b/src/renderer/public/cropImgTest/single2.json
deleted file mode 100644
index 180f7c5..0000000
--- a/src/renderer/public/cropImgTest/single2.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  "img_direction": 0,
-  "results": [
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 14,
-          "height": 58,
-          "width": 727,
-          "top": 2
-        },
-        "word": "(四川成都锦江区校级自主招生)九年级1班在课外活动时,",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 14,
-          "height": 54,
-          "width": 730,
-          "top": 51
-        },
-        "word": "甲、乙、丙三位同学进行乒乓球练习,为确定哪两位同学先打",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 51,
-          "width": 731,
-          "top": 101
-        },
-        "word": "球,甲、乙、丙三位同学用“手心、手背”游戏(游戏时,“手心向",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 47,
-          "width": 731,
-          "top": 151
-        },
-        "word": "上”简称手心;“手背向上”简称手背)来决定.游戏规则是:每",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 10,
-          "height": 42,
-          "width": 731,
-          "top": 201
-        },
-        "word": "人每次同时随机伸出一只手,出手心或手背.若出现“两同一",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 10,
-          "height": 40,
-          "width": 729,
-          "top": 249
-        },
-        "word": "异”(即两手心、一手背或两手背、一手心)的情况,则同出手心",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 9,
-          "height": 38,
-          "width": 729,
-          "top": 297
-        },
-        "word": "或手背的两个人先打球,另一人做裁判;否则继续进行,直到",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 11,
-          "height": 32,
-          "width": 255,
-          "top": 348
-        },
-        "word": "出现“两同一异”为止.",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 10,
-          "height": 34,
-          "width": 726,
-          "top": 393
-        },
-        "word": "(1)请你列出甲、乙、丙三位同学运用“手心、手背”游戏,出手",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 7,
-          "height": 37,
-          "width": 723,
-          "top": 439
-        },
-        "word": "一次出现的所有等可能情况(用A表示手心,用B表示手背);",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 8,
-          "height": 36,
-          "width": 724,
-          "top": 485
-        },
-        "word": "(2)求甲、乙、丙三位同学运用“手心、手背”游戏,出手一次出",
-        "line_probability": {}
-      }
-    },
-    {
-      "chars": [],
-      "words_type": "print",
-      "words": {
-        "words_location": {
-          "left": 6,
-          "height": 34,
-          "width": 257,
-          "top": 529
-        },
-        "word": "现“两同一异”的概率.",
-        "line_probability": {}
-      }
-    }
-  ],
-  "layouts_num": 0,
-  "results_num": 12,
-  "log_id": 1869573563121265400
-}
\ No newline at end of file

From d8c487611988ad117e9d039a96e70cd218148eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 25 Dec 2024 17:04:29 +0800
Subject: [PATCH 08/10] =?UTF-8?q?[=E7=A7=91=E5=AD=A6=E5=AE=9E=E9=AA=8C]=20?=
 =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0=E4=BD=9C=E4=B8=9A=E5=AD=A6=E6=AE=B5?=
 =?UTF-8?q?=E5=AD=A6=E7=A7=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/store/modules/classTask.js   |  2 +-
 .../components/experimentList.vue             |  2 +-
 .../components/selectClass.vue                | 69 +++++++++++++++----
 .../classTask/newClassTaskAssign/index.vue    |  5 +-
 4 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/src/renderer/src/store/modules/classTask.js b/src/renderer/src/store/modules/classTask.js
index 17b008d..fc64a44 100644
--- a/src/renderer/src/store/modules/classTask.js
+++ b/src/renderer/src/store/modules/classTask.js
@@ -7,7 +7,7 @@ const useClassTaskStore = defineStore('classTask',{
   state: () => ({
     experimentObj:{
       edustage: '小学', // 教育阶段
-      edusubject: '', // 学科
+      edusubject: '数学', // 学科
       experimentList: [], // 实验科目列表
       updateEduInfo: '小学-数学',    //实际需上传的学段+学科信息(用于上传及回显实验内的学段学科)
     },
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
index c19db84..a7ff24a 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/experimentList.vue
@@ -42,7 +42,7 @@ const updateLabel = (val) => {
 
 const onSelectOption = (option) => {
   classTaskStore.updateEduInfo = `${classTaskStore.edustage}-${classTaskStore.edusubject}`;
-  console.log('updateEduInfo->', classTaskStore.experimentList.updateEduInfo);
+  console.log('updateEduInfo->', classTaskStore.updateEduInfo);
   console.log(option,'选择的实验课-------')
   emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
 }
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
index d076cee..635643d 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
@@ -56,7 +56,7 @@ const subjectList = ref([])
 const chooseGrade= ref({})
 const expList = ref([]) // 当前年级的所有课程
 const checkList = ref([])// 当前年级对应学科的课程，
-
+const isLoaded = ref(false);
 
 // 获取基础的学科
 const getSubject = () => {
@@ -80,8 +80,15 @@ const getSubject = () => {
         })
     })
     console.log(subjectList,'subjectList');
+    
     // 默认读取一个学科
-    handleUserEduStage(useClassTaskStore().experimentObj.edustage)
+    const edusubject = useClassTaskStore().experimentObj.edusubject;
+    handleUserEduStage(useClassTaskStore().experimentObj.edustage);
+    // 这里确保第一次初始化时, 该任务是从左侧作业列表中进来而存在指定的学科时, 重新赋值回来.
+    useClassTaskStore().experimentObj.edusubject = edusubject;
+    // 执行完毕后标志位[置位]
+    isLoaded.value = true;
+    //console.log('初始化执行完毕----');
 }
 // 展示有 实验科目的学科
 const isExpList = (edusubject) => {
@@ -108,7 +115,8 @@ const isExpList = (edusubject) => {
 // 选择学段
 const handleUserEduStage = (item) => {
     // userStore.edustage = item
-    useClassTaskStore().experimentObj.edustage = item
+    useClassTaskStore().experimentObj.edustage = item;
+    
     //清空操作
     expList.value = []
     if(item === '小学'){
@@ -121,6 +129,7 @@ const handleUserEduStage = (item) => {
                 useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }else if(item === '初中'){
@@ -133,6 +142,7 @@ const handleUserEduStage = (item) => {
                 useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }else if(item === '高中'){
@@ -145,6 +155,7 @@ const handleUserEduStage = (item) => {
                 useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }
@@ -177,20 +188,50 @@ const handleUserEduSubject = (item) => {
     // emit('experlist',checkList.value)
 }
 
-const updateCheckList = () => {
-    const edustage = useClassTaskStore().experimentObj.edustage;
-    if(edustage === '小学'){
-        chooseGrade.value = jsonData.data.primary
-    }else if(edustage === '初中'){
-        chooseGrade.value = jsonData.data.junior
-    }else if(edustage === '高中'){
-        chooseGrade.value = jsonData.data.senior
+const updateCheckList = async () => {
+    try {
+        await waitForSubjectData();
+
+        //console.log('父组件执行开始-------', );
+        //console.log('experimentObj-> ', useClassTaskStore().experimentObj);
+        // 再执行更新逻辑
+        const edustage = useClassTaskStore().experimentObj.edustage;
+        if(edustage === '小学'){
+            chooseGrade.value = jsonData.data.primary
+        }else if(edustage === '初中'){
+            chooseGrade.value = jsonData.data.junior
+        }else if(edustage === '高中'){
+            chooseGrade.value = jsonData.data.senior
+        }
+        expList.value = chooseGrade.value
+        const edusubject = useClassTaskStore().experimentObj.edusubject;
+        handleUserEduSubject(edusubject);
+    } catch (error) {
+        console.error(error);
     }
-    expList.value = chooseGrade.value
-    const edusubject = useClassTaskStore().experimentObj.edusubject;
-    handleUserEduSubject(edusubject);
 }
 
+const waitForSubjectData = () => {
+    return new Promise((resolve, reject) => {
+        let timeoutId;
+        let intervalId;
+
+        const checkIsLoaded = () => {
+            if (isLoaded.value) {
+                clearInterval(intervalId);
+                clearTimeout(timeoutId);
+                resolve();
+            }
+        };
+
+        intervalId = setInterval(checkIsLoaded, 100);
+        timeoutId = setTimeout(() => {
+            clearInterval(intervalId);
+            reject(new Error('该作业-等待[科学实验]学科学段初始化超时'));
+        }, 5000);
+    });
+};
+
 
 onMounted(() => {
     getSubject()
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 6448666..51cb2d7 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -537,7 +537,7 @@ const handleClassWorkFormQuizRemove = (index) =>{
       if(isShow.value === false){
         if(classWorkForm.id != '' ) {// 编辑状态 有id
           editWork(cform); // 编辑作业
-        return;
+          return;
         }
       }
       
@@ -600,7 +600,8 @@ const handleClassWorkFormQuizRemove = (index) =>{
       }
       else if(classWorkForm.worktype === "科学实验"){
         if (classWorkForm.fileHomeworkList.length == 0) return ElMessage({ type: 'warning', message: '请选择科学实验的课程!'});
-        cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+        cform.worktag = useClassTaskStores.experimentObj.updateEduInfo;           // 当前实验的学段学科, 格式为[小学-数学]
+        cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);         // 实验信息  
         cform.entpcourseworklist = JSON.stringify([{'id':-3, 'score': '10'}]);
         try {
           console.log(cform,'科学实验')

From eb7d6df35577e258a6f147ce91beb66eeec23f77 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Wed, 25 Dec 2024 17:29:34 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/AixPPTist/src/api/watcher.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index 29ea2e7..5a9e731 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -99,7 +99,7 @@ export default () => {
           }
           break
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
-          emitter.emit('closegridPic')
+          emitter.emit('closegridPic') //如果有推图片窗口 就关闭
           const slideIndex = content?.current || 0
           const type = content?.animation // 上下动作
           const steps = content?.animationSteps // 动画步骤
@@ -132,7 +132,7 @@ export default () => {
           break
           case MsgEnum.HEADS.MSG_pushSreen_ImgList: // 推图片上屏
           const imgArray = content.ImgList.map((obj) => obj.url);
-          emitter.emit('opengridPic',{arr:imgArray})
+          emitter.emit('opengridPic',{arr:imgArray}) // 打开推图片上屏窗口
           break
         case MsgEnum.HEADS.MSG_0010: // 备用
           break

From 4b935b9110dbd41029ae2660ba4d4f8ba9b1965f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 25 Dec 2024 17:30:42 +0800
Subject: [PATCH 10/10] 1

---
 src/renderer/src/hooks/useClassTask.js               |  1 +
 .../experimentQuestion/components/selectClass.vue    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js
index 3668ef6..50d8cf4 100644
--- a/src/renderer/src/hooks/useClassTask.js
+++ b/src/renderer/src/hooks/useClassTask.js
@@ -121,6 +121,7 @@ export const editListItem = (row, courseObj) => {
             const eduInfo = row.worktag.split('-');
             useClassTaskStores.experimentObj.edustage = eduInfo[0];
             useClassTaskStores.experimentObj.edusubject = eduInfo[1];
+            useClassTaskStores.experimentObj.updateEduInfo = row.worktag;
           }
           // 更新科学实验内容
           classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
index 635643d..a504518 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/experimentQuestion/components/selectClass.vue
@@ -125,8 +125,8 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '小学');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
-                useClassTaskStore().experimentObj.edusubject = name;
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
                 break;
@@ -138,8 +138,8 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '初中');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
-                useClassTaskStore().experimentObj.edusubject = name;
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
                 break;
@@ -151,8 +151,8 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '高中');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
-                useClassTaskStore().experimentObj.edusubject = name;
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
                 break;