Merge branch 'main' into zouyf_dev

# Conflicts:
#	src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue

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({

src/renderer/src/api/education/entpCourseWork.js

@@ -136,3 +136,17 @@ export function getJYPath(url,config) {
     params: config.params
   })
 }
+
+
+/**
+ * @desc: 百度识图转发
+ * @return: {*}
+ * @param {*} data
+ */
+export function getOcrContent(data) {
+  return request({
+    url: '/ocr/exam',
+    method: 'post',
+    data: data
+  })
+}

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' ? '#A5B3CA' : 'black',
+      },
+    },
+    node.label
+  );
+}
 onMounted( async () => {
   treeLoading.value = true
   try{

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,14 @@ 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];
+            useClassTaskStores.experimentObj.updateEduInfo = row.worktag;
+          }
+          // 更新科学实验内容
           classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
           //
           // console.log('科学实验', classtaskObj);

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('')
+            .join('');
-          row[i].workanswerFormat = arr2Char
+          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 = ''

src/renderer/src/store/modules/classTask.js

@@ -7,8 +7,9 @@ const useClassTaskStore = defineStore('classTask',{
   state: () => ({
     experimentObj:{
       edustage: '小学', // 教育阶段
-      edusubject: '', // 学科
+      edusubject: '数学', // 学科
       experimentList: [], // 实验科目列表
+      updateEduInfo: '小学-数学',    //实际需上传的学段+学科信息(用于上传及回显实验内的学段学科)
     },
     isOpenQuestUploadView: false, // 是否打开习题上传的页面
     classListIds: [],

src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue

@@ -435,7 +435,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, getClassworkdata, updateClassWorkDataAutoFinish } from '@/api/classTask'
+import { getClassworkdata, updateClassworkevalList, updateClassWorkDataAutoFinish } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
@@ -894,22 +894,41 @@ const onSubmit = () => {
   })
 
   // 更新题目批改
-  classWorkFormScore.teacherRating &&
+  const queryList = [];
-    classWorkFormScore.teacherRating.map((item, index) => {
+  classWorkFormScore.teacherRating && classWorkFormScore.teacherRating.map((item, index) => {
-      const queryParams = {
+    const queryParams = {
-        id: item.id,
+      id: item.id,
-        teacherRating: item.score, // 教师评分
+      teacherRating: item.score, // 教师评分
-        rating: classWorkFormScore.rating, //  评价
+      rating: classWorkFormScore.rating, //  评价
-        teacherremark: classWorkFormScore.teacherremark, //评分说明
+      teacherremark: classWorkFormScore.teacherremark, //评分说明
-        timestamp: getTimeDate() // 时间
+      timestamp: getTimeDate() // 时间
-      }
+    }
-      console.log(queryParams)
+    queryList.push(queryParams)
-      updateClassworkeval(queryParams).then((res) => {
+  })
-        // if(res.code == 200){
+  //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: '提交成功!'

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+']');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+        if (isJson(tmpJson)){
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          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();
 })
 

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.updateEduInfo);
+  console.log(option,'选择的实验课-------')
+  emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
+}
 
 onMounted(() => {
 })
 
-const onSelectOption = (option) => {
+defineExpose({
-  console.log(option,'选择的实验课-------')
+  updateLabel
-  emit('selectItem', classTaskStore.experimentList.filter(item => item.label === option)[0])
+})
-}
+
 
 </script>
 <style scoped>

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 === '小学'){
@@ -117,10 +125,11 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '小学');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
-                useClassTaskStore().experimentObj.edusubject = name;
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }else if(item === '初中'){
@@ -129,10 +138,11 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '初中');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
-                useClassTaskStore().experimentObj.edusubject = name;
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }else if(item === '高中'){
@@ -141,10 +151,11 @@ const handleUserEduStage = (item) => {
         const newSubjectList = subjectList.value.filter(item => item.edustage === '高中');
         for(let i in newSubjectList){
             const name = newSubjectList[i].itemtitle
-            if(isExpList(name)){
+            if(isExpList(name) && useClassTaskStore().experimentObj.edusubject===name){
-                useClassTaskStore().experimentObj.edusubject = name;
+                //useClassTaskStore().experimentObj.edusubject = name;
                 // 更改学科默认与学科下的实验科目
                 handleUserEduSubject(name)
+                break;
             }
         }
     }
@@ -177,10 +188,59 @@ const handleUserEduSubject = (item) => {
     // emit('experlist',checkList.value)
 }
 
+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);
+    }
+}
+
+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()
 })
