Merge remote-tracking branch 'origin/main'

.env.development

@@ -17,6 +17,7 @@ VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktx
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
 
 # websocket 地址
+# VITE_APP_WS_URL = 'wss://prev.ysaix.com:7868'
 VITE_APP_WS_URL = 'wss://file.ysaix.com:7868'
 # VITE_APP_WS_URL = 'ws://192.168.2.16:7865'
 

src/renderer/src/AixPPTist/src/hooks/useScreening.ts

@@ -1,5 +1,6 @@
 import { useScreenStore, useSlidesStore, useClasscourseStore } from '../store'
 import { enterFullscreen, exitFullscreen, isFullscreen } from '../utils/fullscreen'
+import { sessionStore } from '@/utils/store' // electron-store 状态管理
 import ChatWs from '@/plugins/socket' // 聊天socket
 
 export default () => {
@@ -25,6 +26,9 @@ export default () => {
     if (!!classcourse) { //DOTO 有课堂，执行退相关操作
       console.log('退出放映状态')
       ChatWs?.close() // 关闭ws
+      sessionStore.delete('curr.classcourse') // 清除课堂信息
+      sessionStore.delete('curr.resource')    // 清除课件信息
+      sessionStore.delete('curr.isPublic')    // 清除公屏状态
       setTimeout(() => {
         window.close() // 关闭窗口
       }, 1000)

src/renderer/src/api/classTask/index.js

@@ -80,6 +80,15 @@ export function updateClassworkdata(data) {
   })
 }
 
+// 批阅后, 待所有学生都批改完成后自动结束当前作业为[已完成]
+export function updateClassWorkDataAutoFinish(data) {
+  return request({
+    url: '/education/classworkdata/updAutoFinish',
+    method: 'put',
+    data: data
+  })
+}
+
 // 修改classwork
 export function updateClasswork(data) {
   return request({

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, updateClassworkdata, getClassworkdata } from '@/api/classTask'
+import { updateClassworkeval, getClassworkdata, updateClassWorkDataAutoFinish } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
 import { quizStrToList } from '@/utils/comm';
@@ -890,7 +890,7 @@ const onSubmit = () => {
     updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm;
   };
   // 更新作业批改状态
-  updateClassworkdata(formd).then(res => {
+  updateClassWorkDataAutoFinish(formd).then(res => {
   })
 
   // 更新题目批改

src/renderer/src/views/prepare/container/ai-pptistV2.vue

@@ -10,7 +10,7 @@
           <div class="paragraphs">
             {{ outputText }}
           </div>
-         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">{{ outputText ? '重新生产' : '生成大纲' }}</el-button>
+         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">{{ outputText ? '重新生成' : '生成大纲' }}</el-button>
         <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1" :disabled="!outputText">下一步</el-button>
       </el-card>
       <el-card v-if="activeStep === 1">

src/renderer/src/views/prepare/container/class-start.vue

@@ -25,9 +25,9 @@
           <c-form v-bind="classForm">
             <template #item_classid="{prop, form}">
               <span v-if="dt.ctCourse">{{ dt.ctCourse?.caption }}</span>
-              <el-select v-else v-model="form[prop]" placeholder="请选择班级">
+              <el-select v-else v-model="form[prop]" placeholder="请选择班级" clearable>
                 <el-option v-for="item in listData.classList" :value="item.id"
-                          :label="`${item.caption} (${item.classstudentcount}人)`" />
+                  :label="`${item.caption} (${item.classstudentcount}人)`" />
               </el-select>
             </template>
           </c-form>
@@ -249,10 +249,10 @@ const getClasscourseList = async type => {
 // 创建课程  isPublic 公屏上课
 const createClasscourse = async (isPublic = false) => {
   const { classid } = classForm.form
-  if (!classid) {
-    ElMessage.warning('请选择班级')
-    return
-  }
+  // if (!classid) {
+  //   ElMessage.warning('请选择班级')
+  //   return
+  // }
   dt.loading = true
   const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
   const curDate = commUtil.getDateNow('yyyy-MM-dd')
@@ -372,9 +372,9 @@ const openPublicScreen = (classcourse, isPublic) => {
   createWindow('open-win', {
     url: '/pptist', // 窗口关闭时，清除缓存
     close: () => {
-      sessionStore.set('curr.resource', null) // 清除缓存
-      sessionStore.set('curr.classcourse', null) // 清除缓存
-      sessionStore.set('curr.isPublic', null) // 清除缓存
+      sessionStore.delete('curr.resource') // 清除缓存
+      sessionStore.delete('curr.classcourse') // 清除缓存
+      sessionStore.delete('curr.isPublic') // 清除缓存
     }
   })
   visible.value = false // 关闭弹窗

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

@@ -497,11 +497,11 @@ export default {
       createWindow('open-win', {
         url: '/pptist', // 窗口关闭时，清除缓存
         close: () => {
-          sessionStore.set('curr.resource', null) // 清除缓存
+          sessionStore.delete('curr.resource') // 清除缓存
           if (type=='edit') {
-            sessionStore.set('curr.smarttalk', null) // 清除缓存
+            sessionStore.delete('curr.smarttalk') // 清除缓存
             this.asyncAllFile() // 刷新资源列表
-          } else sessionStore.set('curr.classcourse', null) // 清除缓存
+          } else sessionStore.delete('curr.classcourse') // 清除缓存
         }
       })
     },