fix: datetimerange over 7 days
This commit is contained in:
@@ -17,6 +17,21 @@ const { stationCode, ndmCamera } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -55,7 +70,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -18,6 +18,21 @@ const { stationCode, ndmDecoder } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -60,7 +75,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -16,6 +16,21 @@ const { stationCode, ndmKeyboard } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
const deviceStatusHistoryDiagCardRef = useTemplateRef<DeviceStatusHistoryDiagCardInst>('deviceStatusHistoryDiagCardRef');
|
const deviceStatusHistoryDiagCardRef = useTemplateRef<DeviceStatusHistoryDiagCardInst>('deviceStatusHistoryDiagCardRef');
|
||||||
@@ -48,7 +63,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -19,6 +19,21 @@ const { stationCode, ndmNvr } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -67,7 +82,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -19,6 +19,21 @@ const { stationCode, ndmSecurityBox } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -70,7 +85,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -18,6 +18,21 @@ const { stationCode, ndmServer } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -60,7 +75,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -19,6 +19,21 @@ const { stationCode, ndmSwitch } = toRefs(props);
|
|||||||
const searchFields = reactive({
|
const searchFields = reactive({
|
||||||
dateTimeRange: undefined as DatePickerProps['value'],
|
dateTimeRange: undefined as DatePickerProps['value'],
|
||||||
});
|
});
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.dateTimeRange = [start, adjustedEnd];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.dateTimeRange = value;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
type DeviceStatusHistoryDiagCardInst = InstanceType<typeof DeviceStatusHistoryDiagCard> | null;
|
||||||
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
type DeviceAlarmHistoryDiagCardInst = InstanceType<typeof DeviceAlarmHistoryDiagCard> | null;
|
||||||
@@ -67,7 +82,7 @@ const selectedCards = ref<string[]>([...diagCards.value.map((option) => `${optio
|
|||||||
<NFlex justify="space-between" :wrap="false">
|
<NFlex justify="space-between" :wrap="false">
|
||||||
<NGrid :x-gap="8" :y-gap="8">
|
<NGrid :x-gap="8" :y-gap="8">
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" />
|
<NDatePicker v-model:value="searchFields.dateTimeRange" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NGi>
|
</NGi>
|
||||||
<NGi :span="20">
|
<NGi :span="20">
|
||||||
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
<NSelect v-model:value="selectedCards" multiple :options="diagCards" />
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ const resetSearchFields = () => {
|
|||||||
searchFields.alarmDate = [dayjs().startOf('date').subtract(1, 'week').valueOf(), dayjs().endOf('date').valueOf()];
|
searchFields.alarmDate = [dayjs().startOf('date').subtract(1, 'week').valueOf(), dayjs().endOf('date').valueOf()];
|
||||||
};
|
};
|
||||||
const onDateChange = (value: [number, number] | null) => {
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
if (!value || value.length !== 2) {
|
if (!value) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const [start, end] = value;
|
const [start, end] = value;
|
||||||
|
|||||||
@@ -78,6 +78,21 @@ const resetSearchFields = () => {
|
|||||||
searchFields.stationCode = stationList.value.find((station) => station.online)?.code;
|
searchFields.stationCode = stationList.value.find((station) => station.online)?.code;
|
||||||
searchFields.logType_in = [];
|
searchFields.logType_in = [];
|
||||||
};
|
};
|
||||||
|
const onDateChange = (value: [number, number] | null) => {
|
||||||
|
if (!value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const [start, end] = value;
|
||||||
|
const diffDays = dayjs(end).diff(dayjs(start), 'day');
|
||||||
|
if (diffDays > 7) {
|
||||||
|
// 如果超过7天,自动调整结束时间
|
||||||
|
const adjustedEnd = dayjs(start).add(7, 'day').valueOf();
|
||||||
|
searchFields.createdTime = [dayjs(start).format('YYYY-MM-DD HH:mm:ss'), dayjs(adjustedEnd).format('YYYY-MM-DD HH:mm:ss')];
|
||||||
|
window.$message.warning('时间范围不能超过7天,已自动调整');
|
||||||
|
} else {
|
||||||
|
searchFields.createdTime = [dayjs(start).format('YYYY-MM-DD HH:mm:ss'), dayjs(end).format('YYYY-MM-DD HH:mm:ss')];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const tableColumns: DataTableColumns<NdmVimpLogResultVO> = [
|
const tableColumns: DataTableColumns<NdmVimpLogResultVO> = [
|
||||||
{ title: '时间', key: 'createdTime' },
|
{ title: '时间', key: 'createdTime' },
|
||||||
@@ -258,7 +273,7 @@ watchEffect(() => {
|
|||||||
<NSelect v-model:value="searchFields.logType_in" :options="vimpOperationTypeOptions" multiple clearable />
|
<NSelect v-model:value="searchFields.logType_in" :options="vimpOperationTypeOptions" multiple clearable />
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
<NFormItemGi :span="1" label="时间" label-placement="left">
|
<NFormItemGi :span="1" label="时间" label-placement="left">
|
||||||
<NDatePicker v-model:formatted-value="searchFields.createdTime" type="datetimerange" />
|
<NDatePicker v-model:formatted-value="searchFields.createdTime" type="datetimerange" @update:value="onDateChange" />
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
</NGrid>
|
</NGrid>
|
||||||
<!-- 按钮 -->
|
<!-- 按钮 -->
|
||||||
|
|||||||
Reference in New Issue
Block a user