gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 更改vsys页面ID显示 及 二级页面滚动条显示

Browse Source
This commit is contained in:
likexuan
2022-10-12 16:37:51 +08:00
parent 9f6b404533
commit 96e0c08834
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/js/tools.js
View File

@@ -343,14 +343,14 @@ export const bottomBoxWindow = {
fullScreen (vm) { fullScreen (vm) {
window.resizing = true window.resizing = true
const contentRightDom = document.querySelector('.list-page') // 右侧内容区 const contentRightDom = document.querySelector('.list-page') // 右侧内容区
const contentRightHeight = contentRightDom.offsetHeight // 可视高度 // const contentRightHeight = contentRightDom.offsetHeight // 可视高度
vm.bottomBox.isFullScreen = true vm.bottomBox.isFullScreen = true
// 主列表 // 主列表
vm.bottomBox.mainListHeight = document.querySelector('.main-list-with-sub').offsetHeight // 记录全屏前主列表的高度 vm.bottomBox.mainListHeight = document.querySelector('.main-list-with-sub').offsetHeight // 记录全屏前主列表的高度
document.querySelector('.main-list-with-sub').style.height = '0' document.querySelector('.main-list-with-sub').style.height = '0'
vm.bottomBox.mainResizeShow = false 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' document.querySelector('.sub-list').style.top = 0 + 'px'
window.resizing = false window.resizing = false
}, },

2
nezha-fronted/src/components/common/table/asset/assetVsysTable.vue
View File

@@ -31,7 +31,7 @@
</template> </template>
<template slot-scope="scope" :column="item"> <template slot-scope="scope" :column="item">
<template v-if="item.prop === 'vsysId'"> <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>
<template v-else-if="item.prop === 'uts'"> <template v-else-if="item.prop === 'uts'">
{{scope.row[item.prop] ? utcTimeToTimezoneStr(scope.row[item.prop]) : '-'}} {{scope.row[item.prop] ? utcTimeToTimezoneStr(scope.row[item.prop]) : '-'}}