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

NEZ-2821 fix：Record rules 二级页面Eval log时间显示错误

Browse Source
This commit is contained in:
zyh
2023-05-12 10:53:09 +08:00
parent c8c82ea059
commit 469c1f28df
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue
View File

@@ -48,13 +48,13 @@
<el-tooltip :disabled="!scope.row.etts" effect="light" placement="right">
<div slot="content">
{{$t('overall.endTime')}}<br/>
{{utcTimeToTimezoneStr(scope.row.etts)}}
{{timeFormat(scope.row.etts)}}
</div>
<span>{{getDuration(scope.row)}}</span>
</el-tooltip>
</template>
<template v-else-if="item.prop === 'stts'">
{{utcTimeToTimezoneStr(scope.row[item.prop])}}
{{timeFormat(scope.row[item.prop])}}
</template>
<span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
<template v-else>-</template>
@@ -73,6 +73,7 @@
</template>
<script>
import bus from '@/libs/bus'
import table from '@/components/common/mixin/table'
import { calcDurationByStringTimeMs } from '@/components/common/js/tools'
export default {
@@ -113,6 +114,9 @@ export default {
computed: {
},
methods: {
timeFormat (timestamp) {
return bus.timeFormate(bus.computeTimezone(timestamp))
},
getDuration (record) {
if (record.etts) {
return calcDurationByStringTimeMs(record.stts, record.etts)

8
nezha-fronted/src/components/common/table/settings/recordRuleEvalLogTable.vue
View File

@@ -48,13 +48,13 @@
<el-tooltip :disabled="!scope.row.etts" effect="light" placement="right">
<div slot="content">
{{$t('overall.endTime')}}<br/>
{{utcTimeToTimezoneStr(scope.row.etts)}}
{{timeFormat(scope.row.etts)}}
</div>
<span>{{getDuration(scope.row)}}</span>
</el-tooltip>
</template>
<template v-else-if="item.prop === 'stts'">
{{utcTimeToTimezoneStr(scope.row[item.prop])}}
{{timeFormat(scope.row[item.prop])}}
</template>
<span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
<template v-else>-</template>
@@ -73,6 +73,7 @@
</template>
<script>
import bus from '@/libs/bus'
import table from '@/components/common/mixin/table'
import { calcDurationByStringTimeMs } from '@/components/common/js/tools'
export default {
@@ -112,6 +113,9 @@ export default {
computed: {
},
methods: {
timeFormat (timestamp) {
return bus.timeFormate(bus.computeTimezone(timestamp))
},
getDuration (record) {
if (record.etts) {
return calcDurationByStringTimeMs(record.stts, record.etts)