From 25f09cb4e06272e493e5bf3bef9127324db3de8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Mon, 16 Dec 2024 16:40:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=B4=E5=83=8F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Toolbar/ElementStylePanel/Active/index.vue      | 13 -------------
 src/renderer/src/layout/components/Aside.vue        |  2 +-
 src/renderer/src/views/profile/userAvatar.vue       |  4 ++--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
index 0b09412..0354fba 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/Active/index.vue
@@ -80,20 +80,13 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted, nextTick, watch } from 'vue'
 import Divider from '../../../../../components/Divider.vue'
-import { listEntpcoursefile } from '@/api/education/entpcoursefile'
-import { homeworklist } from '@/api/teaching/classwork'
-import { processList } from "@/hooks/useProcessList";
-import { listEntpcoursework } from "@/api/classTask/index";
 import { ElMessageBox,ElMessage } from 'element-plus'
 import NewClassTsakAssign from '@/views/classTask/newClassTaskAssign/index.vue'
 import { sessionStore } from '@/utils/store'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { PPTApi } from '../../../../../api/index'
-import { storeToRefs } from 'pinia'
 import {useSlidesStore} from '../../../../../store' 
-import { updateEntpcoursefileNew } from '@/api/education/entpcoursefile'
 const slidesStore = useSlidesStore()
-const { slides, slideIndex, currentSlide, workItem } = storeToRefs(slidesStore)
 interface CourseNode {
     rootid: number;
     parentNode: { id: number };
@@ -111,12 +104,6 @@ interface CurrentCourse {
     worktype: string;
 }
 
-interface Params {
-    parentid: number;
-    pageSize: number;
-    orderby: string;
-}
-
 interface WorkType {
     label: string;
     value: string;
diff --git a/src/renderer/src/layout/components/Aside.vue b/src/renderer/src/layout/components/Aside.vue
index ba2186f..cd55238 100644
--- a/src/renderer/src/layout/components/Aside.vue
+++ b/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' ? 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>
             </div>
           </template>
diff --git a/src/renderer/src/views/profile/userAvatar.vue b/src/renderer/src/views/profile/userAvatar.vue
index 7880aff..efb970a 100644
--- a/src/renderer/src/views/profile/userAvatar.vue
+++ b/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' ? 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, // 是否默认生成截图框
   autoCropWidth: 400, // 默认生成截图框宽度
   autoCropHeight: 400, // 默认生成截图框高度
@@ -69,7 +69,7 @@ function uploadImg(data) {
 
 /** 关闭窗口 */
 function closeDialog() {
-  options.img = userStore.user.avatar ==='/img/avatar-default.jpg' ? 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
 }
 const cancle = () => {
-- 
2.44.0.windows.1