diff --git a/src/api/media/home.ts b/src/api/media/home.ts index 8385fd80..131f9745 100644 --- a/src/api/media/home.ts +++ b/src/api/media/home.ts @@ -2,8 +2,8 @@ import server from '@/utils/request' export default { // 设备数量 - deviceCount: () => server.get(`/media/device/_count`), + deviceCount: (params: any) => server.get(`/media/device/_count`, params), // 通道数量 - channelCount: () => server.post(`/media/channel/_count`), + channelCount: (data: any) => server.post(`/media/channel/_count`, data), } \ No newline at end of file diff --git a/src/utils/utils.ts b/src/utils/utils.ts index d9d3e290..7be52fc8 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -84,3 +84,34 @@ export const randomString = (length?: number) => { } return pwd; }; + +/** + * 时间戳转时分秒文本 + * @param time + * @returns + */ +export const timestampFormat = (time: number) => { + let hour = 0; + let minute = 0; + let second = 0; + const timeStr = 'hh小时mm分钟ss秒'; + + if (time) { + if (time >= 60 * 60 * 1000) { + hour = Math.trunc(time / (60 * 60 * 1000)); + } + + if (time >= 60 * 1000) { + minute = Math.trunc((time - hour * 60 * 60 * 1000) / (60 * 1000)); + } + + second = Math.trunc( + (time - hour * (60 * 60 * 1000) - minute * 60 * 1000) / 1000, + ); + } + + return timeStr + .replace('hh', hour.toString()) + .replace('mm', minute.toString()) + .replace('ss', second.toString()); +}; \ No newline at end of file diff --git a/src/views/media/DashBoard/components/TopCard.vue b/src/views/media/DashBoard/components/TopCard.vue index 8e7469a4..c82d296c 100644 --- a/src/views/media/DashBoard/components/TopCard.vue +++ b/src/views/media/DashBoard/components/TopCard.vue @@ -19,7 +19,8 @@ diff --git a/src/views/media/DashBoard/index.vue b/src/views/media/DashBoard/index.vue index 94dcb0f2..602ec600 100644 --- a/src/views/media/DashBoard/index.vue +++ b/src/views/media/DashBoard/index.vue @@ -39,19 +39,40 @@