gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改 project alertTable的state的颜色 以及换行

Browse Source
This commit is contained in:
zhangyu
2020-10-09 11:26:16 +08:00
parent 299df85ca7
commit 613911374c
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/alert/alertMessageTable.vue
View File

@@ -79,7 +79,7 @@
<span v-if="scope.row[item.prop] == 'low'"><i class="nz-icon nz-icon-arrow-down"></i>&nbsp;{{returnSeverityLabel(scope.row[item.prop])}}</span> <span v-if="scope.row[item.prop] == 'low'"><i class="nz-icon nz-icon-arrow-down"></i>&nbsp;{{returnSeverityLabel(scope.row[item.prop])}}</span>
</span> </span>
<template v-else-if="item.prop == 'labels'" class="labels"> <template v-else-if="item.prop == 'labels'" class="labels">
<div v-for="(item,i) in labelsSort(scope.row.labels)"> <span v-for="(item,i) in labelsSort(scope.row.labels)">
<span @mouseenter="labelHover(scope.row, item.label, true, $event)" @mouseleave="labelHover(scope.row, item.label, false)"> <span @mouseenter="labelHover(scope.row, item.label, true, $event)" @mouseleave="labelHover(scope.row, item.label, false)">
<nz-alert-tag <nz-alert-tag
:label="item.label" :type="tagType(item.label)" style="margin: 5px 0 5px 5px;" :label="item.label" :type="tagType(item.label)" style="margin: 5px 0 5px 5px;"
@@ -96,7 +96,7 @@
:that="scope.row[item.label]" :that="scope.row[item.label]"
:type="item.label" :type="item.label"
></alertLabel> ></alertLabel>
</div> </span>
<!--<el-tooltip <!--<el-tooltip
v-for="(item,i) in labelsSort(scope.row.labels)" v-for="(item,i) in labelsSort(scope.row.labels)"

3
nezha-fronted/src/components/common/alert/alertRuleInfo.vue
View File

@@ -140,6 +140,9 @@
width: 150px; width: 150px;
color: #1a1a1a; color: #1a1a1a;
padding: 0 3px 0 13px; padding: 0 3px 0 13px;
word-wrap: break-word;
white-space: normal;
overflow: hidden;
} }
/* .alert-rule-info::after { /* .alert-rule-info::after {
content: ''; content: '';

17
nezha-fronted/src/components/common/project/popData/alertTable.vue
View File

@@ -89,8 +89,8 @@
<span v-if="scope.row[item.prop] == 'low'"><i class="nz-icon nz-icon-arrow-down"></i>&nbsp;{{returnSeverityLabel(scope.row[item.prop])}}</span> <span v-if="scope.row[item.prop] == 'low'"><i class="nz-icon nz-icon-arrow-down"></i>&nbsp;{{returnSeverityLabel(scope.row[item.prop])}}</span>
</span> </span>
<template v-else-if="item.prop == 'labels'" class="labels"> <template v-else-if="item.prop == 'labels'" class="labels">
<div v-for="(item,i) in labelsSort(scope.row.labels)"> <span v-for="(item,i) in labelsSort(scope.row.labels)">
<span @mouseenter="labelHover(scope.row, item.label, true, $event)" @mouseleave="labelHover(scope.row, item.label, false)"> <span @mouseenter="labelHover(scope.row,scope.$index, item.label, true, $event)" @mouseleave="labelHover(scope.row,scope.$index, item.label, false)">
<nz-alert-tag <nz-alert-tag
:label="item.label" :type="tagType(item.label)" style="margin: 5px 0 5px 5px;" :label="item.label" :type="tagType(item.label)" style="margin: 5px 0 5px 5px;"
:cursor-point="tagType(item.label) == 'info' ? false : true" :cursor-point="tagType(item.label) == 'info' ? false : true"
@@ -106,7 +106,7 @@
:that="scope.row[item.label]" :that="scope.row[item.label]"
:type="item.label" :type="item.label"
></alertLabel> ></alertLabel>
</div> </span>
<!--<el-tooltip <!--<el-tooltip
v-for="(item,i) in labelsSort(scope.row.labels)" v-for="(item,i) in labelsSort(scope.row.labels)"
@@ -135,12 +135,10 @@
</el-tooltip>--> </el-tooltip>-->
</template> </template>
<div v-else-if="item.prop == 'state'"> <span v-else-if="item.prop == 'state'" :class="{'green': scope.row['state'] == 2, 'red': scope.row['state'] == 1}">
<span class="">
{{scope.row['state'] == 1 ? "Pending" : ""}} {{scope.row['state'] == 1 ? "Pending" : ""}}
{{scope.row['state'] == 2 ? "Expired" : ""}} {{scope.row['state'] == 2 ? "Expired" : ""}}
</span> </span>
</div>
<div v-else-if="item.prop == 'current'" class="too-long-split pointer" @click="detail(scope.row)"> <div v-else-if="item.prop == 'current'" class="too-long-split pointer" @click="detail(scope.row)">
<span v-if="!scope.row.current">-</span> <span v-if="!scope.row.current">-</span>
<el-popover v-else placement="right" trigger="hover"> <el-popover v-else placement="right" trigger="hover">
@@ -399,7 +397,7 @@
//this.$set(this.tableData,index,item);// 调用父组件 //this.$set(this.tableData,index,item);// 调用父组件
}, },
// label 鼠标划入 // label 鼠标划入
labelHover(item, type, loading, e){ labelHover(item,index, type, loading, e){
if(this.labelToolTipDis(type)){ if(this.labelToolTipDis(type)){
return; return;
} }
@@ -499,6 +497,11 @@
/deep/.el-tooltip{ /deep/.el-tooltip{
display: inline-block; display: inline-block;
} }
.red,.green{
color: white;
padding: 2px 5px;
border-radius: 4px;
}
/* end--table*/ /* end--table*/
</style> </style>