fix: 修复首页统计自定义查询时间不正常

@@ -85,7 +85,7 @@ interface TrendParamsType {
 }
 }
 // 获取租户趋势或者客户趋势数据
 // 获取租户趋势或者客户趋势数据
 export const getTrendData = (params: TrendParamsType) => {
 export const getTrendData = (params: TrendParamsType) => {
-  return defHttp.get({
+  return defHttp.get<Record<'date' | 'value', string>[]>({
     url: HomeEnum.TrendAPI,
     url: HomeEnum.TrendAPI,
     params,
     params,
   });
   });

@@ -132,6 +132,9 @@
             @calendarChange="handleCalendarChange"
             @calendarChange="handleCalendarChange"
             size="small"
             size="small"
             v-model:value="customerDateValue"
             v-model:value="customerDateValue"
+            :showTime="{
+              defaultValue: [dateUtil('00:00:00', 'HH:mm:ss'), dateUtil('23:59:59', 'HH:mm:ss')],
+            }"
           >
           >
             <Button
             <Button
               type="link"
               type="link"
@@ -165,7 +168,7 @@
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
-  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
   import CustomerTrend from './CustomerTrend.vue';
   import CustomerTrend from './CustomerTrend.vue';
   // import TenantTrend from './TenantTrend.vue';
   // import TenantTrend from './TenantTrend.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
@@ -530,6 +533,7 @@
   };
   };
 
 
   const handleDisableDate = (current: moment.Moment) => {
   const handleDisableDate = (current: moment.Moment) => {
+    if (!current) return true;
     if (!unref(customerDateValue) || unref(customerDateValue).length === 0) {
     if (!unref(customerDateValue) || unref(customerDateValue).length === 0) {
       return false;
       return false;
     }
     }

@@ -117,6 +117,9 @@
             @calendarChange="handleCalendarChange"
             @calendarChange="handleCalendarChange"
             :disabledDate="handleDisableDate"
             :disabledDate="handleDisableDate"
             v-model:value="tenantDateValue"
             v-model:value="tenantDateValue"
+            :showTime="{
+              defaultValue: [dateUtil('00:00:00', 'HH:mm:ss'), dateUtil('23:59:59', 'HH:mm:ss')],
+            }"
           >
           >
             <Button
             <Button
               type="link"
               type="link"
@@ -175,7 +178,7 @@
   import { useWebSocket } from '@vueuse/core';
   import { useWebSocket } from '@vueuse/core';
   import { getAuthCache } from '/@/utils/auth';
   import { getAuthCache } from '/@/utils/auth';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
   import { JWT_TOKEN_KEY } from '/@/enums/cacheEnum';
-  import { formatToDateTime } from '/@/utils/dateUtil';
+  import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
   // import CustomerTrend from './CustomerTrend.vue';
   // import CustomerTrend from './CustomerTrend.vue';
   import TenantTrend from './TenantTrend.vue';
   import TenantTrend from './TenantTrend.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
   import CustomerAlarmMessage from './CustomerAlarmMessage.vue';
@@ -548,6 +551,7 @@
   };
   };
 
 
   const handleDisableDate = (current: moment.Moment) => {
   const handleDisableDate = (current: moment.Moment) => {
+    if (!current) return true;
     if (!unref(tenantDateValue) || unref(tenantDateValue).length === 0) {
     if (!unref(tenantDateValue) || unref(tenantDateValue).length === 0) {
       return false;
       return false;
     }
     }

-import { dateUtil, formatToDateTime } from '/@/utils/dateUtil';
-import { ref } from 'vue';
+import { dateUtil } from '/@/utils/dateUtil';
+import { Ref, ref } from 'vue';
 import { getTrendData } from '/@/api/dashboard';
 import { getTrendData } from '/@/api/dashboard';
 import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
 import { RangePickerValue } from 'ant-design-vue/lib/date-picker/interface';
+import moment from 'moment';
 
 
 export enum ShortcutQueryKeyEnum {
 export enum ShortcutQueryKeyEnum {
   LATEST_1_MONTH = 'LATEST_1_MONTH',
   LATEST_1_MONTH = 'LATEST_1_MONTH',
@@ -42,8 +43,8 @@ export function getDateByShortcutQueryKey(value: ShortcutQueryKeyEnum) {
 export function useDate() {
 export function useDate() {
   const tenantDateValue = ref([]);
   const tenantDateValue = ref([]);
   const customerDateValue = ref<RangePickerValue>([]);
   const customerDateValue = ref<RangePickerValue>([]);
-  const tenantTrendList = ref([]);
-  const customerTrendList = ref([]);
+  const tenantTrendList = ref<[string, string][]>([]);
+  const customerTrendList = ref<[string, string][]>([]);
   const activeTenantIndex = ref(0);
   const activeTenantIndex = ref(0);
   const activeCustomerIndex = ref(0);
   const activeCustomerIndex = ref(0);
   const TenantOrCustomerDateList = ref([
   const TenantOrCustomerDateList = ref([
@@ -80,52 +81,39 @@ export function useDate() {
   }
   }
 
 
   // 获取选中的时间范围内的数据
   // 获取选中的时间范围内的数据
-  async function getDateData(startTs, endTs, trend: 'CUSTOMER_TREND' | 'TENANT_TREND', list) {
-    // 计算时间间隔
-    function computedInterval(startTs: number, endTs: number) {
-      /**
-       * 选择的时间间隔
-       * <=1 2h
-       * <=30 1day
-       *  >30<90 2day
-       *  >90 1month
-       */
-      let interval = 86400000;
-      if (endTs - startTs <= 86400000) {
-        interval = 7200000;
-      } else if (endTs - startTs <= 2592000000) {
-        interval = 86400000;
-      } else if (endTs - startTs > 2592000000 && endTs - startTs < 7776000000) {
-        interval = 172800000;
-      } else if (endTs - startTs > 7776000000) {
-        interval = 2592000000;
-      }
-      return interval;
-    }
-    startTs = parseInt(formatToDateTime(startTs, 'x')) - 86400000;
-    endTs = parseInt(formatToDateTime(endTs, 'x'));
+  async function getDateData(
+    startTs: moment.Moment,
+    endTs: moment.Moment,
+    trend: 'CUSTOMER_TREND' | 'TENANT_TREND',
+    list: Ref<[string, string][]>
+  ) {
     const res = await getTrendData({
     const res = await getTrendData({
-      startTs,
-      endTs,
-      interval: computedInterval(startTs, endTs),
+      startTs: startTs.valueOf(),
+      endTs: endTs.valueOf(),
+      interval: 24 * 60 * 60 * 1000,
       trend,
       trend,
     });
     });
-    list.value = res.map((item) => [item.ts, item.value]);
+    list.value = res.map((item) => [item.date, item.value]);
   }
   }
 
 
   // 租户选择日期
   // 租户选择日期
-  function onDateTenantChange(_, dateString) {
-    if (!_.length) return;
-    const [startTs, endTs] = dateString;
+  function onDateTenantChange(range: RangePickerValue) {
+    if (!range.length) return;
+    const [startTs, endTs] = range;
     activeTenantIndex.value = -1;
     activeTenantIndex.value = -1;
-    getDateData(startTs, endTs, 'TENANT_TREND', tenantTrendList);
+    getDateData(startTs as moment.Moment, endTs as moment.Moment, 'TENANT_TREND', tenantTrendList);
   }
   }
   // 客户趋势选择日期
   // 客户趋势选择日期
-  function onDateCustomerChange(_, dateString) {
-    if (!_.length) return;
-    const [startTs, endTs] = dateString;
+  function onDateCustomerChange(range: RangePickerValue) {
+    if (!range.length) return;
+    const [startTs, endTs] = range;
     activeCustomerIndex.value = -1;
     activeCustomerIndex.value = -1;
-    getDateData(startTs, endTs, 'CUSTOMER_TREND', customerTrendList);
+    getDateData(
+      startTs as moment.Moment,
+      endTs as moment.Moment,
+      'CUSTOMER_TREND',
+      customerTrendList
+    );
   }
   }
   return {
   return {
     tenantDateValue,
     tenantDateValue,