默认窗口最大化

# Conflicts:
#	src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

.env.development

@@ -15,3 +15,5 @@ VITE_APP_UPLOAD_API = 'https://file.ysaix.com:7868/prod-api'
 VITE_APP_RES_FILE_PATH = 'https://file.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://file.ysaix.com:7868/'
+
+VITE_SHOW_DEV_TOOLS = 'true'

.env.production

@@ -17,3 +17,5 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
 
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
+
+VITE_SHOW_DEV_TOOLS = 'true'

src/main/index.js

@@ -73,8 +73,7 @@ function createLoginWindow() {
     loginWindow.loadFile(join(__dirname, '../renderer/index.html'), { hash: 'login' })
     updateInit(loginWindow)
   }
-
-  loginWindow.webContents.openDevTools()
+  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -128,7 +127,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  mainWindow.webContents.openDevTools()
+  if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
@@ -138,6 +137,7 @@ function createMainWindow() {
 
   // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
   // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
+  mainWindow.maximize();
   // 第三步： 开启remote服务
   remote.enable(mainWindow.webContents)
 }

src/renderer/src/hooks/useClassTask.js

@@ -34,6 +34,7 @@ export const editListItem = (row, courseObj) => {
       chooseWorkLists: [],// 设计中的框架梳理list
       fileHomeworkList: [],// 设计中的常规作业list
       whiteboardObj: '',// 设计中的课堂展示对象
+      question: '', // 设计中的[课堂展示]的问题
     };
     console.log('编辑的行', row);
 
@@ -99,7 +100,7 @@ export const editListItem = (row, courseObj) => {
         console.log('row.课堂展示', row.workcodes);
         const workcodes = JSON.parse(row.workcodes);
         classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
-        //
+        classtaskObj.question = row.worktag;
         // console.log('课堂展示', classtaskObj);
         return resolve(classtaskObj);
       }

src/renderer/src/plugins/imChat/index.js

@@ -285,8 +285,11 @@ export class ImChat {
       // callback: (data) => {}
     }
     // console.log('发送消息', option)
-    this.setConsole('%cim-chat: 发送消息', option)
-    return this.timChat.TIMMsgSendMessageV2(option)
+    this.setConsole('%cim-chat: 发送消息【req】', conv_id, msg)
+    return this.timChat.TIMMsgSendMessageV2(option).then(res => {
+      this.setConsole('%cim-chat: 发送消息【res】', JSON.stringify(res))
+      return res
+    })
   }
   /**
    * @description 发送群消息

src/renderer/src/utils/tool.js

@@ -138,7 +138,7 @@ export const createWindow = async (type, data) => {
       wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口
       wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口
       wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
-      wins_tool.webContents.openDevTools() // 打开调试工具
+      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') wins_tool.webContents.openDevTools() // 打开调试工具
       eventHandles(type, wins_tool) // 事件监听处理
       return wins_tool
     }
@@ -165,7 +165,7 @@ export const createWindow = async (type, data) => {
       win.type = type  // 唯一标识
       win.show()
       win.setFullScreen(true) // 设置窗口为全屏
-      win.webContents.openDevTools() // 打开调试工具
+      if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
       eventHandles(type, win) // 事件监听处理
       winPdf=win
       break

src/renderer/src/views/classTask/classTask.vue

@@ -237,7 +237,7 @@ const getStudentClassWorkData = async() => {
     //   deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
     // deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
     //   //status: '1', // 作业状态：1-已发布
-    //   orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
+    //   orderby: "deaddate DESC",// 
     //   pageSize: 1000,
     // })
 
@@ -401,7 +401,8 @@ const onClickItem = (item) => {
   clearInterval(pollingST.value)
 
   console.log('防抖开启弹窗')
-  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 

src/renderer/src/views/classTask/classTaskAssign.vue

@@ -15,10 +15,11 @@
       <!-- 标题 -->
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
-          <div class="unit-top-left" @click="isCollapse = !isCollapse">
-            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
-            <span>课程目录</span>
-            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
+          <!-- <div class="unit-top-left" @click="isCollapse = !isCollapse"> -->
+          <div class="unit-top-left">
+            <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
+            <span>作业布置</span>
+            <!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
           </div>
         </el-col>
         <el-col :span="12">
@@ -147,7 +148,7 @@
             </template>
           </div>
         </div>
-        <!-- TODO 课堂展示 、常规作业 预览待开发-->
+        <!-- TODO 课堂展示 预览待开发-->
         <!-- 常规作业：包含多个格式（图片略缩图展示，点击放大；其他附件跳转另外弹窗查看） -->
         <div v-if="currentTag=='常规作业'" :style="{'padding': '15px', 'overflow': 'auto'}">
           <div style="margin: 5px; background-color: white">
@@ -476,7 +477,8 @@ const debounceOpenWin = debounce(() => {
 // 批改作业
 const onClickItem = (item) => {
   console.log('防抖开启弹窗')
-  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item
+  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 
@@ -878,18 +880,20 @@ watch(() => courseObj.node, (newVal,oldVal) => {
 
 </script>
 
+<!--
 <style>
   .el-table .hidden-row {
     display: none !important;
     /* color: #ccc !important; */
   }
   .el-table .father-row {
-    --el-table-tr-bg-color: #fff;
+    &#45;&#45;el-table-tr-bg-color: #fff;
   }
   .el-table .son-row {
-    --el-table-tr-bg-color: #f0f0f08a;
+    &#45;&#45;el-table-tr-bg-color: #f0f0f08a;
   }
 </style>
