From 1d808950b5cfa06740a061d159f0169a01d725a1 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Mon, 2 Sep 2024 16:33:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/pdf/index.vue        | 9 ---------
 src/renderer/src/views/classBegins/index.vue     | 7 +++++--
 src/renderer/src/views/tool/components/board.vue | 4 ++--
 src/renderer/src/views/tool/sphere.vue           | 7 ++++---
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/renderer/src/components/pdf/index.vue b/src/renderer/src/components/pdf/index.vue
index ae43c6e..64a8671 100644
--- a/src/renderer/src/components/pdf/index.vue
+++ b/src/renderer/src/components/pdf/index.vue
@@ -383,16 +383,7 @@ defineExpose({
   savaDataStore
 })
 watchEffect(() => {
-  setTimeout(() => {
-    console.log(toolState,'监听')
-
-  }, 300)
   if(toolState.isPdfWin){
-  // if(toolState.isToolWin){
-  //   ispointer.value=false
-  // }else{
-  //   ispointer.value=true
-  // }
     watchToolState() //监听工具栏
   }
 })
diff --git a/src/renderer/src/views/classBegins/index.vue b/src/renderer/src/views/classBegins/index.vue
index a1b4ec3..afd9920 100644
--- a/src/renderer/src/views/classBegins/index.vue
+++ b/src/renderer/src/views/classBegins/index.vue
@@ -104,9 +104,12 @@ const switchPageMode = () => {
   }
 }
 onMounted(async () => {
+  const isDev = process.env.NODE_ENV == 'development'
   toolState.isPdfWin=true //设置打开pdf窗口
-  pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
-  // pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
+  if (isDev) 
+    pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
+  else
+    pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
   textbookId.value = route.query.textbookId
   pdfObj.bookId=textbookId.value
   //初始化获取接口数据
diff --git a/src/renderer/src/views/tool/components/board.vue b/src/renderer/src/views/tool/components/board.vue
index c6d4144..6aa1686 100644
--- a/src/renderer/src/views/tool/components/board.vue
+++ b/src/renderer/src/views/tool/components/board.vue
@@ -29,7 +29,7 @@ onMounted(async() => {
 const handleMode = (newVal, oldVal) => {
   if(toolStore.isPdfWin){
     if(newVal=='clear'){
-      emit('update:modelValue', oldVal)
+      setTimeout(() => emit('update:modelValue', oldVal), 10)
     }
     return
   }
@@ -47,7 +47,7 @@ const handleMode = (newVal, oldVal) => {
     case 'clear':   // 清空画布
       if(oldVal){
         FabricVue.history?.clean()
-        emit('update:modelValue', oldVal)
+        setTimeout(() => emit('update:modelValue', oldVal), 10)
       }
       
       break
diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index f5c55ce..7b6030c 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -51,8 +51,9 @@ import imChat from './components/imChat.vue'    // im-chat-子组件
 import vDrag from './directive/drag'            // 自定义指令-拖拽
 import vIgnore from './directive/ignore'        // 自定义指令-穿透
 import { useToolState } from '@/store/modules/tool' // 数据状态-缓存
-import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具
+import { ipcMsgSend, ipcMain, sessionStore } from '@/utils/tool' // 相关工具
 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息头-相关定义(nuem)
+
 const route = useRoute();
 const tabActive = ref('select')   // 工具栏当前选中项
 const isFold = ref(false)         // 折叠工具栏
@@ -82,7 +83,8 @@ const btnList = [                 // 工具栏按钮列表
 // === 页面加载完毕 ===
 onMounted(async() => {
   if (!electron) return // 浏览器端
-  getClassInfo()        // 获取课堂详情 ex3
+  // console.log(sessionStore)
+  // getClassInfo()        // 获取课堂详情 ex3
   setTimeout(() => {
     resetStatus()       // 开启重置状态-监听
   }, 200);
@@ -104,7 +106,6 @@ const getClassInfo = async () => {
 const tabChange = (val) => {
   const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
   if(bool) toolStore.showBoardAll = true
-  // ipcMsgSend('tool-sphere:close')
   toolStore.model = val // 存储当前tab
 }
 // logo 点击-事件 折叠|展开