新主题

src/layout/index.scss

@@ -86,7 +86,7 @@
         .hc-layout-aside {
             position: relative;
             color: white;
-            padding: 3px 0;
+            padding: 8px 0;
             background: var(--el-color-primary);
         }
         .hc-layout-main {

src/layout/index.vue

@@ -1,7 +1,7 @@
 <template>
     <el-container class="hc-layout-box">
         <el-header class="hc-layout-header">
-            <div class="hc-layout-header-logo" style="width: 200px">
+            <div class="hc-layout-header-logo" :style="`width: ${isCollapse ? '90px' : '200px'};`">
                 <img id="logo-icon" :src="appLogoIcon" alt="">
                 <img v-show="!isCollapse" id="logo-name" :src="appLogoName" alt="">
             </div>
@@ -20,12 +20,12 @@
             </div>
         </el-header>
         <el-container class="hc-layout-container">
-            <el-aside class="hc-layout-aside" :class="[isCollapse ? 'is-collapse' : '']" :width="isCollapse ? '90px' : '200px'">
+            <el-aside v-if="isAsideMenu" class="hc-layout-aside" :class="[isCollapse ? 'is-collapse' : '']" :width="isCollapse ? '90px' : '200px'">
                 <MenuBar :collapse="isCollapse" :cur="menuBarKey" :datas="menuBarData" :msg-count="msgCount" @change="menuBarChange" />
             </el-aside>
             <el-main class="hc-layout-main">
                 <div class="hc-router-menu-bar">
-                    <RouterMenu />
+                    <RouterMenu @load="routerMenuLoad" />
                 </div>
                 <div id="hc-main-box" class="hc-main-page">
                     <div class="h-full">
@@ -46,13 +46,12 @@
 <script setup>
 import { nextTick, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import HcSocket from '~src/plugins/HcSocket'
-import { getObjValue } from 'js-fast-way'
+import { getObjValue, isNullES } from 'js-fast-way'
 
 //初始组合式
 const router = useRouter()
-const useRoutes = useRoute()
 const store = useAppStore()
 
 const reloadRouter = ref(true)
@@ -79,6 +78,11 @@ onMounted(() => {
 
 })
 
+//路由信息
+const routerMenuLoad = ({ key }) => {
+    menuBarKey.value = key
+}
+
 // 是否折叠
 const isCollapse = ref(false)
 const collapseChange = () => {
@@ -88,13 +92,17 @@ const collapseChange = () => {
 }
 
 //顶部菜单导航
-const topMenuLoad = (key) => {
-    console.log(key)
+const isAsideMenu = ref(true)
+const topMenuLoad = () => {
+    isAsideMenu.value = false
 }
 
 //顶部菜单导航被点击
 const topMenuChange = (data) => {
-    menuBarData.value = data
+    if (!isNullES(data)) {
+        menuBarData.value = data
+        isAsideMenu.value = true
+    }
 }
 
 //菜单被点击
@@ -117,14 +125,14 @@ const msgCount = ref({
 
 //用户信息
 const userInfoLoad = ({ user_id }) => {
-    /*HcSocket.create(user_id, (data) => {
+    HcSocket.create(user_id, (data) => {
         msgCount.value = getObjValue(data)
-    })*/
+    })
 }
 
 //项目合同段的ID
 const cascaderSend = ({ projectId, contractId }) => {
-    //HcSocket.send(projectId + ',' + contractId)
+    HcSocket.send(projectId + ',' + contractId)
 }
 
 // 项目切换

src/layout/modules/RouterMenu.vue

@@ -22,6 +22,7 @@ import { onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 
+const emit = defineEmits(['load'])
 //初始组合式
 const router = useRouter()
 const useRoutes = useRoute()
@@ -58,6 +59,7 @@ const setBarMenuData = () => {
         }
         setStoreValue('bar-menu-datas', barMenuData.value)
     }
+    emit('load', barRoutes.value)
 }
 
 //菜单被点击