提交 7957ac5a authored 作者: junjie's avatar junjie

feat: 过滤组件条件调整

上级 678b748d
...@@ -64,26 +64,26 @@ export default { ...@@ -64,26 +64,26 @@ export default {
label: this.$t('chart.filter_not_like') label: this.$t('chart.filter_not_like')
}] }]
}, },
{ // {
label: '', // label: '',
options: [{ // options: [{
value: 'lt', // value: 'lt',
label: this.$t('chart.filter_lt') // label: this.$t('chart.filter_lt')
}, { // }, {
value: 'gt', // value: 'gt',
label: this.$t('chart.filter_gt') // label: this.$t('chart.filter_gt')
}] // }]
}, // },
{ // {
label: '', // label: '',
options: [{ // options: [{
value: 'le', // value: 'le',
label: this.$t('chart.filter_le') // label: this.$t('chart.filter_le')
}, { // }, {
value: 'ge', // value: 'ge',
label: this.$t('chart.filter_ge') // label: this.$t('chart.filter_ge')
}] // }]
}, // },
{ {
label: '', label: '',
options: [{ options: [{
......
...@@ -54,16 +54,16 @@ export default { ...@@ -54,16 +54,16 @@ export default {
label: this.$t('chart.filter_not_eq') label: this.$t('chart.filter_not_eq')
}] }]
}, },
{ // {
label: '', // label: '',
options: [{ // options: [{
value: 'like', // value: 'like',
label: this.$t('chart.filter_like') // label: this.$t('chart.filter_like')
}, { // }, {
value: 'not like', // value: 'not like',
label: this.$t('chart.filter_not_like') // label: this.$t('chart.filter_not_like')
}] // }]
}, // },
{ {
label: '', label: '',
options: [{ options: [{
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
</el-row> </el-row>
</div> </div>
<div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style"> <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
<el-row> <el-row style="height: 100%;">
<el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr"> <el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
<span style="width: 80px;text-align: right;">{{ $t('chart.dimension') }}</span> <span style="width: 80px;text-align: right;">{{ $t('chart.dimension') }}</span>
<draggable <draggable
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
group="dimension" group="dimension"
animation="300" animation="300"
:move="onMove" :move="onMove"
style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;" style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
@end="end2" @end="end2"
> >
<transition-group class="draggable-group"> <transition-group class="draggable-group">
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</transition-group> </transition-group>
</draggable> </draggable>
</el-row> </el-row>
<el-row class="padding-lr"> <el-row class="padding-lr" style="margin-top: 6px;">
<span style="width: 80px;text-align: right;">{{ $t('chart.quota') }}</span> <span style="width: 80px;text-align: right;">{{ $t('chart.quota') }}</span>
<draggable <draggable
v-model="view.yaxis" v-model="view.yaxis"
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
group="quota" group="quota"
animation="300" animation="300"
:move="onMove" :move="onMove"
style="padding:2px 0 0 0;width:100%;height: 100%;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;" style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
@end="end2" @end="end2"
> >
<transition-group class="draggable-group"> <transition-group class="draggable-group">
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</transition-group> </transition-group>
</draggable> </draggable>
</el-row> </el-row>
<div class="padding-lr filter-class"> <div class="padding-lr filter-class" style="margin-top: 6px;">
<span>{{ $t('chart.result_filter') }}</span> <span>{{ $t('chart.result_filter') }}</span>
<el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter"> <el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter">
{{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon--right" /> {{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon--right" />
...@@ -1233,7 +1233,7 @@ export default { ...@@ -1233,7 +1233,7 @@ export default {
} }
.attr-style{ .attr-style{
height: calc(100vh - 56px - 25vh - 40px - 60px); height: calc(100vh - 56px - 25vh - 40px - 40px);
} }
.attr-selector{ .attr-selector{
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论