From 755978994f5824b6fd8c473682292d6be2abe188 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Fri, 6 Feb 2026 16:04:04 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E9=85=8D=E6=96=B9=E5=BA=93-?=
 =?UTF-8?q?=E8=8B=A5=E5=BD=93=E5=89=8D=E5=AD=90=E5=88=97=E8=A1=A8=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=88=99=E8=AF=BB=E5=8F=96=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=B7=BB=E5=8A=A0=E8=A6=86=E7=9B=96=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/recipeConfig/index.ts             |  2 +-
 src/locales/en.ts                             |  1 +
 src/locales/zh-CN.ts                          |  1 +
 .../components/FormulaLibraryReadDialog.vue   | 13 ++++++-
 src/views/formula/formulaLibrary/index.vue    | 37 ++++++++++++++++++-
 5 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/src/api/iot/recipeConfig/index.ts b/src/api/iot/recipeConfig/index.ts
index 06931a2d..6ab87269 100644
--- a/src/api/iot/recipeConfig/index.ts
+++ b/src/api/iot/recipeConfig/index.ts
@@ -176,7 +176,7 @@ export const RecipeConfigApi = {
   },
 
   getRecipePointDetailPage: async (params: any) => {
-    return await request.get({ url: `/iot/recipe-device-attribute/page`, params })
+    return await request.get({ url: `/iot/recipe-device-attribute/getList`, params })
   },
   updateRecipeDeviceAttribute: async (data: { recipeId: string | number; ids: number[] }) => {
     return await request.put({ url: `/iot/recipe-device-attribute/update`, data })
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 96e4f225..2d4e749a 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -2657,6 +2657,7 @@ export default {
       readDialogSubmitButtonText: 'Read',
       readDialogCancelButton: 'Cancel',
       readDeviceConfirmMessage: 'Do you want to read device data?',
+      readDialogOverwriteTip: 'Reading again will overwrite existing device data and manual parameters',
       detailTabDeviceDataLabel: 'Device Data',
       detailTabManualLabel: 'Manual Parameters',
       detailDevicePointNameColumn: 'Point Name',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 060387bc..2eab0318 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2240,6 +2240,7 @@ export default {
       readDialogSubmitButtonText: '读 取',
       readDialogCancelButton: '取 消',
       readDeviceConfirmMessage: '是否读取设备数据？',
+      readDialogOverwriteTip: '再次读取会覆盖已有设备数据和手动录入参数',
       detailTabDeviceDataLabel: '设备数据',
       detailTabManualLabel: '手动录入参数',
       detailDevicePointNameColumn: '点位名称',
diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue
index 4eb9bbb5..855edfcc 100644
--- a/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue
+++ b/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue
@@ -1,6 +1,14 @@
 <template>
   <Dialog v-model="visible" :title="title" width="920px">
     <div class="formula-library-read-content">
+      <el-alert
+        v-if="hasExistingRecords"
+        type="warning"
+        :closable="false"
+        :title="t('RecipeManagement.RecipeLibrary.readDialogOverwriteTip')"
+        show-icon
+        class="mb-15px"
+      />
       <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
         <!-- <el-table-column type="index" :label="t('RecipeManagement.RecipeLibrary.tableIndexColumn')" align="center" width="70" /> -->
         <el-table-column
@@ -94,6 +102,7 @@ type PageResult<T> = { list: T[]; total: number }
 const visible = ref(false)
 const title = ref('')
 const loading = ref(false)
+const hasExistingRecords = ref(false)
 
 const recipeId = ref<string | number | undefined>(undefined)
 const list = ref<RecipePointVO[]>([])
@@ -144,11 +153,13 @@ const open = async (options: {
   recipeId: string | number
   recipeName?: string
   data?: Array<RecipePointVO>
-    id : undefined | number
+  id: number | undefined
+  hasExistingRecords?: boolean
 }) => {
   visible.value = true
   formulaLibraryId.value = options.id
   recipeId.value = options.recipeId
+  hasExistingRecords.value = !!options.hasExistingRecords
   const baseTitle = t('RecipeManagement.RecipeLibrary.readDialogTitle')
   title.value = options.recipeName ? `${baseTitle}-${options.recipeName}` : baseTitle
   queryParams.pageNo = 1
diff --git a/src/views/formula/formulaLibrary/index.vue b/src/views/formula/formulaLibrary/index.vue
index 3bf3e535..45113b53 100644
--- a/src/views/formula/formulaLibrary/index.vue
+++ b/src/views/formula/formulaLibrary/index.vue
@@ -223,7 +223,8 @@ import { RecipeConfigApi } from '@/api/iot/recipeConfig'
 import { RecipePointApi } from '@/api/iot/recipePoint'
 import FormulaLibraryDetailTabs from './components/FormulaLibraryDetailTabs.vue'
 import FormulaLibraryReadDialog from './components/FormulaLibraryReadDialog.vue'
-import { RecipeDeviceRecordApi} from '@/api/iot/recipeDeviceRecord'
+import { RecipeDeviceRecordApi } from '@/api/iot/recipeDeviceRecord'
+import { RecipePointRecordApi } from '@/api/iot/recipepointrecord'
 
 type SelectOption<T = any> = { label: string; value: T }
 
@@ -398,11 +399,37 @@ const openDialog = async (type: 'create' | 'update', row?: RecipePlanDetailVO) =
 
 const readDialogRef = ref<InstanceType<typeof FormulaLibraryReadDialog>>()
 
+const checkRecipeRecords = async (recipeId: string | number) => {
+  const params = {
+    pageNo: 1,
+    pageSize: 1,
+    recipeId: String(recipeId)
+  }
+  try {
+    const [devicePage, manualPage] = await Promise.all([
+      RecipeDeviceRecordApi.getRecipeDeviceRecordPage(params),
+      RecipePointRecordApi.getRecipePointRecordPage(params)
+    ])
+    const deviceTotal = Number((devicePage as any)?.total ?? 0)
+    const manualTotal = Number((manualPage as any)?.total ?? 0)
+    return {
+      hasDeviceRecords: deviceTotal > 0,
+      hasManualRecords: manualTotal > 0
+    }
+  } catch {
+    return {
+      hasDeviceRecords: false,
+      hasManualRecords: false
+    }
+  }
+}
+
 const handleRead = async (row: RecipePlanDetailVO) => {
   const recipeId = row?.recipeId
   const id = row?.id
   if (!recipeId) return
   const recipeName = row?.recipeName
+  const { hasDeviceRecords, hasManualRecords } = await checkRecipeRecords(recipeId)
   const data = await RecipePointApi.getRecipePointList(Number(recipeId))
   if (!data?.length) {
     await message.confirm(t('RecipeManagement.RecipeLibrary.readDeviceConfirmMessage'))
@@ -412,7 +439,13 @@ const handleRead = async (row: RecipePlanDetailVO) => {
     return
     }
   }
-  await readDialogRef.value?.open({ recipeId, recipeName, data, id })
+  await readDialogRef.value?.open({
+    recipeId,
+    recipeName,
+    data,
+    id,
+    hasExistingRecords: hasDeviceRecords || hasManualRecords
+  })
 }
 
 const submitDialog = async () => {