Merge branch 'dev-3.6' of git.mesalab.cn:nezha/nezha-fronted into dev-3.7

This commit is contained in:
zyh
2023-06-14 10:47:10 +08:00

View File

@@ -7,7 +7,7 @@
<span @click="split"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span> <span @click="split"><i class="nz-icon nz-icon-close" :title="$t('overall.close')"></i></span>
</div> </div>
<!-- 顶部工具栏 --> <!-- 顶部工具栏 -->
<div class="top-tools" style="z-index: 2001;position:relative;"> <div class="top-tools" style="z-index: 2">
<el-row class="block-col-2" style="width: 300px;"> <el-row class="block-col-2" style="width: 300px;">
<el-col> <el-col>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
@@ -113,7 +113,7 @@
></promql-input> ></promql-input>
</template> </template>
</div> </div>
<div ref="scrollWrap" style="height: auto; padding: 0 20px 4px;"> <div ref="scrollWrap" style="position: relative;z-index: 1;height: auto; padding: 0 20px 4px;">
<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">