From f68fb91a5b9f9d39965a726358eff45ab0006e52 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 30 Jun 2022 18:55:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/components/settings/Setting.vue  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/settings/Setting.vue b/frontend/src/business/components/settings/Setting.vue
index f5c2e91712..dd92cdfe99 100644
--- a/frontend/src/business/components/settings/Setting.vue
+++ b/frontend/src/business/components/settings/Setting.vue
@@ -1,14 +1,12 @@
 <template>
   <ms-container :is-show-warning="isShowWarning && isSystemGroup">
-
     <ms-aside-container>
-      <ms-current-user/>
-      <el-divider/>
-      <h1>{{ $t('commons.setting') }}</h1>
       <ms-setting-menu/>
     </ms-aside-container>
-
     <ms-main-container>
+      <div class="ms-system-header">
+        <ms-header-right-menus/>
+      </div>
       <keep-alive>
         <router-view/>
       </keep-alive>
@@ -24,10 +22,11 @@ import MsContainer from "../common/components/MsContainer";
 import MsMainContainer from "../common/components/MsMainContainer";
 import {getCurrentUser} from "@/common/js/utils";
 import {GROUP_SYSTEM} from "@/common/js/constants";
+import MsHeaderRightMenus from "@/business/components/layout/HeaderRightMenus";
 
 export default {
   name: "MsSetting",
-  components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser},
+  components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, MsHeaderRightMenus},
   computed: {
     isShowWarning() {
       return this.$store.state.showLicenseCountWarning;
@@ -47,11 +46,12 @@ export default {
 <style scoped>
 .ms-aside-container {
   height: calc(100vh) !important;
-  padding: 20px;
+  padding: 0px;
 }
 
 .ms-main-container {
   height: calc(100vh) !important;
+  padding: 2px;
 }
 
 h1 {
@@ -59,5 +59,12 @@ h1 {
   font-weight: 500;
 }
 
+.ms-system-header {
+  width: 400px;
+  position: fixed;
+  right: 0px;
+  z-index: 666;
+  top: 6px;
+}
 </style>