首次提交

src/layout/index.scss

@@ -28,8 +28,7 @@
             }
             .logo-name {
                 color: white;
-                font-size: 22px;
-                margin-left: 6px;
+                font-size: 18px;
             }
             &:hover {
                 opacity: .8;

src/layout/index.vue

@@ -2,16 +2,14 @@
     <el-container class="hc-layout-box">
         <el-header class="hc-layout-header">
             <div class="hc-layout-header-logo" :style="`width: ${isCollapse ? '90px' : '200px'};`" @click="logoClick">
-                <img id="logo-icon" :src="appLogoIcon" alt="">
-                <span v-show="!isCollapse" class="logo-name">计量系统</span>
+                <span v-if="!isCollapse" class="logo-name">{{appLogoName}}</span>
+                <span v-else class="logo-name sub">管理后台</span>
             </div>
             <div class="header-top-collapse-bar" @click="collapseChange">
-                <HcIcon v-if="isCollapse" name="menu-unfold" />
-                <HcIcon v-else name="menu-fold" />
-            </div>
-            <div class="header-top-menu-bar">
-                1
+                <hc-icon v-if="isCollapse" name="menu-unfold" />
+                <hc-icon v-else name="menu-fold" />
             </div>
+            <div class="header-top-menu-bar"/>
             <div class="header-content-bar">
                 <HelpInfoBar />
                 <ConfigBar />
@@ -19,13 +17,12 @@
             </div>
         </el-header>
         <el-container class="hc-layout-container">
-            <el-aside v-if="isAsideMenu" class="hc-layout-aside" :class="[isCollapse ? 'is-collapse' : '']" :width="isCollapse ? '90px' : '200px'">
+            <el-aside 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">
-                    222
-                    <!--RouterMenu @load="routerMenuLoad" /-->
+                    <RouterMenu @load="routerMenuLoad" />
                 </div>
                 <div id="hc-main-box" class="hc-main-page">
                     <div class="hc-main-body">
@@ -44,12 +41,12 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { useRouter } from 'vue-router'
 import { initButtons } from '~sto/app'
-import HcSocket from '~src/plugins/HcSocket'
-import { getObjValue, isNullES } from 'js-fast-way'
+//import HcSocket from '~src/plugins/HcSocket'
+import { getObjValue } from 'js-fast-way'
 
 //初始组合式
 const router = useRouter()
@@ -60,15 +57,14 @@ const reloadRouter = ref(true)
 //子组件
 import UserInfoBar from './modules/UserInfoBar.vue'
 import HelpInfoBar from './modules/HelpInfoBar.vue'
+import RouterMenu from './modules/RouterMenu.vue'
 import ConfigBar from './modules/ConfigBar.vue'
 import MenuBar from '~src/layout/modules/MenuBar.vue'
-
-// logo
-const appLogoIcon = ref(store.getLogoIcon)
+const appLogoName = ref(store.getLogoName)
 
 //菜单数据
 const menuBarKey = ref('')
-const menuBarData = ref([])
+const menuBarData = ref(store.getMenus)
 
 //渲染完成
 onMounted(() => {
@@ -88,24 +84,10 @@ const collapseChange = () => {
     store.setCollapse(bool)
 }
 
-//顶部菜单导航
-const isAsideMenu = ref(true)
-const topMenuLoad = () => {
-    isAsideMenu.value = false
-}
-
-//顶部菜单导航被点击
-const topMenuChange = (data) => {
-    if (!isNullES(data)) {
-        menuBarData.value = data
-        isAsideMenu.value = true
-    }
-}
-
 //菜单被点击
 const menuBarChange = ({ code }) => {
     menuBarKey.value = code
-    router.push({ name: code })
+    //router.push({ name: code })
 }
 
 //消息数量
@@ -122,22 +104,9 @@ 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)
-}
-
-// 项目切换
-const cascaderChange = () => {
-    reloadRouter.value = false
-    nextTick(() => {
-        reloadRouter.value = true
-    })
+    })*/
 }
 
 //首页

src/layout/modules/MenuBar.vue

@@ -1,9 +1,9 @@
 <template>
-    <el-scrollbar>
+    <hc-body padding="0px" scrollbar>
         <el-menu :collapse="isCollapse" :default-active="curKey" class="hc-aside-menu" unique-opened text-color="#fff">
             <MenuItem :collapse="isCollapse" :cur="curKey" :datas="datas" :msg-count="msgCount" @change="MenuClick" />
         </el-menu>
-    </el-scrollbar>
+    </hc-body>
 </template>
 
 <script setup>

src/layout/modules/RouterMenu.vue

@@ -1,7 +1,7 @@
 <template>
     <el-scrollbar>
         <div class="hc-router-tab-box">
-            <div class="hc-router-tab-item" :class="(barRoutes.key === 'home' || barRoutes.key === 'home-index') ? 'cur' : ''" @click="toHomeClick">首页</div>
+            <div class="hc-router-tab-item" :class="(barRoutes.key === 'home' || barRoutes.key === 'index') ? 'cur' : ''" @click="toHomeClick">首页</div>
             <template v-for="(item, index) in barMenuData" :key="item.key">
                 <div
                     :class="item.key === barRoutes.key ? 'cur' : ''" class="hc-router-tab-item"
@@ -9,14 +9,14 @@
                 >
                     <span>{{ item.title }}</span>
                     <div class="close-icon" @click.stop="barMenuCloseClick(item, index)">
-                        <HcIcon name="close" />
+                        <hc-icon name="close" />
                     </div>
                 </div>
             </template>
         </div>
     </el-scrollbar>
     <!-- 右键菜单 -->
-    <HcContextMenu ref="contextMenuRef" :datas="menusData" @item-click="handleMenuSelect" />
+    <hc-context-menu ref="contextMenuRef" :datas="menusData" @item-click="handleMenuSelect" />
 </template>
 
 <script setup>
@@ -54,7 +54,7 @@ watch(() => [
 //设置菜单数据
 const setBarMenuData = () => {
     const { key, path, title, query } = barRoutes.value
-    if (['home', 'home-index'].indexOf(key) === -1) {
+    if (['home', 'index'].indexOf(key) === -1) {
         const index = barMenuData.value.findIndex(item => item.key === key)
         if (index === -1) {
             barMenuData.value.push({ path, key: key, title, query })
@@ -95,7 +95,7 @@ const handleMenuSelect = ({ key }) => {
     } else if (key === 'all') {
         barMenuData.value = []
         setStore('bar-menu-datas', [])
-        router.push({ name: 'home-index' })
+        router.push({ name: 'index' })
     } else if (key === 'other') {
         const { key } = barRoutes.value
         barMenuData.value = barMenuData.value.filter(item => item.key === key)
@@ -118,7 +118,7 @@ const barMenuCloseClick = (item, index) => {
         }
         if (indexs < 0) {
             setStore('bar-menu-datas', barMenuData.value)
-            router.push({ name: 'home-index' })
+            router.push({ name: 'index' })
         } else {
             barRoutes.value = items
             setStore('bar-menu-datas', barMenuData.value)
@@ -131,6 +131,6 @@ const barMenuCloseClick = (item, index) => {
 
 //点击了首页
 const toHomeClick = () => {
-    router.push({ name: 'home' })
+    router.push({ name: 'index' })
 }
 </script>

src/styles/app/main.scss

@@ -1,6 +1,7 @@
 html, body, #app {
     height: 100%;
     background-color: #F1F5F8;
+    overflow: hidden;
 }
 
 embed {