Merge branch 'main' into zouyf_dev

Reviewed-on: #387

src/renderer/src/layout/components/Header.vue

@@ -29,7 +29,11 @@
         <div class="avatar-container">
           <div class="avatar-wrapper flex">
             <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
-              <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
+              <el-image :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left">
+                <template #error>
+                  <el-image :src="defaultUserImg" class="user-avatar" style="float: left" />
+                </template>
+              </el-image>
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
@@ -80,6 +84,7 @@ import { updateUserInfo } from '@/api/system/user'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { sessionStore } from '@/utils/store'
+import defaultUserImg from '@/assets/images/img-avatar.png'
 // import Chat from '@/utils/chat' // im 登录初始化
 // if (!Chat.imChat) Chat.init()
 

src/renderer/src/views/tool/sphere.vue

@@ -207,14 +207,14 @@ const sideMouse = e => {
     return
   }
   mouseChange(type == 'mouseleave')
-  // 关闭侧边工具内容窗口
-  if (type == 'mouseleave') {
-    timingSide = setTimeout(() => {
-      sideVueRef.value.closeActive()
-    }, 500)
-  } else { // 移入
-    if (!!timingSide) clearTimeout(timingSide)
-  }
+  // // 关闭侧边工具内容窗口
+  // if (type == 'mouseleave') {
+  //   timingSide = setTimeout(() => {
+  //     sideVueRef.value.closeActive()
+  //   }, 500)
+  // } else { // 移入
+  //   if (!!timingSide) clearTimeout(timingSide)
+  // }
 }
 // 侧边工具栏: 操作变化
 const sideChange = async o => {