Merge pull request 'zdg' (#323) from zdg into main

Reviewed-on: #323

src/renderer/src/components/set-homework/index.vue

@@ -55,6 +55,7 @@ import { saveByClassWorkArray } from '@/api/teaching/classwork'
 import useUserStore from '@/store/modules/user'
 import { getCurrentTime } from '@/utils/date'
 import { uniqBy, groupBy } from 'lodash'
+import { sessionStore } from '@/utils/store'
 
 const model = defineModel({ type: Boolean, default: false })
 const props = defineProps({
@@ -211,6 +212,8 @@ const delStudent = (index) => {
 
 const onSubmit = (formEl) => {
   if (!formEl) return
+  // 课堂id
+  const classRoomId = sessionStore.get('curClassRoom.id')
   formEl.validate((valid) => {
     if (valid) {
       /**
@@ -226,7 +229,8 @@ const onSubmit = (formEl) => {
           id: 0,
           parentid: props.row.id,
           classid: value,
-          classcourseid: 0,
+          classcourseid: 0,           // 课堂id-ppt为字符串不能使用
+          classReservId: classRoomId, // 课堂id
           entpcourseid: props.entpcourseid,
           studentlist: JSON.stringify(gradeObj[value]),
           feedback: form.feedback,

src/renderer/src/views/prepare/index.vue

@@ -138,6 +138,8 @@
   <!-- 上课配置 -->
   <class-start ref="calssRef" @close="closeChange"/>
   <PptDialog v-model="pptDialog"/>
+
+  <!-- <button @click="test">test</button> -->
 </template>
 <script setup>
 import { Check,Plus } from '@element-plus/icons-vue'
@@ -174,7 +176,6 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
 import classStart from './container/class-start.vue' // 预备上课
 import MsgEnum from '@/plugins/imChat/msgEnum'  // im 消息枚举
 import Chat from '@/utils/chat' // im 登录初始化
-import msgEnum from '@/plugins/imChat/msgEnum'
 if (!Chat.imChat) Chat.init()
 
 const toolStore = useToolState()
@@ -286,6 +287,10 @@ export default {
   //   }
   // },
   methods: {
+    // test() {
+    //   toolStore.resetDef() // 重置状态
+    //   ipcMsgSend('tool-sphere:close')       // 关闭窗口
+    // },
     // 开始上课
     startClass(item, classObj) {
       // 关闭状态，打开上课相关功能(已打开，忽略)
@@ -311,7 +316,7 @@ export default {
         }
         case 'close': { // 关闭上课
           const head = MsgEnum.HEADS.MSG_closed // closed
-          const msgT = msgEnum.TYPES.TEACHER    // teacher
+          const msgT = MsgEnum.TYPES.TEACHER    // teacher
           const isApt = !row.bookImg // bookImg ppt 否则Apt
           row.ex3 == 'undefined' && (row.ex3 = null)
           const timgroupid = isApt ? row.timgroupid : row.ex3 // ex3 ppt 否则Apt

src/renderer/src/views/tool/sphere.vue

@@ -98,6 +98,7 @@ onMounted(async() => {
 const getClassInfo = async () => {
   const { data } = await classManageApi.getClassInfo(classObj.id)
   classObj.data = data
+  sessionStore.set('curClassRoom', classObj) // 课堂信息-缓存
   // 群id
   let timGroupId = data?.ex3 || ''
   console.log('获取群ID:', timGroupId)