Merge pull request 'zxl' (#145) from zxl into main

Reviewed-on: #145

src/renderer/src/AixPPTist/src/api/watcher.ts

@@ -23,7 +23,6 @@ export default () => {
   const resource = sessionStore.get('curr.resource') // apt 资源
   const smarttalk = sessionStore.get('curr.smarttalk') // 备课资源
   const execPlay = useExecPlay() // 播放控制
-  
   // 监听幻灯片内容变化
   watch(() => slidesStore.slides, (newVal, oldVal) => {
     PPTApi.updateSlides(newVal, oldVal) // 更新幻灯片内容
@@ -39,6 +38,13 @@ export default () => {
   watch(() => slidesStore.slideIndex, (newVal, oldVal) => {
     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
   // console.log('监听器已开启', ChatWs)

src/renderer/src/layout/components/Aside.vue

@@ -5,7 +5,7 @@
         <el-popover ref="popoverRef" placement="right" trigger="hover" popper-class="popoverStyle" :tabindex="999" >
           <template #reference>
             <div class="user-info">
-              <el-image class="user-img" :src="userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api + userStore.user.avatar"  />
+              <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"  />
               <span>{{ userStore.user.nickName }}</span>
             </div>
           </template>

src/renderer/src/views/profile/userAvatar.vue

@@ -33,7 +33,7 @@ const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 
 //图片裁剪数据
 const options = reactive({
-  img: userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
+  img: userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar, // 裁剪图片的地址
   autoCrop: true, // 是否默认生成截图框
   autoCropWidth: 400, // 默认生成截图框宽度
   autoCropHeight: 400, // 默认生成截图框高度
@@ -69,7 +69,7 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || '/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
+  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' || userStore.user.avatar ==='/images/img-avatar.png' ? defaultUserImg : dev_api.value + userStore.user.avatar
   options.visible = false
 }
 const cancle = () => {