From 7974aeabe416fa201b9e6fe226d93c0c4b940db2 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 8 Aug 2024 17:38:45 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=88=97=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron.vite.config.mjs                      |  4 +-
 src/renderer/src/api/classManage/index.js     | 16 +++++
 src/renderer/src/layout/components/Header.vue |  1 +
 src/renderer/src/router/index.js              |  6 ++
 .../src/views/classManage/classReserv.vue     | 56 +++++++++++++++
 .../src/views/classManage/reserv-item.vue     | 72 +++++++++++++++++++
 .../src/views/prepare/container/reserv.vue    | 44 +++++++++++-
 src/renderer/src/views/prepare/index.vue      |  4 +-
 8 files changed, 197 insertions(+), 6 deletions(-)
 create mode 100644 src/renderer/src/views/classManage/classReserv.vue
 create mode 100644 src/renderer/src/views/classManage/reserv-item.vue

diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index c48cc00..9b9c503 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -24,8 +24,8 @@ export default defineConfig({
     server: {
       proxy: {
         '/dev-api': {
-          target: 'http://27.128.240.72:7865',
-          // target: 'http://192.168.2.52:7863',
+          // target: 'http://27.128.240.72:7865',
+          target: 'http://192.168.2.52:7863',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }
diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js
index 14a8314..e783daf 100644
--- a/src/renderer/src/api/classManage/index.js
+++ b/src/renderer/src/api/classManage/index.js
@@ -130,3 +130,19 @@ export function addStudentmainByNameArray(data) {
     data: data
   })
 }
+//新增课程预约
+export function addSmartClassReserv(data) {
+  return request({
+    url: '/smarttalk/classReserv/addSmartClassReserv',
+    method: 'post',
+    data: data
+  })
+}
+//查询课程预约
+export function getSelfReserv() {
+  return request({
+    url: '/smarttalk/classReserv/getSelfReserv',
+    method: 'get'
+  })
+}
+
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 00deb25..799bf33 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -35,6 +35,7 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
+                <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
                 <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
                 <el-dropdown-item divided command="logout">
                   <span>退出登录</span>
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index b4c3a54..eab5de5 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -45,6 +45,12 @@ export const constantRoutes = [
         name: 'profile',
         meta: {title: '个人中心'}
       },
+      {
+        path: '/classReserv',
+        component: () => import('@/views/classManage/classReserv.vue'),
+        name: 'classReserv',
+        meta: {title: '课程预约'}
+      },
       {
         path: '/class',
         component: () => import('@/views/classManage/index.vue'),
diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue
new file mode 100644
index 0000000..f47373b
--- /dev/null
+++ b/src/renderer/src/views/classManage/classReserv.vue
@@ -0,0 +1,56 @@
+<template>
+  <el-container class="class-reserv-wrap">
+    <div class="class-reserv-tabs">
+      <el-segmented block v-model="tabActive" :options="tabOptions" size="large" />
+    </div>
+    <div class="class-reserv-body">
+      <reserv-item v-for="(item, index) in activeDataList" :key="index" :item="item" v-show="tabActive === '进行中'"></reserv-item>
+      <reserv-item v-for="(item, index) in doneDataList" :key="index" :item="item" v-show="tabActive === '已结束'"></reserv-item>
+    </div>
+  </el-container>
+</template>
+
+<script setup>
+import { ref, onMounted, computed } from 'vue'
+import { getSelfReserv } from '@/api/classManage'
+import ReservItem from '@/views/classManage/reserv-item.vue'
+
+const tabOptions = ref(['进行中','已结束'])
+const tabActive = ref('进行中')
+const dataList = ref([])
+
+const activeDataList = computed(() => {
+  return dataList.value.filter(item => {
+    return item.status !== "已结束"
+  })
+})
+const doneDataList = computed(() => {
+  return dataList.value.filter(item => {
+    return item.status === "已结束"
+  })
+})
+onMounted(() => {
+  getSelfReserv().then(res => {
+    dataList.value = res.data
+  })
+})
+</script>
+
+<style scoped lang="scss">
+.class-reserv-wrap{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  padding: 15px 30px;
+  .class-reserv-tabs{
+    width: 30%;
+    text-align: left;
+  }
+  .class-reserv-body{
+    height: 100%;
+    flex: 1;
+    overflow: auto;
+    padding: 10px 0;
+  }
+}
+</style>
diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue
new file mode 100644
index 0000000..ab720ca
--- /dev/null
+++ b/src/renderer/src/views/classManage/reserv-item.vue
@@ -0,0 +1,72 @@
+<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 style="margin-left: 5px;" v-for="(tag, index) in item.classItemList" :key="index"> {{ index===0? tag.name:'、'+tag.name }}</span>
+      </div>
+    </div>
+    <div class="class-reserv-item-tool">
+      <el-button type="primary">上课</el-button>
+      <el-button>编辑</el-button>
+      <el-button type="info">下课</el-button>
+      <el-button type="danger">删除</el-button>
+    </div>
+  </div>
+</template>
+<script setup>
+import { ref } from 'vue'
+const props = defineProps({
+  item: {
+    type: Object,
+    default: () => {}
+  }
+})
+const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
+</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: 80px;
+    padding-left: 20px;
+    img{
+      width: 100%;
+    }
+  }
+  .class-reserv-item-body{
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    text-align: left;
+    padding-left: 30px;
+    font-size: 14px;
+    .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/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue
index 4288303..469836d 100644
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@@ -78,8 +78,19 @@
 </template>
 <script setup>
 import { ref, defineExpose, onMounted, reactive, computed } from 'vue'
-import { listClassmain } from '@/api/classManage'
+import { addSmartClassReserv, listClassmain } from '@/api/classManage'
 import useUserStore from '@/store/modules/user'
+import { ElMessage } from 'element-plus'
+const props = defineProps({
+  subject: {
+    type: String,
+    default: ''
+  },
+  bookId: {
+    type: Number,
+    default: ''
+  }
+})
 const ruleFormDialog = ref(null)
 const userStore = useUserStore().user
 const centerDialogVisible = ref(false)
@@ -87,7 +98,7 @@ const form = reactive({
   name: '',
   type: '常规课',
   day: '',
-  time: '',
+  time: [],
   resource: [],
   classRoom: ''
 })
@@ -141,10 +152,39 @@ const submitForm = async () => {
   if (!formEl) return
   await formEl.validate((valid) => {
     if (valid) {
+      addClassReserv(form)
       centerDialogVisible.value = false
     }
   })
 }
+const addClassReserv = (formData) => {
+  let ids = formData.resource.join(",")
+  let param = {
+    className: formData.name,
+    classType: formData.type,
+    classDay: formData.day,
+    startTime: formData.time[0],
+    endTime: formData.time[1],
+    classList: ids,
+    classRoom: formData.classRoom,
+    classSubject: props.subject,
+    ex1: props.bookId
+   }
+  addSmartClassReserv(param).then((res) => {
+    if (res.data === true) {
+      closeDialog();
+      ElMessage({
+        type: 'success',
+        message: '预约成功！'
+      })
+    } else {
+      ElMessage({
+        type: 'error',
+        message: res.message
+      })
+    }
+  })
+}
 defineExpose({
   openDialog,
   closeDialog
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 3aad3db..7ca0b9a 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -102,7 +102,7 @@
       @on-close="closeHomework"
     />
   </div>
-  <reserv ref="reservDialog"></reserv>
+  <reserv :subject="currentNode.edusubject" :book-id="uploadData.textbookId" ref="reservDialog"></reserv>
 </template>
 <script setup>
 import { Check } from '@element-plus/icons-vue'
@@ -539,7 +539,7 @@ export default {
       if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本，请勿重复操作')
       // let path = await this.getBookPathFromServer()
       // console.log(path)
-      // console.log(this.uploadData.textbookId) 
+      // console.log(this.uploadData.textbookId)
       createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId })
     },
     // 上课-工具类悬浮

From 572bdb5fec0df526acb02024b2a414aa9b86174d Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 8 Aug 2024 17:39:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=88=97=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron.vite.config.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index 9b9c503..c48cc00 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -24,8 +24,8 @@ export default defineConfig({
     server: {
       proxy: {
         '/dev-api': {
-          // target: 'http://27.128.240.72:7865',
-          target: 'http://192.168.2.52:7863',
+          target: 'http://27.128.240.72:7865',
+          // target: 'http://192.168.2.52:7863',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }

From e5845a6714e98f3f63347bc13c9b45fd4fc076d8 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 8 Aug 2024 17:44:03 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=88=97=E8=A1=A8=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index a663c25..d2d56be 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -225,7 +225,7 @@ export default {
             })
             ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => {
               if (isSuccess === true) {
-                resolve(appRootFilePath + fileName)
+                resolve(fileName)
               } else {
                 ElMessage({
                   type: 'info',
@@ -234,7 +234,7 @@ export default {
               }
             })
           } else {
-            resolve(appRootFilePath + fileName)
+            resolve(fileName)
           }
         })
       })
@@ -538,8 +538,6 @@ export default {
       const toolStore = useToolState()
       if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本，请勿重复操作')
       let path = await this.getBookPathFromServer()
-      path=path.replace(/^.*[\\\/]/, '');
-      // console.log(this.uploadData.textbookId)
       createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId+'&path='+ path })
     },
     // 上课-工具类悬浮

From ae500c94ce4ecb754b1f1422330a6841e7ed88e5 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 9 Aug 2024 15:06:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron.vite.config.mjs                      |  4 +-
 src/main/file.js                              |  4 +-
 src/renderer/src/api/classManage/index.js     | 29 ++++++-
 .../src/views/classManage/classReserv.vue     | 45 +++++++---
 .../src/views/classManage/reserv-item.vue     | 82 ++++++++++++++----
 .../src/views/prepare/container/reserv.vue    | 85 +++++++++++++++----
 src/renderer/src/views/prepare/index.vue      | 44 ++++++++--
 7 files changed, 237 insertions(+), 56 deletions(-)

diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index c48cc00..9b9c503 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -24,8 +24,8 @@ export default defineConfig({
     server: {
       proxy: {
         '/dev-api': {
-          target: 'http://27.128.240.72:7865',
-          // target: 'http://192.168.2.52:7863',
+          // target: 'http://27.128.240.72:7865',
+          target: 'http://192.168.2.52:7863',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }
diff --git a/src/main/file.js b/src/main/file.js
index 9cc20ea..d3eede2 100644
--- a/src/main/file.js
+++ b/src/main/file.js
@@ -250,7 +250,9 @@ export default async function ({ app, shell, BrowserWindow, ipcMain }) {
             onDownloadStarted: async ({ id, item, webContents }) => {
               // Do something with the download id
             },
-            onDownloadProgress: async ({ id, item, percentCompleted }) => {},
+            onDownloadProgress: async ({ id, item, percentCompleted }) => {
+              e.reply('download-file-default-prog' + fileName, percentCompleted)
+            },
             onDownloadCompleted: async ({ id, item }) => {
               console.log('完成')
               e.reply('download-file-default' + fileName, true)
diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js
index e783daf..6db5913 100644
--- a/src/renderer/src/api/classManage/index.js
+++ b/src/renderer/src/api/classManage/index.js
@@ -138,6 +138,14 @@ export function addSmartClassReserv(data) {
     data: data
   })
 }
+//修改课程预约
+export function updateSmartClassReserv(data) {
+  return request({
+    url: '/smarttalk/classReserv/updateSmartClassReserv',
+    method: 'post',
+    data: data
+  })
+}
 //查询课程预约
 export function getSelfReserv() {
   return request({
@@ -145,4 +153,23 @@ export function getSelfReserv() {
     method: 'get'
   })
 }
-
+export function deleteSmartReserv(id) {
+  return request({
+    url: '/smarttalk/classReserv/' + id,
+    method: 'delete'
+  })
+}
+export function startClass(id) {
+  return request({
+    url: '/smarttalk/classReserv/startClass',
+    method: 'get',
+    params: {id}
+  })
+}
+export function endClass(id) {
+  return request({
+    url: '/smarttalk/classReserv/endClass',
+    method: 'get',
+    params: {id}
+  })
+}
diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue
index f47373b..408b62e 100644
--- a/src/renderer/src/views/classManage/classReserv.vue
+++ b/src/renderer/src/views/classManage/classReserv.vue
@@ -1,12 +1,25 @@
 <template>
   <el-container class="class-reserv-wrap">
     <div class="class-reserv-tabs">
-      <el-segmented block v-model="tabActive" :options="tabOptions" size="large" />
+      <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
     </div>
     <div class="class-reserv-body">
-      <reserv-item v-for="(item, index) in activeDataList" :key="index" :item="item" v-show="tabActive === '进行中'"></reserv-item>
-      <reserv-item v-for="(item, index) in doneDataList" :key="index" :item="item" v-show="tabActive === '已结束'"></reserv-item>
+      <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"
+      ></reserv-item>
     </div>
+    <reserv ref="reservDialog"></reserv>
   </el-container>
 </template>
 
@@ -14,39 +27,45 @@
 import { ref, onMounted, computed } from 'vue'
 import { getSelfReserv } from '@/api/classManage'
 import ReservItem from '@/views/classManage/reserv-item.vue'
-
-const tabOptions = ref(['进行中','已结束'])
+import Reserv from '@/views/prepare/container/reserv.vue'
+const reservDialog = ref(null)
+const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
 
 const activeDataList = computed(() => {
-  return dataList.value.filter(item => {
-    return item.status !== "已结束"
+  return dataList.value.filter((item) => {
+    return item.status !== '已结束'
   })
 })
+const deleteReserv = (item) => {
+  dataList.value = dataList.value.filter((is) => {
+    return is.id !== item.id
+  })
+}
 const doneDataList = computed(() => {
-  return dataList.value.filter(item => {
-    return item.status === "已结束"
+  return dataList.value.filter((item) => {
+    return item.status === '已结束'
   })
 })
 onMounted(() => {
-  getSelfReserv().then(res => {
+  getSelfReserv().then((res) => {
     dataList.value = res.data
   })
 })
 </script>
 
 <style scoped lang="scss">
-.class-reserv-wrap{
+.class-reserv-wrap {
   height: 100%;
   display: flex;
   flex-direction: column;
   padding: 15px 30px;
-  .class-reserv-tabs{
+  .class-reserv-tabs {
     width: 30%;
     text-align: left;
   }
-  .class-reserv-body{
+  .class-reserv-body {
     height: 100%;
     flex: 1;
     overflow: auto;
diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue
index ab720ca..373ce2e 100644
--- a/src/renderer/src/views/classManage/reserv-item.vue
+++ b/src/renderer/src/views/classManage/reserv-item.vue
@@ -1,31 +1,40 @@
 <template>
   <div class="class-reserv-item">
     <div class="class-reserv-item-img">
-      <img :src="basePath + item.bookImg" alt="封面"/>
+      <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>
+        <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}}老师
+        {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}
+        {{ item.createUserName }}老师
       </div>
       <div class="class-reserv-item-title3">
-        <span style="margin-left: 5px;" v-for="(tag, index) in item.classItemList" :key="index"> {{ index===0? tag.name:'、'+tag.name }}</span>
+        <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
+          {{ index === 0 ? tag.name : '、' + tag.name }}</span
+        >
       </div>
     </div>
     <div class="class-reserv-item-tool">
-      <el-button type="primary">上课</el-button>
-      <el-button>编辑</el-button>
-      <el-button type="info">下课</el-button>
-      <el-button type="danger">删除</el-button>
+      <el-button v-if="item.status !== '已结束'" 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
+      >
+      <el-button type="danger" @click="deleteReserv">删除</el-button>
     </div>
   </div>
 </template>
 <script setup>
-import { ref } from 'vue'
+import { deleteSmartReserv, startClass, endClass } from '@/api/classManage'
+import { ElMessage } from 'element-plus'
+const emit = defineEmits(['openEdit', 'deleteReserv'])
 const props = defineProps({
   item: {
     type: Object,
@@ -33,37 +42,74 @@ const props = defineProps({
   }
 })
 const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
+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) {
+      ElMessage({
+        message: '上课成功',
+        type: 'success'
+      })
+      item.status = '上课中'
+    }
+  })
+}
+
+const endClassR = (item) => {
+  endClass(item.id).then((res) => {
+    if (res.data === true) {
+      ElMessage({
+        message: '下课成功',
+        type: 'success'
+      })
+      item.status = '已结束'
+    }
+  })
+}
 </script>
 <style scoped lang="scss">
-.class-reserv-item{
+.class-reserv-item {
   display: flex;
   background-color: white;
   border-radius: 10px;
   padding: 5px;
   margin-bottom: 10px;
-  .class-reserv-item-img{
+  .class-reserv-item-img {
     width: 80px;
     padding-left: 20px;
-    img{
+    img {
       width: 100%;
     }
   }
-  .class-reserv-item-body{
+  .class-reserv-item-body {
     flex: 1;
     display: flex;
     flex-direction: column;
     text-align: left;
     padding-left: 30px;
     font-size: 14px;
-    .class-reserv-item-title1{
+    .class-reserv-item-title1 {
       flex: 1;
-      label{
+      label {
         font-size: 20px;
         font-weight: bold;
       }
     }
   }
-  .class-reserv-item-tool{
+  .class-reserv-item-tool {
     margin-left: 15px;
     display: flex;
     align-items: center;
diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue
index 469836d..a98c206 100644
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@@ -77,21 +77,24 @@
   </el-dialog>
 </template>
 <script setup>
-import { ref, defineExpose, onMounted, reactive, computed } from 'vue'
-import { addSmartClassReserv, listClassmain } from '@/api/classManage'
+import { ref, defineExpose, onMounted, reactive, computed, watch } from 'vue'
+import { addSmartClassReserv, updateSmartClassReserv, listClassmain } from '@/api/classManage'
 import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 const props = defineProps({
-  subject: {
-    type: String,
-    default: ''
-  },
   bookId: {
     type: Number,
-    default: ''
+    default: 0
+  },
+  currentNode: {
+    type: Object,
+    default: () => {
+      return {}
+    }
   }
 })
 const ruleFormDialog = ref(null)
+const nowType = ref('add')
 const userStore = useUserStore().user
 const centerDialogVisible = ref(false)
 const form = reactive({
@@ -102,6 +105,13 @@ const form = reactive({
   resource: [],
   classRoom: ''
 })
+const updateForm = ref({})
+watch(
+  () => props.currentNode,
+  (newValue, oldValue) => {
+    form.name = newValue.label
+  }
+)
 const ruleForm = reactive({
   name: [{ required: true, message: '请输入课程名称', trigger: 'blur' }],
   day: [{ required: true, message: '请选择上课日期', trigger: 'change' }],
@@ -132,17 +142,29 @@ const locationOptions = [
 const locationMessage = computed(() => {
   return locationOptions.find((item) => item.value === form.type).message
 })
-const openDialog = () => {
+const openDialog = (data) => {
+  if (data) {
+    updateForm.value = data
+    nowType.value = 'update'
+    form.name = data.className
+    form.type = data.classType
+    form.day = data.classDay
+    form.time = [data.startTime, data.endTime]
+    form.resource = data.classList.split(',').map((item) => parseInt(item))
+    form.classRoom = data.classRoom
+  }
   centerDialogVisible.value = true
 }
 const closeDialog = () => {
   ruleFormDialog.value.resetFields()
   centerDialogVisible.value = false
+  form.name = props.currentNode.label
 }
 const classList = ref([])
 onMounted(() => {
   listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(
     (response) => {
+      console.log(response)
       classList.value = [...response.rows]
     }
   )
@@ -152,13 +174,17 @@ const submitForm = async () => {
   if (!formEl) return
   await formEl.validate((valid) => {
     if (valid) {
-      addClassReserv(form)
+      if (nowType.value === 'update') {
+        updateClassReserv(form)
+      } else {
+        addClassReserv(form)
+      }
       centerDialogVisible.value = false
     }
   })
 }
-const addClassReserv = (formData) => {
-  let ids = formData.resource.join(",")
+const updateClassReserv = (formData) => {
+  let ids = formData.resource.join(',')
   let param = {
     className: formData.name,
     classType: formData.type,
@@ -167,12 +193,41 @@ const addClassReserv = (formData) => {
     endTime: formData.time[1],
     classList: ids,
     classRoom: formData.classRoom,
-    classSubject: props.subject,
-    ex1: props.bookId
-   }
+    id: updateForm.value.id
+  }
+  updateSmartClassReserv(param).then((res) => {
+    if (res.data === true) {
+      closeDialog()
+      ElMessage({
+        type: 'success',
+        message: '修改预约成功！'
+      })
+      Object.assign(updateForm.value, param)
+    } else {
+      ElMessage({
+        type: 'error',
+        message: res.message
+      })
+    }
+  })
+}
+const addClassReserv = (formData) => {
+  let ids = formData.resource.join(',')
+  let param = {
+    className: formData.name,
+    classType: formData.type,
+    classDay: formData.day,
+    startTime: formData.time[0],
+    endTime: formData.time[1],
+    classList: ids,
+    classRoom: formData.classRoom,
+    classSubject: props.currentNode.edusubject,
+    ex1: props.bookId,
+    ex2: props.currentNode.id
+  }
   addSmartClassReserv(param).then((res) => {
     if (res.data === true) {
-      closeDialog();
+      closeDialog()
       ElMessage({
         type: 'success',
         message: '预约成功！'
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index d2d56be..89c8003 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -13,8 +13,10 @@
           <el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
         </div>
         <el-button type="primary" class="to-class-btn" @click="openLesson">
-          <i class="iconfont icon-lingdang"></i>上课</el-button
-        >
+          <label><i class="iconfont icon-lingdang"></i>上课</label>
+          <label>{{ curClassReserv.classDay }} {{ getWeekday1(curClassReserv.classDay) }}</label>
+          <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
+        </el-button>
         <div class="top-zoom-style"></div>
       </div>
       <div class="prepare-body-header">
@@ -102,7 +104,7 @@
       @on-close="closeHomework"
     />
   </div>
-  <reserv :subject="currentNode.edusubject" :book-id="uploadData.textbookId" ref="reservDialog"></reserv>
+  <reserv ref="reservDialog" :current-node="currentNode" :book-id="uploadData.textbookId"></reserv>
 </template>
 <script setup>
 import { Check } from '@element-plus/icons-vue'
@@ -129,6 +131,7 @@ import outLink from '@/utils/linkConfig'
 import { createWindow } from '@/utils/tool'
 import { uniqBy, cloneDeep } from 'lodash'
 import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
+import { getSelfReserv } from '@/api/classManage'
 const fs = require('fs')
 const { ipcRenderer } = window.electron || {}
 
@@ -157,6 +160,7 @@ export default {
       currentFileList: [],
       currentWorkList: [],
       curBookPath: '',
+      curClassReserv: {},
       lastAsyncAllTime: '',
       uploadData: {
         textbookId: null,
@@ -199,7 +203,16 @@ export default {
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
   },
-  mounted() {},
+  mounted() {
+    getSelfReserv().then((res) => {
+      let list = res.data.filter((item) => {
+        return item.status !== '已结束'
+      })
+      if (list.length > 0) {
+        this.curClassReserv = list[list.length - 1]
+      }
+    })
+  },
   activated() {
     if (this.uploadData.textbookId !== null) {
       this.asyncAllFile()
@@ -223,6 +236,8 @@ export default {
               url: filePath,
               fileName: fileName
             })
+            ipcRenderer.removeListener('download-file-default-prog' + fileName, this.progDownFile)
+            ipcRenderer.on('download-file-default-prog' + fileName, this.progDownFile)
             ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => {
               if (isSuccess === true) {
                 resolve(fileName)
@@ -239,6 +254,10 @@ export default {
         })
       })
     },
+    progDownFile(e, num) {
+      console.log(num)
+      //TODO 进度条
+    },
     createFile() {
       creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
         this.currentFileList.unshift(res.resData)
@@ -510,6 +529,11 @@ export default {
         this.currentWorkList = cloneDeep(ary)
       })
     },
+    getWeekday1(date) {
+      const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      const weekday = new Date(date).getDay()
+      return weekdays[weekday]
+    },
     // 打开布置作业窗口
     openSet(row) {
       this.row = row
@@ -538,7 +562,9 @@ export default {
       const toolStore = useToolState()
       if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本，请勿重复操作')
       let path = await this.getBookPathFromServer()
-      createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId+'&path='+ path })
+      createWindow('open-PDF', {
+        url: '/classBegins/index?textbookId=' + this.uploadData.textbookId + '&path=' + path
+      })
     },
     // 上课-工具类悬浮
     openLesson() {
@@ -658,7 +684,13 @@ export default {
         margin-left: 25px;
         font-size: 18px;
         z-index: 1;
-
+        & label:hover {
+          cursor: pointer !important;
+        }
+        & > :deep(span) {
+          flex-direction: column !important;
+          font-size: 12px;
+        }
         .icon-lingdang {
           margin-right: 5px;
           color: #ffffff;

From c2876ff983769da273c919c4660f38d29d987e3f Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 9 Aug 2024 17:20:55 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/index.js                             |  2 +-
 src/renderer/src/plugins/shareStore.js        |  6 +--
 src/renderer/src/store/modules/tool.js        |  2 +-
 src/renderer/src/utils/tool.js                |  6 +--
 .../src/views/classManage/classReserv.vue     | 12 ++++-
 .../src/views/classManage/reserv-item.vue     | 29 ++++++++---
 .../src/views/prepare/container/reserv.vue    |  2 +
 src/renderer/src/views/prepare/index.vue      | 48 ++++++++++++-------
 src/renderer/src/views/tool/sphere.vue        |  8 +++-
 9 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 653c83c..441bf06 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -243,4 +243,4 @@ function handleAll() {
       }
     }
   })
-}
\ No newline at end of file
+}
diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js
index 1a43c74..da709f0 100644
--- a/src/renderer/src/plugins/shareStore.js
+++ b/src/renderer/src/plugins/shareStore.js
@@ -20,7 +20,7 @@ export function shareStorePlugin({store}) {
 function stateSync(store) {
   const storeName = store.$id
   const jsonStr = JSON.stringify(store.$state)
-  // console.log('state-change', jsonStr, storeName)
+  console.log('state-change', jsonStr, storeName)
   // 通知主线程更新
   ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
 }
@@ -37,7 +37,7 @@ function stateChange(store) {
       // 更新状态
       store.$patch(stateJson)
       // 您可以通过将其 $state 属性设置为新对象来替换 Store 的整个状态
-      // store.$state = stateJson 
+      // store.$state = stateJson
     }
   })
-}
\ No newline at end of file
+}
diff --git a/src/renderer/src/store/modules/tool.js b/src/renderer/src/store/modules/tool.js
index c3fe9a7..9ec7d55 100644
--- a/src/renderer/src/store/modules/tool.js
+++ b/src/renderer/src/store/modules/tool.js
@@ -12,4 +12,4 @@ export const useToolState = defineStore('tool', {
   }),
   actions: {
   }
-})
\ No newline at end of file
+})
diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index 87ee641..c9c91f1 100644
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@@ -19,7 +19,7 @@ const isDev = isNode?process.env.NODE_ENV !== 'production':''
 export const ipcMain = Remote?.ipcMain || {}
 /**
  * 获取静态资源，开发和生产环境
- * @param {*} url 
+ * @param {*} url
  * @param {*} type 类型 app 应用内 user (用户目录 selfFile 自定义文件路径)
  * @returns
  */
@@ -67,9 +67,9 @@ export function ipcMsgInvoke(key, ...args) {
 /**
  * @description 封装ipcRenderer事件监听
  * @param {*} fn on once handle invoke
- * @param {*} key 
+ * @param {*} key
  * @param  {Function} cb 回调函数
- * @returns 
+ * @returns
  */
 export function ipcHandle(fn,key, cb) {
   return ipcRenderer[fn](key, cb)
diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue
index 408b62e..8983269 100644
--- a/src/renderer/src/views/classManage/classReserv.vue
+++ b/src/renderer/src/views/classManage/classReserv.vue
@@ -24,10 +24,11 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, watch } from 'vue'
 import { getSelfReserv } from '@/api/classManage'
 import ReservItem from '@/views/classManage/reserv-item.vue'
 import Reserv from '@/views/prepare/container/reserv.vue'
+import { useToolState } from '@/store/modules/tool'
 const reservDialog = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
@@ -48,6 +49,15 @@ const doneDataList = computed(() => {
     return item.status === '已结束'
   })
 })
+const toolStore = useToolState()
+watch(
+  () => toolStore.isToolWin,
+  (newD, oldD) => {
+    getSelfReserv().then((res) => {
+      dataList.value = [...res.data]
+    })
+  }
+)
 onMounted(() => {
   getSelfReserv().then((res) => {
     dataList.value = res.data
diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue
index 373ce2e..685d03a 100644
--- a/src/renderer/src/views/classManage/reserv-item.vue
+++ b/src/renderer/src/views/classManage/reserv-item.vue
@@ -24,16 +24,20 @@
         >上课</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 === '上课中'" type="info" @click="endClassR(item)"
         >下课</el-button
-      >
+      >-->
       <el-button type="danger" @click="deleteReserv">删除</el-button>
     </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: {
@@ -59,15 +63,26 @@ const deleteReserv = () => {
 const startClassR = (item) => {
   startClass(item.id).then((res) => {
     if (res.data === true) {
-      ElMessage({
-        message: '上课成功',
-        type: 'success'
-      })
       item.status = '上课中'
+      openLesson()
+    }
+  })
+}
+const toolStore = useToolState()
+// 上课-工具类悬浮
+const openLesson = () => {
+  if (toolStore.isToolWin) return ElMessage.error('您当前已开始上课，请勿重复操作')
+  startClass(props.item.id)
+  listEntpcourse({
+    evalid: props.item.ex2,
+    edituserid: useUserStore().user.userId,
+    pageSize: 500
+  }).then(res=>{
+    if (res.rows[0].id) {
+      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + res.rows[0].id + "&reservId=" + props.item.id })
     }
   })
 }
-
 const endClassR = (item) => {
   endClass(item.id).then((res) => {
     if (res.data === true) {
diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue
index a98c206..ceb4dcd 100644
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@@ -81,6 +81,7 @@ import { ref, defineExpose, onMounted, reactive, computed, watch } from 'vue'
 import { addSmartClassReserv, updateSmartClassReserv, listClassmain } from '@/api/classManage'
 import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
+const emit = defineEmits(['addSuccess'])
 const props = defineProps({
   bookId: {
     type: Number,
@@ -232,6 +233,7 @@ const addClassReserv = (formData) => {
         type: 'success',
         message: '预约成功！'
       })
+      emit('addSuccess')
     } else {
       ElMessage({
         type: 'error',
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 89c8003..8a2aaab 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -3,8 +3,9 @@
     <ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
     <div class="page-right">
       <div class="header-top flex">
-        <div class="textbook-img" @click="navtoPdf">
-          <el-image style="width: 80px; height: 110px" :src="curBookImg" />
+        <div class="textbook-img">
+          <el-image style="width: 80px; height: 110px" :src="curBookImg" @click="navtoPdf"/>
+          <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>
@@ -12,7 +13,7 @@
           <el-button class="btn" @click="handleOutLink('gk')">高考研读</el-button>
           <el-button class="btn" @click="handleOutLink('aiModel')">教学大模型</el-button>
         </div>
-        <el-button type="primary" class="to-class-btn" @click="openLesson">
+        <el-button :type="!curClassReserv.id?'info' : 'primary'" :disabled="!curClassReserv.id" class="to-class-btn" @click="openLesson">
           <label><i class="iconfont icon-lingdang"></i>上课</label>
           <label>{{ curClassReserv.classDay }} {{ getWeekday1(curClassReserv.classDay) }}</label>
           <label>{{ curClassReserv.startTime }}-{{ curClassReserv.endTime }}</label>
@@ -104,7 +105,7 @@
       @on-close="closeHomework"
     />
   </div>
-  <reserv ref="reservDialog" :current-node="currentNode" :book-id="uploadData.textbookId"></reserv>
+  <reserv ref="reservDialog" @add-success="initReserv" :current-node="currentNode" :book-id="uploadData.textbookId"></reserv>
 </template>
 <script setup>
 import { Check } from '@element-plus/icons-vue'
@@ -131,7 +132,8 @@ import outLink from '@/utils/linkConfig'
 import { createWindow } from '@/utils/tool'
 import { uniqBy, cloneDeep } from 'lodash'
 import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
-import { getSelfReserv } from '@/api/classManage'
+import { getSelfReserv, startClass } from '@/api/classManage'
+const toolStore = useToolState()
 const fs = require('fs')
 const { ipcRenderer } = window.electron || {}
 
@@ -161,6 +163,7 @@ export default {
       currentWorkList: [],
       curBookPath: '',
       curClassReserv: {},
+      downloadNum: 0,
       lastAsyncAllTime: '',
       uploadData: {
         textbookId: null,
@@ -202,24 +205,33 @@ export default {
       this.callback(param)
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
+    this.initReserv()
   },
   mounted() {
-    getSelfReserv().then((res) => {
-      let list = res.data.filter((item) => {
-        return item.status !== '已结束'
-      })
-      if (list.length > 0) {
-        this.curClassReserv = list[list.length - 1]
-      }
+    this.$watch(()=>toolStore.isToolWin,(newD, oldD)=>{
+      setTimeout(this.initReserv, 500)
     })
   },
   activated() {
     if (this.uploadData.textbookId !== null) {
       this.asyncAllFile()
       this.initHomeWork()
+      this.initReserv()
     }
   },
   methods: {
+    initReserv() {
+      getSelfReserv().then((res) => {
+        let list = res.data.filter((item) => {
+          return item.status !== '已结束'
+        })
+        if (list.length > 0) {
+          this.curClassReserv = list[list.length - 1]
+        }else {
+          this.curClassReserv = {}
+        }
+      })
+    },
     getBookPathFromServer() {
       let fileName = this.curBookPath
       if (!fileName) return
@@ -255,8 +267,7 @@ export default {
       })
     },
     progDownFile(e, num) {
-      console.log(num)
-      //TODO 进度条
+      this.downloadNum = num
     },
     createFile() {
       creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
@@ -559,7 +570,6 @@ export default {
 
     // 打开PDF-课件
     async navtoPdf() {
-      const toolStore = useToolState()
       if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本，请勿重复操作')
       let path = await this.getBookPathFromServer()
       createWindow('open-PDF', {
@@ -570,7 +580,8 @@ export default {
     openLesson() {
       const toolStore = useToolState()
       if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作')
-      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid })
+      startClass(this.curClassReserv.id)
+      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid + "&reservId=" + this.curClassReserv.id })
     }
   }
 }
@@ -645,9 +656,14 @@ export default {
         overflow: hidden;
         margin-right: 20px;
         z-index: 1;
+        position: relative;
         &:hover {
           cursor: pointer;
         }
+        :deep(.el-progress-circle) {
+          width: 90px!important;
+          background-color: white;
+        }
       }
 
       .top-item {
diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index 5a2aef3..d0861fc 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -30,13 +30,16 @@
 <script setup>
 // 功能说明：electron 悬浮球
 import { onMounted, ref, reactive, watchEffect } from 'vue'
+import { useRoute } from 'vue-router';
 import logo from '@root/resources/icon.png' // logo
 import boardVue from './components/board.vue'  // 画板-子组件
 import sideVue from './components/side.vue'  // 画板-子组件
 import vDrag from './directive/drag' // 自定义指令-拖拽
 import vIgnore from './directive/ignore' // 自定义指令-穿透
+import { endClass } from '@/api/classManage'
 import { useToolState } from '@/store/modules/tool'
 import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具
+const route = useRoute();
 const tabActive = ref('select')   // 工具栏当前选中项
 const isFold = ref(false)         // 折叠工具栏
 const isDrag = ref(false)         // 开始拖拽
@@ -111,6 +114,7 @@ const sideChange = o => {
       break
     case 'over':     // 下课
       toolStore.isToolWin = false
+      endClass(route.query.reservId)
       ipcMsgSend('tool-sphere:close')
       break
   }
@@ -118,7 +122,7 @@ const sideChange = o => {
 
 // === 监听器 ===
 watchEffect(() => {
-  // 不同的时候, 更新值: 是否显示-画板  
+  // 不同的时候, 更新值: 是否显示-画板
   const show = !toolStore.isPdfWin && toolStore.showBoardAll
   if (show != isShow.value) isShow.value = show
 })
@@ -170,4 +174,4 @@ watchEffect(() => {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

From c29a3d7a775f4121be183c839d56f5ce68df0ea3 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 9 Aug 2024 17:26:04 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/tool/sphere.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index a0b06fb..982b5e6 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -36,14 +36,7 @@
 // 功能说明：electron 悬浮球
 import { onMounted, ref, reactive, watchEffect } from 'vue'
 import { useRoute } from 'vue-router';
-import logo from '@root/resources/icon.png' // logo
-import boardVue from './components/board.vue'  // 画板-子组件
-import sideVue from './components/side.vue'  // 画板-子组件
-import vDrag from './directive/drag' // 自定义指令-拖拽
-import vIgnore from './directive/ignore' // 自定义指令-穿透
 import { endClass } from '@/api/classManage'
-import { useToolState } from '@/store/modules/tool'
-
 import logo from '@root/resources/icon.png'     // logo
 import boardVue from './components/board.vue'   // 画板-子组件
 import sideVue from './components/side.vue'     // 画板-子组件