Преглед изворни кода

feat: 告警列表时长从秒转为时分秒展示;

liujia пре 3 недеља
родитељ
комит
90d482e

+ 10 - 3
src/views/alarm/history/index.vue

@@ -60,7 +60,9 @@
             <div class="eventInfo">
               <div v-if="record.info?.start_time">开始时间:{{ record.info?.start_time }}</div>
               <div v-if="record.info?.end_time">结束时间:{{ record.info?.end_time }}</div>
-              <div v-if="record.info?.stay_time">停留时长:{{ record.info?.stay_time }}(秒)</div>
+              <div v-if="record.info?.stay_time"
+                >停留时长:{{ formatSeconds(record.info?.stay_time) }}</div
+              >
               <div v-if="record.info?.count">次数:{{ record.info?.count }}</div>
               <a-collapse ghost accordion v-if="record.info?.event_list && !initPanel">
                 <template #expandIcon="{ isActive }">
@@ -75,8 +77,12 @@
                     >
                       <div v-if="event.start_time">开始时间:{{ event.start_time }}</div>
                       <div v-if="event.end_time">结束时间:{{ event.end_time }}</div>
-                      <div v-if="event.stay_time">停留时长:{{ event.stay_time }}(秒)</div>
-                      <div v-if="event.absence_time">消失时长:{{ event.absence_time }}(秒)</div>
+                      <div v-if="event.stay_time"
+                        >停留时长:{{ formatSeconds(event.stay_time) }}</div
+                      >
+                      <div v-if="event.absence_time"
+                        >消失时长:{{ formatSeconds(event.absence_time) }}</div
+                      >
                       <span class="showIndex">{{ index + 1 }}</span>
                     </div>
                   </ScrollContainer>
@@ -126,6 +132,7 @@ import { useDictName } from '@/hooks/useDictName'
 import * as statsApi from '@/api/stats'
 import type { StatsAlarmQueryDataRow } from '@/api/stats/types'
 import { CaretRightOutlined } from '@ant-design/icons-vue'
+import { formatSeconds } from '@/utils/index'
 
 // const router = useRouter()
 

+ 10 - 3
src/views/device/detail/components/deviceStatsDrawer/index.vue

@@ -55,7 +55,9 @@
             <div class="eventInfo">
               <div v-if="record.info?.start_time">开始时间:{{ record.info?.start_time }}</div>
               <div v-if="record.info?.end_time">结束时间:{{ record.info?.end_time }}</div>
-              <div v-if="record.info?.stay_time">停留时长:{{ record.info?.stay_time }}(秒)</div>
+              <div v-if="record.info?.stay_time"
+                >停留时长:{{ formatSeconds(record.info?.stay_time) }}</div
+              >
               <div v-if="record.info?.count">次数:{{ record.info?.count }}</div>
               <a-collapse ghost accordion v-if="record.info?.event_list && !initPanel">
                 <template #expandIcon="{ isActive }">
@@ -70,8 +72,12 @@
                     >
                       <div v-if="event.start_time">开始时间:{{ event.start_time }}</div>
                       <div v-if="event.end_time">结束时间:{{ event.end_time }}</div>
-                      <div v-if="event.stay_time">停留时长:{{ event.stay_time }}(秒)</div>
-                      <div v-if="event.absence_time">消失时长:{{ event.absence_time }}(秒)</div>
+                      <div v-if="event.stay_time"
+                        >停留时长:{{ formatSeconds(event.stay_time) }}</div
+                      >
+                      <div v-if="event.absence_time"
+                        >消失时长:{{ formatSeconds(event.absence_time) }}</div
+                      >
                       <span class="showIndex">{{ index + 1 }}</span>
                     </div>
                   </ScrollContainer>
@@ -113,6 +119,7 @@ import { useDict, type DictItem } from '@/hooks/useDict'
 import { useDictName } from '@/hooks/useDictName'
 import * as alarmApi from '@/api/alarm'
 import { CaretRightOutlined } from '@ant-design/icons-vue'
+import { formatSeconds } from '@/utils/index'
 
 defineOptions({
   name: 'DeviceStatsDrawer',