From 47f93231ea0c0e9f692497afbecad7fc6a8c3920 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 11 Jul 2022 11:32:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=BA=95=E5=BC=B9=E7=AA=97=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/js/tools.js               | 4 +++-
 .../src/components/common/popBox/topToolMoreOptions.vue       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index 6d0b864a0..06f452093 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -316,6 +316,7 @@ export const bottomBoxWindow = {
 
     // 副列表
     document.querySelector('.sub-list').style.height = vm.bottomBox.mainListHeight ? contentRightHeight - vm.bottomBox.mainListHeight - 9 + 'px' : 'calc(50% - 4px)'
+    document.querySelector('.sub-list').style.top = 9 + 'px'
     setTimeout(() => {
       if (document.querySelector('.main-list-with-sub').offsetHeight >= 100) {
         vm.bottomBox.mainResizeShow = true
@@ -334,7 +335,7 @@ export const bottomBoxWindow = {
   fullScreen (vm) {
     window.resizing = true
     const contentRightDom = document.querySelector('.list-page') // 右侧内容区
-    const contentRightHeight = contentRightDom.offsetHeight - 9// 可视高度
+    const contentRightHeight = contentRightDom.offsetHeight // 可视高度
     vm.bottomBox.isFullScreen = true
     // 主列表
     vm.bottomBox.mainListHeight = document.querySelector('.main-list-with-sub').offsetHeight // 记录全屏前主列表的高度
@@ -342,6 +343,7 @@ export const bottomBoxWindow = {
     vm.bottomBox.mainResizeShow = false
     // 副列表
     document.querySelector('.sub-list').style.height = contentRightHeight + 'px'
+    document.querySelector('.sub-list').style.top = 0 + 'px'
     window.resizing = false
   },
   showSubListWatch (vm, n) {
diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index da3478d44..7c448c600 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -6,7 +6,7 @@
       </button>
       <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
         <el-dropdown-item  v-if="showLock">
-          <div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</div>
+          <div @click="editPanel" id="edit-bottom-panel"><i class="nz-icon nz-icon-edit"></i>{{$t('dashboard.panel.editPanelTitle')}}</div>
         </el-dropdown-item>
         <el-dropdown-item  v-if="showLock">
           <div @click="panelLock=!panelLock" id="panel-lock"><i :class="{'nz-icon nz-icon-lock':!panelLock,'nz-icon nz-icon-unlock':panelLock}"></i>{{!panelLock ? $t("overall.locked") : $t("overall.unlocked")}}</div>