From 6935bec1e479e9ab8d2ff50097a40636a1ce5d39 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Sat, 21 Sep 2024 12:05:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/tool/test.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/views/tool/test.vue b/src/renderer/src/views/tool/test.vue
index 61fcc59..49cbbd3 100644
--- a/src/renderer/src/views/tool/test.vue
+++ b/src/renderer/src/views/tool/test.vue
@@ -1,9 +1,15 @@
 <template>
-  <canvas ref="canvasRef" />
-  <button @click="eraseTo">橡皮擦
-    <i class="iconfont icon-xiangpica"></i>
-  </button>
-  <button @click="close">销毁</button>
+  <canvas ref="canvasRef" style="pointer-events: none;" />
+  <div style="position: absolute;top: 0;" @click="test('click')"
+  @mouseenter="test('mouseenter')" @mousemove="test('mousemove')" @mouseleave="test('mouseleave')"
+  @touchstart="test('touchstart')" @touchmove="test('touchmove')" @touchend="test('touchend')"
+  @touchcancel="test('touchcancel')" @mousedown="test('mousedown')" @mouseup="test('mouseup')"
+  @mouseout="test('mouseout')" @mouseover="test('mouseover')" @mousewheel="test('mousewheel')">
+    <!-- <button @click="eraseTo">橡皮擦</button> -->
+    <!-- <i class="iconfont icon-xiangpica"></i> -->
+    <!-- <button @click="close">销毁</button> -->
+    <div style="width: 100px;height: 100px;background: #ffbcbc;">小星星</div>
+  </div>
 </template>
 
 <script setup>
@@ -43,6 +49,10 @@ const eraseTo = () => { // 橡皮擦
   // canvas.dispose()
 }
 const close = () => { FabricVue.removeCanvas() }
+
+const test = (key, e) => {
+  console.log('event: ', key)
+}
 </script>
 
 <style lang="scss" scoped>

From 2f49d424189b9f89ef0795e8210428e97ff5484b Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Mon, 23 Sep 2024 10:38:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E5=87=BA=20=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AD=A3=E5=9C=A8=E4=B8=8A=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/layout/components/Header.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index cba3b47..9fc6d6d 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -65,7 +65,7 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, ElMessage } from 'element-plus'
 import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
@@ -74,6 +74,10 @@ import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { clearBookInfo } from '@/utils/ruoyi'
+import { sessionStore } from '@/utils/store'
+import { useToolState } from '@/store/modules/tool'
+
+const toolState = useToolState();
 let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -166,6 +170,8 @@ function handleCommand(command) {
 }
 
 function logout() {
+  const hasClass = sessionStore.has('activeClass.id')
+  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结结束上课')
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

From 372371e2f028ab07f2cb2372bcde11dae1e75c6e Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Mon, 23 Sep 2024 11:05:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E8=AF=BE?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/store/modules/tool.js | 7 ++++---
 src/renderer/src/views/tool/sphere.vue | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/store/modules/tool.js b/src/renderer/src/store/modules/tool.js
index cf8ffc3..3f5c5d3 100644
--- a/src/renderer/src/store/modules/tool.js
+++ b/src/renderer/src/store/modules/tool.js
@@ -23,11 +23,12 @@ export const useToolState = defineStore('tool', {
   }),
   actions: {
     async resetDef() { // 重置数据-下课
-      this.model = 'select'        // 悬浮球-当前模式
-      await sleep(20) // 休眠20ms
+      // this.model = 'select'        // 悬浮球-当前模式
+      await sleep(50) // 休眠50ms
       this.showBoardAll = false    // 全屏画板-是否显示
-      await sleep(20) // 休眠20ms
+      await sleep(50) // 休眠50ms
       this.isToolWin = false       // 工具窗口是否打开
+      await sleep(50) // 休眠50ms
     }
   }
 })
diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index f46966e..d003ad5 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -243,6 +243,7 @@ const sideChange = async o => {
 
 // === 监听器 ===
 watchEffect(() => {
+  if (isOver.value) return // 下课, 不往下执行
   // 不同的时候, 更新值: 是否显示-画板
   const show = !toolStore.isPdfWin && toolStore.showBoardAll
   if (show != isShow.value) isShow.value = show