From 71bd199f4a19b60b0257073f127bd7244a306b46 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 10 Oct 2024 10:12:38 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   | 2 +-
 src/main/index.js              | 4 ++--
 src/renderer/src/utils/tool.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 89cc4f2..73da1d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "",
   "main": "./out/main/index.js",
   "author": "example.com",
diff --git a/src/main/index.js b/src/main/index.js
index f6726b2..4dcd521 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -74,7 +74,7 @@ function createLoginWindow() {
     updateInit(loginWindow)
   }
 
-  // loginWindow.webContents.openDevTools()
+  loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -128,7 +128,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  // mainWindow.webContents.openDevTools()
+  mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index d1a2869..3ab107b 100644
--- a/src/renderer/src/utils/tool.js
+++ b/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() // 打开调试工具
+      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() // 打开调试工具
+      win.webContents.openDevTools() // 打开调试工具
       eventHandles(type, win) // 事件监听处理
       winPdf=win
       break

From 7d457782cc762665370b83dff4e3e35e47f2aa7c Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 10 Oct 2024 16:00:13 +0800
Subject: [PATCH 2/8] edit

---
 .../src/views/tool/components/homework.vue    | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue
index 6aae4db..8cddb71 100644
--- a/src/renderer/src/views/tool/components/homework.vue
+++ b/src/renderer/src/views/tool/components/homework.vue
@@ -14,19 +14,26 @@
           <el-scrollbar height="360px">
             <ul>
               <!--资源-->
-              <li class="item flex" v-for="item in resourceList" :key="item.id">
-                <div class="item-left flex">
-                  <FileImage :size="50" :file-name="item.fileShowName" />
-                  <div class="item-info flex">
-                    <span class="item-name">{{ item.fileShowName }}</span>
-                    <div class="item-student">
-                      <span class="item-option">{{ item.fileFlag }}</span>
-                      <span>{{ item.fileSuffix }}</span>
+              
+              <template v-for="item in resourceList" :key="item.id">
+                <!--
+                apt pptx 暂时不显示
+                2024-10-10
+                -->
+                <li class="item flex"  v-if="item.fileFlag != 'apt' && item.fileSuffix != 'pptx' && item.fileSuffix != 'ppt'">
+                  <div class="item-left flex" >
+                    <FileImage :size="50" :file-name="item.fileShowName" />
+                    <div class="item-info flex">
+                      <span class="item-name">{{ item.fileShowName }}</span>
+                      <div class="item-student">
+                        <span class="item-option">{{ item.fileFlag }}</span>
+                        <span>{{ item.fileSuffix }}</span>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <el-button color="#349d44" @click="openFileLink(item)">推送</el-button>
-              </li>
+                  <el-button color="#349d44" @click="openFileLink(item)">推送</el-button>
+                </li>
+              </template>
               <!--作业-->
               <li class="item flex" v-for="item in dataList" :key="item.id">
                 <div class="item-left flex">
