fix: 主题样式调整,修复chart页面逻辑错误问题
This commit is contained in:
@@ -323,7 +323,7 @@
|
|||||||
.el-table__body-wrapper {
|
.el-table__body-wrapper {
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
background-color: $--table-body-background-color;
|
background-color: $--table-body-background-color;
|
||||||
height: 100% !important;
|
height: calc(100% - 42px) !important;
|
||||||
}
|
}
|
||||||
.el-table__fixed-body-wrapper {
|
.el-table__fixed-body-wrapper {
|
||||||
top: 42px !important;
|
top: 42px !important;
|
||||||
@@ -532,3 +532,16 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
.list-page.detail-view .nz-detail-view-right{
|
||||||
|
.nz-table2 .el-table--border {
|
||||||
|
height: calc(100% - 45px) !important;
|
||||||
|
.gutter {
|
||||||
|
position: fixed;
|
||||||
|
right: 42px;
|
||||||
|
height: 42px;
|
||||||
|
border-bottom: 1px solid $--border-color-light;
|
||||||
|
background-color: $--background-color-empty;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -71,6 +71,21 @@
|
|||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
.list-page {
|
||||||
|
.sub-box.bottom-box {
|
||||||
|
.nz-table2 .el-table--border {
|
||||||
|
.gutter {
|
||||||
|
position: fixed;
|
||||||
|
right: 31px;
|
||||||
|
height: 41px;
|
||||||
|
border-bottom: 1px solid $--border-color-light;
|
||||||
|
background-color: $--background-color-empty;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.sub-list {
|
.sub-list {
|
||||||
height: calc(100% - 9px);
|
height: calc(100% - 9px);
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
color: $--color-text-regular;
|
color: $--color-text-regular;
|
||||||
}
|
}
|
||||||
.operation-length {
|
.operation-length {
|
||||||
margin-top: 3px;
|
margin-top: 2px;
|
||||||
color: $--color-text-regular;
|
color: $--color-text-regular;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ export default {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
isNoData () {
|
isNoData () {
|
||||||
return !this.chartData || this.chartData.length === 0 || this.chartData.type == 'url' ? false : true || this.chartData == 'text' ? false : true
|
return lodash.isEmpty(this.chartData) && ['text', 'url'].indexOf(this.chartInfo.type) === -1
|
||||||
},
|
},
|
||||||
chartOption () {
|
chartOption () {
|
||||||
if (this.customChartOption) {
|
if (this.customChartOption) {
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
<el-form-item :label="$t('alert.severity')" class="severity-box half-form-item" prop="severityId">
|
<el-form-item :label="$t('alert.severity')" class="severity-box half-form-item" prop="severityId">
|
||||||
<el-select id="alert-box-input-severity" v-model="editAlertRule.severityId" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
|
<el-select id="alert-box-input-severity" v-model="editAlertRule.severityId" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
|
||||||
<el-option v-for="item in severityData" :id="'alert-severity-'+item.value" :key="item.id" :label="item.name" :value="item.id">
|
<el-option v-for="item in severityData" :id="'alert-severity-'+item.value" :key="item.id" :label="item.name" :value="item.id">
|
||||||
<div style="display: flex;justify-content: space-between;padding: 5px;">
|
<div style="display: flex;justify-content: space-between;padding: 5px;line-height: 23px">
|
||||||
<div><i :style="{color:item.color,'font-size':'12px'}" class="nz-icon nz-icon-circle"></i> {{item.name}}</div>
|
<div><i :style="{color:item.color,'font-size':'12px'}" class="nz-icon nz-icon-circle"></i> {{item.name}}</div>
|
||||||
<div class="severity-item text-ellipsis" :title="item.remark">{{item.remark}}</div>
|
<div class="severity-item text-ellipsis" :title="item.remark">{{item.remark}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -217,7 +217,7 @@ export default {
|
|||||||
},
|
},
|
||||||
silenceBoxShow: false,
|
silenceBoxShow: false,
|
||||||
dataListLayout: localStorage.getItem('dataList-layout' + 'assetTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'assetTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
|
dataListLayout: localStorage.getItem('dataList-layout' + 'assetTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'assetTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
|
||||||
assetNzTableHeightOffset: 281, // 包含click-search时nz-table的高度
|
assetNzTableHeightOffset: 283, // 包含click-search时nz-table的高度
|
||||||
blankObject: {
|
blankObject: {
|
||||||
id: '',
|
id: '',
|
||||||
name: '',
|
name: '',
|
||||||
|
|||||||
Reference in New Issue
Block a user