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

Merge branch 'dev-3.9' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.10-uPlot

Browse Source
This commit is contained in:
zhangyu
2023-11-03 14:31:00 +08:00
parent e8d3f0ffad ac512bc0a2
commit 7217f93ee0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss
View File

@@ -5,7 +5,9 @@
} }
.log-table{ .log-table{
position: relative; position: relative;
min-height: 200px; min-height: auto;
height: calc(100% - 50px);
overflow-x: auto;
.table-no-data { .table-no-data {
position: absolute; position: absolute;
top: 50%; top: 50%;
@@ -14,6 +16,9 @@
margin-left: -50px; margin-left: -50px;
text-align: center; text-align: center;
} }
.el-table--mini {
min-width: 350px;
}
} }
.log-table .nz-table-list { .log-table .nz-table-list {
padding: 10px 0 0 0; padding: 10px 0 0 0;
@@ -117,7 +122,7 @@
.log-pre-wrap.log-border--unknown::after { .log-pre-wrap.log-border--unknown::after {
background-color: #B4C7DE; background-color: #B4C7DE;
} }
// 不换行 // 不换行
.log-row-wrap--no-wrap .cell { .log-row-wrap--no-wrap .cell {
white-space: nowrap; white-space: nowrap;
@@ -335,4 +340,4 @@
} }
} }
} }
} }

4
nezha-fronted/src/components/chart/chart/chartLog.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="log-detail chart-log" style="flex-direction: column;display: flex"> <div class="log-detail chart-log" style="flex-direction: column;display: block;overflow: hidden">
<div class="log-operations"> <div class="log-operations">
<div class="log-operation"> <div class="log-operation">
<span class="operation-label">{{$t('overall.time')}}</span> <span class="operation-label">{{$t('overall.time')}}</span>
@@ -30,7 +30,7 @@
<button class="top-tool-btn" style="cursor: pointer" type="button" @click="exportLog" :title="$t('overall.download')"><i class="nz-icon nz-icon-download"></i></button> <button class="top-tool-btn" style="cursor: pointer" type="button" @click="exportLog" :title="$t('overall.download')"><i class="nz-icon nz-icon-download"></i></button>
</div> </div>
</div> </div>
<div class="log-table" style="flex: 1"> <div class="log-table" style="flex: 1;">
<el-table <el-table
:cell-class-name="cellClassName" :cell-class-name="cellClassName"
:data="tableData" :data="tableData"