NEZ-1022 fix: logs 日志条数限制修改
This commit is contained in:
@@ -292,7 +292,7 @@
|
|||||||
<!--lock-->
|
<!--lock-->
|
||||||
<el-form-item v-if="editChart.type ==='diagram'" :label="$t('dashboard.panel.chartForm.lock')" class="form-item--half-width" prop="lock">
|
<el-form-item v-if="editChart.type ==='diagram'" :label="$t('dashboard.panel.chartForm.lock')" class="form-item--half-width" prop="lock">
|
||||||
<el-select id="chart-box-statistics" v-model="editChart.param.lock" placeholder="" popper-class="chart-box-dropdown-mini prevent-clickoutside" size="small" @change="$forceUpdate">
|
<el-select id="chart-box-statistics" v-model="editChart.param.lock" placeholder="" popper-class="chart-box-dropdown-mini prevent-clickoutside" size="small" @change="$forceUpdate">
|
||||||
<el-option v-for="item in lockList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in lockList" :key="item.value" :label="item.label" :value="item.value" class="width310">
|
||||||
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
|
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
@@ -303,18 +303,23 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item v-if="editChart.type === 'line' || editChart.type == 'bar' || editChart.type == 'stackArea' || editChart.type == 'table'" :label='"Null value"' class="form-item--half-width" prop="nullType">
|
<el-form-item v-if="editChart.type === 'line' || editChart.type == 'bar' || editChart.type == 'stackArea' || editChart.type == 'table'" :label='"Null value"' class="form-item--half-width" prop="nullType">
|
||||||
<el-select id="chart-box-nullType" v-model="editChart.param.nullType" placeholder="" popper-class="chart-box-dropdown-small prevent-clickoutside" size="small" @change="$forceUpdate()">
|
<el-select id="chart-box-nullType" v-model="editChart.param.nullType" placeholder="" popper-class="chart-box-dropdown-small prevent-clickoutside" size="small" @change="$forceUpdate()" class="width310">
|
||||||
<el-option v-for="item in nullTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
<el-option v-for="item in nullTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item v-if="editChart.type == 'singleStat' || editChart.type == 'pie'|| editChart.type=='table' || editChart.type == 'bar'" :label="$t('dashboard.panel.chartForm.statistics')" class="form-item--half-width" prop="param.statistics">
|
<el-form-item v-if="editChart.type == 'singleStat' || editChart.type == 'pie'|| editChart.type=='table' || editChart.type == 'bar'" :label="$t('dashboard.panel.chartForm.statistics')" class="form-item--half-width" prop="param.statistics">
|
||||||
<el-select id="chart-box-statistics" v-model="editChart.param.statistics" placeholder="" popper-class="chart-box-dropdown-mini prevent-clickoutside" size="small" @change="$forceUpdate">
|
<el-select id="chart-box-statistics" v-model="editChart.param.statistics" placeholder="" popper-class="chart-box-dropdown-mini prevent-clickoutside" size="small" @change="$forceUpdate">
|
||||||
<el-option v-for="item in statisticsList" :key="item.value" :label="item.label" :value="item.value">
|
<el-option v-for="item in statisticsList" :key="item.value" :label="item.label" :value="item.value" class="width310">
|
||||||
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
|
<span class="panel-dropdown-label-txt" >{{item.label}}</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item class="form-item--half-width" v-if="editChart.type == 'logs'" :label='$t("dashboard.panel.chartForm.limit")' prop="param.limit">
|
||||||
|
<el-select v-model="editChart.param.limit" size="small">
|
||||||
|
<el-option v-for="option in limitOptions" :key="option" :value="option" class="width310"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item class="form-item--half-width" v-if="editChart.type == 'logs'" :label='$t("dashboard.panel.chartForm.time")' prop="param.time">
|
<el-form-item class="form-item--half-width" v-if="editChart.type == 'logs'" :label='$t("dashboard.panel.chartForm.time")' prop="param.time">
|
||||||
<el-switch id="chart-box-time"
|
<el-switch id="chart-box-time"
|
||||||
v-model="editChart.param.time"
|
v-model="editChart.param.time"
|
||||||
@@ -339,9 +344,6 @@
|
|||||||
active-color="#ee9d3f"
|
active-color="#ee9d3f"
|
||||||
size="small"></el-switch>
|
size="small"></el-switch>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="form-item--half-width" v-if="editChart.type == 'logs'" :label='$t("dashboard.panel.chartForm.limit")' prop="param.limit">
|
|
||||||
<el-input id="chart-box-limit" v-model="editChart.param.limit" maxlength="1024" show-word-limit size="small"></el-input>
|
|
||||||
</el-form-item>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="editChart.type ==='diagram'" class="form__sub-title">
|
<div v-if="editChart.type ==='diagram'" class="form__sub-title">
|
||||||
@@ -653,6 +655,7 @@ export default {
|
|||||||
elementTarget: [], // 本地保存数据
|
elementTarget: [], // 本地保存数据
|
||||||
alertParams: {},
|
alertParams: {},
|
||||||
spanList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
|
spanList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
|
||||||
|
limitOptions: [100, 200, 500, 1000, 2000],
|
||||||
nullTypeList: [{
|
nullTypeList: [{
|
||||||
label: 'null',
|
label: 'null',
|
||||||
value: 'null'
|
value: 'null'
|
||||||
@@ -1535,7 +1538,7 @@ export default {
|
|||||||
time: true,
|
time: true,
|
||||||
descending: true,
|
descending: true,
|
||||||
wrapLines: true,
|
wrapLines: true,
|
||||||
limit: 1000
|
limit: 100
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* if(this.$refs.chartTag){
|
/* if(this.$refs.chartTag){
|
||||||
@@ -1933,4 +1936,7 @@ export default {
|
|||||||
height: 195px;
|
height: 195px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
.width310{
|
||||||
|
width: 310px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -454,7 +454,7 @@ export default {
|
|||||||
queryLogData (limit) { // log的chart和table是一个请求
|
queryLogData (limit) { // log的chart和table是一个请求
|
||||||
this.chartLoading = true
|
this.chartLoading = true
|
||||||
if (!limit) {
|
if (!limit) {
|
||||||
limit = this.$refs.logDetail ? this.$refs.logDetail.getLimit() : 1000
|
limit = this.$refs.logDetail ? this.$refs.logDetail.getLimit() : 100
|
||||||
}
|
}
|
||||||
if (this.expressions.length > 0) {
|
if (this.expressions.length > 0) {
|
||||||
const requestArr = []
|
const requestArr = []
|
||||||
|
|||||||
@@ -113,8 +113,8 @@ export default {
|
|||||||
time: true, // 换行和时间不需要处理数据
|
time: true, // 换行和时间不需要处理数据
|
||||||
wrapLines: true,
|
wrapLines: true,
|
||||||
|
|
||||||
limit: 1000, // limit改动需要请求接口
|
limit: 100, // limit改动需要请求接口
|
||||||
limitOptions: [300, 1000, 3000, 5000],
|
limitOptions: [100, 200, 500, 1000, 2000],
|
||||||
levelOptions: [
|
levelOptions: [
|
||||||
{
|
{
|
||||||
type: 'trace',
|
type: 'trace',
|
||||||
|
|||||||
Reference in New Issue
Block a user