diff --git a/src/views/iot/deviceParamAnalysis/index.vue b/src/views/iot/deviceParamAnalysis/index.vue index 722a5e53..8608816c 100644 --- a/src/views/iot/deviceParamAnalysis/index.vue +++ b/src/views/iot/deviceParamAnalysis/index.vue @@ -45,6 +45,7 @@ :disabled-date="disableFutureDate" @change="(value) => handleDateRangeChange(group, value)" /> +
最多选择 8 小时,且不能选择未来日期
diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index b354508a..7ac237ae 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -267,6 +267,18 @@ const parseIdsValue = (value: any): number[] => { .filter((v) => !Number.isNaN(v)) } +const normalizeNumberish = (value: any): number | undefined => { + if (value === null || value === undefined || value === '') return undefined + if (typeof value === 'number') return Number.isFinite(value) ? value : undefined + if (typeof value === 'string') { + const trimmed = value.trim() + if (!trimmed) return undefined + const n = Number(trimmed) + return Number.isFinite(n) ? n : undefined + } + return undefined +} + const normalizeYmd = (value: any): string | undefined => { if (value === null || value === undefined || value === '') return undefined if (typeof value === 'string') { @@ -475,6 +487,7 @@ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) => formData.value = { ...initFormData(), ...(detail as any), + deviceType: normalizeNumberish((detail as any)?.deviceType), deviceManagerIds: parseIdsValue((detail as any)?.deviceManager), productionDate: normalizeYmd((detail as any)?.productionDate), factoryEntryDate: normalizeYmd((detail as any)?.factoryEntryDate), @@ -503,6 +516,7 @@ const submitForm = async () => { try { const data = { ...(formData.value as any), + deviceType: normalizeNumberish(formData.value.deviceType), productionDate: normalizeYmd(formData.value.productionDate), factoryEntryDate: normalizeYmd(formData.value.factoryEntryDate), deviceManager: formData.value.deviceManagerIds?.length ? formData.value.deviceManagerIds.join(',') : undefined,