zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
朱浩 2025-01-06 14:51:26 +08:00
parent b13eb11633 cd748afb51
commit 1814f811d4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/components/whiteboard/whiteboard.vue
View File

@ -123,7 +123,7 @@
<!-- 边框样式 --> <!-- 边框样式 -->
<div class="blockBox"> <div class="blockBox">
<el-dropdown @command="updateStyle('lineDash', $event)" placement="top"> <el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
<el-button><el-image src="../../../src/assets/images/borderstyle.png" <el-button><el-image :src="borderStyleImg"
style="width: 14px; height: 14px"></el-image></el-button> style="width: 14px; height: 14px"></el-image></el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
@ -303,6 +303,7 @@ import {
import Contextmenu from './components/Contextmenu.vue' import Contextmenu from './components/Contextmenu.vue'
import { fontFamilyList, fontSizeList } from './constants' import { fontFamilyList, fontSizeList } from './constants'
const borderStyleImg = new URL('../../../src/assets/images/borderstyle.png', import.meta.url).href
const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()

1
src/renderer/src/views/teachingDesign/container/center.vue
View File

@ -74,6 +74,7 @@ emitter.on('onShow', (data)=>{
const getDetails = (id) =>{ const getDetails = (id) =>{
syllabuss(id).then( res =>{ syllabuss(id).then( res =>{
Object.assign(curItem, res.data) Object.assign(curItem, res.data)
emitter.emit('onResult', res.data)
}) })
} }