Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck

This commit is contained in:
zhangyu
2020-12-16 15:01:39 +08:00
2 changed files with 8 additions and 5 deletions

View File

@@ -663,7 +663,8 @@
background-color: rgba(0,0,0,.1); background-color: rgba(0,0,0,.1);
z-index: 100; z-index: 100;
}*/ }*/
.chart-table .nz-table .el-table__row .costom-value .cell{ .chart-table ,.chart-preview-dialog {
padding: 1px 0; .nz-table .el-table__row .costom-value .cell{
padding: 1px 0;
}
} }

View File

@@ -141,9 +141,11 @@
{{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}} {{ scope.row.element.alias?scope.row.element.alias:scope.row.element.element}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" width="90"> <el-table-column sortable prop="value" :label="$t('dashboard.panel.chartTableColumn.value')" width="90" class-name="costom-value">
<template slot-scope="scope"> <template slot-scope="scope">
<div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff',margin: '10px 0'}">{{ scope.row.value}}</div> <div :style="{color:scope.row.mapping?scope.row.mapping.color.text:'#000',background:scope.row.mapping?scope.row.mapping.color.bac:'#fff'}">
<span style="padding: 0px 10px;">{{ scope.row.value}}</span>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>