From 2f318bad834276157405f6da0df7353d0c5e2d55 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 08 Apr 2026 20:17:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
index cfbb742..b7190b3 100644
--- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -76,7 +76,7 @@
import { computed, ref, watch } from 'vue'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { alarmLogApi, areaDivideListApi } from '@/api/dataCockpit'
-import { getDictLabel } from '@ztzf/utils'
+import { getDictLabel,dateRangeFormat } from '@ztzf/utils'
const props = defineProps({
modelValue: {
@@ -155,7 +155,7 @@
total.value = 0
return
}
- const [startTime, endTime] = searchParams.value.dateRange || []
+ const [startTime, endTime] = dateRangeFormat(searchParams.value.dateRange) || []
const keyword = (searchParams.value.keyword || '').trim()
const params = {
alarmType: '2',
--
Gitblit v1.9.3