fix：V7.2 外发前整体特性验收修复后续提交

webfe/package_vue/src/components/log-version.vue

@@ -24,7 +24,7 @@
               <span
                 v-if="index === current"
                 class="item-current"
-              >{{ $t('当前版本') }}</span>
+              >{{ $t('当前版本-label') }}</span>
             </li>
           </ul>
         </div>
@@ -49,26 +49,26 @@ import { marked } from 'marked';
 export default {
   name: 'LogVersion',
   props: {
-    dialogShow: Boolean
+    dialogShow: Boolean,
   },
-  data () {
+  data() {
     return {
       show: false,
       current: 0,
       active: 0,
       logList: [],
       loading: false,
-      contactLoading: false
+      contactLoading: false,
     };
   },
   computed: {
-    currentLog () {
+    currentLog() {
       return marked(this.logList[this.active]?.detail || '');
-    }
+    },
   },
   watch: {
     dialogShow: {
-      async handler (v) {
+      async handler(v) {
         this.show = v;
         if (v) {
           this.loading = true;
@@ -79,37 +79,37 @@ export default {
           this.loading = false;
         }
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
-  beforeDestroy () {
+  beforeDestroy() {
     this.show = false;
     this.$emit('update:dialogShow', false);
   },
   methods: {
-    handleValueChange (v) {
+    handleValueChange(v) {
       this.$emit('update:dialogShow', v);
     },
     // 查看log详情
-    async handleItemClick (index = 0, curEvent) {
+    async handleItemClick(index = 0, curEvent) {
       this.loading = true;
       this.active = index;
       setTimeout(() => {
         this.loading = false;
       }, 20);
     },
-    async getVersionLogsList () {
+    async getVersionLogsList() {
       try {
         const data = await this.$store.dispatch('getVersionLog');
         return data.map(item => ({ title: item.version, date: item.date, detail: item.content }));
       } catch (e) {
         this.$paasMessage({
           theme: 'error',
-          message: e.detail || this.$t('接口异常')
+          message: e.detail || this.$t('接口异常'),
         });
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -202,7 +202,7 @@ export default {
 </style>
 <style lang="scss">
 .detail-container{
-  
+
   font-size: 14px;
         color: #313238;
         h1,

webfe/package_vue/src/components/paas-header.vue

@@ -61,7 +61,7 @@
             ext-cls="top-bar-popover"
             placement="bottom"
             :arrow="false"
-            offset="0, 10"
+            offset="0, 5"
             trigger="mouseenter"
             :tippy-options="{ hideOnClick: false }"
           >
@@ -71,18 +71,12 @@
             <template #content>
               <ul class="monitor-navigation-admin">
                 <li
-                  class="nav-item"
-                  @click="switchLanguage('zh-cn')"
-                >
-                  <i class="bk-icon icon-chinese lang-icon" />
-                  {{ $t('中文') }}
-                </li>
-                <li
-                  class="nav-item"
-                  @click="switchLanguage('en')"
+                  v-for="item in languageList"
+                  :class="['nav-item', { active: item.id === localLanguage }]"
+                  @click="switchLanguage(item.id)"
+                  :key="item.id"
                 >
-                  <i class="bk-icon icon-english lang-icon" />
-                  {{ $t('英文') }}
+                  <i :class="['bk-icon', 'lang-icon', item.icon]" />{{ item.text }}
                 </li>
               </ul>
             </template>
@@ -91,7 +85,7 @@
             theme="light navigation-message"
             ext-cls="top-bar-popover"
             :arrow="false"
-            offset="-20, 10"
+            offset="-20, 5"
             placement="bottom-start"
             :tippy-options="{ hideOnClick: false }"
           >
@@ -154,7 +148,7 @@
           theme="light navigation-message"
           ext-cls="top-bar-popover"
           :arrow="false"
-          offset="30, 18"
+          offset="30, 13"
           placement="bottom-start"
           :tippy-options="{ hideOnClick: false }"
         >
@@ -342,6 +336,10 @@ export default {
       // eslint-disable-next-line comma-dangle
       link: this.GLOBAL.LINK.APIGW_INDEX,
       navText: '',
+      languageList: [
+        { icon: 'icon-chinese', id: 'zh-cn', text: this.$t('中文') },
+        { icon: 'icon-english', id: 'en', text: this.$t('英文') },
+      ],
     };
   },
   computed: {
@@ -1094,13 +1092,15 @@ export default {
 }
 </style>
 <style lang="scss">
-.top-bar-popover .tippy-backdrop {
-  background: transparent !important;
-}
-.top-bar-popover .tippy-content {
-  box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.1) !important;
-  border: 1px solid #dcdee5;
-  border-radius: 2px;
+.top-bar-popover {
+  .tippy-tooltip.light-theme {
+    box-shadow: 0 0 6px 0 #dcdee5 !important;
+    padding:0;
+  }
+  .tippy-content {
+    box-shadow: 0 2px 6px 0 rgba(0,0,0,0.10) !important;
+    border-radius: 2px;
+  }
 }
 .top-bar-wrapper .header-mind {
   color: #768197;
@@ -1223,35 +1223,40 @@ export default {
   margin: 0;
   color: #63656e;
 }
-.monitor-navigation-admin .nav-item {
-  -webkit-box-flex: 0;
-  -ms-flex: 0 0 32px;
-  flex: 0 0 32px;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  padding: 0 16px;
-  list-style: none;
-  color: #63656e;
-  a {
-    color: #63656e;
-  }
+.monitor-navigation-admin .nav-item{
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 32px;
+    flex: 0 0 32px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    padding: 0 16px;
+    list-style: none;
+    color: #63656E;
+    a {
+      color: #63656E;
+    }
+    &.active {
+      background-color: #eaf3ff;
+      color: #3a84ff;
+      a {
+        color: #3a84ff;
+      }
+    }
 }
 .monitor-navigation-admin .nav-item .lang-icon {
   font-size: 18px;
   margin-right: 6px;
 }
-.monitor-navigation-admin .nav-item:hover {
-  cursor: pointer;
-  background: #f5f7fa;
-}
-.tippy-popper .tippy-tooltip.navigation-message-theme {
-  padding: 0;
-  border-radius: 0;
-  -webkit-box-shadow: none;
-  box-shadow: none;
+.monitor-navigation-admin .nav-item:hover{
+    cursor:pointer;
+    background-color: #eaf3ff;
+    color: #3a84ff;
+    a {
+      color: #3a84ff;
+    }
 }
 </style>