From 141126ea2ceea6e0b7afea11fe414038aa718e1c Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 13 Mar 2026 14:14:42 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E8=AE=BE=E5=A4=87=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6-=E7=BC=96=E8=BE=91-=E7=B1=BB=E5=9E=8B=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/deviceParamAnalysis/index.vue     |  1 +
 src/views/mes/deviceledger/DeviceLedgerForm.vue | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

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)"
                 />
+                <div class="mt-4px text-12px text-gray-500">最多选择 8 小时，且不能选择未来日期</div>
               </div>
             </el-form-item>
             <el-form-item>
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,