Merge branch 'main' into zhuhao_dev

src/renderer/src/views/experiment/components/experimentBook.vue

@@ -45,6 +45,7 @@
   import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
   import { cloneDeep } from 'lodash'
   import { listEvaluation } from '@/api/subject'
+  import { sessionStore } from '@/utils/store'
   
   const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
   // 定义要发送的emit事件
@@ -195,6 +196,7 @@
         //获取学科列表
       const { rows } = await listEvaluation(subjectParams)
         // 获取所有的教材
+      subjectList.value = sessionStore.get('subject.bookList')
       const res = await listEvaluation(unitParams)
       unitList.value = [...res.rows]
       // 当前教材