From bb096c0c6b2dbad2f03405344dc15fb0d0619a21 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 16 Mar 2026 14:13:58 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E9=85=8D=E6=96=B9=E5=BA=93-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E9=9B=86=E6=97=B6=E9=97=B4/?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/recipePlanDetail/index.ts         |  8 +++++
 .../components/FormulaLibraryDetailTabs.vue   | 29 +++++++++++++++++++
 src/views/formula/formulaLibrary/index.vue    | 21 ++++++++++++++
 3 files changed, 58 insertions(+)

diff --git a/src/api/iot/recipePlanDetail/index.ts b/src/api/iot/recipePlanDetail/index.ts
index 4445651e..0f4086f6 100644
--- a/src/api/iot/recipePlanDetail/index.ts
+++ b/src/api/iot/recipePlanDetail/index.ts
@@ -14,6 +14,11 @@ export interface RecipePlanDetailVO {
   isEnable?: string | number | boolean
 }
 
+export interface CollectLatestTimeResult {
+  timeAbnormal?: boolean
+  latestTime?: string | number
+}
+
 export const RecipePlanDetailApi = {
   getRecipePlanDetailPage: async (params: any) => {
     return await request.get({ url: `/iot/recipe-plan-detail/page`, params })
@@ -39,5 +44,8 @@ export const RecipePlanDetailApi = {
     return await request.post({ url: `/iot/recipe-plan-detail/batch-create?id=` + id })
   },
 
+  getCollectLatestTime: async (params: { id?: number | string; recipeId?: number | string }) => {
+    return await request.get({ url: `/iot/recipe-plan-detail/getCollectLatestTime`, params })
+  }
 }
 
diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue
index c6687b13..13107978 100644
--- a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue
+++ b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue
@@ -32,6 +32,11 @@
           prop="value"
           min-width="180"
         />
+        <el-table-column label="采集时间" align="center" prop="collectionTime" min-width="180">
+          <template #default="scope">
+            {{ formatTime(scope.row?.collectionTime) }}
+          </template>
+        </el-table-column>
       </el-table>
       <Pagination
         :total="to"
@@ -129,6 +134,11 @@
           prop="remark"
           min-width="180"
         />
+        <el-table-column label="录入时间" align="center" prop="updateTime" min-width="180">
+          <template #default="scope">
+            {{ formatTime(scope.row?.updateTime) }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" fixed="right" label="操作" width="120">
           <template #default="scope">
             <el-button link type="primary" @click="openReferDialog(scope.row)">补录</el-button>
@@ -172,6 +182,7 @@
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
 import { RecipePointRecordApi } from '@/api/iot/recipepointrecord'
 import { RecipeDeviceRecordApi } from '@/api/iot/recipeDeviceRecord'
 import { RecipePointVO } from '@/api/iot/recipePoint'
@@ -212,6 +223,24 @@ const getUnitLabel = (dataUnit: unknown) => {
   return unit?.name ?? id
 }
 
+const formatTime = (value: unknown) => {
+  if (value === undefined || value === null || value === '') return '-'
+  if (typeof value === 'number') {
+    if (!Number.isFinite(value)) return '-'
+    const ms = value < 1e12 ? value * 1000 : value
+    return dayjs(ms).isValid() ? dayjs(ms).format('YYYY-MM-DD HH:mm:ss') : '-'
+  }
+  const raw = String(value).trim()
+  if (!raw) return '-'
+  if (/^\d+$/.test(raw)) {
+    const num = Number(raw)
+    if (!Number.isFinite(num)) return '-'
+    const ms = num < 1e12 ? num * 1000 : num
+    return dayjs(ms).isValid() ? dayjs(ms).format('YYYY-MM-DD HH:mm:ss') : raw
+  }
+  return dayjs(raw).isValid() ? dayjs(raw).format('YYYY-MM-DD HH:mm:ss') : raw
+}
+
 const queryFormRef = ref()
 const queryParams = reactive({
   pageNo: 1,
diff --git a/src/views/formula/formulaLibrary/index.vue b/src/views/formula/formulaLibrary/index.vue
index a353aea0..be180423 100644
--- a/src/views/formula/formulaLibrary/index.vue
+++ b/src/views/formula/formulaLibrary/index.vue
@@ -370,10 +370,31 @@ const checkRecipeRecords = async (recipeId: string | number) => {
   }
 }
 
+const ensureCollectTimeNormalOrConfirmed = async (row: RecipePlanDetailVO) => {
+  try {
+    const res = await RecipePlanDetailApi.getCollectLatestTime({
+      id: row?.id,
+      recipeId: row?.recipeId
+    })
+    const timeAbnormal = !!(res as any)?.timeAbnormal
+    if (!timeAbnormal) return true
+    try {
+      await message.confirm('设备最新数据晚于当前系统时间2分钟，确认是否继续读取。')
+      return true
+    } catch {
+      return false
+    }
+  } catch {
+    return true
+  }
+}
+
 const handleRead = async (row: RecipePlanDetailVO) => {
   const recipeId = row?.recipeId
   const id = row?.id
   if (!recipeId) return
+  const ok = await ensureCollectTimeNormalOrConfirmed(row)
+  if (!ok) return
   handleRowClick(row)
   const recipeName = row?.recipeName
   const { hasDeviceRecords, hasManualRecords } = await checkRecipeRecords(recipeId)