From 1d0c8646f1f1f9c4547020c5631e4c81c96ac3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Thu, 15 Oct 2020 19:28:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dterminal=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3resize=E7=9A=84bug=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/webSSH.vue               | 7 ++++---
 .../src/components/common/bottomBox/tabs/cabinetTab.vue   | 3 +--
 nezha-fronted/src/components/common/language/cn.js        | 1 +
 nezha-fronted/src/components/common/language/en.js        | 1 +
 nezha-fronted/src/components/page/config/dc.vue           | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index 6bda77d93..cee98056c 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -191,9 +191,9 @@
         isFullScreen:false,
         closeConfirmShow:false,
         closeRemember:false,
-        initConsoleHeight:300,//只读,初始化高度
-        consoleHeight:300,//console高度
-        resizeConsoleHeight: 300, //resize后的高度，用于记录最大化、最小化前的高度
+        initConsoleHeight:250,//只读,初始化高度
+        consoleHeight:250,//console高度
+        resizeConsoleHeight: 250, //resize后的高度，用于记录最大化、最小化前的高度
         currentTransform:0,
         editableTabsValue: '-1',//当前显示的console
         currentIndex:'-1',
@@ -290,6 +290,7 @@
             this.closeConfirmShow = true;
           }
         }
+        document.querySelector(".sub-list").style.height = "";
       },
       cancleConfirm(){
         this.closeConfirmShow = false;
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index b4da2db20..496040b16 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -2,8 +2,7 @@
   <span>
     <div class="sub-top-tools">
       <div class="sub-list-tabs">
-        <div class="sub-list-tab-title">{{$t("asset.dcName")}}：{{obj.name}}</div><div
-        class="sub-list-tab" @click="changeTab('detail')">{{$t("overall.detail")}}</div><div
+        <div class="sub-list-tab-title">{{$t("config.dc.dcName")}}：{{obj.name}}</div><div
         class="sub-list-tab sub-list-tab-active">{{$t("config.dc.cabinets")}}</div>
       </div>
       <div class="top-tool-right">
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 03923a0a1..3a02aed63 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -591,6 +591,7 @@ const cn = {
     dc: {
       dc: "数据中心",
       area: "地区",
+      dcName: 'DC名称',
       selectArea: "选择地区",
       cabinetNum: "机柜数量",
       assets: "资产",
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 5577a0702..1e4cc2ced 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -567,6 +567,7 @@ const en = {
     dc: {
       dc: 'Data center',
       area: "Area",
+      dcName: 'DC name',
       selectArea: 'Select area',
       cabinetNum: "Cabinet number",
       assets: "Assets",
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 16c5a8f14..cc41b2113 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -108,11 +108,11 @@
       <div class="pagination-bottom" v-show="!bottomBox.showSubList">
         <Pagination :tableId="tableId" :pageObj="pageObj" @pageNo='pageNo' @pageSize='pageSize' ref="Pagination"></Pagination>
       </div>
-      <transition name="el-zoom-in-bottom">
-        <bottom-box v-if="bottomBox.showSubList" :sub-resize-show="bottomBox.subResizeShow" :obj="bottomBox.dc" :is-full-screen="bottomBox.isFullScreen" :from="'dc'" :target-tab.sync="bottomBox.targetTab" :detail="bottomBox.dcDetail"
-                     @closeSubList="bottomBox.showSubList = false" @fullScreen="fullScreen" @exitFullScreen="exitFullScreen" @listResize="listResize" ></bottom-box>
-      </transition>
     </div>
+    <transition name="el-zoom-in-bottom">
+      <bottom-box v-if="bottomBox.showSubList" :sub-resize-show="bottomBox.subResizeShow" :obj="bottomBox.dc" :is-full-screen="bottomBox.isFullScreen" :from="'dc'" :target-tab.sync="bottomBox.targetTab" :detail="bottomBox.dcDetail"
+                  @closeSubList="bottomBox.showSubList = false" @fullScreen="fullScreen" @exitFullScreen="exitFullScreen" @listResize="listResize" ></bottom-box>
+    </transition>
     <!--dc table end-->
     <transition name="right-box">
       <dc-box @close="closeDcBox" :dc="dc" :user-data="userData" @reload="getTableData" v-if="rightBox.dc.show"></dc-box>