From 96e0c08834232408d67e7fdeda63c24159468ba5 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 12 Oct 2022 16:37:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=9B=B4=E6=94=B9vsys=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2ID=E6=98=BE=E7=A4=BA=20=E5=8F=8A=20=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=98=BE=E7=A4=BA?=
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/table/asset/assetVsysTable.vue      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js
index deddf8a4a..b52f4fa5e 100644
--- a/nezha-fronted/src/components/common/js/tools.js
+++ b/nezha-fronted/src/components/common/js/tools.js
@@ -343,14 +343,14 @@ export const bottomBoxWindow = {
   fullScreen (vm) {
     window.resizing = true
     const contentRightDom = document.querySelector('.list-page') // 右侧内容区
-    const contentRightHeight = contentRightDom.offsetHeight // 可视高度
+    // const contentRightHeight = contentRightDom.offsetHeight // 可视高度
     vm.bottomBox.isFullScreen = true
     // 主列表
     vm.bottomBox.mainListHeight = document.querySelector('.main-list-with-sub').offsetHeight // 记录全屏前主列表的高度
     document.querySelector('.main-list-with-sub').style.height = '0'
     vm.bottomBox.mainResizeShow = false
     // 副列表
-    document.querySelector('.sub-list').style.height = contentRightHeight + 'px'
+    document.querySelector('.sub-list').style.height = '100%'
     document.querySelector('.sub-list').style.top = 0 + 'px'
     window.resizing = false
   },
diff --git a/nezha-fronted/src/components/common/table/asset/assetVsysTable.vue b/nezha-fronted/src/components/common/table/asset/assetVsysTable.vue
index 5a5c871cd..75ebf1135 100644
--- a/nezha-fronted/src/components/common/table/asset/assetVsysTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetVsysTable.vue
@@ -31,7 +31,7 @@
       </template>
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'vsysId'">
-          {{scope.row.delFlag == 1 ? scope.row[item.prop] : '-'}}
+          {{scope.row.delFlag == 1 ? '-' + scope.row[item.prop] : scope.row[item.prop]}}
         </template>
         <template v-else-if="item.prop === 'uts'">
            {{scope.row[item.prop] ? utcTimeToTimezoneStr(scope.row[item.prop]) : '-'}}