From d16fc829c01f38df4d9767037a567a2a74dd0a9d Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 2 Aug 2023 15:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/public/color.less                    | 2 +-
 jero-web/src/components/layouts/TabLayout.vue | 9 ++++++---
 jero-web/src/components/menu/Contextmenu.vue  | 6 ++++++
 jero-web/src/components/page/GlobalHeader.vue | 8 ++++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/jero-web/public/color.less b/jero-web/public/color.less
index 17934091..2992ad2d 100644
--- a/jero-web/public/color.less
+++ b/jero-web/public/color.less
@@ -5352,7 +5352,7 @@ form .ant-upload {
 }
 .ant-menu-submenu > .ant-menu {
   //background-color: #fff;
-  background: none;
+  background: none !important;
   border-radius: 4px;
 }
 .ant-menu-submenu-vertical > .ant-menu-submenu-title .ant-menu-submenu-arrow:before,
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index d3155c32..734555e7 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -15,8 +15,8 @@
         @change="changePage"
         @tabClick="tabCallBack"
         @edit="editPage">
-        <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList" :closable='page.closable' >
-          <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title +'hhhh '}}</span>
+        <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList"  >
+          <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title}}</span>
         </a-tab-pane>
       </a-tabs>
     </div>
@@ -301,6 +301,9 @@ export default {
 </script>
 
 <style lang="less">
+.contextmenu .ant-menu li{
+  color: #333 !important;
+}
 .topHeadertabList .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab.ant-tabs-tab-active{
   color: #0F6FC4;
   text-shadow: none;
@@ -343,7 +346,7 @@ export default {
   background: #F7F8FA;
 }
 </style>
-<style lang="less">
+<style lang="less" >
 
 /*
 * The following styles are auto-applied to elements with
diff --git a/jero-web/src/components/menu/Contextmenu.vue b/jero-web/src/components/menu/Contextmenu.vue
index 39f7887b..23f2ce8d 100644
--- a/jero-web/src/components/menu/Contextmenu.vue
+++ b/jero-web/src/components/menu/Contextmenu.vue
@@ -67,5 +67,11 @@ export default {
     border: 1px solid #9e9e9e;
     border-radius: 4px;
     box-shadow: 2px 2px 10px #aaaaaa !important;
+    background-color: #fff;
+    color:#565656;
+    li{
+      color:#565656 !important;
+
+    }
   }
 </style>
diff --git a/jero-web/src/components/page/GlobalHeader.vue b/jero-web/src/components/page/GlobalHeader.vue
index 9598e135..87cb2741 100644
--- a/jero-web/src/components/page/GlobalHeader.vue
+++ b/jero-web/src/components/page/GlobalHeader.vue
@@ -101,7 +101,7 @@ export default {
   },
   data () {
     return {
-      breadList:[],
+      breadList: [],
       headerBarFixed: false,
       // update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
       topMenuStyle: {
@@ -125,6 +125,9 @@ export default {
       if (newVal === 'topmenu') {
         this.buildTopMenuStyle()
       }
+    },
+    $route () {
+      this.getBreadcrumb()
     }
   },
   // update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
@@ -137,6 +140,7 @@ export default {
     this.getBreadcrumb()
     // update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
   },
+
   methods: {
     getBreadcrumb () {
       this.breadList = []
@@ -191,7 +195,7 @@ export default {
 <style lang="less" scoped>
   /* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-  @height: 59px;
+  @height: 56px;
 
   .layout {
     .bread {