From 8bb0a518dd4d9450370582c4d4ac3ae1dba1466b Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期五, 25 四月 2025 15:28:18 +0800
Subject: [PATCH] 资源

---
 src/views/readerPages/webHome.vue | 1384 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 1,239 insertions(+), 145 deletions(-)

diff --git a/src/views/readerPages/webHome.vue b/src/views/readerPages/webHome.vue
index b8b0ceb..f6b981a 100644
--- a/src/views/readerPages/webHome.vue
+++ b/src/views/readerPages/webHome.vue
@@ -6,8 +6,15 @@
       <span></span>
       <div class="userInfoBox">
         <div class="userName" v-if="userInfo.name">{{ userInfo.name }}</div>
-        <div v-if="token"><div class="layout hover" @click="layoutBtn">閫�鍑�</div></div>
-        <div v-else><div class="layout hover" @click="goLogin">鐧诲綍</div></div>
+        <div v-if="token">
+          <div class="layout hover" @click="layoutBtn">閫�鍑�</div>
+        </div>
+        <div v-else>
+          <div class="layout hover" @click="goLogin">鐧诲綍</div>
+        </div>
+        <!-- <div>
+          <div class="layout hover" @click="openFormulaDialog">鍏紡</div>
+        </div> -->
       </div>
     </div>
     <div class="contentBox">
@@ -112,27 +119,53 @@
               <div>榛樿璧勬簮</div>
               <div :class="resourceType == 'default' ? 'text' : 'line'"></div>
             </div>
-            <hr class="hr" />
-            <div class="tabItem hover" @click="selectResourceType('teacher')">
+            <hr class="hr" v-if="userInfo.role == 'Teacher'"/>
+            <div class="tabItem hover" @click="selectResourceType('teacher')" v-if="userInfo.role == 'Teacher'">
               <div>鏁欏笀璧勬簮</div>
               <div :class="resourceType == 'teacher' ? 'text' : 'line'"></div>
             </div>
+            <hr class="hr" />
+            <div class="tabItem hover" @click="selectResourceType('collect')">
+              <div>鏀惰棌璧勬簮</div>
+              <div :class="resourceType == 'collect' ? 'text' : 'line'"></div>
+            </div>
           </div>
           <div v-if="activeMenu == '棰樺簱'" class="resourceTab">
-            <div class="tabItem hover" @click="selectExercisesType('exercises')" v-if="bookConfig.textbookComponents.indexOf('3D3B4F55') > -1">
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('exercises')"
+              v-if="bookConfig.textbookComponents.indexOf('3D3B4F55') > -1"
+            >
               <div>涔犻</div>
               <div :class="exercisesType == 'exercises' ? 'text' : 'line'"></div>
             </div>
-            <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1"/>
-            <div class="tabItem hover" @click="selectExercisesType('wrong')" v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1">
+            <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('A4821F71') > -1" />
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('additional')"
+              v-if="bookConfig.textbookComponents.indexOf('A4821F71') > -1"
+            >
+              <div>闄勫姞棰�</div>
+              <div :class="exercisesType == 'additional' ? 'text' : 'line'"></div>
+            </div>
+            <!-- <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1" />
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('wrong')"
+              v-if="bookConfig.textbookComponents.indexOf('AFC1A288') > -1"
+            >
               <div>閿欓鏈�</div>
               <div :class="exercisesType == 'wrong' ? 'text' : 'line'"></div>
-            </div>
-            <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1"/>
-            <div class="tabItem hover" @click="selectExercisesType('collection')" v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1">
-              <div>鏀惰棌</div>
+            </div> -->
+            <!-- <hr class="hr" v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1" />
+            <div
+              class="tabItem hover"
+              @click="selectExercisesType('collection')"
+              v-if="bookConfig.textbookComponents.indexOf('A434F2C0') > -1"
+            >
+              <div>鏀惰棌澶�</div>
               <div :class="exercisesType == 'collection' ? 'text' : 'line'"></div>
-            </div>
+            </div> -->
           </div>
         </div>
         <!-- 鐩綍 -->
@@ -170,9 +203,12 @@
                     @click="searchClose(index)"
                     v-if="searchReaultData.isShow && searchReaultData.openIndex == index"
                     class="hover"
-                    ><ArrowDown
-                  /></el-icon>
-                  <el-icon @click="searchOpen(index)" v-else class="hover"><ArrowRight /></el-icon>
+                  >
+                    <ArrowDown />
+                  </el-icon>
+                  <el-icon @click="searchOpen(index)" v-else class="hover">
+                    <ArrowRight />
+                  </el-icon>
                   <span>{{ reault.chapterName }} 锛坽{ reault.itemList.length }}锛�</span>
                 </div>
                 <div
@@ -223,9 +259,12 @@
                     @click="noteClose(index)"
                     v-if="scribeData.isShow && scribeData.openIndex == index"
                     class="hover"
-                    ><ArrowDown
-                  /></el-icon>
-                  <el-icon @click="noteOpen(index)" v-else class="hover"><ArrowRight /></el-icon>
+                  >
+                    <ArrowDown />
+                  </el-icon>
+                  <el-icon @click="noteOpen(index)" v-else class="hover">
+                    <ArrowRight />
+                  </el-icon>
                   <span>{{ noteItem.chapterName }}</span>
                 </div>
                 <div
@@ -337,65 +376,106 @@
                         v-else-if="item.icon && activeClassify != 'image'"
                       />
                       <!-- <el-icon v-else-if="activeClassify == 'image'" size="30"></el-icon> -->
-                      <el-icon v-else-if="activeClassify == 'audio'" size="30"><Headset /></el-icon>
-                      <el-icon v-else-if="activeClassify == 'video'" size="30"
+                      <!-- <el-icon v-else-if="activeClassify == 'audio'" size="30"><Headset /></el-icon> -->
+                      <!-- <el-icon v-else-if="activeClassify == 'video'" size="30"
                         ><VideoCamera
-                      /></el-icon>
-                      <el-icon v-else-if="activeClassify == 'other'" size="30"><Files /></el-icon>
-                      <el-icon v-else-if="activeClassify == 'exercises'" size="30"
-                        ><Tickets
-                      /></el-icon>
+                      /></el-icon> -->
+                      <!-- <el-icon v-else-if="activeClassify == 'other'" size="30"><Files /></el-icon> -->
+                      <img
+                        src="@/assets/images/resource/yp-mr.png"
+                        v-else-if="activeClassify == 'audio'"
+                      />
+                      <img
+                        src="@/assets/images/resource/sp-mr.png"
+                        v-else-if="activeClassify == 'video'"
+                      />
+                      <img
+                        src="@/assets/images/resource/qt-mr.png"
+                        v-else-if="activeClassify == 'other'"
+                      />
                       <div class="handleBox" v-if="showHandle == index">
                         <div class="delImg">
                           <el-icon
                             class="icon hover"
                             size="20"
                             @click="JumpPosition(item)"
-                            v-if="resourceType == 'default'"
-                            ><LocationInformation
-                          /></el-icon>
+                            v-if="item.pagination"
+                          >
+                            <LocationInformation />
+                          </el-icon>
                           <el-icon
                             @click="goPlay(item)"
                             size="20"
                             class="icon hover"
                             v-if="item.resourceType == '瑙嗛'"
-                            ><VideoPlay
-                          /></el-icon>
+                          >
+                            <VideoPlay />
+                          </el-icon>
                           <el-icon
                             @click="goPlay(item, index)"
                             size="20"
                             class="icon hover"
                             v-if="item.resourceType == '闊抽' && playIndex != index"
-                            ><VideoPlay
-                          /></el-icon>
+                          >
+                            <VideoPlay />
+                          </el-icon>
                           <el-icon
                             @click="goPause()"
                             size="20"
                             class="icon hover"
                             v-if="item.resourceType == '闊抽' && playIndex == index"
-                            ><VideoPause
-                          /></el-icon>
+                          >
+                            <VideoPause />
+                          </el-icon>
                           <el-icon
                             @click="getCapture(item, index)"
                             size="20"
                             class="icon hover"
                             v-if="item.resourceType == '鍥剧墖'"
-                            ><View
-                          /></el-icon>
+                          >
+                            <View />
+                          </el-icon>
+                          <!-- 鍏朵粬绫诲瀷棰勮鎴栫洿鎺ヤ笅杞� -->
+                          <el-icon
+                            @click="goPlay(item)"
+                            size="20"
+                            class="icon hover"
+                            v-if="
+                              item.resourceType != '瑙嗛' &&
+                              item.resourceType != '闊抽' &&
+                              item.resourceType != '鍥剧墖'
+                            "
+                          >
+                            <View />
+                          </el-icon>
                           <el-icon
                             size="20"
                             class="icon hover"
-                            @click="goPlay(item)"
-                            v-if="
-                              !(
-                                item.resourceType == '瑙嗛' ||
-                                item.resourceType == '闊抽' ||
-                                item.resourceType == '涔犻' ||
-                                item.resourceType == '鍥剧墖'
-                              ) && item.isDownload == '鏄�'
+                            @click="goDownload(item)"
+                            v-if="item.isDownload == '鏄�'"
+                          >
+                            <Download />
+                          </el-icon>
+                          <!-- 鏀惰棌鎸夐挳 -->
+                          <img
+                            :src="
+                              collectResourceList.findIndex((citem) => citem.id == item.id) > -1
+                                ? isHeart
+                                : heart
                             "
-                            ><Download
-                          /></el-icon>
+                            class="icon hover"
+                            style="width: 15px"
+                            @click="
+                              handleCollectResource(
+                                item.id,
+                                item.md5 ? item.md5 : '',
+                                item.resourcePath ? item.resourcePath : '',
+                                item.resourceType,
+                                item.resourceType == '瑙嗛' || '闊抽' ? 'bits' : 'json',
+                                item.resourceName
+                              )
+                            "
+                          />
                         </div>
                       </div>
                     </div>
@@ -426,9 +506,9 @@
                   <img :src="item.imgUrl" class="capture hover" mode="aspectFill" />
                   <div class="deleteBox" v-if="showDelete == index">
                     <div class="delImg">
