diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 404561bcd..936f8bedf 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -323,7 +323,7 @@ .el-table__body-wrapper { overflow: auto; background-color: $--table-body-background-color; - height: 100% !important; + height: calc(100% - 42px) !important; } .el-table__fixed-body-wrapper { top: 42px !important; @@ -532,3 +532,16 @@ width: 100%; height: 100%; } +.list-page.detail-view .nz-detail-view-right{ + .nz-table2 .el-table--border { + height: calc(100% - 45px) !important; + .gutter { + position: fixed; + right: 42px; + height: 42px; + border-bottom: 1px solid $--border-color-light; + background-color: $--background-color-empty; + box-sizing: border-box; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 713317ae2..46a606200 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -71,6 +71,21 @@ padding: 10px; } } + +} +.list-page { + .sub-box.bottom-box { + .nz-table2 .el-table--border { + .gutter { + position: fixed; + right: 31px; + height: 41px; + border-bottom: 1px solid $--border-color-light; + background-color: $--background-color-empty; + box-sizing: border-box; + } + } + } } .sub-list { height: calc(100% - 9px); diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss index 23d7fb18e..1aea51b16 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss @@ -123,7 +123,7 @@ color: $--color-text-regular; } .operation-length { - margin-top: 3px; + margin-top: 2px; color: $--color-text-regular; } } diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index 1664b821b..cfaaf7491 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -88,7 +88,7 @@ export default { }, computed: { isNoData () { - return !this.chartData || this.chartData.length === 0 || this.chartData.type == 'url' ? false : true || this.chartData == 'text' ? false : true + return lodash.isEmpty(this.chartData) && ['text', 'url'].indexOf(this.chartInfo.type) === -1 }, chartOption () { if (this.customChartOption) { diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 9bb86eef6..6ada1b406 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -37,7 +37,7 @@ -
+
{{item.name}}
{{item.remark}}
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 8c14c05bf..a5357f8b2 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -217,7 +217,7 @@ export default { }, silenceBoxShow: false, dataListLayout: localStorage.getItem('dataList-layout' + 'assetTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'assetTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'], - assetNzTableHeightOffset: 281, // 包含click-search时nz-table的高度 + assetNzTableHeightOffset: 283, // 包含click-search时nz-table的高度 blankObject: { id: '', name: '',