+
+defineExpose({
+    updateCheckList
+})
+
 </script>
 <style scoped>
 .custom-button {

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>

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,'科学实验')
@@ -807,6 +808,7 @@ const editWork = async (cform) =>{
   else if (classWorkForm.worktype=='科学实验') { //TODO 注意，fileHomeworkList字段与常规作业共用
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
     cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
+    cform.worktag = useClassTaskStores.experimentObj.updateEduInfo;
   }
 
   // 3.更新作业任务本身

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+']');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+        if (isJson(tmpJson)){
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          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();
 })
 

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>
@@ -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

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({
+const {
-    url: '/ocr/exam',
+  entpCourseWorkTypeList
-    method: 'post',
+} = useClassTaskStore();
-    data: data
-  })
-}
 
 
 /**
@@ -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, '');
-      ocrTxt = ocrTxt.replace(/<br \/>/g, '');
+    examItem = ocrTxt;
-      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个
+    // 将3个以上连续的下划线统一替换为5个
-    titleAndWorkDesc = titleAndWorkDesc.replace(/_{4,}/g, '_____');
+    titleAndWorkDesc = titleAndWorkDesc.replace(/_{3,}/g, '_____');
 
     // 第二部分[分析-答案] 处理
     let answerAndAnswer = {};
@@ -456,32 +455,35 @@ const assembleExam = (eachSub) => {
     }
   }
 
-  let tmpExam = null;
+  // 目前暂屏蔽无[复合题], 故所有都算基础题 
-  if (answer === '') {
+  let tmpExam = processExamSingle(titleAndWorkDesc, answer);
-    /**
+
-     * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
+  // let tmpExam = null;
-     */
+  // if (answer === '') {
-    tmpExam = processExamSingle(titleAndWorkDesc, answer);
+  //   /**
-  }
+  //    * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
-  else {
+  //    */
-    // 匹配是否存在 1. （1） (1)的存在, 题目与答案都存在则说明题型为复合题(嵌套题)
+  //   tmpExam = processExamSingle(titleAndWorkDesc, answer);
-    regex = /^(\d+[.．。]|\(\d+\)|（\d+）)/;
+  // }
-    let answerFind = regex.test(answer);
+  // else {
-    regex = /(\d+[.．。]|\(\d+\)|（\d+）)/;
+  //   // 匹配是否存在 1. （1） (1)的存在, 题目与答案都存在则说明题型为复合题(嵌套题)
-    let titleFind = regex.test(titleAndWorkDesc);
+  //   regex = /^(\d+[.．。]|\(\d+\)|（\d+）)/;
-    if (titleFind && answerFind) {
+  //   let answerFind = regex.test(answer);
-      /** 
+  //   regex = /(\d+[.．。]|\(\d+\)|（\d+）)/;
-       * [复合题] - 处理逻辑 
+  //   let titleFind = regex.test(titleAndWorkDesc);
-       */
+  //   if (titleFind && answerFind) {
-      tmpExam = processExamMulti(titleAndWorkDesc, answer);
+  //     /** 
-    }
+  //      * [复合题] - 处理逻辑 
-    else {
+  //      */
-      /**
+  //     tmpExam = processExamMulti(titleAndWorkDesc, answer);
-       * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
+  //   }
-       */
+  //   else {
-      tmpExam = processExamSingle(titleAndWorkDesc, answer);
+  //     /**
-    }
+  //      * 基础题型 - [单选题] [多选题] [填空题] [判断题] [主观题]
-  }
+  //      */
+  //     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.workType = "主观题";
-    examSingle.title = titleAndWorkDesc;
 
-    // [选项] - 格式化 --- 主观题无选项
+    // // [题干]-格式化
-    //examSingle.arrWorkDesc = [];
+    // examSingle.title = titleAndWorkDesc;
+
+    // // [选项] - 格式化 --- 主观题无选项
+    // //examSingle.arrWorkDesc = [];
 
     // [题目答案] - 处理 --- ['qweasd123']
     if (answer !== '') {

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 = ['单选题', '多选题', '判断题', '填空题'];
+    //const flagDict = ['单选题', '多选题', '判断题', '填空题'];
-    fromOptions.type = entpCourseWorkTypeList.filter(item => flagDict.includes(item.label));
+    //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')) {
+  if (!item.hasOwnProperty('status')) {
-    item.stutus = '1';
+    item.status = '1';
   }
   // 当不存在[知识点], 默认为空
   if (!item.hasOwnProperty('evalnodeid')) {
@@ -765,7 +779,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 == '复合题') {
     // 同步更新[基础题]的初始结构
     newList = [{text:""}];
@@ -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.replace(/\(主观题\)/g, '');
-    item.worktype = `${item.worktype}(主观题)`;
+    //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, ""); 
         
-      // 针对[主观题]重新格式化信息  ([单题上传]时默认为主观题。 [单题纠错]时会在原题型后面增加标识[(主观题)], 故此处更改为判断是否存在 )
+        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
-      if(questForm.worktype.indexOf('主观题') !== -1) {
+        param.workdesc = ''; 
+        param.workanswer = JSON.stringify(questForm.list.map(item => item.text)); 
+        
+      }
+
+      // 针对[判断题]重新格式化信息
+      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, "");
       }