-                      <el-icon @click="getCapture(item, index)" size="18" class="icon hover"
-                        ><View
-                      /></el-icon>
+                      <el-icon @click="getCapture(item, index)" size="18" class="icon hover">
+                        <View />
+                      </el-icon>
                       <img :src="bianji" class="icon hover" @click="updateScreenshot(item)" />
                       <img :src="shanchu" class="icon hover" @click="deleteScreenshot(item)" />
                     </div>
@@ -461,7 +541,10 @@
           </div>
         </div>
         <div class="questionList" v-if="activeMenu == '棰樺簱'" v-loading="listLoading">
-          <div class="resourceSearchBox">
+          <div
+            class="resourceSearchBox"
+            v-if="exercisesType !== 'collection' && exercisesType !== 'wrong'"
+          >
             <div class="inputBox">
               <el-input
                 class="custom-input"
@@ -482,18 +565,29 @@
               <div v-for="(item, index) in questionList" :key="index" class="reMarkItem">
                 <div
                   class="questionCon hover"
-                  @click="JumpPosition(item)"
+                  @click="clickQuestion(exercisesType, item)"
                   :title="item.resourceName"
                 >
                   {{ item.resourceName }}
                 </div>
               </div>
             </div>
-            <div v-else>
+            <div
+              v-if="
+                questionList.length == 0 &&
+                exercisesType !== 'collection' &&
+                exercisesType !== 'wrong'
+              "
+            >
               <el-empty :image-size="60" description="鏆傛棤鏁版嵁" />
             </div>
           </div>
         </div>
+        <!-- 棰樺簱搴曢儴鏀惰棌澶瑰拰閿欓闆� -->
+        <ul class="question-bottom" v-if="activeMenu == '棰樺簱'">
+          <li @click="selectExercisesType('collection')">鏀惰棌澶�</li>
+          <li @click="selectExercisesType('wrong')">閿欓鏈�</li>
+        </ul>
         <!-- 鑿滃崟鍐呭鏀惰捣 -->
         <div class="menuStateBox" v-if="menuState.open">
           <svg
@@ -554,6 +648,18 @@
             <!-- 鐢荤瑪鐢诲竷 -->
             <div class="canvas-box" v-show="canvasShow">
               <canvas id="canvasRef" :width="canvasWith" :height="canvasheight"></canvas>
+            </div>
+            <!-- 鐣寗闂归挓缁勪欢 -->
+            <div
+              class="watch-box"
+              v-if="pomodoroRef && pomodoroRef.isShow"
+              :style="{ top:position.x + 'px', left:position.y + 'px'}"
+            >
+              <p @mousedown.native="mouseDown">{{ formatTime(pomodoroRef.pageData.currentTime) }}</p>
+              <span @click="()=> pomodoroRef.isRuning ? pomodoroRef.pauseFun() : pomodoroRef.startFun()">{{pomodoroRef.isRuning ? '鏆傚仠': '寮�濮�'}}</span>
+              <span @click="pomodoroRef.resetFun" >閲嶇疆</span>
+              <span @click="pomodoroRef.handleRestFun(false)">闀夸紤鎭�</span>
+              <span @click="pomodoroRef.handleRestFun(true)">鐭紤鎭�</span>
             </div>
           </div>
         </div>
@@ -703,16 +809,24 @@
                 <div class="graphBox">
                   <div class="graphSelect">
                     <div class="flex1">
-                      <div class="square hover" @click="graphSelect('square')"></div>
+                      <div :class="toolSelectData.graphType == 'square' ? 'acitveGraphType' : ''">
+                        <div class="square hover" @click="graphSelect('square')"></div>
+                      </div>
                     </div>
                     <div class="flex1">
-                      <div class="rotundity hover" @click="graphSelect('rotundity')"></div>
+                      <div :class="toolSelectData.graphType == 'rotundity' ? 'acitveGraphType' : ''">
+                        <div class="rotundity hover" @click="graphSelect('rotundity')"></div>
+                      </div>
                     </div>
                     <div class="flex1">
-                      <div class="triangle hover" @click="graphSelect('triangle')"></div>
+                      <div :class="toolSelectData.graphType == 'triangle' ? 'acitveGraphType' : ''">
+                        <div class="triangle hover" @click="graphSelect('triangle')"></div>
+                      </div>
                     </div>
                     <div class="flex1">
-                      <div class="lineSegment hover" @click="graphSelect('lineSegment')">/</div>
+                      <div :class="toolSelectData.graphType == 'lineSegment' ? 'acitveGraphType' : ''">
+                        <div class="lineSegment hover" @click="graphSelect('lineSegment')">/</div>
+                      </div>
                     </div>
                   </div>
                   <div class="lineStyle">
@@ -769,6 +883,10 @@
             </div>
           </div>
         </div>
+        <!-- 璇煶闃呰缁勪欢 -->
+        <!-- <div class="voice-reader">
+          <voiceReader />
+         </div> -->
       </div>
       <!-- 鏁欏缁勪欢 -->
       <div class="toolBox">
@@ -1046,6 +1164,11 @@
     </div>
   </div>
 
+  <!-- 鐧芥澘 -->
+  <div v-if="whiteBoard" class="whiteBoardBox">
+    <whiteBoardBox @whiteBoardClose="whiteBoardClose"></whiteBoardBox>
+  </div>
+
   <el-dialog
     title="璧勬簮"
     align-center
@@ -1058,9 +1181,12 @@
       <video controls controlslist="nodownload" :src="testVideo"></video>
     </div>
 
-    <!-- <div class="wordBox" v-if="resourType == 'word'">
-      <vue-office-docx :src="testWord" />
-    </div> -->
+    <div class="wordBox" v-if="resourType == 'PDF' || resourType == 'PPT' || resourType == 'WORD'">
+      <div v-for="(item, index) in showData" :key="index" class="pdfItem" :page="index + 1">
+        <img :src="item.showSrc" alt="" style="min-height: 550px" loading="lazy" />
+        <el-divider content-position="center"> 绗� {{ index + 1 }} 椤� </el-divider>
+      </div>
+    </div>
   </el-dialog>
   <div class="audioBox" v-show="false">
     <!-- <video controls controlslist="nodownload" :src="testVideo"></video> -->
@@ -1169,6 +1295,11 @@
   </el-dialog>
   <el-dialog title="妯″瀷宸ュ叿" align-center v-model="modelToolVisble" width="80%" class="myDialogs">
     <div class="wendabox">
+      <iframe :src="sceneUrl" frameborder="0"></iframe>
+    </div>
+  </el-dialog>
+  <el-dialog title="妯″瀷宸ュ叿" align-center v-model="modelTool" width="80%" class="myDialogs">
+    <div class="wendabox">
       <iframe src="https://adjam93.github.io/threejs-model-viewer/#" frameborder="0"></iframe>
     </div>
   </el-dialog>
@@ -1177,21 +1308,50 @@
       <newWord :resourceUrl="resourceUrl" />
     </div>
   </el-dialog>
-  <el-dialog title="閿欓鏈�" align-center v-model="wrongQuestionVisble" width="800" class="myDialogs">
+  <el-dialog
+    title="閿欓鏈�"
+    align-center
+    v-model="wrongQuestionVisble"
+    width="800"
+    class="myDialogs"
+  >
     <div class="wendabox">
-      <wrongQuestion  />
+      <wrongQuestion />
     </div>
   </el-dialog>
+  <el-dialog title="鍏紡缂栬緫" align-center v-model="formulaDialog" class="myDialogs">
+    <div class="wendabox">
+      <formula />
+    </div>
+  </el-dialog>
+  <!-- 绛旈鍣� -->
+  <examination
+    ref="examinationRef"
+    :activeBook="bookConfig"
+    :info="examinationData.info"
+    :type="examinationData.type"
+    :infoType="examinationData.infoType"
+  />
+  <!-- 璁$畻鍣� -->
+  <el-dialog title="璁$畻鍣�" align-center v-model="calculatorVisble" width="850" class="myDialogs">
+    <!-- <calculatorNew></calculatorNew> -->
+    <iframe src="https://www.geogebra.org/scientific" frameborder="0" class="iframe-box"></iframe>
+  </el-dialog>
+  <!-- 鐣寗闂归挓 -->
+  <!-- <pomodoro ref="pomodoroRef" /> -->
 </template>
-
 <script setup lang="ts">
+import examination from '@/views/examination/index.vue'
+import pomodoro from '@/views/components/pomodoro.vue'
 import { ref, reactive, watch, onMounted, onBeforeMount, onBeforeUnmount, inject } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
+import { ElMessage, ElMessageBox, valueEquals } from 'element-plus'
+import { useFormatData } from '@/hooks/public'
 import useClipboard from 'vue-clipboard3'
 const { toClipboard } = useClipboard()
+const { formatTime } = useFormatData()
 const MG: any = inject('MG')
 const toolClass = inject('toolClass')
-const qiankunActions = inject('qiankunActions')
 //鑾峰彇璺敱鍣�
 let router = useRouter()
 //鑾峰彇褰撳墠璺敱鐨勪俊鎭�
@@ -1199,8 +1359,10 @@
 import moment from 'moment'
 import dictionary from '@/views/components/dictionary.vue'
 import newWord from '@/views/components/newWord.vue'
+import formula from '@/views/components/formula.vue'
 import wrongQuestion from '@/views/components/wrongQuestion.vue'
-import { ElMessage, ElMessageBox, valueEquals } from 'element-plus'
+import voiceReader from '@/views/components/voiceReader.vue'
+import whiteBoardBox from '@/views/components/whiteBoard.vue'
 import logo from '@/assets/images/header/logo.png'
 import mulu from '@/assets/images/menu/mulu.png'
 import biji from '@/assets/images/menu/biji.png'
@@ -1297,8 +1459,9 @@
 
 import { loadMicroApp } from 'qiankun'
 import { microApps } from '@/child.ts'
+import { open } from 'fs'
 let token = localStorage.getItem('token')
