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

Merge remote-tracking branch 'origin/codeCheck' into codeCheck

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/page/asset/asset.vue
This commit is contained in:
chenjinsong
2020-07-15 11:09:53 +08:00
parent 4ba7d6f5fb 7f163965c3
commit 20a7cc2147
1 changed files with 93 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -134,7 +134,11 @@
<span class="link" @click="showEndpoint(scope.row)">{{scope.row.endpointNum}}</span> <span class="link" @click="showEndpoint(scope.row)">{{scope.row.endpointNum}}</span>
</template> </template>
<template v-if="item.prop=='Alert'"> <template v-if="item.prop=='Alert'">
<span :id="'asset-alerts-'+scope.row.id" @click="jumpToAlertMsg(scope.row)" class="link">{{scope.row.alertNum + ' ' + $t('overall.active')}}</span> <span :id="'asset-alerts-'+scope.row.id" @click="jumpToAlertMsg(scope.row)" class="link">
{{(scope.row.alertNum < 99 ? scope.row.alertNum : 99)}}
<sup class="linkSup" v-if="scope.row.alertNum > 99">+</sup>
{{' ' + $t('overall.active')}}
</span>
</template> </template>
<div v-if="item.prop=='dataCenter'"> <div v-if="item.prop=='dataCenter'">
<span >{{scope.row.idc.name}}</span> <span >{{scope.row.idc.name}}</span>
@@ -1028,4 +1032,15 @@
.tab-input-square-high { .tab-input-square-high {
border: 1px solid #1166bb; border: 1px solid #1166bb;
} }
/deep/ .el-table .cell.el-tooltip{
min-width: 88px;
}
.linkSup{
position: absolute;
top: -15px;
left: 17px;
}
.link{
position: relative;
}
</style> </style>