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

fix：调整页面边距

Browse Source
This commit is contained in:
zyh
2023-06-14 13:55:07 +08:00
parent 394a3892db
commit ae79015d10
4 changed files with 119 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,17 @@
.explores { .explores {
display: flex; display: flex;
padding: 0px 0 10px 0px;
background-color: $--background-color-base; background-color: $--background-color-base;
box-sizing: border-box; box-sizing: border-box;
.main-list::after{ // .main-list::after{
content: ''; // content: '';
display: block; // display: block;
position: absolute; // position: absolute;
bottom: -10px; // bottom: -10px;
left: 0; // left: 0;
right: 14px; // right: 14px;
height: 10px; // height: 10px;
background-color: $--background-color-empty; // background-color: $--background-color-empty;
} // }
pre { pre {
border: 1px solid $--border-color-base; border: 1px solid $--border-color-base;
border-left: 4px solid #e6522c; border-left: 4px solid #e6522c;

4
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -113,7 +113,7 @@
></promql-input> ></promql-input>
</template> </template>
</div> </div>
<div ref="scrollWrap" style="position: relative;z-index: 1;height: auto; padding: 0 20px 4px;"> <div style="position: relative;z-index: 1;height: auto;padding: 0px 20px 10px;">
<el-collapse v-show="!showIntroduce" v-model="collapseValue" class="explore-collapse" @change="logsCollapseChange"> <el-collapse v-show="!showIntroduce" v-model="collapseValue" class="explore-collapse" @change="logsCollapseChange">
<!--metric--> <!--metric-->
<template v-if="showMetrics"> <template v-if="showMetrics">
@@ -3452,7 +3452,7 @@ level=info ts=2020-10-23T20:32:18.068866235Z caller=metrics.go:81 org_id=29 trac
</div> </div>
</div> </div>
</div> </div>
<button :class="{'to-top-is-hover': tableHover}" @click="toTop(scrollbarWrap)" class="to-top" style="position:absolute;bottom: -20px;" v-show="showTopBtn" :title="$t('overall.backToTop')"><i class="nz-icon nz-icon-top"></i></button> <button :class="{'to-top-is-hover': tableHover}" @click="toTop(scrollbarWrap)" class="to-top" style="position:absolute;bottom: -10px;" v-show="showTopBtn" :title="$t('overall.backToTop')"><i class="nz-icon nz-icon-top"></i></button>
<transition name="right-box"> <transition name="right-box">
<chartRightBox v-if="rightBox.show" ref="addChartModal" :chart="chartData" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess"></chartRightBox> <chartRightBox v-if="rightBox.show" ref="addChartModal" :chart="chartData" :from="$CONSTANTS.fromRoute.explore" :panel-data="panelData" :show-panel="{id: -1, name: '', type: 'explore'}" @close="handleBox(false)" @on-create-success="createSuccess"></chartRightBox>
</transition> </transition>

7
nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue
View File

@@ -1,5 +1,6 @@
<template> <template>
<div class="explore list-page" style="background: #fffffe;padding: 10px 15px;"> <div style="height:100%;position:relative;">
<div class="explore list-page" style="background: #fffffe;padding: 10px 15px;overflow-x: hidden;overflow-y: auto;">
<div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;"> <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
<span>{{dataJson.type == 1 ? 'Metric expression' : 'Log expression'}}</span> <span>{{dataJson.type == 1 ? 'Metric expression' : 'Log expression'}}</span>
<span> <span>
@@ -103,6 +104,7 @@
</template> </template>
</el-collapse> </el-collapse>
</div> </div>
</div>
</template> </template>
<script> <script>
@@ -119,7 +121,8 @@ export default {
triggerButtonClass: { // 触发下拉事件的按钮的class triggerButtonClass: { // 触发下拉事件的按钮的class
type: String, type: String,
default: 'top-tool-btn' default: 'top-tool-btn'
} },
tabIndex: Number
}, },
components: { components: {
chart, chart,

5
nezha-fronted/src/entrance/exportHtml/App.vue
View File

@@ -18,7 +18,7 @@
<span> {{dateFormat(dataJson.start * 1000)}} - {{dateFormat(dataJson.end * 1000)}} ({{dataJson.timezone}})</span> <span> {{dateFormat(dataJson.start * 1000)}} - {{dateFormat(dataJson.end * 1000)}} ({{dataJson.timezone}})</span>
</div> </div>
</div> </div>
<div v-if="!dataJson.type" id="dashboardScrollbar" class="box-content" ref="dashboardScrollbar" style='overflow:hidden; overflow-y: auto;height: calc(100% - 60px);display: flex;flex-direction: column'> <div v-if="!dataJson.type" id="dashboardScrollbar" class="box-content" ref="dashboardScrollbar" style='overflow:hidden; overflow-y: auto;height: calc(100% - 72px);display: flex;flex-direction: column'>
<chartList <chartList
ref="chartList" ref="chartList"
name="dashboard" name="dashboard"
@@ -38,7 +38,7 @@
:loading="chartListLoading" :loading="chartListLoading"
/> />
</div> </div>
<div v-if="dataJson.type" id="explore" class="explores" style='overflow:hidden;background: #fffffe; overflow-y: auto;height: calc(100% - 60px);display: flex;flex-direction: column'> <div v-if="dataJson.type" id="explore" class="explores" style='overflow:hidden;background: #fffffe; height: calc(100% - 72px);display: flex;flex-direction: column'>
<exploreItem <exploreItem
ref="exploreItem" ref="exploreItem"
:key="dataJson.type" :key="dataJson.type"
@@ -137,6 +137,5 @@ export default {
text-align: left; text-align: left;
color: #2c3e50; color: #2c3e50;
margin-top: 10px; margin-top: 10px;
padding-bottom: 20px;
} }
</style> </style>