-const canvasWith = ref(1000)
+const canvasWith = ref(800)
 const canvasheight = ref(3000)
 const screenWidth = ref(
   window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
@@ -1308,9 +1471,16 @@
 const bookConfig = ref({})
 const activeCatalog = ref()
 const reMarResult = ref()
+const bookInfo = ref()
+const isBuy = ref(false)
+const tryPageCount = ref(0)
+const searchText = ref()
 onMounted(() => {
   if (token) {
     getUserInfo()
+  }
+  if (localStorage.getItem('bookId')) {
+    getBookInfo()
   }
   setTimeout(() => {
     canvasWith.value = document.querySelector('.content-box').offsetWidth
@@ -1341,12 +1511,14 @@
   window.qiankunActions.onGlobalStateChange((state, prev) => {
     console.log('鐖跺眰state鍙樺寲', state)
     window.qiankunState = state
-
-    if (window.qiankunState && window.qiankunState.initTestBook) {
-      window.qiankunState.initTestBook(
-        localStorage.getItem('bookId') + '',
-        localStorage.getItem('tryPageCount')
-      )
+    if (isBuy.value) {
+      if (window.qiankunState && window.qiankunState.initTestBook) {
+        window.qiankunState.initTestBook(localStorage.getItem('bookId') + '')
+      }
+    } else {
+      if (window.qiankunState && window.qiankunState.initTestBook) {
+        window.qiankunState.initTestBook(localStorage.getItem('bookId') + '', tryPageCount.value)
+      }
     }
   })
 
@@ -1459,6 +1631,45 @@
 //   }
 // )
 
+//鏍规嵁refcode鑾峰彇鍥句功淇℃伅
+
+const getBookInfo = () => {
+  const obj = {
+    storeInfo: 'jsek_digitalTextbooks',
+    path: '*',
+    queryType: '*',
+    coverSize: {
+      width: 150
+    },
+    paging: {
+      start: 0,
+      size: 6
+    },
+    filterList: [
+      {
+        value: 'Normal',
+        field: 'state'
+      }
+    ],
+    fields: {
+      author: [],
+      RefCodes: [localStorage.getItem('bookId')],
+      probationPage: []
+    }
+  }
+  MG.store.getProductList(obj).then((res) => {
+    console.log(res.datas, '鍥句功淇℃伅')
+    if (!res.datas.length) return
+    bookInfo.value = res.datas[0]
+    if (res.datas[0].purchasedSaleMethodIdList.indexOf(res.datas[0].defaultSaleMethodId) > -1) {
+      isBuy.value = true
+    } else {
+      isBuy.value = false
+    }
+    tryPageCount.value = Number(res.datas[0].probationPage)
+  })
+}
+
 const getUserInfo = () => {
   MG.identity.getCurrentAppUser().then((res) => {
     console.log(res, '鐢ㄦ埛淇℃伅')
@@ -1529,11 +1740,7 @@
       name: '鐭ヨ瘑鍥捐氨',
       icon: zhishitupu,
       isShow: bookConfig.value.textbookComponents.indexOf('6BE6A3DC') > -1
-    },
-    {
-      name: '鎴浘',
-      icon: jietu,
-      isShow: bookConfig.value.textbookComponents.indexOf('CB0EACEC') > -1
+      // isShow: true
     },
     {
       name: '涔︾',
@@ -1543,7 +1750,16 @@
     {
       name: '棰樺簱',
       icon: question,
-      isShow: bookConfig.value.textbookComponents.indexOf('3D3B4F55') > -1 || bookConfig.value.textbookComponents.indexOf('AFC1A288') > -1 || bookConfig.value.textbookComponents.indexOf('A434F2C0') > -1
+      isShow:
+        bookConfig.value.textbookComponents.indexOf('3D3B4F55') > -1 ||
+        bookConfig.value.textbookComponents.indexOf('AFC1A288') > -1 ||
+        bookConfig.value.textbookComponents.indexOf('A434F2C0') > -1 ||
+        bookConfig.value.textbookComponents.indexOf('A4821F71') > -1
+    },
+    {
+      name: '鎴浘',
+      icon: jietu,
+      isShow: bookConfig.value.textbookComponents.indexOf('CB0EACEC') > -1
     }
   ]
   teachToolsMenuData = [
@@ -1617,17 +1833,24 @@
       icon: fanqiezhong,
       isShow: bookConfig.value.textbookComponents.indexOf('E4DC9777') > -1
     }
+    // {
+    //   name: '鐣寗闂归挓',
+    //   icon: fanqiezhong,
+    //   isShow: true
+    // }
   ]
   floatingToolBox = [
     {
       icon: huabi,
       name: '鐢荤瑪',
       isShow: bookConfig.value.textbookComponents.indexOf('800109C0') > -1
+      // isShow: true
     },
     {
       icon: baiban,
       name: '鐧芥澘',
       isShow: bookConfig.value.textbookComponents.indexOf('029DB3E0') > -1
+      // isShow: true
     },
     {
       icon: biaozhu,
@@ -1704,10 +1927,19 @@
       catalogueData.value = json.data
       headerData.totlePage = json.data[json.data.length - 1].end
       listLoading.value = false
+      if (localStorage.getItem('chapter') && localStorage.getItem('startPage')) {
+        let chapter = Number(localStorage.getItem('chapter'))
+        let start = Number(localStorage.getItem('startPage'))
+
+        if (window.qiankunState && window.qiankunState.gotoPage) {
+          window.qiankunState.gotoPage(chapter, start)
+          localStorage.removeItem('chapter')
+          localStorage.removeItem('startPage')
+        }
+      }
     })
     .catch(function (error) {
       listLoading.value = false
-      console.log(error)
     })
 }
 const defaultProps = {
@@ -1722,9 +1954,8 @@
 }
 
 const handleNodeClick = (data) => {
-  console.log(data)
-  if (localStorage.getItem('tryPageCount')) {
-    if (data.start < localStorage.getItem('tryPageCount')) {
+  if (!isBuy.value) {
+    if (data.start < tryPageCount.value) {
       headerData.process = data.start
       if (window.qiankunState && window.qiankunState.gotoPage)
         window.qiankunState.gotoPage(data.chapter, data.start)
@@ -1759,6 +1990,7 @@
 const showHandle = ref(null)
 const playIndex = ref(null) //闊抽鎾斁
 const audioPlayer = ref(null)
+const collectResourceList = ref([])
 const getResourceData = () => {
   if (token) {
     imgPreviewList.value = []
@@ -1779,11 +2011,11 @@
               item.icon = ''
             }
             if (resourceType.value == 'default') {
-              if (item.isTeacherResource == '鍚�') {
+              if (item.isDefaultResource == '鏄�') {
                 defaultResourceList.value.push(item)
               }
             } else {
-              if (item.isTeacherResource == '鏄�') {
+              if (item.isTeacherResource == '鏄�' && item.isDefaultResource == '鍚�') {
                 teacherResourceList.value.push(item)
               }
             }
@@ -1861,6 +2093,15 @@
                 if (resItem1.resourceType == classifySelectList.value[0].title) {
                   resourceDataList.value.push(resItem1)
                 }
+                if (activeClassify.value == 'other') {
+                  if (
+                    resItem1.resourceType != '鍥剧墖' &&
+                    resItem1.resourceType != '瑙嗛' &&
+                    resItem1.resourceType != '闊抽'
+                  ) {
+                    resourceDataList.value.push(resItem1)
+                  }
+                }
               })
             }
           } else {
@@ -1935,6 +2176,15 @@
                 if (resItem1.resourceType == classifySelectList.value[0].title) {
                   resourceDataList.value.push(resItem1)
                 }
+                if (activeClassify.value == 'other') {
+                  if (
+                    resItem1.resourceType != '鍥剧墖' &&
+                    resItem1.resourceType != '瑙嗛' &&
+                    resItem1.resourceType != '闊抽'
+                  ) {
+                    resourceDataList.value.push(resItem1)
+                  }
+                }
               })
             }
           }
@@ -1943,6 +2193,8 @@
       })
       .catch(function (error) {
         console.log(error)
+        resourceDataList.value = []
+        classifySelectList.value = []
         listLoading.value = false
       })
   } else {
@@ -1953,13 +2205,22 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
 }
 //璧勬簮鎾斁瑙嗛
+const sceneUrl = ref()
+const showData = ref()
 const goPlay = (data, index) => {
+  console.log(data.resourceType, 123)
   resourType.value = data.resourceType
   if (data.resourceType == '瑙嗛') {
     if (data.md5) {
@@ -1976,6 +2237,59 @@
       testAudio.value = bookConfig.value.resourceUrl + '/' + data.resourcePath
     }
     autoPlay()
+  } else if (data.resourceType == '妯″瀷') {
+    console.log(data, 222)
+    let file = bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5
+    console.log(file.exd, 777)
+    const ctx = 'https://jsek.bnuic.com'
+    if (data.md5) {
+      sceneUrl.value =
+        'https://jsek.bnuic.com/books/book/civilAviation/static/modelView/index.html?md5=' +
+        data.md5 +
+        '&name=je' +
+        '&domain=' +
+        ctx +
+        '&exd=obj' +
+        '&target=iframe'
+    } else {
+      sceneUrl.value = bookConfig.value.resourceUrl + '/' + data.resourcePath
+    }
+    modelToolVisble.value = true
+    // if (data.md5) {
+    //   window.open(bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5)
+    // } else if (data.resourcePath) {
+    //   window.open(bookConfig.value.resourceUrl + '/' + data.resourcePath)
+    // }
+  } else if (data.resourceType == 'PPT' || data.resourceType == 'PDF' || data.resourceType == 'WORD') {
+    let md5 = data.md5
+    let dataList = []
+    MG.file
+      .getPdfInfo({
+        md5
+      })
+      .then((res: any) => {
+        console.log()
+        if (res && res.totalPages) {
+          for (let i = 0; i < res.totalPages; i++) {
+            const src =
+              bookConfig.value.requestCtx +
+              '/file/GetPdfPageImage?md5=' +
+              md5 +
+              '&index=' +
+              (i + 1) +
+              '&dpi=300'
+            dataList.push({
+              showSrc: src
+            })
+          }
+          console.log(dataList)
+          showData.value = dataList
+          // 鍚姩椤电爜瑙傚療
+          setTimeout(() => {
+            resourVisble.value = true
+          }, 500)
+        }
+      })
   } else {
     if (data.md5) {
       window.open(bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5)
@@ -1987,6 +2301,13 @@
   //  else if (data.resourceType == 'word') {
   //   testWord.value = bookConfig.value.resourceUrl + '/' + data.resourcePath
   // }
+}
+const goDownload = (data) => {
+  if (data.md5) {
+    window.open(bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5)
+  } else if (data.resourcePath) {
+    window.open(bookConfig.value.resourceUrl + '/' + data.resourcePath)
+  }
 }
 // 鍏抽棴瑙嗛
 const resourVisbleClose = () => {
@@ -2006,7 +2327,6 @@
 
 //璧勬簮璺宠浆鍒版寚瀹氫綅缃�
 const JumpPosition = (data) => {
-  console.log(data, '璺宠浆')
   if (window.qiankunState && window.qiankunState.gotoPage) {
     window.qiankunState.gotoPage(Number(data.chapterNum), Number(data.pagination))
   }
@@ -2015,15 +2335,26 @@
 //璧勬簮绫诲瀷閫夋嫨榛樿/鏁欏笀
 const selectResourceType = (type) => {
   resourceType.value = type
+  resourceDataList.value = []
+  classifySelectList.value = []
+  activeClassify.value = ''
   searchText.value = ''
-  getResourceData()
+  if (type == 'collect') {
+    getCollectResource()
+  } else {
+    getResourceData()
+  }
 }
 //璧勬簮绫诲瀷鍥剧墖/瑙嗛/闊抽/涔犻/鍏朵粬
 const classifyClick = (item) => {
   activeClassify.value = item.key
   resourceDataList.value = []
   searchText.value = ''
-  getResourceData()
+  if (resourceType.value == 'collect') {
+    getCollectResource()
+  } else {
+    getResourceData()
+  }
 }
 const searchBtn = () => {
   if (searchShow.value) {
@@ -2033,9 +2364,161 @@
   }
 }
 
+// 鑾峰彇鏀惰棌鐨勮祫婧�
+const getCollectResource = () => {
+  if (token) {
+    MG.identity
+      .getUserKey({
+        domain: 'collectResource',
+        keys: [bookConfig.value.bookId]
+      })
+      .then((res) => {
+        if (res.length) {
+          collectResourceList.value = JSON.parse(res[0].value)
+          console.log('鏀惰棌璧勬簮鍒楄〃', collectResourceList.value)
+          if (collectResourceList.value.length > 0) {
+            let imgCount = 0
+            let audioCount = 0
+            let videoCount = 0
+            let exercisesCount = 0
+            let otherCount = 0
+            resourceDataList.value = []
+            collectResourceList.value.forEach((resItem) => {
+              if (resItem.resourceType == '鍥剧墖') {
+                if (resItem.resourcePath) {
+                  resItem.resourcePath = bookConfig.value.resourceUrl + '/' + resItem.resourcePath
+                } else {
+                  resItem.resourcePath =
+                    bookConfig.value.requestCtx + '/file/GetPreViewImage?md5=' + resItem.md5
+                }
+
+                imgPreviewList.value.push(resItem.resourcePath)
+                if (activeClassify.value == 'image') {
+                  resourceDataList.value.push(resItem)
+                }
+                imgCount++
+              } else if (resItem.resourceType == '闊抽') {
+                if (activeClassify.value == 'audio') {
+                  resourceDataList.value.push(resItem)
+                }
+                audioCount++
+              } else if (resItem.resourceType == '瑙嗛') {
+                if (activeClassify.value == 'video') {
+                  resourceDataList.value.push(resItem)
+                }
+                videoCount++
+              } else {
+                if (activeClassify.value == 'other') {
+                  resourceDataList.value.push(resItem)
+                }
+                otherCount++
+              }
+            })
+            classifySelectList.value = []
+            if (imgCount > 0) {
+              classifySelectList.value.push({
+                title: '鍥剧墖',
+                count: imgCount,
+                key: 'image'
+              })
+            }
+            if (audioCount > 0) {
+              classifySelectList.value.push({
+                title: '闊抽',
+                count: audioCount,
+                key: 'audio'
+              })
+            }
+            if (videoCount > 0) {
+              classifySelectList.value.push({
+                title: '瑙嗛',
+                count: videoCount,
+                key: 'video'
+              })
+            }
+            if (otherCount > 0) {
+              classifySelectList.value.push({
+                title: '鍏朵粬',
+                count: otherCount,
+                key: 'other'
+              })
+            }
+            if (!activeClassify.value) {
+              activeClassify.value = classifySelectList.value[0].key
+              collectResourceList.value.forEach((resItem1) => {
+                if (resItem1.resourceType == classifySelectList.value[0].title) {
+                  resourceDataList.value.push(resItem1)
+                }
+                if (activeClassify.value == 'other') {
+                  if (
+                    resItem1.resourceType != '鍥剧墖' &&
+                    resItem1.resourceType != '瑙嗛' &&
+                    resItem1.resourceType != '闊抽'
+                  ) {
+                    resourceDataList.value.push(resItem1)
+                  }
+                }
+              })
+            }
+          }
+        } else {
+          resourceDataList.value = []
+        }
+      })
+  } else {
+    ElMessageBox.confirm('璇峰厛鐧诲綍锛�', {
+      confirmButtonText: '鍘荤櫥褰�',
+      cancelButtonText: '鍙栨秷',
+      autofocus: false,
+      type: 'warning'
+    })
+      .then(() => {
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
+      })
+      .catch(() => {})
+  }
+}
+// 鏀惰棌鎸夐挳
+const handleCollectResource = (id, md5, resourcePath, resourceType, source, resourceName) => {
+  if (collectResourceList.value.findIndex((item) => item.id == id) > -1) {
+    collectResourceList.value = collectResourceList.value.filter((item) => item.id != id)
+  } else {
+    collectResourceList.value.push({
+      id,
+      md5,
+      resourcePath: resourcePath.replace(bookConfig.value.resourceUrl + '/', ''),
+      resourceType,
+      source,
+      resourceName
+    })
+  }
+  MG.identity.setUserKey({
+    setKeyRequests: [
+      {
+        domain: 'collectResource',
+        key: bookConfig.value.bookId,
+        value: JSON.stringify(collectResourceList.value)
+      }
+    ]
+  })
+}
+
 //涔犻
 const exercisesType = ref('exercises') //涔犻绫诲瀷
 const questionList = ref([])
+const examinationRef = ref() // 绛旈鍣ㄥ疄渚�
+const examinationData = reactive({
+  type: '', // 绛旈绫诲瀷  option 娴嬭瘯
+  infoType: '', // 鏁版嵁鏉ユ簮  bits 姣旂壒鍚庡彴  json  鍋囨暟鎹�
+  info: {} // 杩欏棰樼殑淇℃伅
+})
+// 鑾峰彇涔犻
 const getExercisesList = () => {
   if (token) {
     listLoading.value = true
@@ -2072,6 +2555,44 @@
       type: 'warning'
     })
       .then(() => {
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
+      })
+      .catch(() => {})
+  }
+}
+
+// 鑾峰彇闄勫姞棰�
+const getAdditionalList = () => {
+  if (token) {
+    listLoading.value = true
+    questionList.value = []
+    axios
+      .get(bookConfig.value.resourceUrl + '/bits-question.json')
+      .then((res) => {
+        // 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
+        if (res.data.data.length > 0) {
+          questionList.value = res.data.data
+          examinationData.infoType = res.data.type
+        }
+        listLoading.value = false
+      })
+      .catch(() => {
+        listLoading.value = false
+      })
+  } else {
+    ElMessageBox.confirm('璇峰厛鐧诲綍锛�', {
+      confirmButtonText: '鍘荤櫥褰�',
+      cancelButtonText: '鍙栨秷',
+      autofocus: false,
+      type: 'warning'
+    })
+      .then(() => {
         router.push('/login')
       })
       .catch(() => {})
@@ -2081,14 +2602,38 @@
 //閿欓鏈�
 const wrongQuestionVisble = ref(false)
 const selectExercisesType = (type) => {
-  exercisesType.value = type
-  searchText.value = ''
   if (type == 'exercises') {
     getExercisesList()
-  } else if(type == 'wrong'){
-    questionList.value = []
-  }else{
-    questionList.value = []
+    exercisesType.value = type
+    searchText.value = ''
+  } else if (type == 'additional') {
+    getAdditionalList()
+    exercisesType.value = type
+    searchText.value = ''
+  } else if (type == 'wrong') {
+    openExaminationDialog(true, {}, 'errorQuestion')
+  } else {
+    openExaminationDialog(true, {}, 'collectQuestion')
+  }
+}
+// 棰樺垪琛ㄧ偣鍑�
+const clickQuestion = (type: string, data: any) => {
+  switch (type) {
+    case 'exercises':
+      JumpPosition(data)
+      break
+    case 'additional':
+      openExaminationDialog(true, data, 'option')
+      break
+    default:
+      break
+  }
+}
+const openExaminationDialog = (isSHow: boolean, data: any, type: string) => {
+  if (examinationRef.value) {
+    examinationRef.value.handleExaminationDialog(isSHow)
+    examinationData.type = type
+    examinationData.info = data
   }
 }
 
@@ -2099,6 +2644,7 @@
 const menuItemClick = (name) => {
   searchText.value = ''
   allSearchReault.value = []
+  listLoading.value = false
   if (menuState.open && activeMenu.value == name) {
     menuState.open = false
   } else {
@@ -2145,7 +2691,6 @@
   // }
 }
 
-const searchText = ref<string>('') //绛涢��
 const menuState = reactive({
   open: true,
   notesColor: 'all' //绗旇棰滆壊
@@ -2280,12 +2825,12 @@
       getExercisesList()
       break
     case '妫�绱�':
-      listLoading.value = true
       allSearchReault.value = []
-      console.log(window.qiankunState.searchBookByKeyword)
       if (window.qiankunState && window.qiankunState.searchBookByKeyword) {
+        console.log(window.qiankunState.searchBookByKeyword)
         let searchReault = window.qiankunState.searchBookByKeyword(searchText.value)
         if (searchReault.length > 0) {
+          listLoading.value = true
           let catalogueList = sortArr(catalogueData.value, 'chapter')
           if (catalogueList.length > 0) {
             catalogueList.forEach((item) => {
@@ -2314,7 +2859,8 @@
               }
             })
           }
-          console.log(allSearchReault.value, 444)
+          listLoading.value = false
+        }else{
           listLoading.value = false
         }
       }
@@ -2399,21 +2945,24 @@
       break
   }
 }
-
+type pomodoroType = InstanceType<typeof Pomodoro>
 const baiduVisible = ref(false)
 const wendaVisible = ref(false)
 const cidianVisible = ref(false)
 const functionVisible = ref(false)
 const siweiVisble = ref(false)
 const modelToolVisble = ref(false)
+const modelTool = ref(false)
 const shengciVisble = ref(false)
+const calculatorVisble = ref(false)
+const pomodoroRef = ref<pomodoroType>()
 const activeTool = ref(0)
 const toolState = reactive({
   open: true
 })
 const resourceUrl = ref('')
 
-const selectTeachTools = (item) => {
+const selectTeachTools = (item: any) => {
   if (token) {
     activeTool.value = item.name
     switch (item.name) {
@@ -2427,7 +2976,7 @@
         siweiVisble.value = true
         break
       case '妯″瀷宸ュ叿':
-        modelToolVisble.value = true
+        modelTool.value = true
         break
       case '璇嶅吀':
         cidianVisible.value = true
@@ -2435,6 +2984,12 @@
       case '鐢熻瘝鍗$墖':
         resourceUrl.value = bookConfig.value.resourceUrl
         shengciVisble.value = true
+        break
+      case '璁$畻鍣�':
+        calculatorVisble.value = true
+      case '鐣寗闂归挓':
+        pomodoroRef.value.setDialogVisable(true)
+        break
     }
   } else {
     ElMessageBox.confirm('璇峰厛鐧诲綍锛�', {
@@ -2444,7 +2999,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2476,7 +3037,7 @@
 
 //鐢诲竷鎮诞鎿嶄綔
 
-let canvas = null
+let canvasBox: any = null
 const floatingToolData = reactive({
   activeToolData: '', //閫変腑宸ュ叿
   activeBookmark: '', //閫変腑涔︾
@@ -2487,6 +3048,10 @@
 
 //鐢诲竷
 const canvasShow = ref(false)
+let textBox: any = null
+let activeElBox: any = null
+//鐧芥澘
+const whiteBoard = ref(false)
 
 //鎴浘浜嬩欢
 const nameRef = ref()
@@ -2506,7 +3071,6 @@
 
 //娴獥宸ュ叿鏍忕偣鍑讳簨浠�
 const floatItemHandle = (item) => {
-  console.log(floatingToolData.activeToolData, 'floatingToolData.activeToolData')
   if (floatingToolData.activeToolData == '鐢荤瑪') {
     floatingToolData.activeToolData = ''
   } else {
@@ -2514,10 +3078,17 @@
   }
 
   canvasShow.value = false
+  whiteBoard.value = false
   switch (floatingToolData.activeToolData) {
     case '鐢荤瑪':
       canvasShow.value = true
       toolSelectData.activeTool = 'huabi'
+      canvasBox = new fabric.Canvas('canvasRef')
+      canvasBox.setZoom(1); // 璁剧疆鐢诲竷缂╂斁姣斾緥涓�1
+      canvasBox.absolutePan({ x: 0, y: 0 });
+      break
+    case '鐧芥澘':
+      whiteBoard.value = true
       break
     case '鏍囪':
       break
@@ -2545,18 +3116,53 @@
 const toolSelectHandle = (title) => {
   toolSelectData.activeTool = title
   toolSelectData.lineColorActive = ''
+  canvasBox.isDrawingMode = false
   switch (title) {
     case 'huabi':
-      init()
+      canvasBox.skipTargetFind = false
+      canvasBox.isDrawingMode = true
+      toolSelectData.graphType = ''
+      canvasBox.freeDrawingBrush.color = '#333'
+      canvasBox.freeDrawingBrush.width = '3'
+      canvasBox.on('mouse:down', '') // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:up', '')
+      canvasBox.on('mouse:move', '')
       break
     case 'wenzi':
+      canvasBox.skipTargetFind = false
+      canvasBox.isDrawingMode = false
+      toolSelectData.graphType = ''
+      textBox = new fabric.IText('璇疯緭鍏ユ枃鏈�', {
+        left: 50,
+        top: 50,
+        fontSize: toolSelectData.fontSizeActive
+      })
+      canvasBox.add(textBox)
+      canvasBox.on('mouse:down', '') // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:up', '')
+      canvasBox.on('mouse:move', '')
+      break
+    case 'tuxing':
+      canvasBox.isDrawingMode = false
+      canvasBox.selectionColor = 'transparent'
+      canvasBox.skipTargetFind = true
+      toolSelectData.lineColorActive = '#000'
+      break
+    case 'chexiao':
+      canvasBox.skipTargetFind = false
+      canvasBox.isDrawingMode = false
+      canvasBox.remove(activeElBox)
+      canvasBox.requestRenderAll()
+      activeElBox = null
       break
     case 'tuichu':
+      canvasBox.skipTargetFind = false
+      canvasBox.isDrawingMode = false
       canvasShow.value = false
       floatingToolData.activeToolData = ''
       break
     case 'qingchu':
-      canvas.clear()
+      canvasBox.clear()
       break
   }
 }
@@ -2564,31 +3170,32 @@
 //閫変腑鐢荤瑪绮楃粏
 const selectThickness = (str) => {
   toolSelectData.thicknessActive = str
-  canvas.freeDrawingBrush.color = toolSelectData.thicknessActive
+  canvasBox.freeDrawingBrush.width = toolSelectData.thicknessActive
 }
 
 const selectLineType = (str) => {
   toolSelectData.lineTypeActive = str
-  init()
+  if (toolSelectData.lineTypeActive == 'dashed') {
+    canvasBox.freeDrawingBrush.strokeDashArray = [10]
+  } else {
+    canvasBox.freeDrawingBrush.strokeDashArray = null
+  }
 }
 //鐢荤瑪棰滆壊閫夋嫨
 const lineColorSelect = (item) => {
   toolSelectData.lineColorActive = item.key
-  canvas.freeDrawingBrush.color = item.key
-}
-//鐢诲竷灞炴��
-const isDrawing = ref(true) // 鏄惁寮�鍚粯鍥撅紝true 寮�鍚紱false 鍏抽棴
-const init = () => {
-  canvas = new fabric.Canvas('canvasRef', {
-    isDrawingMode: isDrawing.value // 鍚敤缁樼敾妯″紡
-  })
-  canvas.freeDrawingBrush.color = toolSelectData.lineColorActive
-  canvas.freeDrawingBrush.width = toolSelectData.thicknessActive
+  if ((toolSelectData.activeTool == 'huabi')) {
+    canvasBox.freeDrawingBrush.color = item.key
+  }
+  if ((toolSelectData.activeTool == 'wenzi')) {
+    textBox.fill = toolSelectData.lineColorActive
+  }
 }
 
 //鏂囧瓧澶у皬
 const selectfontSize = (str) => {
   toolSelectData.fontSizeActive = str
+  textBox.fontSize = toolSelectData.fontSizeActive
 }
 
 //閫夋嫨鍥惧舰
@@ -2596,14 +3203,190 @@
   toolSelectData.graphType = type
   switch (type) {
     case 'square':
+      canvasBox.on('mouse:down', canvasMouseDown) // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:up', canvasMouseUp)
+      canvasBox.selectionBorderColor = toolSelectData.lineColorActive
       break
     case 'rotundity':
+      canvasBox.on('mouse:down', canvasMouseDown) // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:up', canvasMouseUp)
+      canvasBox.on('mouse:move', canvasMouseMove)
       break
     case 'triangle':
+      canvasBox.on('mouse:down', canvasMouseDown) // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:up', canvasMouseUp)
+      canvasBox.on('mouse:move', canvasMouseMove)
       break
     case 'lineSegment':
+      canvasBox.on('mouse:down', canvasMouseDown) // 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+      canvasBox.on('mouse:move', canvasMouseMove) // 榧犳爣鍦ㄧ敾甯冧笂绉诲姩
+      canvasBox.on('mouse:up', canvasMouseUp)
       break
   }
+}
+
+let downPoint = null // 榧犳爣鎸変笅鐨勫潗鏍�
+let upPoint = null
+let currentCircle = null // 涓存椂鍦嗭紝鍒涘缓鍦嗙殑鏃跺�欎娇鐢�
+let currentTriangle = null // 涓存椂涓夎褰�
+let currentLine = null // 涓存椂绾挎
+function canvasOnMouseDownDel(opt) {
+  // 鍙抽敭锛屼笖鍦ㄥ厓绱犱笂鍙抽敭
+  // button: 1-宸﹂敭锛�2-涓敭锛�3-鍙抽敭
+  // 鍦ㄧ敾甯冧笂鍙抽敭锛宼arget 涓� null
+  if (opt.button === 1 && opt.target) {
+    // 鑾峰彇褰撳墠鍏冪礌
+    activeElBox = opt.target
+  }
+}
+// 榧犳爣鍦ㄧ敾甯冧笂鎸変笅
+function canvasMouseDown(e) {
+  downPoint = e.absolutePointer
+  if (toolSelectData.graphType === 'rotundity') {
+    currentCircle = new fabric.Circle({
+      top: downPoint.y,
+      left: downPoint.x,
+      radius: 0,
+      fill: 'transparent',
+      stroke: toolSelectData.lineColorActive
+    })
+
+    canvasBox.add(currentCircle)
+  }
+  if (toolSelectData.graphType === 'triangle') {
+    currentTriangle = new fabric.Triangle({
+      top: downPoint.y,
+      left: downPoint.x,
+      width: 0,
+      height: 0,
+      fill: 'transparent',
+      stroke: toolSelectData.lineColorActive
+    })
+    canvasBox.add(currentTriangle)
+  }
+  if (toolSelectData.graphType === 'lineSegment') {
+    currentLine = new fabric.Line(
+      [
+        downPoint.x,
+        downPoint.y, // 璧峰鐐瑰潗鏍�
+        downPoint.x,
+        downPoint.y // 缁撴潫鐐瑰潗鏍�
+      ],
+      {
+        stroke: toolSelectData.lineColorActive // 绗旇Е棰滆壊
+      }
+    )
+    canvasBox.add(currentLine)
+  }
+}
+// 榧犳爣鍦ㄧ敾甯冧笂鏉惧紑
+function canvasMouseUp(e) {
+  if (toolSelectData.graphType === 'square') {
+    // 鍒涘缓鐭╁舰
+    createRect(e.absolutePointer)
+  }
+
+  if (toolSelectData.graphType === 'rotundity') {
+    if (JSON.stringify(downPoint) === JSON.stringify(upPoint)) {
+      canvasBox.remove(currentCircle)
+    } else {
+      if (currentCircle) {
+        currentCircle.set('stroke', toolSelectData.lineColorActive)
+      }
+    }
+    currentCircle = null
+  }
+
+  if (toolSelectData.graphType === 'triangle') {
+    if (JSON.stringify(downPoint) === JSON.stringify(upPoint)) {
+      canvasBox.remove(currentTriangle)
+    } else {
+      currentTriangle.set('stroke', toolSelectData.lineColorActive)
+    }
+    currentTriangle = null
+  }
+
+  if (toolSelectData.graphType === 'lineSegment') {
+    if (JSON.stringify(downPoint) === JSON.stringify(upPoint)) {
+      canvasBox.remove(currentLine)
+    } else {
+      currentLine.set('stroke', toolSelectData.lineColorActive)
+    }
+    currentLine = null
+  }
+}
+// 鍒涘缓鐭╁舰
+function createRect(pointer) {
+  // 鐐瑰嚮浜嬩欢锛屼笉鐢熸垚鐭╁舰
+  if (JSON.stringify(downPoint) === JSON.stringify(pointer)) {
+    return
+  }
+
+  // 鍒涘缓鐭╁舰
+  // 鐭╁舰鍙傛暟璁$畻
+  let top = Math.min(downPoint.y, pointer.y)
+  let left = Math.min(downPoint.x, pointer.x)
+  let width = Math.abs(downPoint.x - pointer.x)
+  let height = Math.abs(downPoint.y - pointer.y)
+
+  // 鐭╁舰瀵硅薄
+  const rect = new fabric.Rect({
+    top,
+    left,
+    width,
+    height,
+    fill: 'transparent',
+    stroke: toolSelectData.lineColorActive
+  })
+  // 灏嗙煩褰㈡坊鍔犲埌鐢诲竷涓�
+  canvasBox.add(rect)
+  downPoint = null
+}
+// 榧犳爣鍦ㄧ敾甯冧笂绉诲姩
+function canvasMouseMove(e) {
+  if (toolSelectData.graphType === 'rotundity' && currentCircle) {
+    const currentPoint = e.absolutePointer
+
+    let radius =
+      Math.min(Math.abs(downPoint.x - currentPoint.x), Math.abs(downPoint.y - currentPoint.y)) / 2
+    let top = currentPoint.y > downPoint.y ? downPoint.y : downPoint.y - radius * 2
+    let left = currentPoint.x > downPoint.x ? downPoint.x : downPoint.x - radius * 2
+
+    currentCircle.set('radius', radius)
+    currentCircle.set('top', top)
+    currentCircle.set('left', left)
+
+    canvasBox.requestRenderAll()
+  }
+  if (toolSelectData.graphType === 'triangle' && currentTriangle) {
+    const currentPoint = e.absolutePointer
+
+    let width = Math.abs(downPoint.x - currentPoint.x)
+    let height = Math.abs(downPoint.y - currentPoint.y)
+
+    let top = currentPoint.y > downPoint.y ? downPoint.y : currentPoint.y
+    let left = currentPoint.x > downPoint.x ? downPoint.x : currentPoint.x
+
+    currentTriangle.set('width', width)
+    currentTriangle.set('height', height)
+    currentTriangle.set('top', top)
+    currentTriangle.set('left', left)
+    canvasBox.requestRenderAll()
+  }
+  if (toolSelectData.graphType === 'lineSegment' && currentLine) {
+    const currentPoint = e.absolutePointer
+
+    currentLine.set('x2', currentPoint.x)
+    currentLine.set('y2', currentPoint.y)
+
+    canvasBox.requestRenderAll()
+  }
+}
+
+//鐧芥澘鍏抽棴
+const whiteBoardClose = () => {
+  whiteBoard.value = false
+  floatingToolData.activeToolData = ''
 }
 //鏍囪鏄剧ず闅愯棌
 const labelShow = (str) => {
@@ -2683,7 +3466,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2723,7 +3512,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2731,7 +3526,6 @@
 
 //璺宠浆
 const goReMark = (item) => {
-  console.log(item)
   if (window.qiankunState && window.qiankunState.gotoPage) {
     window.qiankunState.gotoPage(Number(item.chapterNum), Number(item.page))
   }
@@ -2797,7 +3591,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -2810,7 +3610,6 @@
 }
 //鍙栨秷鍥炶皟
 const closeFn = (base64: any) => {
-  console.log(base64)
   floatingToolData.activeToolData = ''
 }
 //淇濆瓨鎴浘
@@ -2902,7 +3701,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3051,7 +3856,6 @@
         window.speechSynthesis.cancel()
         const synth = window.speechSynthesis
         const utterance = new SpeechSynthesisUtterance(dialogToolData.txt)
-        console.log(utterance, 1)
         utterance.lang = 'zh-CN' // 璁剧疆璇█涓轰腑鏂�
         synth.speak(utterance)
         showToolBox.value = false
@@ -3088,10 +3892,8 @@
 
         showToolBox.value = false
         // cidianVisible.value = true
-        console.log(dialogToolData.txt)
         break
       case '鐧剧':
-        console.log('https://baike.baidu.com/item/' + dialogToolData.txt)
         baiduVisible.value = true
         break
     }
@@ -3103,7 +3905,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {
         showToolBox.value = false
@@ -3203,7 +4011,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3287,7 +4101,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3314,7 +4134,6 @@
             const item = res[i]
             // 鍌ㄥ��
             let data = catalogueData.value.find((item1) => item1.chapter == Number(item.key))
-            // console.log(data,'666')
             let dataList = []
             if (catalogueData.value.length > 0) {
               catalogueData.value.forEach((item1) => {
@@ -3356,7 +4175,6 @@
               })
             }
           }
-          console.log(scribeData.noteList, 'scribeData.noteList')
         }
         listLoading.value = false
       })
@@ -3368,7 +4186,13 @@
       type: 'warning'
     })
       .then(() => {
-        router.push('/login')
+        if (sessionStorage.getItem('loginCtx')) {
+          window.open(sessionStorage.getItem('loginCtx'))
+        } else {
+          router.replace({
+            path: '/login'
+          })
+        }
       })
       .catch(() => {})
   }
@@ -3424,13 +4248,11 @@
   document.addEventListener('mousemove', function (event) {
     var x = event.offsetX
     var y = event.offsetY
-    // console.log('榧犳爣鍧愭爣浣嶇疆锛�', x, y)
     noteContent.top = event.clientY + 20
     noteContent.left = event.clientX
   })
 }
 window.noteOut = (type) => {
-  console.log(type, 123)
   noteContent.show = false
 }
 
@@ -3480,7 +4302,6 @@
 
 //绗旇璺宠浆
 const jumpContent = (item) => {
-  console.log(item)
   if (window.qiankunState && window.qiankunState.gotoPage) {
     window.qiankunState.gotoPage(Number(item.chapterNum), Number(item.page))
   }
@@ -3488,7 +4309,6 @@
 
 //鑿滃崟绗旇缂栬緫
 const update = (item) => {
-  console.log(item)
   dialogToolData.chapter = item.chapterNum
   noteColorActive.value = item.color
   formData.id = item.id
@@ -3571,13 +4391,11 @@
         }
       ])
       .then((res) => {
-        console.log(res[0][0], 'cid')
         if (res.length > 0 && res[0].length > 0) {
           res[0].map((item) => {
             item.trans = JSON.parse(item.trans)
           })
           dictionaryData.data = res[0][0]
-          console.log(dictionaryData.data, '14')
           dictionaryData.showContent = true
         }
       })
@@ -3648,11 +4466,53 @@
 const layoutBtn = () => {
   localStorage.removeItem('token')
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
 }
 const goLogin = () => {
   localStorage.removeItem('userInfo')
-  router.push('/login')
+  // router.push('/login')
+  if (sessionStorage.getItem('loginCtx')) {
+    window.open(sessionStorage.getItem('loginCtx'))
+  } else {
+    router.replace({
+      path: '/login'
+    })
+  }
+}
+
+const formulaDialog = ref(false)
+const openFormulaDialog = () => {
+  formulaDialog.value = true
+}
+
+// 鐣寗閽熺Щ鍔�
+const isMove = ref<boolean>(false)
+const position = reactive({x:100,y:100})
+const dragOffset = reactive({x:0,y:0})
+const mouseDown = (e: MouseEvent) => {
+  isMove.value = true
+  dragOffset.x = e.clientX - position.x
+  dragOffset.y = e.clientY - position.y
+  document.addEventListener('mousemove', mouseMove)
+  document.addEventListener('mouseup', mouseUp)
+}
+const mouseUp = (e: MouseEvent) => {
+  isMove.value = false
+  document.removeEventListener('mousemove', mouseMove)
+  document.removeEventListener('mouseup', mouseUp)
+}
+const mouseMove = (e: MouseEvent) => {
+  if (isMove.value) {
+    position.x = e.clientX - dragOffset.x
+    position.y = e.clientY - dragOffset.y
+  }
 }
 </script>
 
@@ -3675,15 +4535,18 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .logoTxt {
       font-size: 24px;
       color: #333;
       letter-spacing: 2px;
       font-weight: bold;
     }
+
     .userInfoBox {
       display: flex;
       align-items: center;
+
       .userName {
         font-size: 18px;
         margin-right: 15px;
@@ -3691,6 +4554,7 @@
         border-right: 1px solid #e0e0e0;
         color: #2c2c2c;
       }
+
       .layout {
         width: 69px;
         height: 30px;
@@ -3702,11 +4566,13 @@
       }
     }
   }
+
   .contentBox {
     overflow: hidden;
     flex: 1;
     display: flex;
     position: relative;
+
     .menuBox {
       width: 80px;
       flex-shrink: 0;
@@ -3729,30 +4595,36 @@
         width: 63px;
         margin: 10px auto;
         border-radius: 10px;
+
         &.active,
         &:hover {
           background-color: rgba(0, 147, 255, 0.1);
+
           p {
             color: #0093ff;
           }
         }
+
         .menuIcon {
           display: inline-block;
           width: 32px;
           height: 32px;
         }
+
         .name {
           text-align: center;
           line-height: 1;
           color: #2c3e50;
         }
       }
+
       .reload {
         width: 80px;
         position: absolute;
         bottom: 100px;
         text-align: center;
       }
+
       .setting {
         width: 80px;
         position: absolute;
@@ -3760,7 +4632,9 @@
         text-align: center;
       }
     }
+
     .menuContent {
+      // position: relative;
       width: 300px;
       flex-shrink: 0;
       height: calc(100vh - 48px);
@@ -3769,6 +4643,7 @@
       -moz-user-select: none;
       -khtml-user-select: none;
       user-select: none;
+
       .searchBox {
         width: 100%;
         height: 60px;
@@ -3778,22 +4653,27 @@
         align-items: center;
         border-bottom: 1px solid #efefef;
       }
+
       .resourceSearchBox {
         padding: 10px 0;
         margin: 0 20px;
         border-bottom: 1px solid rgba(204, 204, 204, 0.32);
+
         .classification {
           width: 100%;
           display: flex;
           justify-content: space-between;
           align-items: center;
+
           .flex1 {
             flex: 1;
             text-align: center;
           }
+
           .title {
             color: #999999;
           }
+
           .count {
             width: 35px;
             margin: 0 auto;
@@ -3804,16 +4684,19 @@
             height: 18px;
             font-size: 12px;
           }
+
           .activeClassify,
           .classifyItem:hover {
             .title {
               color: #0093ff;
             }
+
             .count {
               background: #0093ff;
               color: #fff;
             }
           }
+
           .showSearch {
             .imgBox {
               width: 39px;
@@ -3821,17 +4704,20 @@
               border-radius: 16px;
               margin: 0 auto;
             }
+
             .imgBox:hover,
             .activeSearch {
               border: 1px solid #0093ff;
             }
           }
         }
+
         .inputBox {
           margin-top: 10px;
           width: 100% !important;
         }
       }
+
       .resourceTab {
         width: 100%;
         height: 60px;
@@ -3839,18 +4725,22 @@
         justify-content: center;
         align-items: center;
         font-size: 16px;
+
         .hr {
           height: 25px;
           color: #dbdbdb !important;
         }
+
         .tabItem:first-child(1) {
           border-right: 1px solid #707070;
         }
+
         .tabItem {
           flex: 1;
           text-align: center;
           line-height: 57px;
         }
+
         .text {
           width: 43px;
           height: 3px;
@@ -3858,12 +4748,15 @@
           background: #0093ff;
           border-radius: 3px 3px 0px 0px;
         }
+
         .line {
           height: 3px;
         }
       }
+
       .inputBox {
         width: 85%;
+
         .custom-input {
           border: 1px solid #0093ff !important;
           border-radius: 50px;
@@ -3875,19 +4768,23 @@
         .is-focus,
         .el-input__wrapper {
           box-shadow: none !important;
+
           .el-input__inner {
             border: none !important;
             height: 34px !important;
           }
         }
+
         .el-input-group__append {
           padding: 0 10px !important;
           background: none !important;
         }
       }
+
       .screenBox {
         display: flex;
         padding: 0 10px;
+
         .title {
           margin: 10px 0;
           line-height: 40px;
@@ -3938,14 +4835,17 @@
           border: 1px solid #0093ff;
         }
       }
+
       .menuList {
         height: calc(100% - 60px);
         overflow-y: auto;
         padding: 10px 0;
       }
+
       .list-box {
         .resourceList {
           padding: 10px;
+
           .resourceItem {
             padding: 10px 0;
             align-items: center;
@@ -3960,11 +4860,13 @@
               align-items: center;
               justify-content: center;
               position: relative;
+
               img {
                 height: 100%;
                 width: 100%;
                 object-fit: contain;
               }
+
               .handleBox {
                 position: absolute;
                 top: 0;
@@ -3974,11 +4876,13 @@
                 background: rgba(44, 44, 44, 0.6);
                 text-align: center;
                 padding: 2px;
+
                 .delImg {
                   height: 100%;
                   display: flex;
                   align-items: center;
                   justify-content: center;
+
                   .icon {
                     position: static;
                     margin: 5px;
@@ -3994,21 +4898,25 @@
             }
           }
         }
+
         .screenshot {
           padding: 20px;
           display: flex;
           flex-wrap: wrap;
           justify-content: space-between;
+
           .captureItem {
             margin-bottom: 10px;
             width: 46%;
             position: relative;
+
             .imgBox {
               border: 1px solid #d8d8d8;
               width: 100%;
               height: 80px;
               margin-bottom: 5px;
             }
+
             .deleteBox {
               position: absolute;
               top: 0;
@@ -4018,11 +4926,13 @@
               background: rgba(44, 44, 44, 0.6);
               text-align: center;
               padding: 2px;
+
               .delImg {
                 height: 100%;
                 display: flex;
                 align-items: center;
                 justify-content: center;
+
                 .icon {
                   position: static;
                   margin: 5px;
@@ -4030,6 +4940,7 @@
                 }
               }
             }
+
             // .capture {
             //   width: 100%;
             // }
@@ -4053,22 +4964,26 @@
           background: #fff;
           border-radius: 5px;
           padding: 10px 0;
+
           .textBox {
             .title {
               display: flex;
               justify-content: space-between;
               align-items: center;
               margin-right: 10px;
+
               .border-left {
                 height: 25px;
                 border-right: 4px solid;
                 border-radius: 0 5px 5px 0;
                 margin-right: 10px;
               }
+
               .title-con {
                 display: flex;
                 align-items: center;
                 color: #949494;
+
                 .round {
                   width: 10px;
                   height: 10px;
@@ -4081,6 +4996,7 @@
                 margin-left: 5px;
               }
             }
+
             .chapter {
               color: #b7b7b7;
               margin: 5px 5px 5px 14px;
@@ -4093,10 +5009,12 @@
               padding: 0 5px;
             }
           }
+
           .noteText {
             margin: 10px 10px 10px 15px;
             border-radius: 3px;
             padding: 2px 5px;
+
             .con {
               max-height: 65px;
               display: -webkit-box;
@@ -4106,14 +5024,17 @@
             }
           }
         }
+
         .chapterName {
           margin: 15px;
           display: flex;
           align-items: center;
+
           span {
             margin-left: 5px;
           }
         }
+
         .reMarkItem {
           margin: 15px;
           background: #fff;
@@ -4121,8 +5042,10 @@
           padding: 10px;
           display: flex;
           justify-content: space-between;
+
           .reMarkCon {
             display: flex;
+
             .con {
               width: 200px;
               white-space: nowrap;
@@ -4131,10 +5054,12 @@
               margin-right: 8px;
             }
           }
+
           .deleteReMarkImg {
             display: flex;
             align-items: center;
           }
+
           .questionCon {
             width: 240px;
             white-space: nowrap;
@@ -4150,10 +5075,12 @@
             border-radius: 10px;
             padding: 10px;
             display: flex;
+
             .index {
               line-height: 24px;
               margin-right: 10px;
             }
+
             .searchCon {
               flex: 1;
               width: 240px;
@@ -4165,6 +5092,7 @@
               -webkit-box-orient: vertical;
               -webkit-line-clamp: 2;
               text-overflow: ellipsis;
+
               .searchColor {
                 background: rgb(245, 225, 42, 0.5);
               }
@@ -4172,6 +5100,7 @@
           }
         }
       }
+
       .allSearch,
       .notesBox,
       .resourceBox,
@@ -4181,7 +5110,33 @@
         height: calc(100% - 60px);
         overflow-y: auto;
       }
+
+      .questionList {
+        height: 83%;
+      }
+
+      .question-bottom {
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        justify-content: space-evenly;
+        width: 300px;
+        padding: 20px 0;
+        background-color: #fff;
+        li {
+          cursor: pointer;
+          width: 65px;
+          height: 65px;
+          border: 1px solid #cfcfcf;
+          border-radius: 10px;
+          background-color: #f9f9f9;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
     }
+
     .menuStateBox {
       width: 25px;
       height: 25px;
@@ -4193,6 +5148,7 @@
       text-align: center;
       box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
       z-index: 2;
+
       img {
         height: 10px;
         width: 18px;
@@ -4203,6 +5159,7 @@
       flex: 1;
       font-size: 16px;
       position: relative;
+
       .pageBox-header {
         height: 57px;
         padding: 0 20px;
@@ -4211,6 +5168,7 @@
         z-index: 99;
         align-items: center;
         justify-content: space-between;
+
         .classTime {
           display: flex;
           align-items: center;
@@ -4218,6 +5176,7 @@
           border-radius: 20px 20px 20px 20px;
           color: #0093ff;
           padding: 8px;
+
           .qureIcon {
             width: 9px;
             height: 9px;
@@ -4226,16 +5185,20 @@
             margin: 0 5px;
           }
         }
+
         .progress {
           text-align: center;
+
           .bookName {
             font-weight: 800;
             margin-bottom: 5px;
             color: #333;
           }
         }
+
         .rightBox {
           display: flex;
+
           .pageSizeBox {
             display: flex;
             align-items: center;
@@ -4245,21 +5208,25 @@
               padding: 5px;
               display: flex;
               align-items: center;
+
               img {
                 width: 18px;
                 height: 18px;
               }
             }
           }
+
           .brushImgBox {
             display: flex;
             align-items: center;
             border-left: 1px solid #d8d8d8;
+
             div {
               padding: 5px;
               display: flex;
               align-items: center;
             }
+
             .brushImg {
               width: 22px;
               margin-left: 20px;
@@ -4268,21 +5235,26 @@
           }
         }
       }
+
       .pageBox-content {
         height: calc(100% - 57px);
         background: #fbf9f4;
         padding: 10px 0;
+
         .content-box {
           height: 100%;
           position: relative;
+
           #container {
             background: #fbf9f4;
             height: 100%;
+
             #__qiankun_microapp_wrapper_for_app_content__ {
               height: 100%;
             }
           }
         }
+
         .canvas-box {
           height: 100%;
           width: 100%;
@@ -4292,8 +5264,36 @@
           z-index: 96;
           background: rgba(255, 255, 255, 0.2);
         }
+        .watch-box {
+          display: flex;
+          align-items: center;
+          position: absolute;
+          background-color: #555;
+          color: #fff;
+          padding: 10px;
+          border-radius: 5px;
+          width: max-content;
+          p {
+            cursor: move;
+            padding: 0 8px;
+            font-size: 18px;
+            border-radius: 4px;
+            margin-right: 10px;
+            background-color: #666;
+          }
+          span {
+            cursor: pointer;
+            border-right: 1px solid #fff;
+            padding: 0 4px;
+            font-size: 14px;
+            &:last-child {
+              border-right: none;
+            }
+          }
+        }
       }
     }
+
     .toolBox {
       position: relative;
       box-shadow: -3px 0px 6px 1px rgba(0, 0, 0, 0.07);
@@ -4302,11 +5302,13 @@
       -moz-user-select: none;
       -khtml-user-select: none;
       user-select: none;
+
       .toolTitle {
         height: 57px;
         line-height: 53px;
         text-align: center;
         border-bottom: 1px solid #efefef;
+
         .text {
           width: 43px;
           height: 3px;
@@ -4315,11 +5317,13 @@
           border-radius: 3px 3px 0px 0px;
         }
       }
+
       .menu {
         padding-top: 20px;
+
         li > div {
           // height: 50px;
-          padding: 10px 36px;
+          padding: 10px 36px 10px 25px;
           font-size: 16px;
           display: flex;
           align-items: center;
@@ -4336,6 +5340,7 @@
           }
         }
       }
+
       .openBox {
         width: 25px;
         height: 25px;
@@ -4354,22 +5359,27 @@
           width: 18px;
         }
       }
+
       .right {
         right: 198px !important;
         border-radius: 0px 3px 3px 0px !important;
       }
+
       .classRoomBox {
         position: absolute;
         bottom: 0;
         width: 100%;
+
         .el-tabs__nav {
           width: 100% !important;
         }
+
         .el-tabs__item {
           flex: 1 !important;
           padding: 0 !important;
           text-align: center;
         }
+
         .el-tabs__active-bar {
           width: 43px !important;
           left: 30px !important;
@@ -4377,13 +5387,16 @@
           bottom: 1px;
           border-radius: 3px 3px 0px 0px;
         }
+
         .tabBox {
           height: 100px;
           padding: 10px 17px;
           text-align: center;
+
           .insertSelect {
             display: flex;
             justify-content: space-between;
+
             .selectItem {
               text-align: center;
               background: rgba(207, 207, 207, 0.13);
@@ -4391,6 +5404,7 @@
               border-radius: 5px;
               border: 2px solid #cfcfcf;
             }
+
             .typeActive {
               text-align: center;
               color: #0093ff;
@@ -4400,6 +5414,7 @@
               background: rgba(0, 147, 255, 0.13);
             }
           }
+
           .giveLessons {
             color: #0093ff;
             width: 90px;
@@ -4410,6 +5425,7 @@
             display: flex;
             align-items: center;
             justify-content: center;
+
             span {
               margin-left: 10px;
             }
@@ -4430,6 +5446,7 @@
       border-radius: 10px;
       padding: 6px;
       overflow: hidden;
+
       .floatToolItem {
         margin: 10px 0;
         height: 30px;
@@ -4439,11 +5456,13 @@
         border-radius: 5px;
         color: #fff;
         cursor: pointer;
+
         .imgBox {
           width: 24px;
           height: 24px;
           margin: 0 auto;
           position: relative;
+
           img {
             width: 100%;
             height: 100%;
@@ -4459,10 +5478,12 @@
             margin: auto;
           }
         }
+
         .text {
           margin-right: 5px;
         }
       }
+
       .floatToolItem:hover,
       .floatToolActive {
         background-color: rgba(255, 255, 255, 0.3);
@@ -4481,10 +5502,12 @@
       background: #fff;
       overflow: hidden;
       box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
+
       .toolList {
         display: flex;
         justify-content: center;
         align-items: center;
+
         .floatToolItem {
           margin: 6px 8px;
           padding: 5px;
@@ -4495,6 +5518,7 @@
           align-items: center;
           // flex: 1;
           font-size: 14px;
+
           .imgBox {
             height: 18px;
             width: 18px;
@@ -4502,9 +5526,11 @@
             margin: 0 auto;
           }
         }
+
         .floatToolItem:hover {
           background-color: rgba(44, 44, 44, 0.2);
         }
+
         .layOutTool {
           height: 20px;
           margin-right: 5px;
@@ -4516,6 +5542,7 @@
     .dialogToolBox {
       position: fixed;
       z-index: 2;
+
       .toolSelectBox {
         height: 40px;
         display: flex;
@@ -4525,6 +5552,7 @@
         overflow: hidden;
         padding: 5px;
         background-color: rgba(90, 90, 90, 0.9);
+
         // background-image: linear-gradient(to right, #0093ff, #005dff);
         .dialogToolItem {
           user-select: none;
@@ -4535,10 +5563,12 @@
           margin: 0 5px;
           cursor: pointer;
           text-align: center;
+
           span {
             color: #fff;
           }
         }
+
         .dialogToolItem:hover,
         .active {
           background-color: rgba(255, 255, 255, 0.2);
@@ -4548,6 +5578,7 @@
         }
       }
     }
+
     .colorSelectBox {
       padding: 5px 10px;
       width: 190px;
@@ -4557,8 +5588,10 @@
       box-shadow: 0px 0px 10px 1px rgba(0, 0, 0, 0.16);
       border-radius: 5px;
       margin-bottom: 10px;
+
       .flex1 {
         flex: 1;
+
         .scribeItem {
           width: 18px;
           height: 18px;
@@ -4573,6 +5606,7 @@
     }
   }
 }
+
 .lineDeleteBox {
   position: fixed;
   z-index: 2;
@@ -4582,6 +5616,7 @@
   background-color: rgba(90, 90, 90, 0.9);
   border-radius: 5px;
   display: flex;
+
   .dialogToolItem {
     padding: 3px;
     margin: 0 5px;
@@ -4590,10 +5625,12 @@
     justify-content: center;
     align-items: center;
   }
+
   .dialogToolItem:hover {
     background-color: rgba(255, 255, 255, 0.3);
   }
 }
+
 .noteContentBox {
   max-width: 240px;
   position: fixed;
@@ -4601,6 +5638,7 @@
   padding: 10px;
   border-radius: 5px;
 }
+
 .dictionaryDataBox {
   position: fixed;
   z-index: 2;
@@ -4608,9 +5646,11 @@
   padding: 5px 20px;
   background: #fff;
   border-radius: 5px;
+
   .word {
     font-weight: bold;
   }
+
   .phone_con {
     .per-phone {
       align-items: center;
@@ -4624,38 +5664,56 @@
       margin-right: 10px;
       margin-top: 10px;
       padding: 8px 10px;
+
       span {
         margin: 0 10px;
         flex: 1;
       }
     }
+
     .soundBtn {
       width: 16px;
       height: 14px;
     }
   }
+
   .trans {
     padding: 20px 0;
+
     .itemList {
       display: flex;
       padding: 10px 0;
+
       .index {
         margin-right: 15px;
       }
+
       .pos {
         margin-right: 30px;
       }
     }
   }
 }
+
 .wendabox {
   width: 100%;
-  height: 80vh;
+  height: 82vh;
+  padding:20px;
 
   iframe {
     width: 100%;
     height: 100%;
   }
+}
+
+.whiteBoardBox {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 2000;
+  background-color: rgba(2, 2, 2, 0.3);
 }
 
 .myDialogs,
@@ -4682,38 +5740,48 @@
     top: 0px !important;
     right: 0px !important;
   }
-  .el-dialog__body {
-    padding: 20px !important;
-  }
+
+  // .el-dialog__body {
+  //   padding: 20px !important;
+  // }
+
   .el-dialog__footer {
     padding: 10px 20px 20px !important;
     text-align: right;
     box-sizing: border-box;
   }
 }
+
 .myDialogs {
   height: 90vh;
 }
+
 .myAnserDialogs {
   width: 700px;
   height: 90vh;
 }
+
 .myNoteDialogs {
   width: 500px !important;
 }
+
 .screenshotDialog {
   width: 400px !important;
 }
+
 .baiduDialog {
   width: 90vw;
   height: 90vh;
 }
+
 .noteColorSelectBox {
   margin-top: 10px;
   width: 190px;
   display: flex;
+
   .flex1 {
     flex: 1;
+
     .scribeItem {
       width: 18px;
       height: 18px;
@@ -4726,24 +5794,50 @@
     }
   }
 }
+
 .videoBox {
   text-align: center;
+
   video {
     width: 100%;
   }
 }
+
 .audioBox {
   // display:none;
 }
 
 .wordBox {
   height: 600px;
+  width: 100%;
+  overflow-y: scroll;
+
+  img {
+    display: block;
+    margin: 0 auto;
+    width: 90%;
+    height: auto;
+    box-shadow: 0px 0px 10px 1px rgba(0, 0, 0, 0.1);
+    object-fit: contain;
+  }
 }
+
 .imgUrlBox {
   width: 100%;
   text-align: center;
+
   img {
     width: 100%;
   }
 }
+
+.voice-reader {
+  position: absolute;
+  bottom: 30px;
+  left: 50px;
+}
+.iframe-box {
+  width: 100%;
+  height: 800px;
+}
 </style>

--
Gitblit v1.9.1