From d58264983b22512a834368aaf643d584daaa3695 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 1 Jul 2022 14:03:29 +0800
Subject: [PATCH] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E9=81=AE=E7=BD=A9=E5=B1=82=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/App.vue                 |  2 +-
 .../api/automation/api-automation.js          |  2 +-
 .../components/notice/Notification.vue        | 41 +++++----
 .../business/components/settings/Setting.vue  |  2 +-
 .../business/components/task/TaskCenter.vue   | 83 +++++--------------
 5 files changed, 49 insertions(+), 81 deletions(-)

diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue
index cca352b9cf..ac18e424ac 100644
--- a/frontend/src/business/App.vue
+++ b/frontend/src/business/App.vue
@@ -19,7 +19,7 @@
       <el-aside
         :class="isCollapse ? 'ms-aside': 'ms-aside-open'"
         class="ms-left-aside"
-        :style="isFixed ? 'opacity:100%; position: relative': 'opacity: 95%;position: fixed'"
+        :style="isFixed ? 'opacity:100%; position: relative;z-index: 666;': 'opacity: 95%;position: fixed'"
         @mouseenter.native="collapseOpen"
         @mouseleave.native="collapseClose">
         <ms-aside-header :color="color" :isCollapse="isCollapse"/>
diff --git a/frontend/src/business/components/api/automation/api-automation.js b/frontend/src/business/components/api/automation/api-automation.js
index 5c71ee2048..ee9d9af313 100644
--- a/frontend/src/business/components/api/automation/api-automation.js
+++ b/frontend/src/business/components/api/automation/api-automation.js
@@ -109,7 +109,7 @@ export function editApiScenarioCaseOrder(request, callback) {
 }
 
 export function savePreciseEnvProjectIds(projectIds, envMap) {
-  if (envMap != null && projectIds != null) {
+  if (envMap != null && projectIds != null && projectIds.length > 0) {
     let keys = envMap.keys();
     for (let key of keys) {
       if (!projectIds.has(key)) {
diff --git a/frontend/src/business/components/notice/Notification.vue b/frontend/src/business/components/notice/Notification.vue
index df003a989f..008e4ed490 100644
--- a/frontend/src/business/components/notice/Notification.vue
+++ b/frontend/src/business/components/notice/Notification.vue
@@ -1,23 +1,18 @@
 <template>
   <div>
-    <el-menu :unique-opened="true" class="header-user-menu align-right header-top-menu"
-             mode="horizontal"
-             text-color="#fff"
-             active-text-color="#fff">
-      <el-menu-item onselectstart="return false">
-        <el-tooltip effect="light">
-          <template v-slot:content>
-            <span>{{ $t('commons.notice_center') }}</span>
-          </template>
-          <div @click="showNoticeCenter" v-if="noticeCount > 0 || noticeShow">
-            <el-badge is-dot class="item" type="danger">
-              <font-awesome-icon class="icon global focusing" :icon="['fas', 'bell']"/>
-            </el-badge>
-          </div>
-          <font-awesome-icon @click="showNoticeCenter" class="icon global focusing" :icon="['fas', 'bell']" v-else/>
-        </el-tooltip>
-      </el-menu-item>
-    </el-menu>
+    <div class="ms-header-menu align-right">
+      <el-tooltip effect="light">
+        <template v-slot:content>
+          <span>{{ $t('commons.notice_center') }}</span>
+        </template>
+        <div @click="showNoticeCenter" v-if="noticeCount > 0 || noticeShow">
+          <el-badge is-dot class="item" type="danger">
+            <font-awesome-icon class="icon global focusing" :icon="['fas', 'bell']"/>
+          </el-badge>
+        </div>
+        <font-awesome-icon @click="showNoticeCenter" class="icon global focusing" :icon="['fas', 'bell']" v-else/>
+      </el-tooltip>
+    </div>
 
     <el-drawer :visible.sync="taskVisible" :destroy-on-close="true" direction="rtl"
                :withHeader="true" :modal="false" :title="$t('commons.notice_center')" size="550px"
@@ -276,4 +271,14 @@ export default {
 .ms-task-success {
   color: #67C23A;
 }
+
+.ms-header-menu {
+  padding: 12px 0px 0px;
+}
+
+.ms-header-menu:hover {
+  cursor: pointer;
+  border-color: var(--color);
+}
+
 </style>
diff --git a/frontend/src/business/components/settings/Setting.vue b/frontend/src/business/components/settings/Setting.vue
index dd92cdfe99..72aeac1acb 100644
--- a/frontend/src/business/components/settings/Setting.vue
+++ b/frontend/src/business/components/settings/Setting.vue
@@ -63,7 +63,7 @@ h1 {
   width: 400px;
   position: fixed;
   right: 0px;
-  z-index: 666;
+  z-index: 3000;
   top: 6px;
 }
 </style>
diff --git a/frontend/src/business/components/task/TaskCenter.vue b/frontend/src/business/components/task/TaskCenter.vue
index 292b5ad834..b8f2ede30a 100644
--- a/frontend/src/business/components/task/TaskCenter.vue
+++ b/frontend/src/business/components/task/TaskCenter.vue
@@ -1,26 +1,17 @@
 <template>
   <div v-permission="['PROJECT_API_SCENARIO:READ','WORKSPACE_USER:READ']">
-    <el-menu
-      v-if="showMenu"
-      :unique-opened="true"
-      class="header-user-menu align-right header-top-menu"
-      mode="horizontal"
-      text-color="#fff"
-      active-text-color="#fff">
-      <el-menu-item onselectstart="return false">
-        <el-tooltip effect="light">
-          <template v-slot:content>
-            <span>{{ $t('commons.task_center') }}</span>
-          </template>
-          <div @click="showTaskCenter" v-if="runningTotal > 0">
-            <el-badge :value="runningTotal" class="item" type="primary">
-              <font-awesome-icon class="icon global focusing" :icon="['fas', 'tasks']" style="font-size: 18px"/>
-            </el-badge>
-          </div>
-          <font-awesome-icon @click="showTaskCenter" class="icon global focusing" :icon="['fas', 'tasks']" v-else/>
-        </el-tooltip>
-      </el-menu-item>
-    </el-menu>
+
+    <el-tooltip effect="light" class="ms-header-menu align-right" v-if="showMenu">
+      <template v-slot:content>
+        <span>{{ $t('commons.task_center') }}</span>
+      </template>
+      <div @click="showTaskCenter" v-if="runningTotal > 0">
+        <el-badge :value="runningTotal" class="item" type="primary">
+          <font-awesome-icon class="icon global focusing" :icon="['fas', 'tasks']"/>
+        </el-badge>
+      </div>
+      <font-awesome-icon @click="showTaskCenter" class="icon global focusing" :icon="['fas', 'tasks']" v-else/>
+    </el-tooltip>
 
     <el-drawer
       :visible.sync="taskVisible"
@@ -484,29 +475,8 @@ export default {
 }
 
 .global {
-  color: rgb(96,98,102);
-}
-
-.header-top-menu {
-  height: 40px;
-  line-height: 40px;
-  color: inherit;
-}
-
-.header-top-menu.el-menu--horizontal > li {
-  height: 40px;
-  line-height: 40px;
-  color: inherit;
-}
-
-.header-top-menu.el-menu--horizontal > li.el-submenu > * {
-  height: 39px;
-  line-height: 40px;
-  color: inherit;
-}
-
-.header-top-menu.el-menu--horizontal > li.is-active {
-  background: var(--color_shallow) !important;
+  color: rgb(96, 98, 102);
+  font-size: 14px
 }
 
 .ms-card-task:hover {
@@ -514,26 +484,19 @@ export default {
   border-color: #783887;
 }
 
+.ms-header-menu {
+  padding: 12px 0px 0px;
+}
+
+.ms-header-menu:hover {
+  cursor: pointer;
+  border-color: var(--color);
+}
+
 /deep/ .el-progress-bar {
   padding-right: 20px;
 }
 
-/deep/ .el-menu-item {
-  padding-left: 0;
-  padding-right: 0;
-}
-
-/deep/ .el-badge__content.is-fixed {
-  top: 25px;
-}
-
-/deep/ .el-badge__content {
-  border-radius: 10px;
-  height: 10px;
-  line-height: 10px;
-}
-
-
 .item {
   margin-right: 10px;
 }