diff --git a/src/utils/other.ts b/src/utils/other.ts index 2ef7ab4..41626d7 100644 --- a/src/utils/other.ts +++ b/src/utils/other.ts @@ -10,9 +10,17 @@ import request from '/@/utils/request'; import { useMessage } from '/@/hooks/message'; import * as CryptoJS from 'crypto-js'; import { sm4 } from 'sm-crypto' +import dayjs from "dayjs"; + import { validateNull } from './validate'; +export const getDefaultAlarmDateList = (format: "YYYY-MM-DD HH:mm:ss" | "YYYY-MM-DD" = "YYYY-MM-DD HH:mm:ss") => { + const endTime = dayjs().hour(23).minute(23).second(23).format(format) + const startTime = dayjs().subtract(3, 'month').startOf('day').format(format) + return [startTime, endTime] +} + /** * 设置浏览器标题国际化 * @method const title = useTitle(); ==> title() diff --git a/src/views/alarm/alarm-record/index.vue b/src/views/alarm/alarm-record/index.vue index a93327a..fcd8eef 100644 --- a/src/views/alarm/alarm-record/index.vue +++ b/src/views/alarm/alarm-record/index.vue @@ -92,6 +92,9 @@ import * as alarmRecordApi from "/@/api/alarm/alarmRecord"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" + + const storesPanel = usePanel() @@ -111,6 +114,7 @@ const multiple = ref(true) const state: BasicTableProps = reactive({ queryForm: { alarmTypeList: [], + alarmDateList: getDefaultAlarmDateList(), }, pageList: alarmRecordApi.fetchList }) @@ -174,4 +178,4 @@ const handleDelete = async (ids: string[]) => { useMessage().error(err.msg); } }; - \ No newline at end of file + diff --git a/src/views/api/carLog/index.vue b/src/views/api/carLog/index.vue index 85a5ae2..53bc3c1 100644 --- a/src/views/api/carLog/index.vue +++ b/src/views/api/carLog/index.vue @@ -82,6 +82,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; +import { getDefaultAlarmDateList } from "/@/utils/other" import * as ComDhLogApi from "/@/api/com/comDhLog"; @@ -100,7 +101,8 @@ const multiple = ref(true) const state: BasicTableProps = reactive({ queryForm: { type: "车", - typeList: [] + typeList: [], + createTimeList: getDefaultAlarmDateList("YYYY-MM-DD") }, pageList: ComDhLogApi.fetchList }) diff --git a/src/views/api/deviceLog/index.vue b/src/views/api/deviceLog/index.vue index 788126b..588681c 100644 --- a/src/views/api/deviceLog/index.vue +++ b/src/views/api/deviceLog/index.vue @@ -84,6 +84,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; +import { getDefaultAlarmDateList } from "/@/utils/other" import * as ComDhLogApi from "/@/api/com/comDhLog"; @@ -102,7 +103,8 @@ const multiple = ref(true) const state: BasicTableProps = reactive({ queryForm: { type: "设备", - typeList: [] + typeList: [], + createTimeList: getDefaultAlarmDateList("YYYY-MM-DD") }, pageList: ComDhLogApi.fetchList }) diff --git a/src/views/api/doorLog/index.vue b/src/views/api/doorLog/index.vue index be72cd9..79154d6 100644 --- a/src/views/api/doorLog/index.vue +++ b/src/views/api/doorLog/index.vue @@ -82,6 +82,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; +import { getDefaultAlarmDateList } from "/@/utils/other" import * as ComDhLogApi from "/@/api/com/comDhLog"; @@ -100,7 +101,8 @@ const multiple = ref(true) const state: BasicTableProps = reactive({ queryForm: { type: "门禁", - typeList: [] + typeList: [], + createTimeList: getDefaultAlarmDateList("YYYY-MM-DD") }, pageList: ComDhLogApi.fetchList }) diff --git a/src/views/car/carAccess/index.vue b/src/views/car/carAccess/index.vue index d078d85..6f0fbee 100644 --- a/src/views/car/carAccess/index.vue +++ b/src/views/car/carAccess/index.vue @@ -111,6 +111,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; import { timeDiff } from '/@/utils/dispose'; +import { getDefaultAlarmDateList } from "/@/utils/other" import * as CarAccessApi from "/@/api/car/carAccess"; @@ -129,7 +130,10 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + enterTimeList: getDefaultAlarmDateList("YYYY-MM-DD"), + exitTimeList: getDefaultAlarmDateList("YYYY-MM-DD") + }, pageList: CarAccessApi.fetchList }) diff --git a/src/views/car/carAlarm/index.vue b/src/views/car/carAlarm/index.vue index 26bf917..b7b2bbb 100644 --- a/src/views/car/carAlarm/index.vue +++ b/src/views/car/carAlarm/index.vue @@ -163,6 +163,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useDict } from '/@/hooks/dict'; import { parseTime } from "/@/utils/formatTime" import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" const storesPanel = usePanel() @@ -184,7 +185,9 @@ const multiple = ref(true) const { dh_car_color, dh_enter_or_exit, dh_car_num_color, dh_car_direct, car_alarm_type, yes_no_type } = useDict("dh_car_color", "dh_enter_or_exit", "dh_car_num_color", "dh_car_direct", "car_alarm_type", "yes_no_type") const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + capTimeList: getDefaultAlarmDateList(), + }, pageList: CarAccessApi.carAlarmPage }) diff --git a/src/views/car/carRecord/index.vue b/src/views/car/carRecord/index.vue index 7aec0ac..efce270 100644 --- a/src/views/car/carRecord/index.vue +++ b/src/views/car/carRecord/index.vue @@ -136,6 +136,7 @@ import * as carRecordApi from "/@/api/car/carRecord"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" const storesPanel = usePanel() @@ -154,7 +155,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + capTimeList: getDefaultAlarmDateList() + }, pageList: carRecordApi.fetchList }) diff --git a/src/views/door/doorAlarm/index.vue b/src/views/door/doorAlarm/index.vue index 0bd4c6c..dbf0356 100644 --- a/src/views/door/doorAlarm/index.vue +++ b/src/views/door/doorAlarm/index.vue @@ -176,6 +176,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useDict } from '/@/hooks/dict'; import { parseTime } from "/@/utils/formatTime" import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" const storesPanel = usePanel() @@ -200,7 +201,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + swingTimeList: getDefaultAlarmDateList() + }, pageList: DoorRecordApi.doorAlarmPage }) diff --git a/src/views/door/doorRecord/index.vue b/src/views/door/doorRecord/index.vue index be13921..6d09003 100644 --- a/src/views/door/doorRecord/index.vue +++ b/src/views/door/doorRecord/index.vue @@ -157,6 +157,7 @@ import * as doorRecordApi from "/@/api/door/doorRecord"; import { useMessage, useMessageBox } from "/@/hooks/message"; import { useDict } from '/@/hooks/dict'; import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" const storesPanel = usePanel() @@ -175,7 +176,9 @@ const selectObjs = ref([]) as any const multiple = ref(true) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + swingTimeList: getDefaultAlarmDateList(), + }, pageList: doorRecordApi.fetchList }) diff --git a/src/views/door/doorReignRecord/index.vue b/src/views/door/doorReignRecord/index.vue index 55e17f4..79728a7 100644 --- a/src/views/door/doorReignRecord/index.vue +++ b/src/views/door/doorReignRecord/index.vue @@ -96,6 +96,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import * as doorRecordApi from "/@/api/door/doorRecord"; import { useDict } from '/@/hooks/dict'; import { usePanel } from "/@/stores/panel" +import { getDefaultAlarmDateList } from "/@/utils/other" const storesPanel = usePanel() @@ -117,7 +118,7 @@ const multiple = ref(true) const doorTableDialogRef = ref(null) const state: BasicTableProps = reactive({ - queryForm: { swingTimeList: [] }, + queryForm: { swingTimeList: getDefaultAlarmDateList() }, pageList: doorRecordApi.beLatePage }) diff --git a/src/views/report/car/index.vue b/src/views/report/car/index.vue index 9d3e52f..71e5371 100644 --- a/src/views/report/car/index.vue +++ b/src/views/report/car/index.vue @@ -123,6 +123,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { parseTime } from "/@/utils/formatTime" import { useDict } from '/@/hooks/dict'; +import { getDefaultAlarmDateList } from "/@/utils/other" import * as CarRecordApi from "/@/api/car/carRecord"; @@ -181,7 +182,9 @@ const columnSetting = ref({ }) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + capTimeList: getDefaultAlarmDateList() + }, pagination: { size: 20, pageSizes: [20, 50, 100, 500, 1000, 2000] diff --git a/src/views/report/door/index.vue b/src/views/report/door/index.vue index 897ae50..dd894c3 100644 --- a/src/views/report/door/index.vue +++ b/src/views/report/door/index.vue @@ -177,6 +177,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"; import { useDict } from '/@/hooks/dict'; import { parseTime } from "/@/utils/formatTime" +import { getDefaultAlarmDateList } from "/@/utils/other" import * as DoorRecordApi from "/@/api/door/doorRecord"; @@ -251,7 +252,9 @@ const columnSetting = ref({ }) const state: BasicTableProps = reactive({ - queryForm: {}, + queryForm: { + swingTimeList: getDefaultAlarmDateList() + }, pagination: { size: 20, pageSizes: [20, 50, 100, 500, 1000, 2000]