From c49e2fed522f689952835e230a6b32dd0b6b9e4b Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 7 Jan 2026 19:29:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=85=8D=E6=96=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE-=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/recipeConfig/index.ts             |  45 +--
 src/api/iot/recipePoint/index.ts              |  31 ++
 .../components/RecipeDetailList.vue           | 332 ++++++++++++++++++
 src/views/formula/formulaConfig/index.vue     | 109 ++----
 4 files changed, 400 insertions(+), 117 deletions(-)
 create mode 100644 src/api/iot/recipePoint/index.ts
 create mode 100644 src/views/formula/formulaConfig/components/RecipeDetailList.vue

diff --git a/src/api/iot/recipeConfig/index.ts b/src/api/iot/recipeConfig/index.ts
index 46ebb05c..90e6a386 100644
--- a/src/api/iot/recipeConfig/index.ts
+++ b/src/api/iot/recipeConfig/index.ts
@@ -20,12 +20,14 @@ export interface RecipeConfigVO {
 
 export interface RecipePointDetailVO {
   id: number
-  recipeId: number
+  recipeId: string | number
   attributeId?: number
-  pointName: string
-  pointType: string
-  dataType: string
-  dataUnit: string
+  pointName?: string
+  pointType?: string
+  dataType?: string
+  dataUnit?: string
+  attributeName?: string
+  attributeType?: string
 }
 
 export interface RecipePointCandidateVO {
@@ -172,39 +174,10 @@ export const RecipeConfigApi = {
   },
 
   getRecipePointDetailPage: async (params: any) => {
-    ensureMockSeeded()
-    await sleep(120)
-    const recipeId = Number(params?.recipeId)
-    const pageNo = params?.pageNo
-    const pageSize = params?.pageSize
-    if (!recipeId) return { list: [], total: 0 }
-
-    const relation = loadFromStorage<Record<string, number[]>>(STORAGE_KEYS.recipePointRelation, {})
-    const selectedIds = relation[String(recipeId)] ?? []
-    const candidates = loadFromStorage<RecipePointCandidateVO[]>(
-      STORAGE_KEYS.pointCandidates,
-      buildMockPointCandidates()
-    )
-    const map = candidates.reduce((acc, cur) => {
-      acc[cur.id] = cur
-      return acc
-    }, {} as Record<number, RecipePointCandidateVO>)
-    const detailAll: RecipePointDetailVO[] = selectedIds
-      .map((id) => map[id])
-      .filter(Boolean)
-      .map((item) => ({
-        id: item.id,
-        recipeId,
-        attributeId: item.id,
-        pointName: item.pointName,
-        pointType: item.pointType,
-        dataType: item.dataType,
-        dataUnit: item.dataUnit
-      }))
-    return paginate(detailAll, pageNo, pageSize)
+    return await request.get({ url: `/iot/recipe-device-attribute/page`, params })
   },
 
-  saveRecipePointConfig: async (data: { recipeId: number; attributeIds: number[] }) => {
+  saveRecipePointConfig: async (data: { recipeId: string | number; attributeIds: number[] }) => {
     ensureMockSeeded()
     await sleep(120)
     const relation = loadFromStorage<Record<string, number[]>>(STORAGE_KEYS.recipePointRelation, {})
diff --git a/src/api/iot/recipePoint/index.ts b/src/api/iot/recipePoint/index.ts
new file mode 100644
index 00000000..2185218a
--- /dev/null
+++ b/src/api/iot/recipePoint/index.ts
@@ -0,0 +1,31 @@
+import request from '@/config/axios'
+
+export interface RecipePointVO {
+  id: number
+  recipeId: string | number
+  name?: string
+  max?: string | number
+  min?: string | number
+  dataType?: string
+  dataUnit?: string
+  remark?: string
+  createTime?: string
+}
+
+export const RecipePointApi = {
+  getRecipePointPage: async (params: any) => {
+    return await request.get({ url: `/iot/recipe-point/page`, params })
+  },
+
+  createRecipePoint: async (params: Partial<RecipePointVO>) => {
+    return await request.post({ url: `/iot/recipe-point/create`, data: params })
+  },
+
+  updateRecipePoint: async (params: Partial<RecipePointVO>) => {
+    return await request.put({ url: `/iot/recipe-point/update`, data: params })
+  },
+
+  deleteRecipePoint: async (id: number) => {
+    return await request.delete({ url: `/iot/recipe-point/delete`, params: { id } })
+  }
+}
diff --git a/src/views/formula/formulaConfig/components/RecipeDetailList.vue b/src/views/formula/formulaConfig/components/RecipeDetailList.vue
new file mode 100644
index 00000000..b3d8fad9
--- /dev/null
+++ b/src/views/formula/formulaConfig/components/RecipeDetailList.vue
@@ -0,0 +1,332 @@
+<template>
+  <ContentWrap v-if="visible">
+    <el-tabs v-model="activeTab" class="mb-12px">
+      <template #extra>
+        <el-button link type="info" @click="handleClose">收起</el-button>
+      </template>
+      <el-tab-pane :label="`详情：${recipeCode} - ${name}`" name="detail">
+        <div class="mb-12px text-left">
+          <el-button type="primary" @click="handleConfig">配置</el-button>
+        </div>
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id">
+          <el-table-column label="序号" align="center" width="80">
+            <template #default="scope">
+              {{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="点位名称" align="center" prop="pointName" />
+          <el-table-column label="点位类型" align="center" prop="pointType" />
+          <el-table-column label="数据类型" align="center" prop="dataType" />
+          <el-table-column label="单位" align="center" prop="dataUnit" />
+        </el-table>
+        <Pagination
+          :total="total"
+          v-model:page="queryParams.pageNo"
+          v-model:limit="queryParams.pageSize"
+          @pagination="handlePagination"
+        />
+      </el-tab-pane>
+
+      <el-tab-pane label="手动录入参数" name="manual">
+        <div class="mb-12px flex justify-start">
+          <el-button type="primary" @click="openManualDialog('create')">新增</el-button>
+        </div>
+        <el-table
+          v-loading="manualLoading"
+          :data="manualList"
+          :stripe="true"
+          :show-overflow-tooltip="true"
+          row-key="id"
+        >
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="上限" align="center" prop="max" />
+          <el-table-column label="下限" align="center" prop="min" />
+          <el-table-column label="单位" align="center" prop="dataUnit" />
+          <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="操作" align="center" width="150px" fixed="right">
+            <template #default="scope">
+              <el-button link type="primary" @click="openManualDialog('update', scope.row)">编辑</el-button>
+              <el-button link type="danger" @click="handleManualDelete(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <Pagination
+          :total="manualTotal"
+          v-model:page="manualQueryParams.pageNo"
+          v-model:limit="manualQueryParams.pageSize"
+          @pagination="handleManualPagination"
+        />
+      </el-tab-pane>
+    </el-tabs>
+
+    <Dialog
+      :title="manualDialogMode === 'create' ? '新增参数' : '编辑参数'"
+      v-model="manualDialogVisible"
+      width="640px"
+    >
+      <el-form
+        ref="manualFormRef"
+        :model="manualForm"
+        :rules="manualRules"
+        label-width="90px"
+        v-loading="manualDialogLoading"
+      >
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="manualForm.name" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item label="上限" prop="max">
+          <el-input v-model="manualForm.max" placeholder="请输入上限" clearable />
+        </el-form-item>
+        <el-form-item label="下限" prop="min">
+          <el-input v-model="manualForm.min" placeholder="请输入下限" clearable />
+        </el-form-item>
+        <el-form-item label="数据类型" prop="dataType">
+          <el-select v-model="manualForm.dataType" placeholder="请选择数据类型" clearable filterable class="!w-full">
+            <el-option
+              v-for="dict in dataTypeDictOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位" prop="dataUnit">
+          <el-select v-model="manualForm.dataUnit" placeholder="请选择单位" clearable filterable class="!w-full">
+            <el-option
+              v-for="dict in unitDictOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="manualForm.remark" placeholder="请输入备注" clearable type="textarea" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="manualDialogVisible = false">取 消</el-button>
+        <el-button type="primary" :disabled="manualDialogLoading" @click="submitManualDialog">保 存</el-button>
+      </template>
+    </Dialog>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { RecipeConfigApi, RecipePointDetailVO } from '@/api/iot/recipeConfig'
+import { RecipePointApi, RecipePointVO } from '@/api/iot/recipePoint'
+import { getStrDictOptions } from '@/utils/dict'
+
+defineOptions({ name: 'RecipeDetailList' })
+
+const message = useMessage()
+const { t } = useI18n()
+
+const props = defineProps<{
+  visible: boolean
+  recipeId?: string
+  manualRecipeId?: string | number
+  recipeCode: string
+  name: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'close'): void
+  (e: 'config'): void
+}>()
+
+const activeTab = ref('detail')
+const loading = ref(false)
+const list = ref<RecipePointDetailVO[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+
+const manualLoading = ref(false)
+const manualList = ref<RecipePointVO[]>([])
+const manualTotal = ref(0)
+const manualQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+
+type ManualDialogMode = 'create' | 'update'
+const manualDialogVisible = ref(false)
+const manualDialogMode = ref<ManualDialogMode>('create')
+const manualDialogLoading = ref(false)
+const manualFormRef = ref()
+const manualForm = reactive({
+  id: undefined as number | undefined,
+  name: '',
+  max: '' as string | undefined,
+  min: '' as string | undefined,
+  dataType: '' as string | undefined,
+  dataUnit: '' as string | undefined,
+  remark: '' as string | undefined
+})
+const manualRules = reactive({
+  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  max: [{ required: true, message: '上限不能为空', trigger: 'blur' }],
+  min: [{ required: true, message: '下限不能为空', trigger: 'blur' }],
+  dataType: [{ required: true, message: '数据类型不能为空', trigger: 'change' }],
+  dataUnit: [{ required: true, message: '单位不能为空', trigger: 'change' }]
+})
+
+const dataTypeDictOptions = computed(() => getStrDictOptions('iot_device_data_type'))
+const unitDictOptions = computed(() => getStrDictOptions('iot_device_attribute_unit'))
+
+const normalizeDetail = (item: any): RecipePointDetailVO => {
+  return {
+    ...item,
+    pointName: item.pointName ?? item.attributeName,
+    pointType: item.pointType ?? item.attributeType
+  }
+}
+
+const getList = async () => {
+  if (!props.recipeId) return
+  loading.value = true
+  try {
+    const pageSize = Math.min(100, Math.max(1, Number(queryParams.pageSize) || 10))
+    const data = await RecipeConfigApi.getRecipePointDetailPage({
+      pageNo: queryParams.pageNo,
+      pageSize,
+      recipeId: props.recipeId
+    })
+    list.value = (data.list ?? []).map(normalizeDetail)
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const handlePagination = () => {
+  getList()
+}
+
+const getManualList = async () => {
+  if (!props.manualRecipeId) return
+  manualLoading.value = true
+  try {
+    const pageSize = Math.min(100, Math.max(1, Number(manualQueryParams.pageSize) || 10))
+    const data = await RecipePointApi.getRecipePointPage({
+      pageNo: manualQueryParams.pageNo,
+      pageSize,
+      recipeId: props.manualRecipeId
+    })
+    manualList.value = data.list ?? []
+    manualTotal.value = data.total
+  } finally {
+    manualLoading.value = false
+  }
+}
+
+const handleManualPagination = () => {
+  getManualList()
+}
+
+const openManualDialog = (mode: ManualDialogMode, row?: RecipePointVO) => {
+  manualDialogMode.value = mode
+  manualDialogVisible.value = true
+  nextTick(() => {
+    manualFormRef.value?.clearValidate?.()
+  })
+  if (mode === 'create') {
+    manualForm.id = undefined
+    manualForm.name = ''
+    manualForm.max = ''
+    manualForm.min = ''
+    manualForm.dataType = ''
+    manualForm.dataUnit = ''
+    manualForm.remark = ''
+    return
+  }
+  manualForm.id = row?.id
+  manualForm.name = row?.name ?? ''
+  manualForm.max = row?.max === undefined || row?.max === null ? '' : String(row.max)
+  manualForm.min = row?.min === undefined || row?.min === null ? '' : String(row.min)
+  manualForm.dataType = row?.dataType === undefined || row?.dataType === null ? '' : String(row.dataType)
+  manualForm.dataUnit = row?.dataUnit ?? ''
+  manualForm.remark = row?.remark ?? ''
+}
+
+const submitManualDialog = async () => {
+  if (!props.manualRecipeId) return
+  await manualFormRef.value?.validate?.()
+  manualDialogLoading.value = true
+  try {
+    const params = {
+      id: manualForm.id,
+      recipeId: props.manualRecipeId,
+      name: manualForm.name,
+      max: manualForm.max,
+      min: manualForm.min,
+      dataType: manualForm.dataType,
+      dataUnit: manualForm.dataUnit,
+      remark: manualForm.remark
+    }
+    if (manualDialogMode.value === 'create') {
+      await RecipePointApi.createRecipePoint(params)
+      message.success(t('common.createSuccess'))
+    } else {
+      await RecipePointApi.updateRecipePoint(params)
+      message.success(t('common.updateSuccess'))
+    }
+    manualDialogVisible.value = false
+    await getManualList()
+  } finally {
+    manualDialogLoading.value = false
+  }
+}
+
+const handleManualDelete = async (row: RecipePointVO) => {
+  try {
+    await message.delConfirm()
+    await RecipePointApi.deleteRecipePoint(row.id)
+    message.success(t('common.delSuccess'))
+    await getManualList()
+  } catch {}
+}
+
+const handleClose = () => {
+  emit('close')
+}
+
+const handleConfig = () => {
+  emit('config')
+}
+
+watch(
+  () => [props.visible, props.recipeId],
+  ([visible]) => {
+    if (!visible) return
+    queryParams.pageNo = 1
+    manualQueryParams.pageNo = 1
+    activeTab.value = 'detail'
+    getList()
+  },
+  { immediate: true }
+)
+
+watch(
+  () => activeTab.value,
+  (tab) => {
+    if (!props.visible) return
+    if (tab === 'manual') {
+      getManualList()
+    }
+  }
+)
+
+const refresh = async () => {
+  if (activeTab.value === 'manual') {
+    await getManualList()
+    return
+  }
+  await getList()
+}
+
+defineExpose({ refresh })
+</script>
diff --git a/src/views/formula/formulaConfig/index.vue b/src/views/formula/formulaConfig/index.vue
index b4729d31..f63a98fd 100644
--- a/src/views/formula/formulaConfig/index.vue
+++ b/src/views/formula/formulaConfig/index.vue
@@ -48,7 +48,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
       <el-table-column label="配方描述" align="center" prop="recipeDesc" />
       <el-table-column label="操作" align="center" width="240px" fixed="right">
         <template #default="scope">
-          <el-button link type="primary" @click.stop="openConfigDialog(scope.row)">配置</el-button>
+          <el-button link type="primary" @click.stop="openDetail(scope.row)">配置</el-button>
           <el-button link type="warning" @click.stop="openDialog('update', scope.row)">编辑</el-button>
           <el-button link type="danger" @click.stop="handleDelete(scope.row)">删除</el-button>
         </template>
@@ -59,31 +59,16 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
       @pagination="handlePagination" />
   </ContentWrap>
 
-  <ContentWrap v-if="detailVisible">
-    <el-tabs v-model="detailActiveTab" class="mb-12px">
-      <template #extra>
-        <el-button link type="info" @click="closeDetail">收起</el-button>
-      </template>
-      <el-tab-pane :label="`详情：${detailMeta.recipeCode} - ${detailMeta.name}`" name="detail">
-        <el-table
-v-loading="detailLoading" :data="detailList" :stripe="true" :show-overflow-tooltip="true"
-          row-key="id">
-          <el-table-column label="序号" align="center" width="80">
-            <template #default="scope">
-              {{ (detailQueryParams.pageNo - 1) * detailQueryParams.pageSize + scope.$index + 1 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="点位名称" align="center" prop="pointName" />
-          <el-table-column label="点位类型" align="center" prop="pointType" />
-          <el-table-column label="数据类型" align="center" prop="dataType" />
-          <el-table-column label="单位" align="center" prop="dataUnit" />
-        </el-table>
-        <Pagination
-:total="detailTotal" v-model:page="detailQueryParams.pageNo"
-          v-model:limit="detailQueryParams.pageSize" @pagination="handleDetailPagination" />
-      </el-tab-pane>
-    </el-tabs>
-  </ContentWrap>
+  <RecipeDetailList
+    ref="detailRef"
+    :visible="detailVisible"
+    :recipe-id="detailMeta.recipeCode"
+    :manual-recipe-id="detailMeta.id"
+    :recipe-code="detailMeta.recipeCode"
+    :name="detailMeta.name"
+    @config="handleDetailConfig"
+    @close="closeDetail"
+  />
 
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="720px">
     <el-form ref="dialogFormRef" :model="dialogForm" :rules="dialogRules" label-width="100px" v-loading="dialogLoading">
@@ -142,7 +127,8 @@ import download from '@/utils/download'
 import { ProductApi } from '@/api/erp/product/product'
 import { DeviceApi } from '@/api/iot/device'
 import { RecipeApi } from '@/api/iot/recipe'
-import { RecipeConfigApi, RecipeConfigVO, RecipePointDetailVO } from '@/api/iot/recipeConfig'
+import { RecipeConfigApi, RecipeConfigVO } from '@/api/iot/recipeConfig'
+import RecipeDetailList from './components/RecipeDetailList.vue'
 
 type SelectOption<T = any> = { label: string; value: T }
 
@@ -261,7 +247,7 @@ const getDeviceOptions = async () => {
 const getRecipeTypeOptions = async () => {
   recipeTypeLoading.value = true
   try {
-    const data = await RecipeApi.getRecipePage()
+    const data = await RecipeApi.getRecipePage({})
     recipeTypeOptions.value = (data?.list ?? []).map((item: any) => ({ label: item.name, value: item.name }))
   } finally {
     recipeTypeLoading.value = false
@@ -351,53 +337,24 @@ const submitDialog = async () => {
   }
 }
 
+const detailRef = ref()
 const detailVisible = ref(false)
-const detailActiveTab = ref('detail')
-const detailLoading = ref(false)
-const detailList = ref<RecipePointDetailVO[]>([])
-const detailTotal = ref(0)
 const detailMeta = reactive({
-  recipeId: undefined as string | undefined,
+  id: undefined as number | undefined,
   recipeCode: '',
   name: ''
 })
-const detailQueryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  recipeId: undefined as string | undefined
-})
-
-const getDetailList = async () => {
-  if (!detailQueryParams.recipeId) return
-  detailLoading.value = true
-  try {
-    const data = await RecipeConfigApi.getRecipePointDetailPage({
-      pageNo: detailQueryParams.pageNo,
-      pageSize: detailQueryParams.pageSize,
-      recipeId: detailQueryParams.recipeId
-    })
-    detailList.value = (data.list ?? []).map((item: any) => {
-      return {
-        ...item,
-        pointName: item.pointName ?? item.attributeName,
-        pointType: item.pointType ?? item.attributeType
-      }
-    })
-    detailTotal.value = data.total
-  } finally {
-    detailLoading.value = false
-  }
-}
 
 const openDetail = async (row: RecipeConfigVO) => {
-  detailMeta.recipeId = row.recipeCode
+  detailMeta.id = row.id
   detailMeta.recipeCode = row.recipeCode
   detailMeta.name = row.name ?? row.recipeName ?? ''
-  detailQueryParams.recipeId = row.recipeCode
-  detailQueryParams.pageNo = 1
   detailVisible.value = true
-  detailActiveTab.value = 'detail'
-  await getDetailList()
+}
+
+const handleDetailConfig = () => {
+  if (!detailMeta.recipeCode) return
+  openConfigDialog(detailMeta.recipeCode)
 }
 
 const handleRowClick = async (row: RecipeConfigVO, column: any) => {
@@ -408,19 +365,9 @@ const handleRowClick = async (row: RecipeConfigVO, column: any) => {
 
 const closeDetail = () => {
   detailVisible.value = false
-  detailActiveTab.value = 'detail'
-  detailMeta.recipeId = undefined
+  detailMeta.id = undefined
   detailMeta.recipeCode = ''
   detailMeta.name = ''
-  detailQueryParams.recipeId = undefined
-  detailQueryParams.pageNo = 1
-  detailQueryParams.pageSize = 10
-  detailList.value = []
-  detailTotal.value = 0
-}
-
-const handleDetailPagination = () => {
-  getDetailList()
 }
 
 type TransferItem = { key: number; label: string; disabled?: boolean }
@@ -431,16 +378,16 @@ const configRecipeId = ref<string | undefined>(undefined)
 const configCandidates = ref<TransferItem[]>([])
 const configSelectedKeys = ref<number[]>([])
 
-const openConfigDialog = async (row: RecipeConfigVO) => {
+const openConfigDialog = async (recipeCode: string) => {
   configVisible.value = true
-  configRecipeId.value = row.recipeCode
+  configRecipeId.value = recipeCode
   configSelectedKeys.value = []
   configCandidates.value = []
   configLoading.value = true
   try {
     const [candidateRes, selectedRes] = await Promise.all([
       DeviceApi.getDeviceContactModelPage(),
-      RecipeConfigApi.getRecipePointDetailPage({ pageNo: 1, pageSize: 1000, recipeId: row.recipeCode })
+      RecipeConfigApi.getRecipePointDetailPage({ pageNo: 1, pageSize: 100, recipeId: recipeCode })
     ])
 
     const candidateList = Array.isArray(candidateRes)
@@ -470,8 +417,8 @@ const submitConfig = async () => {
     })
     message.success(t('common.updateSuccess'))
     configVisible.value = false
-    if (detailVisible.value && detailQueryParams.recipeId === configRecipeId.value) {
-      await getDetailList()
+    if (detailVisible.value && detailMeta.recipeCode === configRecipeId.value) {
+      await detailRef.value?.refresh?.()
     }
   } finally {
     configLoading.value = false