fix:解决冲突

This commit is contained in:
zyh
2023-08-23 14:47:20 +08:00
8 changed files with 59 additions and 12 deletions

View File

@@ -27,8 +27,8 @@
@mouseenter="labelHover(item, 'other', true, false, $event)"
@mouseleave="labelHover(item, 'other', false, false,)"
>
<div class="detail-row-info" :title="getRemoteText(item)">
<div class="asset-manageIp" :title="getRemoteText(item)">
<div class="detail-row-info">
<div class="asset-manageIp">
<el-tooltip effect="light" placement="right">
<div slot="content">
{{$t(getStatusText(item.status))}}

View File

@@ -1061,6 +1061,9 @@ export function hideTableTooltip () {
/* 数字转换保留小数,数字很小时转为科学计数法, dot为保留几位小数 */
export function formatScientificNotation (value, dot = 2) {
if (isNaN(value) || value === null) {
return value
}
let val = value ? parseFloat(Number(value).toFixed(dot)) : 0
if (val === 0) {
val = Number(value).toPrecision(dot + 1)

View File

@@ -564,6 +564,9 @@ export default {
this.$set(this.searchTime, 2, val + 'd')
} else {
this.isCustom = true
if (!time[0]) {
this.isCustom = false
}
this.$set(this.searchTime, 0, time[0])
this.$set(this.searchTime, 1, time[1])
}