From 5d5349c8091fa800bc856ed155115f4aac6fbbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 1 Jul 2025 11:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  3 ++-
 src/App.vue                             |  9 ++++++---
 src/assets/icons/svg/home.svg           |  5 +++++
 src/assets/styles/sidebar.scss          |  4 ++--
 src/layout/components/Sidebar/index.vue |  7 ++++---
 src/layout/index.vue                    | 26 +++++++++++++++++++++++--
 src/router/index.js                     |  3 +--
 7 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 src/assets/icons/svg/home.svg

diff --git a/package.json b/package.json
index 9994d18..7c09a9f 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
   },
   "browserslist": [
     "> 0.25%",
-    "not dead"
+    "not dead",
+    "chrome 58"
   ]
 }
diff --git a/src/App.vue b/src/App.vue
index cd669ff..f6a6a16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,8 +27,8 @@ export default {
       isOnline: {},
       // WebSocket相关
       websocket: null,
-      websocketUrl: 'ws://10.42.0.1:7181/ws',
-      // websocketUrl: 'ws://119.45.202.115:7181/ws',
+      // websocketUrl: 'ws://10.42.0.1:7181/ws',
+      websocketUrl: 'ws://119.45.202.115:7181/ws',
       isWebSocketConnected: false,
       reconnectTimer: null,
       reconnectAttempts: 0,
@@ -104,7 +104,7 @@ export default {
       try {
         const data = JSON.parse(event.data, (key, value, ctx) => {
           if (ctx) {
-            console.log('ctx', ctx)
+            // console.log('ctx', ctx)
           }
           if (typeof value === 'number' && value > Number.MAX_SAFE_INTEGER) {
             return ctx?.source || value;
@@ -375,6 +375,9 @@ export default {
               showConfirmButton: false,
               type: 'error'
             })
+            setTimeout(() => {
+              debugger
+            }, 200)
             this.isOnline[key] = new Date().getTime()
           }
         }
diff --git a/src/assets/icons/svg/home.svg b/src/assets/icons/svg/home.svg
new file mode 100644
index 0000000..64779c9
--- /dev/null
+++ b/src/assets/icons/svg/home.svg
@@ -0,0 +1,5 @@
+<svg t="1751338854355" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4643"
+     width="200" height="200">
+    <path d="M1002.7584 475.776L566.2784 39.68 537.1584 10.24a35.584 35.584 0 0 0-50.176 0L21.2544 475.776A72.192 72.192 0 0 0 0.0064 527.744a72.96 72.96 0 0 0 73.28 71.488h48v367.872h781.44V599.232h49.024c19.264 0 37.44-7.552 51.136-21.184 13.696-13.696 21.12-31.872 21.12-51.2 0-19.2-7.552-37.376-21.248-51.072z m-427.52 410.048H448.7744v-230.4h126.464v230.4z m246.144-367.872v367.872h-173.824V628.288a45.184 45.184 0 0 0-45.184-45.184H421.6384a45.184 45.184 0 0 0-45.184 45.184v257.536H202.6304V517.952H94.2144l417.92-417.6 26.048 26.112 391.68 391.488h-108.48z"
+          fill="#e6e6e6" p-id="4644"></path>
+</svg>
\ No newline at end of file
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index abe5b63..dbfc5b4 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -16,10 +16,10 @@
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
-    height: 100%;
+    height: calc(100% - 50px);
     position: fixed;
     font-size: 0px;
-    top: 0;
+    top: 50px;
     bottom: 0;
     left: 0;
     z-index: 1001;
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 51d0839..7f8f1e0 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-        <logo v-if="showLogo" :collapse="isCollapse" />
+<!--        <logo v-if="showLogo" :collapse="isCollapse" />-->
         <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
             <el-menu
                 :default-active="activeMenu"
@@ -25,12 +25,13 @@
 
 <script>
 import { mapGetters, mapState } from "vuex";
-import Logo from "./Logo";
+// import Logo from "./Logo";
 import SidebarItem from "./SidebarItem";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
-    components: { SidebarItem, Logo },
+    // components: { SidebarItem, Logo },
+  components: { SidebarItem,  },
     computed: {
         ...mapState(["settings"]),
         ...mapGetters(["sidebarRouters", "sidebar"]),
diff --git a/src/layout/index.vue b/src/layout/index.vue
index dba4393..98b13b9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,10 +1,15 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+    <div class="logoDIV" style="display: inline-block">
+      <logo v-if="showLogo" :collapse="true"/>
+    </div>
+    <div class="navbarDIV" style="display: inline-block">
+      <navbar/>
+    </div>
     <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
-        <navbar/>
         <tags-view v-if="needTagsView"/>
       </div>
       <app-main/>
@@ -17,6 +22,7 @@
 
 <script>
 import RightPanel from '@/components/RightPanel'
+import Logo from "@/layout/components/Sidebar/Logo.vue";
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { mapState } from 'vuex'
@@ -30,7 +36,8 @@ export default {
     RightPanel,
     Settings,
     Sidebar,
-    TagsView
+    TagsView,
+    Logo
   },
   mixins: [ResizeMixin],
   computed: {
@@ -42,6 +49,12 @@ export default {
       needTagsView: state => state.settings.tagsView,
       fixedHeader: state => state.settings.fixedHeader
     }),
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo;
+    },
+    isCollapse() {
+      return !this.sidebar.opened;
+    },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
@@ -108,4 +121,13 @@ export default {
   .mobile .fixed-header {
     width: 100%;
   }
+
+  .logoDIV {
+    width: #{$base-sidebar-width};
+  }
+
+  .navbarDIV {
+    width: calc(100% - #{$base-sidebar-width});
+  }
+
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index d4d33d2..28728e0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -50,8 +50,7 @@ export const constantRoutes = [{
   path: '', component: Layout, redirect: 'index', children: [{
     path: 'index',
     component: () => import('@/views/index'),
-    name: 'Index',
-    meta: {title: '首页', icon: 'dashboard', affix: true}
+    name: 'Index', meta: {title: '首页', icon: 'home', affix: true}
   }]
 }, {
   path: "/production/bom-info",