fix:2.0.4bug修改; #250
|
@ -115,7 +115,7 @@ const outerAi = [
|
||||||
title: '生成图片',
|
title: '生成图片',
|
||||||
secondTit: '文生图大模型',
|
secondTit: '文生图大模型',
|
||||||
img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
|
img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
|
||||||
path: '/ais/aisd3'
|
path: '/ais/aiwenxinyige'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 2,
|
id: 2,
|
||||||
|
|
|
@ -235,6 +235,7 @@ onMounted( async () => {
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
curBook.data = useSubject.subjectList[0]
|
curBook.data = useSubject.subjectList[0]
|
||||||
|
localStorage.setItem('curBook', JSON.stringify(curBook.data))
|
||||||
treeData.value = useSubject.treeData
|
treeData.value = useSubject.treeData
|
||||||
}
|
}
|
||||||
// 设置展开并选中
|
// 设置展开并选中
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, watch, onMounted } from 'vue'
|
import { ref, watch, onMounted } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
import { ElMessageBox } from 'element-plus'
|
import { ElMessageBox, ElMessage } from 'element-plus'
|
||||||
import { ArrowDown } from '@element-plus/icons-vue'
|
import { ArrowDown } from '@element-plus/icons-vue'
|
||||||
import WindowTools from '@/components/window-tools/index.vue'
|
import WindowTools from '@/components/window-tools/index.vue'
|
||||||
import useUserStore from '@/store/modules/user'
|
import useUserStore from '@/store/modules/user'
|
||||||
|
@ -74,6 +74,10 @@ import outLink from '@/utils/linkConfig'
|
||||||
import logoIco from '@/assets/images/logo.png'
|
import logoIco from '@/assets/images/logo.png'
|
||||||
import { listEvaluation } from '@/api/classManage/index'
|
import { listEvaluation } from '@/api/classManage/index'
|
||||||
import { clearBookInfo } from '@/utils/ruoyi'
|
import { clearBookInfo } from '@/utils/ruoyi'
|
||||||
|
import { sessionStore } from '@/utils/store'
|
||||||
|
import { useToolState } from '@/store/modules/tool'
|
||||||
|
|
||||||
|
const toolState = useToolState();
|
||||||
let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
|
let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
|
||||||
const { ipcRenderer } = window.electron || {}
|
const { ipcRenderer } = window.electron || {}
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
|
@ -166,6 +170,8 @@ function handleCommand(command) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function logout() {
|
function logout() {
|
||||||
|
const hasClass = sessionStore.has('activeClass.id')
|
||||||
|
if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课,请先结结束上课')
|
||||||
ElMessageBox.confirm('确认退出系统吗?', '提示', {
|
ElMessageBox.confirm('确认退出系统吗?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
|
|
|
@ -23,11 +23,12 @@ export const useToolState = defineStore('tool', {
|
||||||
}),
|
}),
|
||||||
actions: {
|
actions: {
|
||||||
async resetDef() { // 重置数据-下课
|
async resetDef() { // 重置数据-下课
|
||||||
this.model = 'select' // 悬浮球-当前模式
|
// this.model = 'select' // 悬浮球-当前模式
|
||||||
await sleep(20) // 休眠20ms
|
await sleep(50) // 休眠50ms
|
||||||
this.showBoardAll = false // 全屏画板-是否显示
|
this.showBoardAll = false // 全屏画板-是否显示
|
||||||
await sleep(20) // 休眠20ms
|
await sleep(50) // 休眠50ms
|
||||||
this.isToolWin = false // 工具窗口是否打开
|
this.isToolWin = false // 工具窗口是否打开
|
||||||
|
await sleep(50) // 休眠50ms
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -243,6 +243,7 @@ const sideChange = async o => {
|
||||||
|
|
||||||
// === 监听器 ===
|
// === 监听器 ===
|
||||||
watchEffect(() => {
|
watchEffect(() => {
|
||||||
|
if (isOver.value) return // 下课, 不往下执行
|
||||||
// 不同的时候, 更新值: 是否显示-画板
|
// 不同的时候, 更新值: 是否显示-画板
|
||||||
const show = !toolStore.isPdfWin && toolStore.showBoardAll
|
const show = !toolStore.isPdfWin && toolStore.showBoardAll
|
||||||
if (show != isShow.value) isShow.value = show
|
if (show != isShow.value) isShow.value = show
|
||||||
|
|
|
@ -1,9 +1,15 @@
|
||||||
<template>
|
<template>
|
||||||
<canvas ref="canvasRef" />
|
<canvas ref="canvasRef" style="pointer-events: none;" />
|
||||||
<button @click="eraseTo">橡皮擦
|
<div style="position: absolute;top: 0;" @click="test('click')"
|
||||||
<i class="iconfont icon-xiangpica"></i>
|
@mouseenter="test('mouseenter')" @mousemove="test('mousemove')" @mouseleave="test('mouseleave')"
|
||||||
</button>
|
@touchstart="test('touchstart')" @touchmove="test('touchmove')" @touchend="test('touchend')"
|
||||||
<button @click="close">销毁</button>
|
@touchcancel="test('touchcancel')" @mousedown="test('mousedown')" @mouseup="test('mouseup')"
|
||||||
|
@mouseout="test('mouseout')" @mouseover="test('mouseover')" @mousewheel="test('mousewheel')">
|
||||||
|
<!-- <button @click="eraseTo">橡皮擦</button> -->
|
||||||
|
<!-- <i class="iconfont icon-xiangpica"></i> -->
|
||||||
|
<!-- <button @click="close">销毁</button> -->
|
||||||
|
<div style="width: 100px;height: 100px;background: #ffbcbc;">小星星</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
@ -43,6 +49,10 @@ const eraseTo = () => { // 橡皮擦
|
||||||
// canvas.dispose()
|
// canvas.dispose()
|
||||||
}
|
}
|
||||||
const close = () => { FabricVue.removeCanvas() }
|
const close = () => { FabricVue.removeCanvas() }
|
||||||
|
|
||||||
|
const test = (key, e) => {
|
||||||
|
console.log('event: ', key)
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
Loading…
Reference in New Issue