+-->
 
 <style lang="scss" scoped>
 .page-classTaskAssign {
@@ -906,7 +910,6 @@ watch(() => courseObj.node, (newVal,oldVal) => {
     min-height: 100%;
   }
   .unit-top-left {
-    cursor: pointer;
 
     .icon-xiangzuo {
       margin-right: 5px;

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

@@ -13,7 +13,7 @@
     <template #header>
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
-          {{ classWorkAnalysis.title }}答题情况
+          {{ classWorkAnalysis.title }}完成情况
           <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
             classWorkAnalysis.worktype
           }}</el-tag>
@@ -33,13 +33,13 @@
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
               @click="workHandle('quizStats')"
-              >逐题分析</el-button
+              >逐题讲评</el-button
             >
             <el-button
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
               @click="handleClassOverviewOpen('report')"
-              >整体分析</el-button
+              >训练报告</el-button
             >
           </el-button-group>
         </el-row>
@@ -141,12 +141,12 @@
       </div>
     </div>
 
-    <!-- 逐题分析 -->
+    <!-- 逐题讲评 -->
     <div v-else-if="classWorkAnalysis.view == 'quizStats'">
       <quiz-stats :active-data="classWorkActiveData" />
     </div>
 
-    <!-- 整体分析-->
+    <!-- 训练报告-->
     <div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
       <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
       <ClassOverview :table-list="overviewData"></ClassOverview>
@@ -193,7 +193,7 @@ const tableRadio = reactive({
 const loading_dt_table = ref(false)
 const isopen_dtwk_table = ref(false)
 
-// zdg: 逐题分析
+// zdg: 逐题讲评
 const classWorkActiveData = reactive({
   quizlist: [], // 当前习题列表
   studentList: [], // 当前课程-所有学生
@@ -217,7 +217,7 @@ const classWorkAnalysisScore = reactive({
 //   }
 // )
 const openDialog = (data) => {
-  console.log(data, '点击的item答题情况')
+  console.log(data, '点击的item完成情况')
 
   classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
   classWorkAnalysis.worktype = data.worktype
@@ -467,7 +467,7 @@ const getStudentClassWorkDataDetail = (row) => {
       }
     })
     .catch(() => {
-      console.log('获取答题情况失败')
+      console.log('获取完成情况失败')
       ElMessage({
         type: 'warning',
         message: '未获取到答题信息！'
@@ -479,7 +479,7 @@ const onClassWorkScoreSubmit = () => {
   console.log('批改后返回的方法')
   loading_dt_table.value = true
   isopen_dtwk_table.value = false
-  // 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
+  // 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
   //  - 左侧学生列表
   classWorkAnalysis.classworkdata = []
   classWorkAnalysis.activeStudentQuizlist = []
@@ -536,7 +536,7 @@ const escapeHtmlQuotes = (str) => {
   return result;
 }
 
-//#region 逐题分析
+//#region 逐题讲评
 // 查看学生-作业概览
 const workHandle = (type) => {
   // 关闭右侧批阅ui
@@ -571,11 +571,11 @@ const getWorkFeedList = async() =>{
 //#endregion
 
 
-//#regin 整体分析
+//#regin 训练报告
 /*
   author: yangws
   time: 2024-8-06 16:35:33
-  function: 整体分析的处理
+  function: 训练报告的处理
 */
 const handleClassOverviewOpen = (type) =>{
   // 关闭右侧批阅ui
@@ -643,12 +643,12 @@ const closeDialog = () => {
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
     console.log('关闭zdg: 定时执行')
-    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
   }
 })
 
 onUnmounted(() => {
-  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
 })
 
 defineExpose({
@@ -656,8 +656,6 @@ defineExpose({
 })
 </script>
 
-<style src="@/assets/styles/JYStyle.css"></style>
-
 <style scoped lang="scss">
 /*:deep(.reserv-date-pick) {
   width: 140px;
@@ -765,3 +763,4 @@ defineExpose({
   overflow-y: auto;
 }
 </style>
+<style src="@/assets/styles/JYStyle.css"></style>

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -21,7 +21,7 @@
             <div v-if="classWorkForm.worktype == '课堂展示'" style="height: 100%; display: flex; flex-direction: column;">
               <div style="flex: 0 0 auto;">
                 <el-form-item label="问题">
-                  <el-input v-model="classWorkForm.title" type="text" placeholder="请输入问题" />
+                  <el-input v-model="classWorkForm.question" type="text" placeholder="请输入问题" />
                 </el-form-item>
               </div>
               <div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
@@ -349,9 +349,11 @@ let classWorkForm =  reactive({
   chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
   fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
   whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
+  question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
 }); // 提交的作业内容
 // ---------------------------------------------------
-const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
+// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
+const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
 
 // 课堂展示-------
 const boardLoading = ref(false);
@@ -637,6 +639,7 @@ const handleClassWorkSave = async () => {
         let canvasJson = proxy.$refs.boardref.getCanvasJson()
         let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
         // 课堂展示提交内容
+        cform.worktag = classWorkForm.question;
         cform.title = classWorkForm.title;
         cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
         cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
@@ -647,21 +650,13 @@ const handleClassWorkSave = async () => {
             classWorkForm.worktype = "课堂展示";
             classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
             classWorkForm.title = "";
+            classWorkForm.question = "";
             classWorkForm.quizlist = [], // 作业习题列表内容
 
             // 情况选择的资源缓存
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
-            // refresh the list
-            //这里分离了，所以不需要更新表单数据了
-            // this.getClassWorkAllList();
 
-            // TODO 后续看是否跳转到 作业布置页面
-
-            //TODO 下面3个后续看是啥
-            // this.newWorkSpace = false;
-            // this.newWorkSpaceEdit = false;
-            // this.workEdit = false;
             boardLoading.value = false
           })
         } finally {
@@ -685,16 +680,6 @@ const handleClassWorkSave = async () => {
             classWorkForm.chooseWorkLists = []; // 框架梳理list
             classWorkForm.whiteboardObj = ''; // ? // 清空白板
             classWorkForm.fileHomeworkList = []; // 常规作业list
-            // refresh the list
-            //这里分离了，所以不需要更新表单数据了
-            // this.getClassWorkAllList();
-
-            // TODO 后续看是否跳转到 作业布置页面
-
-            //TODO 下面3个后续看是啥
-            // this.newWorkSpace = false;
-            // this.newWorkSpaceEdit = false;
-            // this.workEdit = false;
 
             fileLoading.value = false
           })
@@ -857,6 +842,7 @@ const editWork = async (cform) =>{
     let canvasJson = proxy.$refs.boardref.getCanvasJson()
     let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
     cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
+    cform.worktag = classWorkForm.question;
   }
   else if (classWorkForm.worktype=='常规作业') {
     // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)

src/renderer/src/views/classTask/container/quizStats.vue

@@ -279,7 +279,7 @@ const getStudentName = id => studentList.value.length && (studentList.value.find
 // 获取-选中题
 const getActive = ind => activeTopic.value != ind
 
-// 答题情况-点击题
+// 完成情况-点击题
 const clickInfo = async ind => {
   activeTopic.value = activeTopic.value != ind ? ind : 0
   setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);

src/renderer/src/views/classTask/newClassTask.vue

@@ -15,11 +15,11 @@
       <!-- 标题 -->
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
-          <div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
+          <div v-if="!isOpenLeftBook" class="unit-top-left" @click="onOpenLeftBook">
             <i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
-            <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
-            <span>课程目录</span>
-            <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
+            <!-- <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> -->
+            <span>作业设计</span>
+            <!-- <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> -->
           </div>
           <div v-else class="unit-top-left">
             <i class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
@@ -69,6 +69,7 @@ const classWorkForm =  reactive({
   chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
   fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
   whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
+  question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题
 })
 
 
@@ -113,7 +114,7 @@ const onOpenLeftBook = () => {
     proxy.$modal.msgError(`当前为编辑状态不可选择课程！`);
   }else{
     // 新增状态
-    isCollapse.value = !isCollapse.value
+    // isCollapse.value = !isCollapse.value
   }
 }
 // 返回上一页---返回布置页面

src/renderer/src/views/classTask/teachClassTask.vue

@@ -3,7 +3,7 @@
     <div class="teachClassTask_header">
       <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
         <div style="flex: 1">
-          {{ classWorkAnalysis.title }}答题情况
+          {{ classWorkAnalysis.title }}完成情况
           <el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
             classWorkAnalysis.worktype
           }}</el-tag>
@@ -23,13 +23,13 @@
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
               @click="workHandle('quizStats')"
-              >逐题分析</el-button
+              >逐题讲评</el-button
             >
             <el-button
               v-if="classWorkAnalysis.row.worktype == '习题训练'"
               :type="classWorkAnalysis.view == 'report' ? 'success' : ''"
               @click="handleClassOverviewOpen('report')"
-              >整体分析</el-button
+              >训练报告</el-button
             >
           </el-button-group>
         </div>
@@ -131,12 +131,12 @@
         </div>
       </div>
 
-      <!-- 逐题分析 -->
+      <!-- 逐题讲评 -->
       <div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
         <quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
       </div>
 
-      <!-- 整体分析-->
+      <!-- 训练报告-->
       <div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
         <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
         <ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
@@ -180,7 +180,7 @@ const tableRadio = reactive({
 const loading_dt_table = ref(false)
 const isopen_dtwk_table = ref(false)
 
-// zdg: 逐题分析
+// zdg: 逐题讲评
 const classWorkActiveData = reactive({
   quizlist: [], // 当前习题列表
   studentList: [], // 当前课程-所有学生
@@ -204,7 +204,7 @@ const classWorkAnalysisScore = reactive({
 //   }
 // )
 const openDialog = (data) => {
-  console.log(data, '点击的item答题情况')
+  console.log(data, '点击的item完成情况')
 
   classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
   classWorkAnalysis.worktype = data.worktype
@@ -459,7 +459,7 @@ const getStudentClassWorkDataDetail = (row) => {
       }
     })
     .catch(() => {
-      console.log('获取答题情况失败')
+      console.log('获取完成情况失败')
       ElMessage({
         type: 'warning',
         message: '未获取到答题信息！'
@@ -471,7 +471,7 @@ const onClassWorkScoreSubmit = () => {
   console.log('批改后返回的方法')
   loading_dt_table.value = true
   isopen_dtwk_table.value = false
-  // 1、清空答题情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
+  // 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
   //  - 左侧学生列表
   classWorkAnalysis.classworkdata = []
   classWorkAnalysis.activeStudentQuizlist = []
@@ -528,7 +528,7 @@ const escapeHtmlQuotes = (str) => {
   return result;
 }
 
-//#region 逐题分析
+//#region 逐题讲评
 // 查看学生-作业概览
 const workHandle = (type) => {
   // 关闭右侧批阅ui
@@ -563,11 +563,11 @@ const getWorkFeedList = async() =>{
 //#endregion
 
 
-//#regin 整体分析
+//#regin 训练报告
 /*
   author: yangws
   time: 2024-8-06 16:35:33
-  function: 整体分析的处理
+  function: 训练报告的处理
 */
 const handleClassOverviewOpen = (type) =>{
   // 关闭右侧批阅ui
@@ -634,8 +634,9 @@ const closeDialog = () => {
 
 onMounted(() => {
 
-  // const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-  const data = sessionStore.get('teachClassWorkItem');
+  const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
+  // const data = sessionStore.get('teachClassWorkItem');
+  // const data = localStorage.getItem('teachClassWorkItem');
   console.log(data,'????????????????????' )
   if(data){
     openDialog(data)
@@ -645,20 +646,18 @@ onMounted(() => {
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
     console.log('关闭zdg: 定时执行')
-    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+    clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
   }
 })
 
 onUnmounted(() => {
-  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
+  clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
 })
 
 // defineExpose({
 // })
 </script>
 
-<style src="@/assets/styles/JYStyle.css"></style>
-
 <style scoped lang="scss">
 .teachClassTask{
   height: 100%;
@@ -704,94 +703,6 @@ onUnmounted(() => {
     }
   }
 }
-
-
-
-
-
-
-
-// .clwk_dialog {
-  
-// }
-
-// .clwk_dialog {
-//   display: flex;
-//   justify-content: center;
-//   overflow: hidden;
-// }
-// .clwk_dialog .el-dialog {
-//   margin: 0 auto !important;
-//   height: 85%!important;
-//   overflow: hidden;
-// }
-// .clwk_dialog .el-dialog__header {
-//   /* position: absolute;
-//   top: 0;
-//   left: 0; */
-//   width: 100%!important;
-// }
-// .clwk_dialog .el-dialog__body {
-//   position: absolute;
-//   left: 0;
-//   top: 15px;
-//   bottom: 1px;
-//   right:0;
-//   padding:5px;
-//   z-index:1;
-//   display: flex;
-//   flex-direction: column;
-//   overflow: hidden;
-//   /* overflow:hidden;
-//   overflow-y: auto; */
-// }
-// .clwk_dialog .el-dialog__footer{
-//   position: absolute;
-//   bottom: 10px;
-//   right: 10px;
-// }
-// .clwk_dialog .classwork-score{
-//   overflow-y: auto;
-// }
 </style>
 
-<style scoped>
-/* .clwk_dialog {
-  display: flex;
-  justify-content: center;
-  overflow: hidden;
-}
-.clwk_dialog .el-dialog {
-  margin: 0 auto !important;
-  height: 85%!important;
-  overflow: hidden;
-}
-.clwk_dialog .el-dialog__header {
-  /* position: absolute;
-  top: 0;
-  left: 0; 
-  width: 100%!important;
-}
-.clwk_dialog .el-dialog__body {
-  position: absolute;
-  left: 0;
-  top: 15px;
-  bottom: 1px;
-  right:0;
-  padding:5px;
-  z-index:1;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  /* overflow:hidden;
-  overflow-y: auto; 
-}
-.clwk_dialog .el-dialog__footer{
-  position: absolute;
-  bottom: 10px;
-  right: 10px;
-}
-.clwk_dialog .classwork-score{
-  overflow-y: auto;
-} */
-</style>
+<style src="@/assets/styles/JYStyle.css"></style>

src/renderer/src/views/desktop/container/work-trend.vue

@@ -96,7 +96,8 @@ const debounceOpenWin = debounce(() => {
 // 批改作业
 const onClickItem = (item) => {
   console.log('防抖开启弹窗')
-  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  // sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  localStorage.setItem('teachClassWorkItem', JSON.stringify(item));
   debounceOpenWin();
 }
 

src/renderer/src/views/examReport/container/examReview.vue

@@ -19,22 +19,29 @@
 
   <!-- 试题详情 -->
   <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
-    <el-row class="drawer-main">
-      <el-col :span="24">
-        <span>{{activeExam.worktag}}</span>
-        <span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span>
-      </el-col>
-      <el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat">
-      </el-col>
-      <el-col :span="3"  class="drawer-main-col"><em>【答案】</em></el-col>
-      <el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col>
-      <el-col :span="3"  class="drawer-main-col"><em>【分析】</em></el-col>
-      <el-col :span="20" class="drawer-main-col" v-html="activeExam.method"></el-col>
-      <el-col :span="3"  class="drawer-main-col"><em>【解答】</em></el-col>
-      <el-col :span="20" class="drawer-main-col" v-html="activeExam.analyse"></el-col>
-      <el-col :span="3"  class="drawer-main-col" ><em>【点评】</em></el-col>
-      <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
-    </el-row>
+    <div style="height: calc(100% - 50px);">
+      <el-scrollbar style="background: #e9e9e9;border-radius: 8px;">
+        <el-row class="drawer-main">
+          <el-col :span="24">
+            <span>{{activeExam.worktag}}</span>
+            <span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span>
+          </el-col>
+          <el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat">
+          </el-col>
+          <el-col :span="3"  class="drawer-main-col"><em>【答案】</em></el-col>
+          <el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col>
+          <el-col :span="3"  class="drawer-main-col"><em>【分析】</em></el-col>
+          <el-col :span="20" class="drawer-main-col" v-html="activeExam.method"></el-col>
+          <el-col :span="3"  class="drawer-main-col"><em>【解答】</em></el-col>
+          <el-col :span="20" class="drawer-main-col" v-html="activeExam.analyse"></el-col>
+          <el-col :span="3"  class="drawer-main-col" ><em>【点评】</em></el-col>
+          <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
+        </el-row>
+      </el-scrollbar>
+    </div>
+    <div class="drawer-footer">
+      <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
+    </div>
   </el-drawer>
 </template>
 
@@ -89,13 +96,17 @@ const showExamAnalyseDrawer = (row) => {
 
   .drawer-main{
     margin: 1%; 
-    padding: 1% 2%; 
-    border: 2px dotted;
+    padding: 2%; 
     display: flex;
     text-align: left;
-    
     .drawer-main-col{
       padding: 10px 0px;
     }
   }
+  .drawer-footer{
+    padding-top: 15px;
+    display: flex;
+    justify-content: flex-end;
+    box-sizing: border-box;
+  }
 </style>

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -98,7 +98,7 @@ import FileImage from '@/components/file-image/index.vue'
 import { asyncLocalFile } from '@/utils/talkFile'
 import { toTimeText } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
+import { deleteSmarttalk, updateSmarttalk, getPrepareById, getSmarttalkPage } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import { sessionStore } from '@/utils/store'
@@ -208,6 +208,7 @@ export default {
               }
               if (action === 'cancel'){
                 // 继续上课
+                console.log(obj.bookImg)
                 if (obj.bookImg) {
                   //PPT
                   listEntpcourse({
@@ -241,9 +242,20 @@ export default {
                     }
                   })
                 }else {
-                  //APT
-                  this.$emit('on-start-class', item, obj)
-                  done()
+                  console.log(obj)
+                  getSmarttalkPage({fileId: obj.entpcoursefileid}).then(res2=>{
+                    console.log(res2)
+                    //APT
+                    if (res2&&res2.rows.length>0) {
+                      this.$emit('on-start-class', res2.rows[0], obj)
+                    }else {
+                      ElMessage({
+                        message: '该文件未关联PPT，无法打开！',
+                        type: 'warning'
+                      })
+                    }
+                    done()
+                  })
                 }
               }
               if (action === 'close') {

src/renderer/src/views/tool/components/homework.vue

@@ -128,7 +128,7 @@ const closeHomework = async() => {
 const successHomework = (data)=>{
   // console.log('推送成功', data)
   // 发送im消息-推送作业(app|平板)
-  ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
+  // ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
 }
 // 章节目录change
 const changeChapter = async (data)=>{

src/renderer/src/views/tool/components/imChat.vue

@@ -12,7 +12,7 @@ const props = defineProps({
 })
 const imChatObj = reactive({imChat:null})
 onMounted(() => {
-  ipcMainHandle() // 绑定-监听ipcMain im相关消息
+  // ipcMainHandle() // 绑定-监听ipcMain im相关消息
 })
 // 初始化 im-chat
 const initImChat = async (timGroupId) => {

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

@@ -105,7 +105,7 @@ const getClassInfo = async () => {
   const chat = await imChatRef.value?.initImChat(timGroupId) // 初始化im-chat
   if (!timGroupId) timGroupId = chat?.timGroupId
   if (!timGroupId) return ElMessage.error('房间创建-失败')
-  classManageApi.startClass(classObj.id, timGroupId) // 开始上课
+  if (data.status != '上课中') classManageApi.startClass(classObj.id, timGroupId) // 开始上课
 }
 // 切换tab-change
 const tabChange = (val) => {
@@ -158,7 +158,7 @@ const touchChange = (e) => {
 const chatChange = (type, data, ...args) => {
   if (type == 'createGroup') {  // 创建群-监听
     console.log('创建群:', data)
-    !!data && classManageApi.startClass(classObj.id, data)
+    // !!data && classManageApi.startClass(classObj.id, data)
   } else if (type == 'msg') {   // im-chat 消息监听
     if (!data) return // 没有msg数据 message_msg_id
     const msgId = (args||[])[0].message_msg_id