Compare commits
No commits in common. "436bdfe7c8fe40142e1094a675e5a9a05ea4a87f" and "c2a4f2c70876444f2eb77a96ab198d1663d4c7a1" have entirely different histories.
436bdfe7c8
...
c2a4f2c708
|
@ -23,6 +23,7 @@ export default () => {
|
||||||
const resource = sessionStore.get('curr.resource') // apt 资源
|
const resource = sessionStore.get('curr.resource') // apt 资源
|
||||||
const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
|
const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
|
||||||
const execPlay = useExecPlay() // 播放控制
|
const execPlay = useExecPlay() // 播放控制
|
||||||
|
|
||||||
// 监听幻灯片内容变化
|
// 监听幻灯片内容变化
|
||||||
watch(() => slidesStore.slides, (newVal, oldVal) => {
|
watch(() => slidesStore.slides, (newVal, oldVal) => {
|
||||||
PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
|
PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
|
||||||
|
@ -38,14 +39,7 @@ export default () => {
|
||||||
watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
|
watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
|
||||||
PPTApi.updateWorkList()
|
PPTApi.updateWorkList()
|
||||||
})
|
})
|
||||||
// 监听幻灯片下画布尺寸比例变化
|
|
||||||
watch(() => slidesStore.viewportRatio, (newVal, oldVal) => {
|
|
||||||
const width = slidesStore.viewportSize
|
|
||||||
const widthandration={width, ratio:newVal}
|
|
||||||
const data = { id: resource.id, parentContent: JSON.stringify(widthandration)}
|
|
||||||
PPTApi.updateSlide(data)
|
|
||||||
})
|
|
||||||
|
|
||||||
// 消息监听ws
|
// 消息监听ws
|
||||||
// console.log('监听器已开启', ChatWs)
|
// console.log('监听器已开启', ChatWs)
|
||||||
if (!!ChatWs.ws) {
|
if (!!ChatWs.ws) {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
|
<el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
|
||||||
<template #reference>
|
<template #reference>
|
||||||
<div class="user-info">
|
<div class="user-info">
|
||||||
<el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar" />
|
<el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar" />
|
||||||
<span>{{ userStore.user.nickName }}</span>
|
<span>{{ userStore.user.nickName }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -33,7 +33,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
|
||||||
|
|
||||||
//图片裁剪数据
|
//图片裁剪数据
|
||||||
const options = reactive({
|
const options = reactive({
|
||||||
img: userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
|
img: userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
|
||||||
autoCrop: true, // 是否默认生成截图框
|
autoCrop: true, // 是否默认生成截图框
|
||||||
autoCropWidth: 400, // 默认生成截图框宽度
|
autoCropWidth: 400, // 默认生成截图框宽度
|
||||||
autoCropHeight: 400, // 默认生成截图框高度
|
autoCropHeight: 400, // 默认生成截图框高度
|
||||||
|
@ -69,7 +69,7 @@ function uploadImg(data) {
|
||||||
|
|
||||||
/** 关闭窗口 */
|
/** 关闭窗口 */
|
||||||
function closeDialog() {
|
function closeDialog() {
|
||||||
options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
|
options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
|
||||||
options.visible = false
|
options.visible = false
|
||||||
}
|
}
|
||||||
const cancle = () => {
|
const cancle = () => {
|
||||||
|
|
Loading…
Reference in New Issue