diff --git a/src/views/detections/DetectionRowEvents.vue b/src/views/detections/DetectionRowEvents.vue index ef32ec1c..011480a8 100644 --- a/src/views/detections/DetectionRowEvents.vue +++ b/src/views/detections/DetectionRowEvents.vue @@ -34,8 +34,7 @@
- {{$t('detection.lastTime')}} :   - {{$t('detection.list.endTime')}} :   + {{$t('detection.lastTime')}} :   {{dateFormatByAppearance(detection.endTime) || '-'}}
diff --git a/src/views/detections/overview/EventsTimeline.vue b/src/views/detections/overview/EventsTimeline.vue index 93b788e1..f7b8e8d1 100644 --- a/src/views/detections/overview/EventsTimeline.vue +++ b/src/views/detections/overview/EventsTimeline.vue @@ -224,7 +224,8 @@ export default { const param = { eventId: e.eventId, startTime: e.startTime, - endTime: e.endTime / 1000 + endTime: e.endTime / 1000, + eventStatus: e.eventStatus } this.$emit('change', param) }, 500), diff --git a/src/views/detections/overview/IndicatorMatchOverview.vue b/src/views/detections/overview/IndicatorMatchOverview.vue index c26efb5d..7fa527eb 100644 --- a/src/views/detections/overview/IndicatorMatchOverview.vue +++ b/src/views/detections/overview/IndicatorMatchOverview.vue @@ -12,21 +12,31 @@
{{ $t('detection.list.startTime') }}
- {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }} + {{ dateFormatByAppearance(myDetection.startTime) || '-' }}
-
{{ $t('detection.list.endTime') }}
+
{{$t('detection.lastTime')}}
+
{{$t('detection.list.endTime')}}
- {{ myDetection.endTime ? dateFormatByAppearance(myDetection.endTime) : '-' }} + {{ dateFormatByAppearance(myDetection.endTime) || '-' }}
{{ $t('overall.duration') }}
- {{ unitConvert(parseInt(myDetection.durationS), 'time', 's', null, 0).join(' ') || '-' }} +
+ {{unitConvert(parseInt(myDetection.durationS), 'time', 's', null, 0).join(' ') || '-'}} +
+
{{ $t('detection.list.lastingSeconds')}}
+
+
+
+
{{ $t('overall.status') }}
+
+
{{ $t('detections.active') }}
diff --git a/src/views/detections/overview/SequenceOverview.vue b/src/views/detections/overview/SequenceOverview.vue index e8796266..353c5348 100644 --- a/src/views/detections/overview/SequenceOverview.vue +++ b/src/views/detections/overview/SequenceOverview.vue @@ -12,6 +12,37 @@
{{ $t('detection.list.eventSeverity') }}
{{ getSeverityByCode(myDetection.severity) || '-' }}
+
+
{{ $t('detection.list.startTime') }}
+
+ + {{ dateFormatByAppearance(myDetection.startTime) || '-' }} +
+
+
+
{{$t('detection.lastTime')}}
+
{{$t('detection.list.endTime')}}
+
+ + {{ dateFormatByAppearance(myDetection.endTime) || '-' }} +
+
+
+
{{ $t('overall.duration') }}
+
+ +
+ {{unitConvert(parseInt(myDetection.durationS), 'time', 's', null, 0).join(' ') || '-'}} +
+
{{ $t('detection.list.lastingSeconds')}}
+
+
+
+
{{ $t('overall.status') }}
+
+
{{ $t('detections.active') }}
+
+
{{ $t('detection.detail.stage') }}{{ index + 1 }}
diff --git a/src/views/detections/overview/ThresholdOverview.vue b/src/views/detections/overview/ThresholdOverview.vue index 6aff0ffe..929c4aae 100644 --- a/src/views/detections/overview/ThresholdOverview.vue +++ b/src/views/detections/overview/ThresholdOverview.vue @@ -7,6 +7,38 @@
+
{{ $t('overall.fields') }}
+
+
{{ $t('detection.list.startTime') }}
+
+ + {{ dateFormatByAppearance(myDetection.startTime) || '-' }} +
+
+
+
{{$t('detection.lastTime')}}
+
{{$t('detection.list.endTime')}}
+
+ + {{ dateFormatByAppearance(myDetection.endTime) || '-' }} +
+
+
+
{{ $t('overall.duration') }}
+
+ +
+ {{unitConvert(parseInt(myDetection.durationS), 'time', 's', null, 0).join(' ') || '-'}} +
+
{{ $t('detection.list.lastingSeconds')}}
+
+
+
+
{{ $t('overall.status') }}
+
+
{{ $t('detections.active') }}
+
+
{{ $t('overall.summary') }}
diff --git a/src/views/detections/overview/detectionDetailMixin.js b/src/views/detections/overview/detectionDetailMixin.js index ad1a3e40..89e3afd7 100644 --- a/src/views/detections/overview/detectionDetailMixin.js +++ b/src/views/detections/overview/detectionDetailMixin.js @@ -1,5 +1,5 @@ import { detectionEventType, detectionRuleType, EN, storageKey, ZH } from '@/utils/constants' -import { getMillisecond, getSecond } from '@/utils/date-util' +import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util' import axios from 'axios' import { api } from '@/utils/api' import { getSeverityNumberColor, lineOption } from '@/views/detections/options/detectionOptions' @@ -7,6 +7,7 @@ import { markRaw } from 'vue' import * as echarts from 'echarts' import { getSeverityByCode } from '@/utils/tools' import Loading from '@/components/common/Loading' +import unitConvert from '@/utils/unit-convert' export default { props: { @@ -73,6 +74,8 @@ export default { this.initData() }, methods: { + dateFormatByAppearance, + unitConvert, initData () { this.loading = true this.myDetection = this.detection @@ -162,11 +165,14 @@ export default { if (detailData?.eventInfo) { detailData.eventInfoList = JSON.parse(detailData.eventInfo) } - if (!detailData.startTime) { + if (detailData.startTime && detailData.endTime) { + detailData.durationS = detailData.endTime - detailData.startTime + } else { detailData.startTime = e.startTime detailData.endTime = e.endTime detailData.durationS = e.endTime - e.startTime } + detailData.status = detailData.eventStatus || e.eventStatus this.myDetection = { ...this.myDetection, ...detailData } } }