-
+      else {
-      // 针对[填空题]重新格式化信息  "<div>什么</div>#&<div>什么哟</div>".replace(/<[^>]*>/g, "")
+        // 非统一标准解答题(主观题), 统一以[主观题]的格式来处理, 主要用于兼容ocr识别解答题及菁优网第三方非同一解答题
-      if(questForm.worktype === '填空题'){
+        param.workdesc = ''; // 主观题选项为空
-        //填空答案： 这里填入选项的值（填空值）
+        // 主观题 答案直接用的 workanswer 存的时候用数组
-        //param.workanswer = questForm.list.map(item => item.text).join('#&').replace(/<[^>]*>/g, ""); 
+        if (questForm.workanswer && questForm.workanswer != '') {
-        
+          param.workanswer = JSON.stringify([questForm.workanswer]);
-        // 填空选项为空，避免后面多次判断，这里只根据正确答案来分析
+        }
-        param.workdesc = ''; 
-        param.workanswer = JSON.stringify(questForm.list.map(item => item.text)); 
-        
       }
 
-      // 针对[判断题]重新格式化信息
-      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) {
@@ -1703,37 +1727,40 @@ 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;
 };
 
-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;
+  let id = lessionid.value;
-  if( props.bookobj.node.edustage == '高中' && (props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语') ){
+  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;
     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{

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 = {
+    const evalId = props.bookobj.levelSecondId=='' ? props.bookobj.levelFirstId : props.bookobj.levelSecondId;
-    // 分页参数
+    const queryForm = {
-    currentPage: paginationParams.pageNum,
+      // 分页参数
-    pageSize: paginationParams.pageSize,
+      currentPage: paginationParams.pageNum,
-    // 课程相关参数
+      pageSize: paginationParams.pageSize,
-    eid: props.bookobj.levelSecondId,
+      // 课程相关参数
-    sectionName: props.bookobj.coursetitle,
+      eid: evalId,  // 当前单元或章节id
-    edusubject: userStore.edusubject,
+      sectionName: props.bookobj.coursetitle,
-    edustage: userStore.edustage,
+      edusubject: userStore.edusubject,
-    //
+      edustage: userStore.edustage,
-    // 题类
+      //
-    worktype: entpCourseWorkQueryParams.worktype.label,
+      // 题类
-    workTypeId: entpCourseWorkQueryParams.worktype.value,
+      worktype: entpCourseWorkQueryParams.worktype.label,
-    // 题源
+      workTypeId: entpCourseWorkQueryParams.worktype.value,
-    workgroup: entpCourseWorkQueryParams.workgroup,
+      // 题源
-    // 年份
+      workgroup: entpCourseWorkQueryParams.workgroup,
-    yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
+      // 年份
-    // 知识点
+      yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
-    thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      // 知识点
-    // 关键字
+      thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
-    keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
+      // 关键字
+      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+']');
+        const tmpJson = '['+clueres.rows[i].childlist+']';
-        for (var j=0; j<clueres.rows[i].childArray.length; j++) {
+        if (isJson(tmpJson)){
-          clueres.rows[i].childArray[j].title = clueres.rows[i].childArray[j].title.replace(/(<([^>]+)>)/ig, '');
+          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();
 })
 

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 useUserStore from '@/store/modules/user'
-import useClassTaskStore from '@/store/modules/classTask'
+// import useClassTaskStore from '@/store/modules/classTask'
-const userStore = useUserStore()
+// const userStore = useUserStore()
-const classTaskStore = useClassTaskStore();
+// 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 = {
 

src/renderer/src/views/model/index.vue

@@ -410,8 +410,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.levelSecondId = cata[1] ?? ''
-  uploadData.value.levelThirdId = cata[2]
+  uploadData.value.levelThirdId = cata[2] ?? ''
   uploadData.value.textbookId = data.textBook.curBookId
   getModelInfo({cataid: currentNode.value.id}).then(res=>{
     console.log(res)

src/renderer/src/views/profile/cropperImage.vue

@@ -206,7 +206,7 @@ export default {
         width: 200px;
         height: 200px;
         position: relative;
-        left: 100px;
+        left: 150px;
         overflow: hidden;
         border-radius: 50%;
       }

src/renderer/src/views/profile/userAvatar.vue

@@ -6,7 +6,6 @@
       append-to-body
       @opened="modalOpened"
       @close="closeDialog"
-      width="100px"
     >
       <CropperImage
         ref="cropper"