@@ -176,6 +183,7 @@ const getResource = () => {
   querySearch.pageSize = 500
 
   getSmarttalkPage(querySearch).then(res => {
+    console.log('资源=====》',res.rows)
     resourceList.value = res.rows
   })
 
@@ -217,8 +225,6 @@ onMounted(async () => {
   curNode.data = sessionStore.get('subject.curNode')
   getHomework()
   getResource()
-
-  
 })
 </script>
 

From bff59d699f423cbd1c582f2e3893be0f37c95ffa Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 10 Oct 2024 16:01:22 +0800
Subject: [PATCH 3/8] edit

---
 src/renderer/src/views/tool/components/homework.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue
index 8cddb71..f4a053f 100644
--- a/src/renderer/src/views/tool/components/homework.vue
+++ b/src/renderer/src/views/tool/components/homework.vue
@@ -14,7 +14,6 @@
           <el-scrollbar height="360px">
             <ul>
               <!--资源-->
-              
               <template v-for="item in resourceList" :key="item.id">
                 <!--
                 apt pptx 暂时不显示
@@ -177,13 +176,11 @@ const openFileLink = async (item) =>{
 // 获取资源数据
 const getResource = () => {
   let querySearch = toRaw(toolStore.curSubjectNode).querySearch
-  
   querySearch.orderByColumn = 'uploadTime'
   querySearch.isAsc = 'desc'
   querySearch.pageSize = 500
 
   getSmarttalkPage(querySearch).then(res => {
-    console.log('资源=====》',res.rows)
     resourceList.value = res.rows
   })
 

From e253a6c9dc9fc3e261ccdf4f90347446a69b83c1 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 10 Oct 2024 17:42:48 +0800
Subject: [PATCH 4/8] =?UTF-8?q?#876=20=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E8=AF=BE=E6=97=B6=E6=A3=80=E6=9F=A5=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E8=AF=BE=E7=A8=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/classManage/index.js     |   5 +-
 src/renderer/src/api/teaching/classcourse.js  |   8 ++
 .../src/views/classManage/classReserv.vue     |  75 +++++++----
 .../src/views/classManage/reserv-item-apt.vue | 127 ++++++++++++++++++
 .../src/views/classManage/reserv-item.vue     |  52 +++----
 .../views/prepare/container/kj-list-item.vue  |  85 +++++++++++-
 src/renderer/src/views/prepare/index.vue      |   4 +-
 7 files changed, 293 insertions(+), 63 deletions(-)
 create mode 100644 src/renderer/src/views/classManage/reserv-item-apt.vue

diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js
index 6b82a81..a0f3d53 100644
--- a/src/renderer/src/api/classManage/index.js
+++ b/src/renderer/src/api/classManage/index.js
@@ -147,10 +147,11 @@ export function updateSmartClassReserv(data) {
   })
 }
 //查询课程预约
-export function getSelfReserv() {
+export function getSelfReserv(params) {
   return request({
     url: '/smarttalk/classReserv/getSelfReserv',
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function deleteSmartReserv(id) {
diff --git a/src/renderer/src/api/teaching/classcourse.js b/src/renderer/src/api/teaching/classcourse.js
index 665489c..d312f85 100644
--- a/src/renderer/src/api/teaching/classcourse.js
+++ b/src/renderer/src/api/teaching/classcourse.js
@@ -9,6 +9,14 @@ export function listClasscourse(query) {
   })
 }
 
+export function listClasscourseNew(query) {
+  return request({
+    url: '/education/classcourse/new/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询classcourse详细
 export function getClasscourse(id) {
   return request({
diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue
index 3414291..b5c6e53 100644
--- a/src/renderer/src/views/classManage/classReserv.vue
+++ b/src/renderer/src/views/classManage/classReserv.vue
@@ -1,25 +1,25 @@
 <template>
   <el-container class="class-reserv-wrap">
-    <div class="class-reserv-tabs">
+<!--    <div class="class-reserv-tabs">
       <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
-    </div>
+    </div>-->
     <div class="class-reserv-body">
-      <reserv-item
-        v-for="(item, index) in activeDataList"
-        v-show="tabActive === '进行中'"
-        :key="index"
-        :item="item"
-        @open-edit="reservDialog.openDialog(item)"
-        @delete-reserv="deleteReserv(item)"
-      ></reserv-item>
-      <reserv-item
-        v-for="(item, index) in doneDataList"
-        v-show="tabActive === '已结束'"
-        :key="index"
-        :item="item"
-        @open-edit="reservDialog.openDialog(item)"
-        @delete-reserv="deleteReserv(item)"
-      ></reserv-item>
+      <template v-for="(item, index) in dataList" :key="index">
+        <reserv-item
+          :style="{'background-color': index%2==0?'#f5f5f5':''}"
+          :item="item"
+          v-if="item.bookImg"
+          @open-edit="reservDialog.openDialog(item)"
+          @delete-reserv="deleteReserv(item)"
+        ></reserv-item>
+        <reserv-item-apt
+          v-if="!item.bookImg"
+          :style="{'background-color': index%2==0?'#f5f5f5':''}"
+          :item="item"
+          @open-edit="reservDialog.openDialog(item)"
+          @delete-reserv="deleteReserv(item)"
+        ></reserv-item-apt>
+      </template>
     </div>
     <reserv ref="reservDialog"></reserv>
   </el-container>
@@ -28,44 +28,62 @@
 <script setup>
 import { ref, onMounted, computed, watch } from 'vue'
 import { getSelfReserv } from '@/api/classManage'
+import { listClasscourseNew } from '@/api/teaching/classcourse' // api接口
 import ReservItem from '@/views/classManage/reserv-item.vue'
 import Reserv from '@/views/prepare/container/reserv.vue'
 import { useToolState } from '@/store/modules/tool'
-import { sessionStore } from '@/utils/tool'
+import useUserStore from '@/store/modules/user'
+import ReservItemApt from '@/views/classManage/reserv-item-apt.vue'
 const reservDialog = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
 
-const activeDataList = computed(() => {
+const toolStore = useToolState()
+const userStore = useUserStore()
+
+/*const activeDataList = computed(() => {
   return dataList.value.filter((item) => {
     return item.status !== '已结束'
   })
+})*/
+
+const props = defineProps({
+  curNode: {
+    type: Object,
+    default: () => {}
+  }
 })
 const deleteReserv = (item) => {
   dataList.value = dataList.value.filter((is) => {
     return is.id !== item.id
   })
 }
-const doneDataList = computed(() => {
+/*const doneDataList = computed(() => {
   return dataList.value.filter((item) => {
     return item.status === '已结束'
   })
-})
+})*/
 // 获取数据
 const getData = () => {
-  getSelfReserv().then((res) => {
+  Promise.all([listClasscourseNew({teacherid: userStore.id,evalid: props.curNode.id,pageSize:1000}), getSelfReserv({ex2:props.curNode.id})]).then(([res1,res2])=>{
+    let list = res2.data || []
+    let list2 = res1.rows || []
+    // list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
+    list = list.concat(list2)
+    list.sort((a,b) => { return new Date(b.createTime) - new Date(a.createTime) })
+    dataList.value = list
+  })
+  /*getSelfReserv().then((res) => {
     const list = res.data || []
     list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
     dataList.value = list
-  })
+  })*/
 }
-const toolStore = useToolState()
 
 watch(
-  () => [dataList,toolStore.isToolWin],
+  () => [dataList,toolStore.isToolWin,props.curNode],
   () => {
-    console.log('====',toolStore)
     setTimeout(()=>{
       getData() // 加载数据
     },300)
@@ -81,13 +99,14 @@ onMounted(() => {
   height: 100%;
   display: flex;
   flex-direction: column;
-  padding: 15px 30px;
+  //padding: 15px 10px;
   .class-reserv-tabs {
     width: 30%;
     text-align: left;
   }
   .class-reserv-body {
     height: 100%;
+    font-size: 12px;
     flex: 1;
     overflow: auto;
     padding: 10px 0;
diff --git a/src/renderer/src/views/classManage/reserv-item-apt.vue b/src/renderer/src/views/classManage/reserv-item-apt.vue
new file mode 100644
index 0000000..879b406
--- /dev/null
+++ b/src/renderer/src/views/classManage/reserv-item-apt.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="class-reserv-item">
+    <div class="class-reserv-item-body">
+      {{ item.openDate }}&nbsp;{{ item.openTime }}
+    </div>
+    <div style="flex: 1;max-width: 400px">
+      <span>{{item.caption}}</span>
+    </div>
+    <div class="class-reserv-item-tool" style="width: 200px;max-width: 300px">
+      <el-tag v-if="item.status === 'close'" style="margin-right: 5px" type="success">已结束</el-tag>
+      <el-tag v-if="item.status === 'open'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <el-button v-if="item.status === 'open'" :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
+      >继续上课</el-button
+      >
+      <!--      <el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
+      <el-button v-if="item.status === 'open'" size="small" type="info" @click="endClassR(item)"
+      >下课</el-button
+      >
+    </div>
+    <div class="class-reserv-item-tool" style="width: 50px;">
+<!--      <el-button v-if="item.status!='open'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
+      <el-tag>APT</el-tag>
+    </div>
+    <div style="min-width: 150px;"><span> 浏览：25955 点赞：26605</span></div>
+  </div>
+</template>
+<script setup>
+import { useToolState } from '@/store/modules/tool'
+import useUserStore from '@/store/modules/user'
+import { createWindow } from '@/utils/tool'
+import { deleteSmartReserv, startClass, endClass } from '@/api/classManage'
+import { ElMessage } from 'element-plus'
+import { listEntpcourse } from '@/api/teaching/classwork'
+const emit = defineEmits(['openEdit', 'deleteReserv'])
+const props = defineProps({
+  item: {
+    type: Object,
+    default: () => {}
+  }
+})
+const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
+const toolStore = useToolState() // 获取状态管理-tool
+const openEdit = () => {
+  emit('openEdit', props.item)
+}
+const deleteReserv = () => {
+  deleteSmartReserv([props.item.id]).then((res) => {
+    if (res.data === true) {
+      ElMessage({
+        message: '删除成功',
+        type: 'success'
+      })
+      emit('deleteReserv', props.item)
+    }
+  })
+}
+const startClassR = (item) => {
+  // startClass(item.id).then((res) => {
+  //   if (res.data === true) {
+  //     item.status = '上课中'
+  //     openLesson()
+  //   }
+  // })
+  // item.status = '上课中'
+  openLesson()
+}
+const endClassR = (item) => {
+  /*endClass(item.id).then((res) => {
+    if (res.data === true) {
+      ElMessage({
+        message: '下课成功',
+        type: 'success'
+      })
+      item.status = '已结束'
+    }
+  })*/
+}
+// const toolStore = useToolState()
+let wins = null;
+// 上课-工具类悬浮
+const openLesson = () => {
+  // startClass(props.item.id)
+  /*listEntpcourse({
+    evalid: props.item.ex2,
+    edituserid: useUserStore().user.userId,
+    pageSize: 500
+  }).then(async res=>{
+    if (res.rows[0].id) {
+      wins = await createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id })
+    }
+  })*/
+}
+</script>
+<style scoped lang="scss">
+.class-reserv-item {
+  display: flex;
+  background-color: white;
+  border-radius: 10px;
+  padding: 5px;
+  margin-bottom: 10px;
+  .class-reserv-item-img {
+    width: 60px;
+    img {
+      width: 100%;
+    }
+  }
+  .class-reserv-item-body {
+    display: flex;
+    align-items: center;
+    text-align: left;
+    padding-left: 5px;
+    width: 120px;
+    .class-reserv-item-title1 {
+      flex: 1;
+      label {
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
+  .class-reserv-item-tool {
+    margin-left: 15px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue
index 5032c49..78db608 100644
--- a/src/renderer/src/views/classManage/reserv-item.vue
+++ b/src/renderer/src/views/classManage/reserv-item.vue
@@ -1,34 +1,27 @@
 <template>
   <div class="class-reserv-item">
-    <div class="class-reserv-item-img">
-      <img :src="basePath + item.bookImg" alt="封面" />
-    </div>
     <div class="class-reserv-item-body">
-      <div class="class-reserv-item-title1">
-        <label>{{ item.className }}</label>
-        <el-tag style="margin-left: 5px" type="primary"> {{ item.classType }}</el-tag>
-        <el-tag style="margin-left: 5px" type="primary"> {{ item.classSubject }}</el-tag>
-      </div>
-      <div class="class-reserv-item-title2">
-        {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}
-        {{ item.createUserName }}老师
-      </div>
-      <div class="class-reserv-item-title3">
-        <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
-          {{ index === 0 ? tag.name : '、' + tag.name }}</span
-        >
-      </div>
+      {{ item.classDay }}&nbsp;{{ item.startTime }}
     </div>
-    <div class="class-reserv-item-tool">
-      <el-button v-if="item.status !== '已结束'" :disabled="toolStore.isToolWin" type="primary" @click="startClassR(item)"
-        >{{item.status == '上课中'?'上课中':'上课'}}</el-button
+    <div style="flex: 1;max-width: 400px">
+      <span v-for="(tag, index) in item.classItemList" :key="index">{{ index === 0 ? tag.name : '、' + tag.name }}</span>
+    </div>
+    <div class="class-reserv-item-tool" style="width: 200px;max-width: 300px">
+      <el-tag v-if="item.status === '已结束'" style="margin-right: 5px" type="success">已结束</el-tag>
+      <el-tag v-if="item.status === '上课中'" style="margin-right: 5px" type="danger">上课中</el-tag>
+      <el-button v-if="item.status === '上课中'" :disabled="toolStore.isToolWin" size="small" type="primary" @click="startClassR(item)"
+        >继续上课</el-button
       >
-      <el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>
-<!--      <el-button v-if="item.status === '上课中'" type="info" @click="endClassR(item)"
+<!--      <el-button v-if="item.status === '未开始'" @click="openEdit">编辑</el-button>-->
+      <el-button v-if="item.status === '上课中'" size="small" type="info" @click="endClassR(item)"
         >下课</el-button
-      >-->
-      <el-button v-if="item.status!='上课中'" type="danger" @click="deleteReserv">删除</el-button>
+      >
     </div>
+    <div class="class-reserv-item-tool" style="width: 50px;">
+<!--      <el-button v-if="item.status!='上课中'" size="small" type="danger" @click="deleteReserv">删除</el-button>-->
+      <el-tag type="success">PPT</el-tag>
+    </div>
+    <div style="min-width: 150px;"></div>
   </div>
 </template>
 <script setup>
@@ -100,25 +93,24 @@ const endClassR = (item) => {
 </script>
 <style scoped lang="scss">
 .class-reserv-item {
+  font-size: 13px;
   display: flex;
   background-color: white;
   border-radius: 10px;
   padding: 5px;
   margin-bottom: 10px;
   .class-reserv-item-img {
-    width: 80px;
-    padding-left: 20px;
+    width: 60px;
     img {
       width: 100%;
     }
   }
   .class-reserv-item-body {
-    flex: 1;
     display: flex;
-    flex-direction: column;
+    align-items: center;
     text-align: left;
-    padding-left: 30px;
-    font-size: 14px;
+    padding-left: 5px;
+    width: 120px;
     .class-reserv-item-title1 {
       flex: 1;
       label {
diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue
index c660859..178486b 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -102,6 +102,10 @@ import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
 import { sessionStore } from '@/utils/store'
+import { listClasscourseNew } from '@/api/teaching/classcourse'
+import { endClass, getSelfReserv } from '@/api/classManage'
+import { listEntpcourse } from '@/api/teaching/classwork'
+import { createWindow } from '@/utils/tool'
 
 const { ipcRenderer } = window.electron || {}
 export default {
@@ -142,8 +146,87 @@ export default {
     this.userInfo = useUserStore().user
   },
   methods: {
+    getOpenCourse() {
+      return Promise.all([listClasscourseNew({teacherid: this.userInfo.userId,status:"open",evalid: this.curNode.id,pageSize:1000}), getSelfReserv({ex2:this.curNode.id})]).then(([res1,res2])=>{
+        let list2 = res1.rows || []
+        let list = res2.data || []
+        let one = list.find(item1 => {
+          if (item1.status === "上课中") {
+            return true
+          }
+        })
+        if (one) {
+          return one
+        }
+        if (list2.length>0) {
+          one = list2[0]
+        }
+        return one
+      })
+    },
     clickStartClass(item) {
-      this.$emit('on-start-class', item)
+      this.getOpenCourse().then(res=>{
+        if(!res){
+          this.$emit('on-start-class', item)
+        }else{
+          ElMessageBox.alert('<strong>上次课程尚未结束，是否继续上课？</strong>', '', {
+            // if you want to disable its autofocus
+            // autofocus: false,
+            confirmButtonText: '下课　　',
+            cancelButtonText: '继续上课',
+            showCancelButton: true,
+            showClose: false,
+            closeOnClickModal: true,
+            distinguishCancelAndClose: true,
+            dangerouslyUseHTMLString: true,
+            cancelButtonClass: "el-button--primary",
+            confirmButtonClass: "el-button--danger",
+            center: true,
+            beforeClose: (action, instance, done) => {
+              if (action === 'confirm'){
+                // 下课
+                if (res.bookImg) {
+                  //PPT
+                  endClass(res.id).then((res1) => {
+                    if (res1.data === true) {
+                      ElMessage({
+                        message: '下课成功',
+                        type: 'success'
+                      })
+                      res.status = '已结束'
+                      done()
+                    }
+                  })
+                }else {
+                  //APT
+                }
+              }
+              if (action === 'cancel'){
+                // 继续上课
+                if (res.bookImg) {
+                  //PPT
+                  listEntpcourse({
+                    evalid: res.ex2,
+                    edituserid: useUserStore().user.userId,
+                    pageSize: 500
+                  }).then(async res1=>{
+                    if (res1.rows[0].id) {
+                      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res1.rows[0].id + "&reservId=" + res.id })
+                      done()
+                    }
+                  })
+                }else {
+                  //APT
+                }
+              }
+              if (action === 'close') {
+                done()
+              }
+            },
+          })
+        }
+      })
+      // this.$emit('on-start-class', item)
     },
     editTalk(item) {
       ElMessageBox.prompt('请输入新的标签', '添加标签', {
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 1346ea5..99a7826 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -28,7 +28,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="教学实录" name="教学实录" class="prepare-center-jxsl">
-          <class-reserv></class-reserv>
+          <class-reserv v-if="activeAptTab==='教学实录'" :curNode="currentNode"></class-reserv>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -654,7 +654,7 @@ export default {
         fullPath: fullPath,
         cookieData: { ...configObj.data }
       })
-    },  
+    },
     // 删除作业
     delhomework(item) {
       this.isLoading = true

From 07fa4c97906fe9f4db9e28d3f95334da1c57ebba Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 11 Oct 2024 13:42:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=92=8C=E4=BA=92=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/tool/components/side.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/views/tool/components/side.vue b/src/renderer/src/views/tool/components/side.vue
index 341bb2f..0e42577 100644
--- a/src/renderer/src/views/tool/components/side.vue
+++ b/src/renderer/src/views/tool/components/side.vue
@@ -48,9 +48,9 @@ const props = defineProps({
   data: { // 数据
     type: Array,
     default: () => [
-      { label: '资源', prop: 'resource', icon: 'icon-kechengziyuan1' },
-      { label: '互动', prop: 'interact', icon: 'icon-hudong' },
-      { label: '窗口', prop: 'win', icon: 'icon-tubiaozhizuomobanyihuifu-' },
+      { label: '活动', prop: 'resource', icon: 'icon-kechengziyuan1' },
+      // { label: '互动', prop: 'interact', icon: 'icon-hudong' },
+      // { label: '窗口', prop: 'win', icon: 'icon-tubiaozhizuomobanyihuifu-' },
       { label: '下课', prop: 'over', isExtra: true, icon: 'icon-a-lujing13357' },
     ]
   }
@@ -103,7 +103,7 @@ const clickHandel = (o, e) => {
   top: 50%;
   transform: translateY(-50%);
   right: 10px;
-  min-height: 40vh;
+  //min-height: 40vh;
   min-width: 4em;
   border-radius: 4em;
   background-color: #121212;

From 3c064ebffd261168ba15839694ad6b92840d7193 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 11 Oct 2024 14:41:36 +0800
Subject: [PATCH 6/8] =?UTF-8?q?#924=20V2.1.5=20PPT=E4=B8=8A=E8=AF=BE?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=B8=8A=E8=AF=BE=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=89=93=E5=BC=80=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8BPPT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/prepare/container/kj-list-item.vue      |  2 ++
 src/renderer/src/views/prepare/index.vue              | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue
index 178486b..57bbc7d 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -106,6 +106,7 @@ import { listClasscourseNew } from '@/api/teaching/classcourse'
 import { endClass, getSelfReserv } from '@/api/classManage'
 import { listEntpcourse } from '@/api/teaching/classwork'
 import { createWindow } from '@/utils/tool'
+import { defineExpose } from 'vue'
 
 const { ipcRenderer } = window.electron || {}
 export default {
@@ -135,6 +136,7 @@ export default {
       default: ''
     }
   },
+  expose: ['openFileWin'],
   emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },
   data() {
     return {
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 99a7826..54c1812 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -18,6 +18,7 @@
             <kj-list-item
               v-for="(item, index) in currentKJFileList"
               :key="index"
+              :ref="'kjItemRef'+item.id"
               :item="item"
               :index="index"
               :curNode="currentNode"
@@ -303,29 +304,29 @@ export default {
   // },
   methods: {
     startClass(item) {
-      // console.log(item, sessionStore)
       // 关闭状态，打开上课相关功能(已打开，忽略)
       const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
       if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
+      // 当前上课-store
+      sessionStore.set('activeClass', item)
+      this.activeClass = item
       if(item.fileFlag === '课件') {
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {
         this.$refs.calssRef.open(item.fileId)
       }
-      // 当前上课-store
-      sessionStore.set('activeClass', item)
-      this.activeClass = item
     },
     closeChange() { // 上课弹窗被关闭-触发
       console.log('关闭上课弹窗')
-      this.activeClass = null
+      // this.activeClass = null
       sessionStore.delete('activeClass')
     },
     initReserv(id) {
       getClassInfo(id).then((res) => {
         this.curClassReserv = res.data
         this.openLesson(res.data.id);
+        this.$refs['kjItemRef'+this.activeClass.id][0].openFileWin(this.activeClass);
       })
     },
     getBookPathFromServer() {

From b4dca578287accac8a337c9f19ce9659b5fa51f2 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 11 Oct 2024 14:51:46 +0800
Subject: [PATCH 7/8] =?UTF-8?q?#909=20V2.1.5=20=E5=B9=B3=E5=8F=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=BA=94=E8=AF=A5=E5=9C=A8=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=86=85=E5=B1=95=E7=A4=BA=E5=87=BA=E6=9D=A5=E3=80=82=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E9=98=85=E6=98=AF=E5=90=A6=E4=B8=BA=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/profile/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index 32ec999..8423f02 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -57,6 +57,13 @@
                 </div>
                 <div class="right-align">{{ state.user.createTime }}</div>
               </li>
+              <li class="list-group-item">
+                <div class="left-align">
+                  <Paperclip class="Calendar"/>
+                  <span>版本编号</span>
+                </div>
+                <div class="right-align">v{{version}}</div>
+              </li>
             </ul>
           </div>
         </el-card>
@@ -83,13 +90,15 @@
 </template>
 
   <script setup name="Profile">
-import { UserFilled, Cellphone, Message, Suitcase, Avatar, Calendar } from '@element-plus/icons-vue'
+  import { UserFilled, Cellphone, Message, Suitcase, Avatar, Calendar, Paperclip } from '@element-plus/icons-vue'
 import { ref, reactive } from 'vue'
 import userAvatar from './userAvatar.vue'
 import userInfo from './userInfo.vue'
 import resetPwd from './resetPwd.vue'
 import { getUserProfile } from '@/api/system/user'
+import pkc from "../../../../../package.json"
 
+  const version = ref(pkc.version)
 const activeTab = ref('userinfo')
 const state = reactive({
   user: {},

From acc20b79f1f028537eccb857ed3ebb94bc7acfed Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 11 Oct 2024 14:59:23 +0800
Subject: [PATCH 8/8] =?UTF-8?q?#895=20V2.1.5=20=E3=80=90=E6=95=99=E5=AD=A6?=
 =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E3=80=91=E2=80=9CAPT=E2=80=9D=E2=80=9CPPT?=
 =?UTF-8?q?=E2=80=9D=E7=8E=B0=E5=9C=A8=E5=88=9B=E5=BB=BA=E5=90=8E=E6=98=AF?=
 =?UTF-8?q?=E5=85=88=E7=94=9F=E6=88=90=E6=96=87=E6=A1=A3=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=88=9B=E5=BB=BA=E5=90=8E=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=93=E5=BC=80=E8=BF=9B=E5=85=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/prepare/index.vue | 37 ++++--------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 54c1812..871b681 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -34,37 +34,6 @@
       </el-tabs>
     </div>
     <div class="page-right">
-<!--      <div class="header-top flex">
-        <div class="textbook-img" @click="navtoPdf">
-          <el-image style="width: 80px; height: 110px" :src="curBookImg" />
-          <el-progress
-            v-if="downloadNum > 0 && downloadNum < 100"
-            style="position: absolute; left: 0; z-index: 999"
-            type="circle"
-            :percentage="downloadNum"
-          />
-        </div>
-        <div class="top-item">
-          <el-button class="btn" @click="handleOutLink('standard')">课标研读</el-button>
-          <el-button class="btn" @click="openReserv">预约课程</el-button>
-          <el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
-          <el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
-        </div>
-        <el-button
-          :type="!curClassReserv.id ? 'info' : 'primary'"
-          :disabled="!curClassReserv.id || toolStore.isToolWin"
-          class="to-class-btn"
-          @click="openLesson"
-        >
-          <label
-            ><i class="iconfont icon-lingdang"></i
-            >{{ curClassReserv.status == '上课中' ? '上课中' : '上课' }}</label
-          >
-          <label>{{ curClassReserv.classDay }} {{ getWeekday1(curClassReserv.classDay) }}</label>
-          <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
-        </el-button>
-        <div class="top-zoom-style"></div>
-      </div>-->
       <div style="padding: 0 20px;height: 100%;">
         <el-tabs v-model="activeTab" class="prepare-tabs" >
           <el-tab-pane label="素材" name="素材">
@@ -369,6 +338,9 @@ export default {
     createFile() {
       creatPPT(this.currentNode.itemtitle + '.pptx', this.uploadData).then((res) => {
         this.currentFileList.unshift(res.resData)
+        setTimeout(()=>{
+          this.$refs['kjItemRef'+res.resData.id][0].openFileWin(res.resData);
+        },500)
       })
     },
     createAptFile() {
@@ -450,6 +422,9 @@ export default {
               fileShowName: this.currentNode.itemtitle + '.apt'
             }).then((res) => {
               this.currentFileList.unshift(res.resData)
+              setTimeout(()=>{
+                this.$refs['kjItemRef'+res.resData.id][0].openFileWin(res.resData);
+              },500)
             })
           })
         })