Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws

fix：固定学科；
Merge pull request 'fix：实验室样式修改；' (#417 ) from yangws into main
2024-11-22 09:27:13 +08:00 · 2024-11-22 09:27:02 +08:00 · 2024-11-21 17:42:24 +08:00
1 changed files with 2 additions and 1 deletions
--- a/src/renderer/src/views/experiment/components/experimentBook.vue
+++ b/src/renderer/src/views/experiment/components/experimentBook.vue
@ -196,7 +196,8 @@
        //获取学科列表
      const { rows } = await listEvaluation(subjectParams)
        // 获取所有的教材
-      subjectList.value = sessionStore.get('subject.bookList')
+      subjectList.value = rows
+      
      const res = await listEvaluation(unitParams)
      unitList.value = [...res.rows]
      // 当前教材
Author	SHA1	Message	Date
小杨	8d8ff06c5e	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws	2024-11-22 09:27:13 +08:00
小杨	0a3ab2eff5	fix：固定学科；	2024-11-22 09:27:02 +08:00
yangws	21a4f4cfac	Merge pull request 'fix：实验室样式修改；' (#417 ) from yangws into main Reviewed-on: #417	2024-11-21 17:42:24 +08:00