From 9ca3c0ba7576ed145923441235c749c20434f676 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 30 Jun 2022 11:16:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E5=B8=83=E5=B1=80):?=
 =?UTF-8?q?=20=E5=B8=83=E5=B1=80=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=BB=91=E5=87=BA=E5=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EnvSelect.vue          |  2 +-
 .../business/components/common/head/HeaderUser.vue |  7 +------
 .../business/components/common/head/HeaderWs.vue   |  3 +--
 .../components/common/head/LanguageSwitch.vue      |  3 +--
 .../src/business/components/layout/AsideHeader.vue | 14 +++++++++-----
 .../src/business/components/layout/AsideMenus.vue  | 10 +++++++---
 .../business/components/notice/Notification.vue    |  2 +-
 .../src/business/components/task/TaskCenter.vue    |  2 +-
 frontend/src/i18n/en-US.js                         |  1 +
 frontend/src/i18n/zh-CN.js                         |  1 +
 frontend/src/i18n/zh-TW.js                         |  1 +
 11 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
index 2c1e25a4dc..3703512138 100644
--- a/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
+++ b/frontend/src/business/components/api/automation/scenario/EnvSelect.vue
@@ -116,7 +116,7 @@ export default {
       return arr;
     },
     getUserPermissionProjectIds(){
-      this.$get('/project/getOwnerProjectIds/', res => {
+      this.$get('/project/getOwnerProjectIds', res => {
         this.permissionProjectIds = res.data;
       })
     },
diff --git a/frontend/src/business/components/common/head/HeaderUser.vue b/frontend/src/business/components/common/head/HeaderUser.vue
index 9153552e4d..214a95579f 100644
--- a/frontend/src/business/components/common/head/HeaderUser.vue
+++ b/frontend/src/business/components/common/head/HeaderUser.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown size="medium" @command="handleCommand" class="align-right">
-    <span class="dropdown-link global">
+    <span class="dropdown-link">
         {{ currentUser.name }}<i class="el-icon-caret-bottom el-icon--right"/>
     </span>
     <template v-slot:dropdown>
@@ -105,7 +105,6 @@ export default {
 .dropdown-link {
   cursor: pointer;
   font-size: 12px;
-  color: rgb(245, 245, 245);
   line-height: 40px;
 }
 
@@ -113,10 +112,6 @@ export default {
   float: right;
   margin-right: 20px;
 }
-
-.global {
-  color: var(--color);
-}
 </style>
 
 
diff --git a/frontend/src/business/components/common/head/HeaderWs.vue b/frontend/src/business/components/common/head/HeaderWs.vue
index f2114f21e8..70b85be1f3 100644
--- a/frontend/src/business/components/common/head/HeaderWs.vue
+++ b/frontend/src/business/components/common/head/HeaderWs.vue
@@ -4,7 +4,7 @@
                   'PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ',
                   'PROJECT_USER:READ', 'PROJECT_ENVIRONMENT:READ', 'PROJECT_FILE:READ+JAR', 'PROJECT_FILE:READ+FILE', 'PROJECT_OPERATING_LOG:READ', 'PROJECT_CUSTOM_CODE:READ',
                   'PROJECT_PERFORMANCE_TEST:READ','PROJECT_PERFORMANCE_REPORT:READ','WORKSPACE_USER:READ']" >
-    <span class="dropdown-link global">
+    <span class="dropdown-link">
       {{ currentWorkspaceName }}
       <i class="el-icon-caret-bottom el-icon--right"/>
     </span>
@@ -180,7 +180,6 @@ export default {
 .dropdown-link {
   cursor: pointer;
   font-size: 12px;
-  color: rgb(245, 245, 245);
   line-height: 40px;
   padding-right: 10px;
   padding-left: 5px;
diff --git a/frontend/src/business/components/common/head/LanguageSwitch.vue b/frontend/src/business/components/common/head/LanguageSwitch.vue
index d8ca94af9c..33b3ab03e5 100644
--- a/frontend/src/business/components/common/head/LanguageSwitch.vue
+++ b/frontend/src/business/components/common/head/LanguageSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown size="medium" @command="changeLanguage" class="align-right">
-    <span class="dropdown-link global">
+    <span class="dropdown-link">
         <font-awesome-icon :icon="['fas', 'language']" size="lg"/>
     </span>
     <template v-slot:dropdown>
@@ -83,7 +83,6 @@ export default {
 .dropdown-link {
   cursor: pointer;
   font-size: 12px;
-  color: rgb(245, 245, 245);
   line-height: 40px;
   padding-right: 20px;
 }
diff --git a/frontend/src/business/components/layout/AsideHeader.vue b/frontend/src/business/components/layout/AsideHeader.vue
index 6e426302d1..6730d755f0 100644
--- a/frontend/src/business/components/layout/AsideHeader.vue
+++ b/frontend/src/business/components/layout/AsideHeader.vue
@@ -1,11 +1,11 @@
 <template>
   <el-menu
-    class="ms-menu-vertical ms-menu"
-    :collapse="isCollapse"
-    :background-color="color"
+    class="ms-menu-vertical ms-menu horizontal-collapse-transition"
     text-color="#F2F2F2"
     active-text-color="#fff"
     :key="menuKey"
+    :collapse="isCollapse"
+    :background-color="color"
     router>
     <el-menu-item>
       <div>
@@ -30,7 +30,7 @@ export default {
   },
   computed: {
     title() {
-      return localStorage.getItem("title") || "MeterSphere";
+      return localStorage.getItem("sysTitle") || "MeterSphere";
     }
   },
   props: {
@@ -65,7 +65,7 @@ export default {
   text-overflow: ellipsis;
   vertical-align: middle;
   white-space: nowrap;
-  width: 98px;
+  width: 105px;
 }
 
 /deep/ .el-menu-item {
@@ -89,4 +89,8 @@ export default {
   background-repeat: no-repeat;
   background-position: 50% center;
 }
+
+.horizontal-collapse-transition {
+  transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+}
 </style>
diff --git a/frontend/src/business/components/layout/AsideMenus.vue b/frontend/src/business/components/layout/AsideMenus.vue
index c38b31ef88..ea3fe4ce5a 100644
--- a/frontend/src/business/components/layout/AsideMenus.vue
+++ b/frontend/src/business/components/layout/AsideMenus.vue
@@ -1,12 +1,13 @@
 <template>
   <el-menu menu-trigger="click"
-           class="ms-menu-vertical ms-menu ms-menu-title" :collapse="isCollapse"
-           :background-color="color"
+           class="ms-menu-vertical ms-menu ms-menu-title horizontal-collapse-transition"
            text-color="#F2F2F2"
            active-text-color="#fff"
+           :collapse="isCollapse"
+           :background-color="color"
            :default-active="activeIndex"
-           @select="handleSelect"
            :key="menuKey"
+           @select="handleSelect"
            router>
     <el-menu-item index="/workstation" v-xpack v-if="check('workstation')">
       <div>
@@ -212,4 +213,7 @@ export default {
   color: #fff !important;
 }
 
+.horizontal-collapse-transition {
+  transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+}
 </style>
diff --git a/frontend/src/business/components/notice/Notification.vue b/frontend/src/business/components/notice/Notification.vue
index d533eb7d92..df003a989f 100644
--- a/frontend/src/business/components/notice/Notification.vue
+++ b/frontend/src/business/components/notice/Notification.vue
@@ -219,7 +219,7 @@ export default {
 }
 
 .global {
-  color: var(--color);
+  color: rgb(146, 147, 150);
 }
 
 .header-top-menu {
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index daefb3f65a..292b5ad834 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -484,7 +484,7 @@ export default {
 }
 
 .global {
-  color: var(--color);
+  color: rgb(96,98,102);
 }
 
 .header-top-menu {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d2cded4563..a954edc8bd 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -517,6 +517,7 @@ export default {
     loginImage: 'Picture on the right side of the login page',
     loginTitle: 'Login page prompt information',
     pageTitle: 'Page Title',
+    sysTitle: 'System Name',
   },
   system_config: {
     base_config: 'Base Config',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 9d58fc88cd..9d9a4ed94c 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -522,6 +522,7 @@ export default {
     loginImage: '登陆页面右侧图片',
     loginTitle: '登陆页面提示信息',
     pageTitle: '页面 Title',
+    sysTitle: '系统名称',
   },
   system_config: {
     base_config: '基本配置',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index d4d2e551fb..a4005e74d4 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -519,6 +519,7 @@ export default {
     loginImage: '登陸頁面右側圖片',
     loginTitle: '登陸頁面提示信息',
     pageTitle: '頁面 Title',
+    sysTitle: '系統名稱',
   },
   system_config: {
     base_config: '基本配置',