src/renderer/src/components/ai-chart/index.vue

@@ -233,7 +233,7 @@ onMounted(() => {
     width: 300px;
     height: calc(100% - 110px);
     border-radius: 10px;
-    z-index: 10;
+
     :deep(.el-card__header) {
       padding: 10px;
     }

src/renderer/src/components/window-tools/index.vue

@@ -51,8 +51,6 @@ const closeWindow = () => {
 
 <style lang="scss" scoped>
 .header-tool {
-  width: 100%;
-  justify-content: flex-end;
   -webkit-app-region: no-drag;
 
   span {

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

@@ -2,16 +2,28 @@
   <div class="title-bar flex">
     <div class="left-section">
       <div class="flex title-box">
-        <el-image style="width: 23px; height: 23px" :src="logoIco" />
+        <el-image style="width: 23px; height: 23px" :src="logoIco"  />
         <span class="title" @click="changeTab">AIX智慧课堂</span>
       </div>
       <div class="change-tab">
         <ul class="flex">
-          <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
+          <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']" 
-            v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
+          v-for="menu in headerMenus" :key="menu.id"  @click="clickMenu(menu)">
             <i class="iconfont" :class="menu.icon"></i>
             <span class="text">{{ menu.name }}</span>
           </li>
+     
+          <!-- <li
+            v-for="(item, index) in routeHeader.nowRouter"
+            :key="index"
+            class="flex"
+            :style="{'color' : item.color}"
+            :class="currentRoute === item.url ? 'active-li' : ''"
+            @click="handleOutLink(item.url,item.type, item.name)"
+          >
+            <i :class="item.img"></i>
+            <span class="text">{{ item.name }}</span>
+          </li> -->
         </ul>
       </div>
     </div>
@@ -20,41 +32,26 @@
       <WindowTools />
       <div class="user flex">
         <div class="avatar-container">
-          <div class="avatar-wrapper flex">
+          <el-dropdown
-            <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
+            class="right-menu-item hover-effect"
+            trigger="click"
+            @command="handleCommand"
+          >
+            <div class="avatar-wrapper">
               <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
-              <template #dropdown>
+              <div style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
-                <el-dropdown-menu>
-                  <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
-                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
-                  <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
-                  <el-dropdown-item divided command="logout">
-                    <span>退出登录</span>
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </template>
-            </el-dropdown>
-            <div class="user-info flex">
-              <span class="user-name">{{ userStore.user.nickName }}</span>
-              <div class="flex">
-                <div class="user-depname">{{ userStore.user.deptName }}</div>
-                <el-dropdown @command="changeSubject">
-                  <div class="user-subject">{{ userStore.user.edusubject }}
-                    <el-icon class="el-icon--right"><arrow-down />
-                    </el-icon>
-                  </div>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item v-for="item in userSubjectList" :key="item.id" :command="item">
-                        {{ item.edustage }}-{{ item.edusubject }}
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
             </div>
-          </div>
+            <template #dropdown>
-
+              <el-dropdown-menu>
+                <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
+                <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
+                <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
+                <el-dropdown-item divided command="logout">
+                  <span>退出登录</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
         </div>
       </div>
     </div>
@@ -62,24 +59,22 @@
 </template>
 
 <script setup>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox } from 'element-plus'
-import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
-import { updateUserInfo } from '@/api/system/user'
+import routerStore from '@/store/modules/route'
 import outLink from '@/utils/linkConfig'
+
 import logoIco from '@/assets/images/logo.png'
-import { listEvaluation } from '@/api/classManage/index'
-
 
+const routeHeader = routerStore()
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
-const userSubjectList = ref([])
 
 const handleOutLink = (path, type, name) => {
   if (!path) return
@@ -91,9 +86,9 @@ const handleOutLink = (path, type, name) => {
     let fullPath = configObj.fullPath + path
     fullPath = fullPath.replaceAll('//', '/')
     const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
-    let unitId = levelSecondId ? levelSecondId : levelFirstId
+    let unitId = levelSecondId ? levelSecondId :levelFirstId
-    if (name == '教材分析' || name == '考试分析') {
+    if(name == '教材分析' || name == '考试分析'){
-      fullPath += `?unitId=${unitId}`
+       fullPath += `?unitId=${unitId}`
     }
     // 通知主进程
     ipcRenderer.send('openWindow', {
@@ -132,11 +127,34 @@ const headerMenus = [
   }
 ]
 
-const clickMenu = ({ id, disabled, path }) => {
+const clickMenu = ({ id, disabled, path }) =>{
-  if (disabled) return
+  if(disabled) return
   activeId.value = id
   router.push(path)
-}
+} 
+
+/*const menus = ref([
+  {
+    icon: 'icon-zhuye2 icon-homepage',
+    name: '主页',
+    path: '/homepage'
+  },
+  {
+    icon: 'icon-jiaoxueziyuan icon-resource',
+    name: '资源',
+    path: '/resource'
+  },
+  {
+    icon: 'icon-beike icon-prepare',
+    name: '备课',
+    path: '/prepare'
+  },
+  {
+    icon: 'icon-jiangke1 icon-teach',
+    name: '授课',
+    path: '/teach'
+  }
+])*/
 
 // 监听当前路由
 watch(
@@ -182,42 +200,13 @@ function logout() {
           ipcRenderer && ipcRenderer.send('openLoginWindow')
         })
     })
-    .catch(() => { })
+    .catch(() => {})
 }
 
 const emits = defineEmits(['setLayout'])
 function setLayout() {
   emits('setLayout')
 }
-// 切换学科
-const changeSubject = async (command) =>{
-  const { userId, userName, phonenumber, plainpwd  } = userStore.user
-  const data = {
-    userId,
-    userName,
-    edustage: command.edustage,
-    edusubject:  command.edusubject
-  }
-  console.log(data,'data')
-  await updateUserInfo(data)
-  await userStore.login({username: phonenumber, password: plainpwd})
-  await userStore.getInfo()
-  router.go()
-}
-
-// 获取学科
-const getAllSubject = async () => {
-  const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
-  const subject = userStore.user.subject.split(',')
-  userSubjectList.value = rows.filter(item =>
-    subject.some(el => item.id == el)
-  )
-}
-
-
-onMounted(() => {
-  getAllSubject()
-})
 </script>
 
 <style lang="scss" scoped>
@@ -233,20 +222,17 @@ onMounted(() => {
   align-items: flex-start;
   flex-direction: column;
   width: 50%;
-
+  .title-box{
-  .title-box {
     padding-top: 8px;
     box-sizing: border-box;
     align-items: center;
     padding-left: 20px;
-
     .title {
       color: #4b73df;
       font-size: 13px;
       padding: 0 5px;
     }
   }
-
   .change-tab {
     -webkit-app-region: no-drag;
     margin-left: 20px;
@@ -287,16 +273,13 @@ onMounted(() => {
           color: #409eff;
         }
       }
-
+      .disabled{
-      .disabled {
         cursor: not-allowed;
         color: #bfbfbf;
-
+        &:hover{
-        &:hover {
           color: #bfbfbf;
         }
       }
-
       .active-li {
         color: #409eff;
       }
@@ -307,7 +290,7 @@ onMounted(() => {
     -webkit-app-region: no-drag;
   }
 
-
+  
 }
 
 .right-section {
@@ -319,25 +302,11 @@ onMounted(() => {
   flex-direction: column;
 
   .user {
-    padding-right: 10px;
-
     .user-info {
       padding-right: 5px;
-      align-items: flex-start;
+      align-items: center;
       flex-direction: column;
       font-size: 12px;
-      height: 100%;
-      justify-content: space-around;
-
-      .user-depname {
-        margin-right: 5px;
-      }
-
-      .user-subject {
-        display: flex;
-        align-items: center;
-        font-size: 12px;
-      }
     }
   }
 }
@@ -347,12 +316,12 @@ onMounted(() => {
 
   .avatar-wrapper {
     display: flex;
-    align-items: center;
 
     .user-avatar {
-      width: 35px;
+      width: 30px;
-      height: 35px;
+      height: 30px;
       border-radius: 10px;
+      margin-top: 8px;
       margin-right: 10px;
     }