From cc26637f18b8ed178420122d7335b3f89be92ada Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期四, 23 五月 2024 10:34:44 +0800
Subject: [PATCH] shujia
---
src/views/home.vue | 796 +++++++++++++++++++++++++++-----------------------------
1 files changed, 382 insertions(+), 414 deletions(-)
diff --git a/src/views/home.vue b/src/views/home.vue
index 432a76b..f8ffa9e 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,28 +1,25 @@
<template>
<div class="homeBox">
<div class="headerBox">
- <!-- <span class="logoTxt">鍖椾含甯堣寖澶у鍑虹増闆嗗洟</span> -->
- <img :src="logo" />
+
+ <img :src="logo" v-if="bookConfig.textbookOwnership == '鍖椾含甯堣寖澶у鍑虹増闆嗗洟'" />
+ <!-- <span class="logoTxt" v-else>閾侀亾鍑虹増绀�</span> -->
+ <span></span>
<div class="userInfoBox">
- <div></div>
- <div></div>
+ <div class="userName" v-if="userInfo.name">{{userInfo.name}}</div>
<div><div class="layout hover" @click="layoutBtn">閫�鍑�</div></div>
</div>
</div>
<div class="contentBox">
<!-- 鑿滃崟 -->
<div class="menuBox">
- <div
- v-for="(item, index) in menuData"
- :key="index"
- @click="menuItemClick(item.name)"
- >
- <div :class="['menuItem', activeMenu == item.name ? 'active' : '']" v-if="item.isShow">
- <div class="menuIcon imgBox">
- <img :src="item.icon" />
+ <div v-for="(item, index) in menuData" :key="index" @click="menuItemClick(item.name)">
+ <div :class="['menuItem', activeMenu == item.name ? 'active' : '']" v-if="item.isShow">
+ <div class="menuIcon imgBox">
+ <img :src="item.icon" />
+ </div>
+ <div class="name">{{ item.name }}</div>
</div>
- <div class="name">{{ item.name }}</div>
- </div>
</div>
<!-- <div class="reload hover" @click="reload()">鍒锋柊</div> -->
<!-- 璁剧疆 -->
@@ -100,7 +97,10 @@
@keyup.enter="searchBook"
>
<template #prefix>
- <el-icon class="hover"><Search /></el-icon>
+ <el-icon><Search /></el-icon>
+ </template>
+ <template #suffix>
+ <svg @click="searchBook" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-list-search hover"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 15m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0" /><path d="M18.5 18.5l2.5 2.5" /><path d="M4 6h16" /><path d="M4 12h4" /><path d="M4 18h4" /></svg>
</template>
</el-input>
</div>
@@ -121,7 +121,7 @@
<el-tree
ref="catalogTree"
default-expand-all="true"
- expand-on-click-node="false"
+ :expand-on-click-node="false"
:data="catalogueData"
:props="defaultProps"
v-if="catalogueData.length > 0"
@@ -135,7 +135,7 @@
</div>
</template>
</el-tree>
- <div v-if="catalogueData.length == 0">
+ <div v-else>
<el-empty :image-size="60" description="鏆傛棤鏁版嵁" />
</div>
</div>
@@ -244,6 +244,9 @@
<template #prefix>
<el-icon><Search /></el-icon>
</template>
+ <template #suffix>
+ <svg @click="searchBook" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-list-search hover"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M15 15m-4 0a4 4 0 1 0 8 0a4 4 0 1 0 -8 0" /><path d="M18.5 18.5l2.5 2.5" /><path d="M4 6h16" /><path d="M4 12h4" /><path d="M4 18h4" /></svg>
+ </template>
</el-input>
</div>
</div>
@@ -323,11 +326,13 @@
</div>
</div>
</div>
+ <!-- 鑿滃崟鍐呭鏀惰捣 -->
+ <div class="menuStateBox" v-if="menuState.open">
+ <svg @click="menuState.open = false" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-arrow-bar-to-left"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M10 12l10 0" /><path d="M10 12l4 4" /><path d="M10 12l4 -4" /><path d="M4 4l0 16" /></svg>
+ <!-- <img :src="shouqiL" @click="menuState.open = false" /> -->
+ </div>
</div>
- <!-- 鑿滃崟鍐呭鏀惰捣 -->
- <div class="menuStateBox" v-if="menuState.open">
- <img :src="shouqiL" @click="menuState.open = false" />
- </div>
+
<!-- 涓棿鍐呭 -->
<div class="pageBox">
<!-- 澶撮儴鏄剧ず -->
@@ -345,9 +350,9 @@
</div>
<div class="rightBox">
<div class="pageSizeBox">
- <div><img :src="zoomIn" @click="changePageSize('add')" /></div>
- <div>{{ headerData.pageSize }}%</div>
<div><img :src="zoomOut" @click="changePageSize('reduce')" /></div>
+ <div>{{ headerData.pageSize }}%</div>
+ <div><img :src="zoomIn" @click="changePageSize('add')" /></div>
</div>
<!-- <div class="brushImgBox">
<div @click="jumpContent('note' + index)">
@@ -360,10 +365,7 @@
<div class="pageBox-content">
<div class="content-box">
<div
- id="container"
- @mousedown="handleMouseDown"
- @mousemove="handleMousemove"
- :style="{ background: settingForm.bgColorActive }"
+ id="container" :style="{ background: settingForm.bgColorActive }"
></div>
<!-- 鐢荤瑪鐢诲竷 -->
<div class="canvas-box" v-show="canvasShow">
@@ -371,131 +373,9 @@
</div>
</div>
</div>
- </div>
- <!-- 鏁欏缁勪欢 -->
- <div class="toolBox">
- <div class="toolTitle">
- <span>{{ toolState.open ? '瀛︿範缁勪欢' : '缁勪欢' }}</span>
- <div class="text"></div>
- </div>
- <div class="menuList">
- <ul class="menu">
- <li v-for="item in teachToolsMenuData" :key="item.key">
- <div :class="item.name === activeTool ? 'activeItem hover' : 'menuItem hover'" :style="!toolState.open ? 'padding:10px 15px' : ''" v-if="item.isShow" @click="selectTeachTools(item)">
- <img :src="item.icon" alt="" />
- <span v-if="toolState.open">{{ item.name }}</span>
- </div>
- </li>
- </ul>
- </div>
- <div :class="['openBox', toolState.open ? 'right' : '']">
- <img :src="shouqiR" v-if="toolState.open" @click="toolState.open = false" />
- <img :src="shouqiL" v-if="!toolState.open" @click="toolState.open = true" />
- </div>
- <div class="classRoomBox" v-if="false">
- <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
- <el-tab-pane label="澶囪缁勪欢" name="first">
- <div class="tabBox">
- <div class="insertSelect">
- <div
- :class="selectType == 'resource' ? 'typeActive' : 'selectItem hover'"
- @click="selectTypeClick('resource')"
- >
- <img :src="selectType == 'resource' ? charuziyuan_blue : charuziyuan" />
- <div>鎻掑叆璧勬簮</div>
- </div>
- <div
- :class="selectType == 'answer' ? 'typeActive' : 'selectItem hover'"
- @click="selectTypeClick('answer')"
- >
- <img :src="selectType == 'answer' ? dati_charu_blue : dati_charu" />
- <div>鎻掑叆绛旈</div>
- </div>
- </div>
- </div>
- </el-tab-pane>
- <el-tab-pane label="涓婅缁勪欢" name="second">
- <div class="tabBox">
- <div class="giveLessons hover" @click="giveLessonsClick()">
- <img :src="xiake" />
- <span>{{ classStart ? '涓婅' : '涓嬭' }}</span>
- </div>
- </div>
- </el-tab-pane>
- </el-tabs>
- </div>
- </div>
- <!-- 鐢荤瑪宸ュ叿鏍� -->
- <div
- draggable="true"
- class="draggableBox"
- @dragstart="dragstart($event)"
- @dragend="dragend($event)"
- :style="`left:${floatingToolData.elLeft}px;top:${floatingToolData.elTop}px`"
- >
+ <!-- 鐢荤瑪缁勪欢 -->
<div
- class="hover"
- v-for="item in floatingToolBox"
- :key="item.name"
- @click="floatItemHandle(item)"
- @mouseover="floatOverHander(item)"
- @mouseout="floatOutHander(item)"
- >
- <div v-if="item.isShow">
- <el-popover
- placement="right"
- width="120"
- trigger="click"
- v-if="floatingToolData.activeToolData == '鏍囪'"
- >
- <div class="popinnerBox">
- <div class="label" v-if="floatingToolData.activeToolData == '鏍囪'">
- <div class="labelItem hover" @click="labelShow('hide')">
- <img :src="hide" />
- <div>闅愯棌</div>
- </div>
- <div class="labelItem hover" @click="labelShow('show')">
- <img :src="show" />
- <div>鏄剧ず</div>
- </div>
- </div>
- </div>
- <template #reference>
- <div
- :class="
- floatingToolData.activeToolData == item.name
- ? 'floatToolActive floatToolItem'
- : 'floatToolItem'
- "
- >
- <img
- :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon"
- alt=""
- />
- <div class="text">{{ item.name }}</div>
- </div>
- </template>
- </el-popover>
- <div
- :class="
- floatingToolData.activeToolData == item.name
- ? 'floatToolActive floatToolItem'
- : 'floatToolItem'
- "
- v-else
- >
- <img
- :src="floatingToolData.activeToolData == item.name ? item.activeIcon : item.icon"
- alt=""
- />
- <div class="text">{{ item.name }}</div>
- </div>
- </div>
- </div>
- </div>
- <div
class="brushBox"
- :style="{ left: brushBoxLeft + 'px' }"
v-if="floatingToolData.activeToolData == '鐢荤瑪'"
>
<div class="toolList">
@@ -562,10 +442,10 @@
</div>
<template #reference>
<div class="floatToolItem hover" @click="toolSelectHandle('huabi')">
- <div class="imgBox">
- <img :src="huabi2" alt="" />
- </div>
- <div class="text">鐢荤瑪</div>
+ <el-tooltip class="box-item" effect="dark" content="鐢荤瑪" placement="bottom">
+ <img :src="huabi2" alt="" class="imgBox"/>
+ </el-tooltip>
+ <!-- <div class="text">鐢荤瑪</div> -->
</div>
</template>
</el-popover>
@@ -625,10 +505,9 @@
</div>
<template #reference>
<div class="floatToolItem hover" @click="toolSelectHandle('wenzi')">
- <div class="imgBox">
- <img :src="wenzi2" alt="" />
- </div>
- <div class="text">鏂囧瓧</div>
+ <el-tooltip class="box-item" effect="dark" content="鏂囧瓧" placement="bottom">
+ <img :src="wenzi2" alt="" class="imgBox"/>
+ </el-tooltip>
</div>
</template>
</el-popover>
@@ -667,10 +546,9 @@
</div>
<template #reference>
<div class="floatToolItem hover" @click="toolSelectHandle('tuxing')">
- <div class="imgBox">
- <img :src="tuxing" alt="" />
- </div>
- <div class="text">鍥惧舰</div>
+ <el-tooltip class="box-item" effect="dark" content="鍥惧舰" placement="bottom">
+ <img :src="tuxing" alt="" class="imgBox"/>
+ </el-tooltip>
</div>
</template>
</el-popover>
@@ -681,10 +559,9 @@
<div class="text">姗＄毊鎿�</div>
</div> -->
<div class="floatToolItem hover" @click="toolSelectHandle('chexiao')">
- <div class="imgBox">
- <img :src="clearPrevious" alt="" />
- </div>
- <div class="text">鎾ら攢</div>
+ <el-tooltip class="box-item" effect="dark" content="鎾ら攢" placement="bottom">
+ <img :src="clearPrevious" alt="" class="imgBox"/>
+ </el-tooltip>
</div>
<!-- <div class="floatToolItem" @click="toolSelectHandle('chongzuo')">
<div class="imgBox">
@@ -693,19 +570,148 @@
<div class="text">閲嶅仛</div>
</div> -->
<div class="floatToolItem hover" @click="toolSelectHandle('qingchu')">
- <div class="imgBox">
- <img :src="qingchu2" alt="" />
- </div>
- <div class="text">娓呴櫎</div>
+ <el-tooltip class="box-item" effect="dark" content="娓呴櫎" placement="bottom">
+ <img :src="qingchu2" alt="" class="imgBox"/>
+ </el-tooltip>
</div>
- <div class="floatToolItem layOutTool hover" @click="toolSelectHandle('tuichu')">
- <div class="imgBox">
- <img :src="tuichu" alt="" />
- </div>
- <div class="text">閫�鍑�</div>
+ <div class="layOutTool"></div>
+ <div class="floatToolItem hover" @click="toolSelectHandle('tuichu')">
+ <el-tooltip class="box-item" effect="dark" content="閫�鍑�" placement="bottom">
+ <img :src="tuichu" alt="" class="imgBox"/>
+ </el-tooltip>
</div>
</div>
</div>
+ </div>
+ <!-- 鏁欏缁勪欢 -->
+ <div class="toolBox">
+ <div class="toolTitle">
+ <span>{{ toolState.open ? '瀛︿範缁勪欢' : '缁勪欢' }}</span>
+ <div class="text"></div>
+ </div>
+ <div class="menuList">
+ <ul class="menu" v-if="teachToolsMenuData.length > 0">
+ <li v-for="item in teachToolsMenuData" :key="item.key">
+ <div
+ :class="item.name === activeTool ? 'activeItem hover' : 'menuItem hover'"
+ :style="!toolState.open ? 'padding:10px 15px' : ''"
+ v-if="item.isShow"
+ @click="selectTeachTools(item)"
+ >
+ <img :src="item.icon" alt="" />
+ <span v-if="toolState.open">{{ item.name }}</span>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <div :class="['openBox', toolState.open ? 'right' : '']">
+ <!-- <img :src="shouqiR" v-if="toolState.open" @click="toolState.open = false" /> -->
+ <!-- <img :src="shouqiL" v-if="!toolState.open" @click="toolState.open = true" /> -->
+ <svg v-if="!toolState.open" @click="toolState.open = true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-arrow-bar-to-left"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M10 12l10 0" /><path d="M10 12l4 4" /><path d="M10 12l4 -4" /><path d="M4 4l0 16" /></svg>
+ <svg v-if="toolState.open" @click="toolState.open = false" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-arrow-bar-to-right"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M14 12l-10 0" /><path d="M14 12l-4 4" /><path d="M14 12l-4 -4" /><path d="M20 4l0 16" /></svg>
+ </div>
+ <div class="classRoomBox" v-if="false">
+ <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+ <el-tab-pane label="澶囪缁勪欢" name="first">
+ <div class="tabBox">
+ <div class="insertSelect">
+ <div
+ :class="selectType == 'resource' ? 'typeActive' : 'selectItem hover'"
+ @click="selectTypeClick('resource')"
+ >
+ <img :src="selectType == 'resource' ? charuziyuan_blue : charuziyuan" />
+ <div>鎻掑叆璧勬簮</div>
+ </div>
+ <div
+ :class="selectType == 'answer' ? 'typeActive' : 'selectItem hover'"
+ @click="selectTypeClick('answer')"
+ >
+ <img :src="selectType == 'answer' ? dati_charu_blue : dati_charu" />
+ <div>鎻掑叆绛旈</div>
+ </div>
+ </div>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="涓婅缁勪欢" name="second">
+ <div class="tabBox">
+ <div class="giveLessons hover" @click="giveLessonsClick()">
+ <img :src="xiake" />
+ <span>{{ classStart ? '涓婅' : '涓嬭' }}</span>
+ </div>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </div>
+ </div>
+ <!-- 鐢荤瑪宸ュ叿鏍� -->
+ <div
+ draggable="true"
+ class="draggableBox"
+ :style="`left:${floatingToolData.elLeft}px`"
+ v-if="floatingToolBox.length > 0"
+ >
+ <div
+ class="hover"
+ v-for="item in floatingToolBox"
+ :key="item.name"
+ @click="floatItemHandle(item)"
+ >
+ <div v-if="item.isShow">
+ <el-popover
+ placement="right"
+ width="120"
+ trigger="click"
+ v-if="floatingToolData.activeToolData == '鏍囪'"
+ >
+ <div class="popinnerBox">
+ <div class="label" v-if="floatingToolData.activeToolData == '鏍囪'">
+ <div class="labelItem hover" @click="labelShow('hide')">
+ <img :src="hide" />
+ <div>闅愯棌</div>
+ </div>
+ <div class="labelItem hover" @click="labelShow('show')">
+ <img :src="show" />
+ <div>鏄剧ず</div>
+ </div>
+ </div>
+ </div>
+ <template #reference>
+ <div
+ :class="
+ floatingToolData.activeToolData == item.name
+ ? 'floatToolActive floatToolItem'
+ : 'floatToolItem'
+ "
+ >
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ :content="item.name"
+ placement="right"
+ >
+ <img :src="item.icon" alt="" />
+ </el-tooltip>
+ <!-- <div class="text">{{ item.name }}</div> -->
+ </div>
+ </template>
+ </el-popover>
+ <div
+ :class="
+ floatingToolData.activeToolData == item.name
+ ? 'floatToolActive floatToolItem'
+ : 'floatToolItem'
+ "
+ v-else
+ >
+ <el-tooltip class="box-item" effect="dark" :content="item.name" placement="right">
+ <img :src="item.icon" alt="" />
+ </el-tooltip>
+ <!-- <div class="text">{{ item.name }}</div> -->
+ </div>
+ </div>
+ </div>
+ </div>
+
<!-- 閫変腑宸ュ叿鏍� -->
<div
class="dialogToolBox"
@@ -727,15 +733,16 @@
</div>
<div class="toolSelectBox" v-show="!(toolActive == '楂樹寒' || toolActive == '鍒掔嚎')">
<div
- :class="item.name == toolActive ? 'dialogToolItem active' : 'dialogToolItem'"
v-for="item in dialogToolList"
:key="item.icon"
@click="dialogToolHandle(item)"
- @mouseover="dialogOverHander(item)"
- @mouseout="dialogOutHander(item)"
>
- <img :src="item.name == toolActive ? item.activeIcon : item.icon" alt="" />
- <span>{{ item.name }}</span>
+ <div :class="item.name == toolActive ? 'dialogToolItem active' : 'dialogToolItem'" v-if="item.isShow">
+ <el-tooltip class="box-item" effect="dark" :content="item.name" placement="bottom">
+ <img :src="item.icon" alt="" />
+ </el-tooltip>
+ </div>
+ <!-- <span>{{ item.name }}</span> -->
</div>
</div>
</div>
@@ -747,7 +754,12 @@
v-show="lineDelete.showLineDelete"
:style="{ top: `${lineDelete.top}px`, left: `${lineDelete.left}px` }"
>
- <el-button @click="delUserKey">鍒犻櫎</el-button>
+ <!-- <el-button @click="delUserKey">鍒犻櫎</el-button> -->
+ <div class="dialogToolItem">
+ <el-tooltip class="box-item" effect="dark" content="鍒犻櫎" placement="bottom">
+ <img :src="trash" @click="delUserKey"/>
+ </el-tooltip>
+ </div>
</div>
<el-dialog title="璧勬簮" align-center v-model="resourVisble" width="845" class="resourDialog">
@@ -866,7 +878,7 @@
import { useRouter, useRoute } from 'vue-router'
import useClipboard from 'vue-clipboard3'
const { toClipboard } = useClipboard()
-const request = inject('request')
+const MG: any = inject('MG')
const toolClass = inject('toolClass')
const qiankunActions = inject('qiankunActions')
//鑾峰彇璺敱鍣�
@@ -908,22 +920,12 @@
import dati_charu_blue from '../assets/images/operation/dati_charu_blue.png'
import xiake from '../assets/images/operation/xiake.png'
-import huabi from '../assets/images/operation/huabi-w.png'
-import huabi1 from '../assets/images/operation/huabi-b.png'
-import qingchu from '../assets/images/operation/Clearaway-w.png'
-import qingchu1 from '../assets/images/operation/Clearaway-b.png'
-import wenzi from '../assets/images/operation/wenzi-w.png'
-import wenzi1 from '../assets/images/operation/wenzi-b.png'
+import huabi from '../assets/images/operation/brush.svg'
import wenzi2 from '../assets/images/operation/wenzi.png'
-import biaoqianw from '../assets/images/operation/biaoqian-w.png'
-import biaoqian1 from '../assets/images/operation/biaoqian-b.png'
-import baiban from '../assets/images/operation/baiban-w.png'
-import baiban1 from '../assets/images/operation/baiban-b.png'
-import biaozhu from '../assets/images/operation/biaozhu-w.png'
-import biaozhu1 from '../assets/images/operation/biaozhu-b.png'
-import jieping from '../assets/images/operation/screenshot-w.png'
-import jieping1 from '../assets/images/operation/screenshot-b.png'
-import clear from '../assets/images/operation/clear.png'
+import biaoqianw from '../assets/images/operation/bookmark-plus.svg'
+import baiban from '../assets/images/operation/chalkboard.svg'
+import biaozhu from '../assets/images/operation/pencil-minus.svg'
+import jieping from '../assets/images/operation/crop.svg'
import clearPrevious from '../assets/images/operation/clearPrevious.png'
import hide from '../assets/images/operation/hide.png'
import show from '../assets/images/operation/show.png'
@@ -956,6 +958,7 @@
import zoomIn from '../assets/images/operation/zoomIn.png'
import zoomOut from '../assets/images/operation/zoomOut.png'
import huabi2 from '../assets/images/operation/huabi.svg'
+import trash from '../assets/images/operation/trash.svg'
import shanchu from '../assets/images/operation/delete.png'
import bianji from '../assets/images/operation/bianji.png'
@@ -977,11 +980,12 @@
const screenWidth = ref(
window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth
)
-const brushBoxLeft = ref(500)
+let userInfo = ref({})
let microApp = null // 寰簲鐢ㄥ疄渚�
const bookConfig = ref({})
const activeCatalog = ref()
onMounted(() => {
+ getUserInfo()
setTimeout(() => {
canvasWith.value = document.querySelector('.content-box').offsetWidth
canvasheight.value = document.querySelector('.content-box').offsetHeight
@@ -989,8 +993,10 @@
if (screenWidth.value < 1180) {
menuState.open = false
toolState.open = false
+ if (!menuState.open) {
+ floatingToolData.elLeft = 90
+ }
}
- brushBoxLeft.value = (screenWidth.value - 450) / 2
window.onresize = () => {
return (() => {
screenWidth.value =
@@ -1016,6 +1022,7 @@
console.log(window.qiankunActions)
window.qiankunActions.setGlobalState({
state: 1, // 鍔犺浇瀛愬簲鐢�
+ bookId: localStorage.getItem('bookId'),
windowSelection: (data) => {
// 缁戝畾瀛愬簲鐢ㄩ�夋嫨鐩戝惉浜嬩欢
console.log(data, '瀛愬簲鐢ㄩ�夋嫨')
@@ -1051,6 +1058,7 @@
// if (window.qiankunState && window.qiankunState.aa) window.qiankunState.aa(1)
})
+
watch(
() => screenWidth.value,
(val) => {
@@ -1058,21 +1066,57 @@
if (screenWidth.value < 1180) {
menuState.open = false
toolState.open = false
- floatingToolData.elLeft = 100
+ if (!menuState.open) {
+ floatingToolData.elLeft = 90
+ }
} else {
- floatingToolData.elLeft = 300
}
}
)
+
+const getUserInfo = () => {
+ MG.identity.getCurrentAppUser().then((res) => {
+ console.log(res, '鐢ㄦ埛淇℃伅')
+ if(res){
+ let teacherRole = res.roleLinks.find((item) => item.role.refCode == 'teacher')
+ let teacherInfos = res.infoList.find((item) => item.type == 'teacherInfo')
+ let phoneInfo = res.secretList.find((item) => item.type == 'MobilePhone')
+ let nameAndPassword = res.secretList.find((item) => item.type == 'LoginNameAndPassword')
+
+ if (nameAndPassword) {
+ userInfo.value = {
+ name: nameAndPassword.credential,
+ }
+ localStorage.setItem('userInfo', JSON.stringify(userInfo.value))
+ }else if(teacherRole && teacherInfos){
+ userInfo.value = {
+ name: teacherInfos.name,
+ role: 'Teacher',
+ roleId: teacherRole.role.id
+ }
+ localStorage.setItem('userInfo', JSON.stringify(userInfo.value))
+ } else if(phoneInfo){
+ userInfo.value = {
+ name: phoneInfo.credential,
+ }
+ localStorage.setItem('userInfo', JSON.stringify(userInfo.value))
+ }
+
+ }
+ })
+}
+
+
let menuData = [] //鑿滃崟
let teachToolsMenuData = [] //鍙充晶瀛︿範缁勪欢
let floatingToolBox = [] //涓棿鎮诞缁勪欢
+let dialogToolList =[] //閫変腑鏂囧瓧鎿嶄綔
//鑾峰彇褰撳墠涔︾睄鎵�闇�缁勪欢
const getTextbookComponents = () => {
menuData = []
teachToolsMenuData = []
- floatingToolBox = []
+ floatingToolBox = []
menuData = [
{
name: '鐩綍',
@@ -1104,7 +1148,7 @@
icon: biaoqian,
isShow: bookConfig.value.textbookComponents.indexOf('CF2E1400') > -1
}
- ];
+ ]
teachToolsMenuData = [
{
name: 'AI鏅鸿兘闂瓟',
@@ -1161,38 +1205,43 @@
icon: moxinggongju,
isShow: bookConfig.value.textbookComponents.indexOf('366F6CF3') > -1
}
- ];
+ ]
floatingToolBox = [
{
icon: huabi,
- activeIcon: huabi1,
name: '鐢荤瑪',
isShow: bookConfig.value.textbookComponents.indexOf('800109C0') > -1
},
{
- activeIcon: baiban1,
icon: baiban,
name: '鐧芥澘',
- isShow: false
+ isShow: bookConfig.value.textbookComponents.indexOf('029DB3E0') > -1
},
{
- activeIcon: biaozhu1,
icon: biaozhu,
name: '鏍囪',
isShow: bookConfig.value.textbookComponents.indexOf('2E613A8F') > -1
},
{
- activeIcon: biaoqian1,
icon: biaoqianw,
name: '涔︾',
isShow: bookConfig.value.textbookComponents.indexOf('D2D30448') > -1
},
{
- activeIcon: jieping1,
icon: jieping,
name: '鎴睆',
isShow: bookConfig.value.textbookComponents.indexOf('86F0A1B8') > -1
}
+ ]
+ dialogToolList = [
+ { icon: gaoliang,name: '楂樹寒',isShow: bookConfig.value.textbookComponents.indexOf('395B91FC') > -1 },
+ { icon: huaxian,name: '鍒掔嚎',isShow: bookConfig.value.textbookComponents.indexOf('229EC161') > -1 },
+ { icon: biji2,name: '绗旇',isShow: bookConfig.value.textbookComponents.indexOf('BC9B0CBD') > -1 },
+ { icon: biaozhu2,name: '鏍囨敞',isShow: bookConfig.value.textbookComponents.indexOf('A63EE24F') > -1 },
+ { icon: fuzhi,name: '澶嶅埗',isShow: bookConfig.value.textbookComponents.indexOf('7D5594B3') > -1 },
+ { icon: AIyuedu,name: 'AI闃呰',isShow: bookConfig.value.textbookComponents.indexOf('C05AA457') > -1 },
+ { icon: cidian2,name: '璇嶅吀',isShow: bookConfig.value.textbookComponents.indexOf('83FB80FD') > -1 },
+ { icon: baidu,name: '鐧剧',isShow: bookConfig.value.textbookComponents.indexOf('65F95274') > -1 }
]
}
@@ -1200,7 +1249,7 @@
const catalogueData = ref([])
const getCatalogueData = () => {
axios
- .get(bookConfig.value.resourceUrl + '/1/information.json')
+ .get(bookConfig.value.resourceUrl + '/information.json')
.then(function (response) {
console.log(response.data, '鐩綍')
var json = response.data
@@ -1231,7 +1280,7 @@
//鑾峰彇璧勬簮
//璧勬簮鍒嗙被
-const classifySelectList = ref()
+const classifySelectList = ref([])
//璧勬簮绫诲瀷
const resourceType = ref('default') //榛樿/鏁欏笀
const activeClassify = ref('')
@@ -1246,7 +1295,7 @@
const getResourceData = () => {
axios
- .get(bookConfig.value.resourceUrl + '/1/resource.json?t=12')
+ .get(bookConfig.value.resourceUrl + '/resource.json?t=12')
.then(function (response) {
var json = response.data
// 澶勭悊鑾峰彇鍒扮殑json鏁版嵁
@@ -1438,9 +1487,14 @@
resourType.value = data.resourceType
if (data.resourceType == '瑙嗛') {
resourVisble.value = true
- testVideo.value = bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5
+ if(data.md5){
+ testVideo.value = bookConfig.value.requestCtx + '/file/api/ApiDownload?md5=' + data.md5
+ }else{
+ testVideo.value = bookConfig.value.resourceUrl + '/' + data.resourcePath
+ }
+
} else if (data.resourceType == 'word') {
- testWord.value = bookConfig.value.resourceUrl + '/resourceData/' + data.name
+ testWord.value = bookConfig.value.resourceUrl + '/' + data.resourcePath
} else {
if (window.qiankunState && window.qiankunState.gotoPage) {
window.qiankunState.gotoPage(Number(data.chapterNum), Number(data.pagination))
@@ -1556,6 +1610,18 @@
],
bgColorActive: '#FBF9F4'
})
+
+watch(
+ () => menuState.open,
+ (val) => {
+ if (menuState.open == false) {
+ floatingToolData.elLeft = 90
+ } else {
+ floatingToolData.elLeft = 390
+ }
+ }
+)
+
const fontSizeSelect = (item) => {
settingForm.fontSizeActive = item.key
window.qiankunActions.setGlobalState({
@@ -1670,55 +1736,13 @@
let canvas = null
const floatingToolData = reactive({
activeToolData: '', //閫変腑宸ュ叿
- elLeft: 400,
- elTop: 300,
+ elLeft: 390,
startclientx: 0,
startclienty: 0
})
//鐢诲竷
const canvasShow = ref(false)
-
-const floatOverHander = (item) => {
- const curIndex = floatingToolBox.findIndex((f) => f.name == item.name)
- switch (curIndex) {
- case 0:
- floatingToolBox[0].icon = huabi1
- break
- case 1:
- floatingToolBox[1].icon = baiban1
- break
- case 2:
- floatingToolBox[2].icon = biaozhu1
- break
- case 3:
- floatingToolBox[3].icon = biaoqian1
- break
- case 4:
- floatingToolBox[4].icon = jieping1
- break
- }
-}
-const floatOutHander = (item) => {
- const curIndex = floatingToolBox.findIndex((f) => f.name == item.name)
- switch (curIndex) {
- case 0:
- floatingToolBox[0].icon = huabi
- break
- case 1:
- floatingToolBox[1].icon = baiban
- break
- case 2:
- floatingToolBox[2].icon = biaozhu
- break
- case 3:
- floatingToolBox[3].icon = biaoqianw
- break
- case 4:
- floatingToolBox[4].icon = jieping
- break
- }
-}
//鎴浘浜嬩欢
const nameRef = ref()
@@ -1755,18 +1779,7 @@
break
}
}
-const dragend = (e) => {
- let x = e.clientX - floatingToolData.startclientx
- let y = e.clientY - floatingToolData.startclienty
- if (floatingToolData.elLeft + x > 0 || floatingToolData.elTop + y > 0) {
- floatingToolData.elLeft = e.x - 40
- floatingToolData.elTop = e.y - 60
- }
-}
-const dragstart = (e) => {
- floatingToolData.startclientx = e.clientX
- floatingToolData.startclienty = e.clientY
-}
+
//鐢荤瑪鎿嶄綔鏍忎簨浠�
const toolSelectData = reactive({
activeTool: '',
@@ -1865,10 +1878,7 @@
chapterNum: currentChapter.value,
chapterName: chapterData.label
})
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'reMark',
@@ -1876,8 +1886,7 @@
value: JSON.stringify(reMarkData.value)
}
]
- }
- })
+ })
.then((res) => {
floatingToolData.activeToolData = ''
getReMarkList()
@@ -1887,14 +1896,10 @@
const getReMarkList = () => {
reMarkList.value = []
reMarkData.value = []
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'reMark',
keys: [bookConfig.value.bookId]
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0 && res[0].value) {
reMarkData.value = JSON.parse(res[0].value)
let list = JSON.parse(res[0].value)
@@ -1915,10 +1920,7 @@
//鍒犻櫎涔︾
const deleteReMark = (item) => {
let list = reMarkList.value.filter((itemData) => itemData.id !== item.id)
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'reMark',
@@ -1926,8 +1928,7 @@
value: JSON.stringify(list)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
ElMessage({
message: '鍒犻櫎涔︾鎴愬姛!',
type: 'success'
@@ -1978,10 +1979,7 @@
}
screenshotLoading.value = true
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'screenshot',
@@ -1989,8 +1987,7 @@
value: JSON.stringify(screenshotData.value)
}
]
- }
- })
+ })
.then((res) => {
screenshotLoading.value = false
getScreenshotList()
@@ -2014,14 +2011,10 @@
const getScreenshotList = () => {
screenshotData.value = []
screenshotList.value = []
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'screenshot',
keys: [bookConfig.value.bookId]
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0 && res[0].value) {
screenshotData.value = JSON.parse(res[0].value)
let list = JSON.parse(res[0].value)
@@ -2068,10 +2061,7 @@
type: 'warning'
})
.then(() => {
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'screenshot',
@@ -2079,8 +2069,7 @@
value: JSON.stringify(list)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
ElMessage({
message: '鍒犻櫎鎴浘鎴愬姛!',
type: 'success'
@@ -2120,18 +2109,7 @@
const toolActive = ref('')
const colorActive = ref('')
const noteColorActive = ref('')
-const dialogToolList = reactive([
- { icon: gaoliang, activeIcon: gaoliang1, name: '楂樹寒' },
- { icon: huaxian, activeIcon: huaxian1, name: '鍒掔嚎' },
- { icon: biji2, activeIcon: biji1, name: '绗旇' },
- { icon: biaozhu2, activeIcon: biaozhu3, name: '鏍囨敞' },
- { icon: fuzhi, activeIcon: fuzhi1, name: '澶嶅埗' },
- { icon: AIyuedu, activeIcon: AIyuedu1, name: 'AI闃呰' },
- { icon: cidian2, activeIcon: cidian1, name: '璇嶅吀' },
- { icon: baidu, activeIcon: baidu, name: '鐧剧' }
- // { icon: yuyinyuedu, activeIcon: yuyinyuedu1, name: '璇煶闃呰' }
- // { icon: cidian2, activeIcon: cidian1, name: '缈昏瘧' }
-])
+
const colorSelectList = reactive([
{
label: '榛勮壊',
@@ -2256,6 +2234,7 @@
break
case '绗旇':
formData.desc = ''
+ noteColorActive.value = '#F5E12A'
addNoteVisble.value = true
showToolBox.value = false
break
@@ -2278,6 +2257,7 @@
break
case '璇嶅吀':
cidianVisible.value = true
+ console.log(dialogToolData.txt)
break
case '鐧剧':
console.log('https://baike.baidu.com/item/' + dialogToolData.txt)
@@ -2350,10 +2330,7 @@
break
}
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: dom,
@@ -2361,8 +2338,7 @@
value: JSON.stringify(data)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
showToolBox.value = false
addNoteVisble.value = false
colorActive.value = ''
@@ -2374,14 +2350,10 @@
}
const getSignData = () => {
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'highLightData-' + bookConfig.value.bookId,
keys: activeCatalog.value.map((item) => item + '')
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0) {
for (let i = 0; i < res.length; i++) {
const item = res[i]
@@ -2397,14 +2369,10 @@
}
}
})
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'underline-' + bookConfig.value.bookId,
keys: activeCatalog.value.map((item) => item + '')
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0) {
for (let i = 0; i < res.length; i++) {
const item = res[i]
@@ -2421,14 +2389,10 @@
}
}
})
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'notes-' + bookConfig.value.bookId,
keys: activeCatalog.value.map((item) => item + '')
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0) {
for (let i = 0; i < res.length; i++) {
const item = res[i]
@@ -2453,14 +2417,10 @@
chapterList.push(item.chapter + '')
})
scribeData.noteList = []
- request({
- url: '/identity/api/ApiGetAppUserKey',
- method: 'post',
- data: {
+ MG.identity.getUserKey({
domain: 'notes-' + bookConfig.value.bookId,
keys: chapterList
- }
- }).then((res) => {
+ }).then((res) => {
if (res && res.length > 0) {
for (let i = 0; i < res.length; i++) {
const item = res[i]
@@ -2547,10 +2507,7 @@
break
}
let list = data[dialogToolData.chapter].filter((item) => item.id != ids)
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: dom,
@@ -2558,8 +2515,7 @@
value: JSON.stringify(list)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
lineDelete.showLineDelete = false
if (window.qiankunState && window.qiankunState.delSign)
window.qiankunState.delSign({ ids: [ids] })
@@ -2593,10 +2549,7 @@
itemNote.color = noteColorActive.value
}
})
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'notes-' + bookConfig.value.bookId,
@@ -2604,8 +2557,7 @@
value: JSON.stringify(data.noteList)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
addNoteVisble.value = false
isUpdate.value = false
getNotesList()
@@ -2625,10 +2577,7 @@
type: 'warning'
})
.then(() => {
- request({
- url: '/identity/api/ApiAppUserSetKey',
- method: 'post',
- data: {
+ MG.identity.setUserKey({
setKeyRequests: [
{
domain: 'notes-' + bookConfig.value.bookId,
@@ -2636,8 +2585,7 @@
value: JSON.stringify(list)
}
]
- }
- }).then((res) => {
+ }).then((res) => {
ElMessage({
message: '鍒犻櫎绗旇鎴愬姛!',
type: 'success'
@@ -2737,6 +2685,13 @@
.userInfoBox {
display: flex;
align-items: center;
+ .userName{
+ font-size: 18px;
+ margin-right:15px;
+ padding-right:15px;
+ border-right:1px solid #e0e0e0;
+ color: #2C2C2C;
+ }
.layout {
width: 69px;
height: 30px;
@@ -2752,6 +2707,7 @@
overflow: hidden;
flex: 1;
display: flex;
+ position: relative;
.menuBox {
width: 80px;
flex-shrink: 0;
@@ -2813,6 +2769,7 @@
display: flex;
justify-content: center;
align-items: center;
+ border-bottom: 1px solid #efefef;
}
.resourceBox {
padding: 10px 0;
@@ -3139,15 +3096,13 @@
.menuStateBox {
width: 25px;
height: 25px;
- background: #fff;
border-radius: 3px 0px 0px 3px;
- border: 1px solid #bce3ff;
- position: fixed;
+ position: absolute;
line-height: 22px;
top: 50%;
- left: 395px;
+ left: 380px;
text-align: center;
- box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
z-index: 2;
img {
height: 10px;
@@ -3158,6 +3113,7 @@
.pageBox {
flex: 1;
font-size: 16px;
+ position: relative;
.pageBox-header {
height: 57px;
padding: 0 20px;
@@ -3281,6 +3237,7 @@
}
span {
+ width:80px;
margin-left: 10px;
}
}
@@ -3290,11 +3247,10 @@
height: 25px;
background: #fff;
border-radius: 3px 0px 0px 3px;
- border: 1px solid #bce3ff;
position: absolute;
top: 50%;
right: 67px;
- box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
display: flex;
align-items: center;
justify-content: center;
@@ -3305,7 +3261,7 @@
}
}
.right {
- right: 215px !important;
+ right: 198px !important;
border-radius: 0px 3px 3px 0px !important;
}
.classRoomBox {
@@ -3369,69 +3325,75 @@
}
.draggableBox {
- width: 85px;
- background-image: linear-gradient(to bottom, #0093ff, #005dff);
- position: fixed;
- height: 310px;
- top: 300px;
- left: 450px;
+ width: 40px;
+ background-image: linear-gradient(to bottom, #65bbf9, #1299fb);
+ // background-color: rgba(44, 44, 44, 0.5);
+ position: absolute;
+ // height: 310px;
+ top: 70px;
+ left: 380px;
z-index: 2000;
border-radius: 10px;
- padding: 5px;
+ padding: 6px;
overflow: hidden;
.floatToolItem {
- height: 60px;
+ margin: 10px 0;
+ height: 28px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 5px;
color: #fff;
cursor: pointer;
- img {
- margin-right: 8px;
- }
.text {
margin-right: 5px;
}
}
.floatToolItem:hover,
.floatToolActive {
- background-color: #fff;
- color: #0093ff;
+ background-color: rgba(255, 255, 255, 0.3);
}
}
.brushBox {
- position: fixed;
- // left: 40%;
- bottom: 20px;
+ position: absolute;
+ width:290px;
+ bottom: 40px;
+ left: 0;
+ right: 0;
z-index: 99;
+ margin:auto;
border-radius: 5px;
background: #fff;
- // padding: 10px;
overflow: hidden;
- border: 1px solid #0093ff;
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
.toolList {
display: flex;
justify-content: center;
align-items: center;
.floatToolItem {
- margin: 6px;
- width: 46px;
+ margin: 6px 8px;
+ padding: 5px;
+ width: 30px;
border-radius: 5px;
- text-align: center;
- flex: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ // flex: 1;
font-size: 14px;
.imgBox {
height: 18px;
width: 18px;
text-align: center;
margin: 0 auto;
- margin-bottom: 5px;
}
}
+ .floatToolItem:hover {
+ background-color: rgba(44, 44, 44, 0.2);
+ }
.layOutTool {
- padding-left: 15px;
+ height:20px;
+ margin-right:5px;
border-left: 1px solid #e0e0e0;
}
}
@@ -3441,38 +3403,34 @@
position: fixed;
z-index: 2;
.toolSelectBox {
- height: 57px;
+ height: 40px;
display: flex;
justify-content: center;
align-items: center;
border-radius: 12px;
overflow: hidden;
padding: 5px;
- background-image: linear-gradient(to right, #0093ff, #005dff);
+ background-color: rgba(90,90,90,0.9);
+ // background-image: linear-gradient(to right, #0093ff, #005dff);
.dialogToolItem {
user-select: none;
- width: 60px;
+ width: 26px;
font-size: 12px;
border-radius: 5px;
- padding: 5px 0;
+ padding:3px;
+ margin:0 5px;
cursor: pointer;
text-align: center;
- img {
- margin: 0 auto;
- display: block;
- margin-bottom: 5px;
- height: 16px;
- }
span {
color: #fff;
}
}
.dialogToolItem:hover,
.active {
- background-color: #fff;
- span {
- color: #0093ff;
- }
+ background-color: rgba(255, 255, 255, 0.2);
+ // span {
+ // color: #0093ff;
+ // }
}
}
}
@@ -3503,10 +3461,20 @@
.lineDeleteBox {
position: fixed;
z-index: 2;
- border: 1px solid #0093ff;
- padding: 20px 8px;
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.3);
+ padding: 5px 20px;
background: #fff;
border-radius: 5px;
+ .dialogToolItem{
+ padding:3px;
+ border-radius: 5px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+ .dialogToolItem:hover{
+ background-color: rgba(44, 44, 44, 0.2);
+ }
}
.wendabox {
width: 100%;
--
Gitblit v1.9.1