From 8587a549c692778b7b9a08e83efc4d139e583bce Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 17 Jan 2026 19:36:51 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat=EF=BC=9A=E3=80=90iot=E3=80=91modbus-tc?=
 =?UTF-8?q?p=20=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=85=A5=2020%=EF=BC=9A?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=9F=BA=E4=BA=8E?=
 =?UTF-8?q?=20dynamic-forging-wigderson.md=20=E8=A7=84=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/modbus/config/index.ts     |  29 ++
 src/api/iot/device/modbus/point/index.ts      |  48 +++
 .../device/detail/DeviceModbusConfig.vue      | 262 +++++++++++++++
 .../device/detail/DeviceModbusConfigForm.vue  | 160 +++++++++
 .../device/detail/DeviceModbusPointForm.vue   | 315 ++++++++++++++++++
 src/views/iot/device/device/detail/index.vue  |  13 +
 src/views/iot/utils/constants.ts              |  68 ++++
 7 files changed, 895 insertions(+)
 create mode 100644 src/api/iot/device/modbus/config/index.ts
 create mode 100644 src/api/iot/device/modbus/point/index.ts
 create mode 100644 src/views/iot/device/device/detail/DeviceModbusConfig.vue
 create mode 100644 src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
 create mode 100644 src/views/iot/device/device/detail/DeviceModbusPointForm.vue

diff --git a/src/api/iot/device/modbus/config/index.ts b/src/api/iot/device/modbus/config/index.ts
new file mode 100644
index 000000000..fa0e0a802
--- /dev/null
+++ b/src/api/iot/device/modbus/config/index.ts
@@ -0,0 +1,29 @@
+import request from '@/config/axios'
+
+/** Modbus 连接配置 VO */
+export interface DeviceModbusConfigVO {
+  id?: number // 主键
+  deviceId: number // 设备编号
+  ip: string // Modbus 服务器 IP 地址
+  port: number // Modbus 服务器端口
+  slaveId: number // 从站地址
+  timeout: number // 连接超时时间，单位：毫秒
+  retryInterval: number // 重试间隔，单位：毫秒
+  status: number // 状态
+}
+
+/** Modbus 连接配置 API */
+export const DeviceModbusConfigApi = {
+  /** 获取设备的 Modbus 连接配置 */
+  getModbusConfig: async (deviceId: number) => {
+    return await request.get<DeviceModbusConfigVO>({
+      url: `/iot/device-modbus-config/get`,
+      params: { deviceId }
+    })
+  },
+
+  /** 保存 Modbus 连接配置 */
+  saveModbusConfig: async (data: DeviceModbusConfigVO) => {
+    return await request.post({ url: `/iot/device-modbus-config/save`, data })
+  }
+}
diff --git a/src/api/iot/device/modbus/point/index.ts b/src/api/iot/device/modbus/point/index.ts
new file mode 100644
index 000000000..5dc05d1c1
--- /dev/null
+++ b/src/api/iot/device/modbus/point/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+/** Modbus 点位配置 VO */
+export interface DeviceModbusPointVO {
+  id?: number // 主键
+  deviceId: number // 设备编号
+  thingModelId: number // 物模型属性编号
+  identifier: string // 属性标识符
+  name: string // 属性名称
+  functionCode: number // Modbus 功能码
+  registerAddress: number // 寄存器起始地址
+  registerCount: number // 寄存器数量
+  byteOrder: string // 字节序
+  rawDataType: string // 原始数据类型
+  scale: number // 缩放因子
+  pollInterval: number // 轮询间隔，单位：毫秒
+  status: number // 状态
+}
+
+/** Modbus 点位配置 API */
+export const DeviceModbusPointApi = {
+  /** 获取设备的 Modbus 点位分页 */
+  getModbusPointPage: async (params: any) => {
+    return await request.get({ url: `/iot/device-modbus-point/page`, params })
+  },
+
+  /** 获取 Modbus 点位详情 */
+  getModbusPoint: async (id: number) => {
+    return await request.get<DeviceModbusPointVO>({
+      url: `/iot/device-modbus-point/get?id=${id}`
+    })
+  },
+
+  /** 创建 Modbus 点位配置 */
+  createModbusPoint: async (data: DeviceModbusPointVO) => {
+    return await request.post({ url: `/iot/device-modbus-point/create`, data })
+  },
+
+  /** 更新 Modbus 点位配置 */
+  updateModbusPoint: async (data: DeviceModbusPointVO) => {
+    return await request.put({ url: `/iot/device-modbus-point/update`, data })
+  },
+
+  /** 删除 Modbus 点位配置 */
+  deleteModbusPoint: async (id: number) => {
+    return await request.delete({ url: `/iot/device-modbus-point/delete?id=${id}` })
+  }
+}
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfig.vue b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
new file mode 100644
index 000000000..d380fb2dc
--- /dev/null
+++ b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
@@ -0,0 +1,262 @@
+<!-- Modbus 配置 -->
+<template>
+  <div>
+    <!-- 连接配置区域 -->
+    <ContentWrap>
+      <div class="flex items-center justify-between mb-4">
+        <span class="text-lg font-medium">连接配置</span>
+        <el-button type="primary" @click="handleEditConfig">编辑</el-button>
+      </div>
+
+      <!-- 详情展示 -->
+      <el-descriptions :column="3" border direction="horizontal">
+        <el-descriptions-item label="IP 地址">
+          {{ modbusConfig.ip || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="端口">
+          {{ modbusConfig.port || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="从站地址">
+          {{ modbusConfig.slaveId || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="连接超时">
+          {{ modbusConfig.timeout ? `${modbusConfig.timeout} ms` : '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="重试间隔">
+          {{ modbusConfig.retryInterval ? `${modbusConfig.retryInterval} ms` : '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="状态">
+          <el-tag :type="modbusConfig.status === 0 ? 'success' : 'danger'">
+            {{ modbusConfig.status === 0 ? '启用' : '禁用' }}
+          </el-tag>
+        </el-descriptions-item>
+      </el-descriptions>
+    </ContentWrap>
+
+    <!-- 点位配置区域 -->
+    <ContentWrap class="mt-4">
+      <div class="flex items-center justify-between mb-4">
+        <span class="text-lg font-medium">点位配置</span>
+        <el-button type="primary" @click="handleAddPoint">
+          <Icon icon="ep:plus" class="mr-1" />
+          新增点位
+        </el-button>
+      </div>
+
+      <!-- 搜索栏 -->
+      <el-form :model="queryParams" :inline="true" class="-mb-15px">
+        <el-form-item label="属性名称" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入属性名称"
+            clearable
+            class="!w-200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="标识符" prop="identifier">
+          <el-input
+            v-model="queryParams.identifier"
+            placeholder="请输入标识符"
+            clearable
+            class="!w-200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery">
+            <Icon icon="ep:search" class="mr-5px" />
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" />
+            重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 点位列表 -->
+      <el-table v-loading="pointLoading" :data="pointList" :stripe="true" class="mt-4">
+        <el-table-column label="属性名称" align="center" prop="name" min-width="100" />
+        <el-table-column label="标识符" align="center" prop="identifier" min-width="100">
+          <template #default="scope">
+            <el-tag size="small" type="primary">{{ scope.row.identifier }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="功能码" align="center" prop="functionCode" min-width="140">
+          <template #default="scope">
+            {{ formatFunctionCode(scope.row.functionCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寄存器地址" align="center" prop="registerAddress" min-width="100">
+          <template #default="scope">
+            {{ formatRegisterAddress(scope.row.registerAddress) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="寄存器数量" align="center" prop="registerCount" min-width="90" />
+        <el-table-column label="数据类型" align="center" prop="rawDataType" min-width="90">
+          <template #default="scope">
+            <el-tag size="small" type="info">{{ scope.row.rawDataType }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="字节序" align="center" prop="byteOrder" min-width="80" />
+        <el-table-column label="缩放因子" align="center" prop="scale" min-width="80" />
+        <el-table-column label="轮询间隔" align="center" prop="pollInterval" min-width="90">
+          <template #default="scope"> {{ scope.row.pollInterval }} ms </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status" min-width="80">
+          <template #default="scope">
+            <!-- TODO @AI dict-tag -->
+            <el-tag :type="scope.row.status === 0 ? 'success' : 'danger'" size="small">
+              {{ scope.row.status === 0 ? '启用' : '禁用' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" width="120">
+          <template #default="scope">
+            <el-button link type="primary" @click="handleEditPoint(scope.row)">编辑</el-button>
+            <el-button link type="danger" @click="handleDeletePoint(scope.row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页 -->
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getPointPage"
+      />
+    </ContentWrap>
+
+    <!-- 连接配置弹窗 -->
+    <DeviceModbusConfigForm ref="configFormRef" :device-id="device.id" @success="getModbusConfig" />
+
+    <!-- 点位表单弹窗 -->
+    <DeviceModbusPointForm
+      ref="pointFormRef"
+      :device-id="device.id"
+      :thing-model-list="thingModelList"
+      @success="getPointPage"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { DeviceVO } from '@/api/iot/device/device'
+import { ProductVO } from '@/api/iot/product/product'
+import { ThingModelData } from '@/api/iot/thingmodel'
+import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
+import { DeviceModbusPointApi, DeviceModbusPointVO } from '@/api/iot/device/modbus/point'
+import { ModbusFunctionCodeOptions } from '@/views/iot/utils/constants'
+import DeviceModbusConfigForm from './DeviceModbusConfigForm.vue'
+import DeviceModbusPointForm from './DeviceModbusPointForm.vue'
+
+defineOptions({ name: 'DeviceModbusConfig' })
+
+const props = defineProps<{
+  device: DeviceVO
+  product: ProductVO
+  thingModelList: ThingModelData[]
+}>()
+
+const message = useMessage()
+
+// ======================= 连接配置 =======================
+// TODO @AI：默认应该都是空的
+const modbusConfig = ref<DeviceModbusConfigVO>({
+  deviceId: props.device.id,
+  ip: '',
+  port: 502,
+  slaveId: 1,
+  timeout: 3000,
+  retryInterval: 1000,
+  status: 0 // TODO @AI：使用 CommonStatus；
+})
+
+/** 获取连接配置 */
+const getModbusConfig = async () => {
+  modbusConfig.value = await DeviceModbusConfigApi.getModbusConfig(props.device.id)
+}
+
+/** 编辑连接配置 */
+const configFormRef = ref()
+const handleEditConfig = () => {
+  configFormRef.value?.open(modbusConfig.value)
+}
+
+// ======================= 点位配置 =======================
+const pointLoading = ref(false)
+const pointList = ref<DeviceModbusPointVO[]>([])
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deviceId: props.device.id,
+  name: undefined as string | undefined,
+  identifier: undefined as string | undefined
+})
+
+/** 获取点位分页 */
+const getPointPage = async () => {
+  pointLoading.value = true
+  try {
+    const data = await DeviceModbusPointApi.getModbusPointPage(queryParams)
+    pointList.value = data.list
+    total.value = data.total
+  } finally {
+    pointLoading.value = false
+  }
+}
+
+/** 搜索 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getPointPage()
+}
+
+/** 重置搜索 */
+const resetQuery = () => {
+  queryParams.name = undefined
+  queryParams.identifier = undefined
+  handleQuery()
+}
+
+/** 格式化功能码 */
+const formatFunctionCode = (code: number) => {
+  const option = ModbusFunctionCodeOptions.find((item) => item.value === code)
+  return option ? option.label : `${code}`
+}
+
+/** 格式化寄存器地址为十六进制 */
+const formatRegisterAddress = (address: number) => {
+  return '0x' + address.toString(16).toUpperCase().padStart(4, '0')
+}
+
+/** 新增点位 */
+const pointFormRef = ref()
+const handleAddPoint = () => {
+  pointFormRef.value?.open('create')
+}
+
+/** 编辑点位 */
+const handleEditPoint = (row: DeviceModbusPointVO) => {
+  pointFormRef.value?.open('update', row.id)
+}
+
+/** 删除点位 */
+const handleDeletePoint = async (id: number) => {
+  // TODO @AI：最好点位的名字带上。参考别的模块；
+  // TODO @AI：参考别的注释。
+  await message.confirm('确定要删除该点位配置吗？')
+  await DeviceModbusPointApi.deleteModbusPoint(id)
+  message.success('删除成功')
+  await getPointPage()
+}
+
+/** 初始化 */
+onMounted(async () => {
+  await getModbusConfig()
+  await getPointPage()
+})
+</script>
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
new file mode 100644
index 000000000..0e9572a60
--- /dev/null
+++ b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
@@ -0,0 +1,160 @@
+<!-- Modbus 连接配置弹窗 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="IP 地址" prop="ip">
+        <el-input v-model="formData.ip" placeholder="请输入 Modbus 服务器 IP 地址" />
+      </el-form-item>
+      <el-form-item label="请输入 Modbus 端口" prop="port">
+        <el-input-number
+          v-model="formData.port"
+          :min="1"
+          :max="65535"
+          controls-position="right"
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="从站地址" prop="slaveId">
+        <el-input-number
+          v-model="formData.slaveId"
+          :min="1"
+          :max="247"
+          controls-position="right"
+          class="!w-full"
+        />
+        <!-- TODO @AI：placehoder 需要写下 -->
+      </el-form-item>
+      <el-form-item label="连接超时" prop="timeout">
+        <el-input-number
+          v-model="formData.timeout"
+          :min="1000"
+          :step="1000"
+          controls-position="right"
+          class="!w-full"
+        />
+        <!-- TODO @AI：placehoder 需要写下 -->
+        <div class="text-xs text-gray-400 mt-1">单位：毫秒</div>
+        <!-- TODO @AI：上面的毫秒，可以去掉 -->
+      </el-form-item>
+      <el-form-item label="重试间隔" prop="retryInterval">
+        <el-input-number
+          v-model="formData.retryInterval"
+          :min="1000"
+          :step="1000"
+          controls-position="right"
+          class="!w-full"
+        />
+        <!-- TODO @AI：placehoder 需要写下 -->
+        <div class="text-xs text-gray-400 mt-1">单位：毫秒</div>
+        <!-- TODO @AI：上面的毫秒，可以去掉 -->
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <!-- TODO @AI：看看别的禁用，应该是怎么样的 -->
+        <el-switch
+          v-model="formData.status"
+          :active-value="0"
+          :inactive-value="1"
+          active-text="启用"
+          inactive-text="禁用"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="submitForm" :loading="formLoading">确定</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
+
+defineOptions({ name: 'DeviceModbusConfigForm' })
+
+const props = defineProps<{
+  deviceId: number
+}>()
+
+const emit = defineEmits<{
+  (e: 'success'): void
+}>()
+
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('编辑 Modbus 连接配置')
+const formLoading = ref(false)
+const formRef = ref()
+
+/** 表单数据 */
+// TODO @AI；
+const formData = ref<DeviceModbusConfigVO>({
+  deviceId: props.deviceId,
+  ip: '',
+  port: 502,
+  slaveId: 1,
+  timeout: 3000,
+  retryInterval: 10000,
+  status: 0 // TODO @AI：commonstatusenum；
+})
+
+/** 表单校验规则 */
+const formRules = {
+  ip: [{ required: true, message: '请输入 IP 地址', trigger: 'blur' }],
+  port: [{ required: true, message: '请输入端口', trigger: 'blur' }],
+  slaveId: [{ required: true, message: '请输入从站地址', trigger: 'blur' }],
+  timeout: [{ required: true, message: '请输入连接超时时间', trigger: 'blur' }],
+  retryInterval: [{ required: true, message: '请输入重试间隔', trigger: 'blur' }]
+}
+
+/** 打开弹窗 */
+const open = async (data?: DeviceModbusConfigVO) => {
+  dialogVisible.value = true
+  resetForm()
+  // 编辑模式
+  if (data && data.id) {
+    formData.value = { ...data }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    deviceId: props.deviceId,
+    ip: '',
+    port: 502,
+    slaveId: 1,
+    timeout: 3000,
+    retryInterval: 1000,
+    status: 0
+  }
+  formRef.value?.resetFields()
+}
+
+/** 提交表单 */
+const submitForm = async () => {
+  // TODO @AI：注释，需要补充下；参考别的模块
+  try {
+    await formRef.value?.validate()
+    formLoading.value = true
+
+    formData.value.deviceId = props.deviceId
+    await DeviceModbusConfigApi.saveModbusConfig(formData.value)
+    message.success('保存成功')
+
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 暴露方法 */
+defineExpose({ open })
+</script>
diff --git a/src/views/iot/device/device/detail/DeviceModbusPointForm.vue b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
new file mode 100644
index 000000000..db0b7b523
--- /dev/null
+++ b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
@@ -0,0 +1,315 @@
+<!-- Modbus 点位表单弹窗 -->
+<template>
+  <!-- TODO @AI：placeholder 都提供下 -->
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="物模型属性" prop="thingModelId">
+        <el-select
+          v-model="formData.thingModelId"
+          placeholder="请选择物模型属性"
+          filterable
+          class="!w-full"
+          @change="handleThingModelChange"
+        >
+          <!-- TODO @AI：增加 option 里的告警； -->
+          <el-option
+            v-for="item in propertyList"
+            :key="item.id"
+            :label="`${item.name} (${item.identifier})`"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="功能码" prop="functionCode">
+        <!-- TODO @AI：select -->
+        <el-radio-group v-model="formData.functionCode">
+          <el-radio
+            v-for="item in ModbusFunctionCodeOptions"
+            :key="item.value"
+            :value="item.value"
+            class="!mr-4"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- TODO @AI：不要转换，直接输入 -->
+      <el-form-item label="寄存器地址" prop="registerAddress">
+        <el-input
+          v-model="registerAddressInput"
+          placeholder="请输入寄存器地址（支持十进制或十六进制如 0x0000）"
+          @blur="handleRegisterAddressBlur"
+        >
+          <template #append>
+            <span class="text-gray-500">
+              = {{ formatRegisterAddress(formData.registerAddress) }}
+            </span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="寄存器数量" prop="registerCount">
+        <el-input-number
+          v-model="formData.registerCount"
+          :min="1"
+          :max="125"
+          controls-position="right"
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="原始数据类型" prop="rawDataType">
+        <el-select
+          v-model="formData.rawDataType"
+          placeholder="请选择数据类型"
+          class="!w-full"
+          @change="handleRawDataTypeChange"
+        >
+          <el-option
+            v-for="item in ModbusRawDataTypeOptions"
+            :key="item.value"
+            :label="`${item.label} - ${item.description}`"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="字节序" prop="byteOrder">
+        <el-select v-model="formData.byteOrder" placeholder="请选择字节序" class="!w-full">
+          <el-option
+            v-for="item in currentByteOrderOptions"
+            :key="item.value"
+            :label="`${item.label} - ${item.description}`"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="缩放因子" prop="scale">
+        <el-input-number
+          v-model="formData.scale"
+          :precision="6"
+          :step="0.1"
+          controls-position="right"
+          class="!w-full"
+        />
+        <!-- TODO @AI：tip，使用默认的 el-input-number 里的 -->
+        <div class="text-xs text-gray-400 mt-1">
+          读取时：实际值 = 原始值 × 缩放因子；写入时：原始值 = 实际值 ÷ 缩放因子
+        </div>
+      </el-form-item>
+      <el-form-item label="轮询间隔" prop="pollInterval">
+        <el-input-number
+          v-model="formData.pollInterval"
+          :min="100"
+          :step="1000"
+          controls-position="right"
+          class="!w-full"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <!-- TODO @AI：参考下别的模块，开关 -->
+        <el-switch
+          v-model="formData.status"
+          :active-value="0"
+          :inactive-value="1"
+          active-text="启用"
+          inactive-text="禁用"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="submitForm" :loading="formLoading">确定</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { ThingModelData } from '@/api/iot/thingmodel'
+import { DeviceModbusPointApi, DeviceModbusPointVO } from '@/api/iot/device/modbus/point'
+import {
+  ModbusFunctionCodeOptions,
+  ModbusRawDataTypeOptions,
+  getByteOrderOptions
+} from '@/views/iot/utils/constants'
+
+defineOptions({ name: 'DeviceModbusPointForm' })
+
+const props = defineProps<{
+  deviceId: number
+  thingModelList: ThingModelData[]
+}>()
+
+const emit = defineEmits<{
+  (e: 'success'): void
+}>()
+
+const message = useMessage()
+
+const dialogVisible = ref(false)
+const dialogTitle = ref('')
+const formLoading = ref(false)
+const formType = ref<'create' | 'update'>('create')
+const formRef = ref()
+
+// TODO @AI：注释的风格，你看看是不是有些地方要尾注释（和别的模块保持一样的风格）
+
+/** 表单数据 */
+// TODO @AI：里面的枚举类型，改成直接用枚举
+const formData = ref<DeviceModbusPointVO>({
+  deviceId: props.deviceId,
+  thingModelId: 0,
+  identifier: '',
+  name: '',
+  functionCode: 3,
+  registerAddress: 0,
+  registerCount: 1,
+  byteOrder: 'AB',
+  rawDataType: 'INT16',
+  scale: 1,
+  pollInterval: 5000,
+  status: 0
+})
+
+/** 寄存器地址输入框（支持十六进制） */
+const registerAddressInput = ref('0')
+
+/** 表单校验规则 */
+const formRules = {
+  thingModelId: [{ required: true, message: '请选择物模型属性', trigger: 'change' }],
+  functionCode: [{ required: true, message: '请选择功能码', trigger: 'change' }],
+  registerAddress: [{ required: true, message: '请输入寄存器地址', trigger: 'blur' }],
+  registerCount: [{ required: true, message: '请输入寄存器数量', trigger: 'blur' }],
+  rawDataType: [{ required: true, message: '请选择数据类型', trigger: 'change' }],
+  pollInterval: [{ required: true, message: '请输入轮询间隔', trigger: 'blur' }]
+}
+
+/** 筛选属性类型的物模型 */
+const propertyList = computed(() => {
+  return props.thingModelList.filter((item) => item.type === 1) // type=1 为属性
+})
+
+/** 当前字节序选项（根据数据类型动态变化） */
+const currentByteOrderOptions = computed(() => {
+  return getByteOrderOptions(formData.value.rawDataType)
+})
+
+/** 打开弹窗 */
+const open = async (type: 'create' | 'update', id?: number) => {
+  dialogVisible.value = true
+  formType.value = type
+  // TODO @AI：参考别的模块，写法；
+  dialogTitle.value = type === 'create' ? '新增 Modbus 点位' : '编辑 Modbus 点位'
+  resetForm()
+
+  if (type === 'update' && id) {
+    formLoading.value = true
+    try {
+      const data = await DeviceModbusPointApi.getModbusPoint(id)
+      formData.value = data
+      registerAddressInput.value = formatRegisterAddress(data.registerAddress)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    deviceId: props.deviceId,
+    thingModelId: 0,
+    identifier: '',
+    name: '',
+    functionCode: 3,
+    registerAddress: 0,
+    registerCount: 1,
+    byteOrder: 'AB',
+    rawDataType: 'INT16',
+    scale: 1,
+    pollInterval: 5000,
+    status: 0
+  }
+  registerAddressInput.value = '0'
+  formRef.value?.resetFields()
+}
+
+/** 物模型属性变化 */
+const handleThingModelChange = (thingModelId: number) => {
+  const thingModel = props.thingModelList.find((item) => item.id === thingModelId)
+  // TODO @AI：这里有 linter 告警，可以看看。
+  if (thingModel) {
+    formData.value.identifier = thingModel.identifier
+    formData.value.name = thingModel.name
+  }
+}
+
+/** 数据类型变化 */
+const handleRawDataTypeChange = (rawDataType: string) => {
+  // 根据数据类型自动设置寄存器数量
+  const option = ModbusRawDataTypeOptions.find((item) => item.value === rawDataType)
+  if (option && option.registerCount > 0) {
+    formData.value.registerCount = option.registerCount
+  }
+
+  // 重置字节序为第一个选项
+  const byteOrderOptions = getByteOrderOptions(rawDataType)
+  if (byteOrderOptions.length > 0) {
+    formData.value.byteOrder = byteOrderOptions[0].value
+  }
+}
+
+/** 寄存器地址输入框失焦 */
+const handleRegisterAddressBlur = () => {
+  const input = registerAddressInput.value.trim()
+  let address = 0
+
+  if (input.toLowerCase().startsWith('0x')) {
+    // 十六进制
+    address = parseInt(input, 16)
+  } else {
+    // 十进制
+    address = parseInt(input, 10)
+  }
+
+  if (isNaN(address) || address < 0) {
+    address = 0
+  }
+
+  formData.value.registerAddress = address
+  registerAddressInput.value = formatRegisterAddress(address)
+}
+
+/** 格式化寄存器地址为十六进制 */
+const formatRegisterAddress = (address: number) => {
+  return '0x' + address.toString(16).toUpperCase().padStart(4, '0')
+}
+
+/** 提交表单 */
+const submitForm = async () => {
+  try {
+    await formRef.value?.validate()
+    formLoading.value = true
+
+    // TODO @AI：这里的注释风格，可以看看。
+    if (formType.value === 'create') {
+      await DeviceModbusPointApi.createModbusPoint(formData.value)
+      message.success('创建成功')
+    } else {
+      await DeviceModbusPointApi.updateModbusPoint(formData.value)
+      message.success('更新成功')
+    }
+
+    dialogVisible.value = false
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 暴露方法 */
+defineExpose({ open })
+</script>
diff --git a/src/views/iot/device/device/detail/index.vue b/src/views/iot/device/device/detail/index.vue
index 3ec756b5c..5c44c94b4 100644
--- a/src/views/iot/device/device/detail/index.vue
+++ b/src/views/iot/device/device/detail/index.vue
@@ -36,6 +36,18 @@
           @success="getDeviceData"
         />
       </el-tab-pane>
+      <el-tab-pane
+        label="Modbus 配置"
+        name="modbus"
+        v-if="product.codecType === 'ModbusTcp'"
+      >
+        <DeviceModbusConfig
+          v-if="activeTab === 'modbus'"
+          :device="device"
+          :product="product"
+          :thing-model-list="thingModelList"
+        />
+      </el-tab-pane>
     </el-tabs>
   </el-col>
 </template>
@@ -50,6 +62,7 @@ import DeviceDetailsThingModel from './DeviceDetailsThingModel.vue'
 import DeviceDetailsMessage from './DeviceDetailsMessage.vue'
 import DeviceDetailsSimulator from './DeviceDetailsSimulator.vue'
 import DeviceDetailConfig from './DeviceDetailConfig.vue'
+import DeviceModbusConfig from './DeviceModbusConfig.vue'
 
 defineOptions({ name: 'IoTDeviceDetail' })
 
diff --git a/src/views/iot/utils/constants.ts b/src/views/iot/utils/constants.ts
index fe6db1881..259f5dcef 100644
--- a/src/views/iot/utils/constants.ts
+++ b/src/views/iot/utils/constants.ts
@@ -541,3 +541,71 @@ export const JSON_PARAMS_EXAMPLE_VALUES = {
   [IoTDataSpecsDataTypeEnum.ARRAY]: { display: '[]', value: [] },
   DEFAULT: { display: '""', value: '' }
 } as const
+
+// ========== Modbus 相关常量 ==========
+
+/** Modbus 功能码枚举 */
+export const ModbusFunctionCodeEnum = {
+  READ_COILS: 1, // 读线圈
+  READ_DISCRETE_INPUTS: 2, // 读离散输入
+  READ_HOLDING_REGISTERS: 3, // 读保持寄存器
+  READ_INPUT_REGISTERS: 4 // 读输入寄存器
+} as const
+
+/** Modbus 功能码选项 */
+export const ModbusFunctionCodeOptions = [
+  { value: 1, label: '01 - 读线圈 (Coils)', description: '可读写布尔值' },
+  { value: 2, label: '02 - 读离散输入 (Discrete Inputs)', description: '只读布尔值' },
+  { value: 3, label: '03 - 读保持寄存器 (Holding Registers)', description: '可读写16位数据' },
+  { value: 4, label: '04 - 读输入寄存器 (Input Registers)', description: '只读16位数据' }
+]
+
+/** Modbus 原始数据类型枚举 */
+export const ModbusRawDataTypeEnum = {
+  INT16: 'INT16',
+  UINT16: 'UINT16',
+  INT32: 'INT32',
+  UINT32: 'UINT32',
+  FLOAT: 'FLOAT',
+  DOUBLE: 'DOUBLE',
+  BOOLEAN: 'BOOLEAN',
+  STRING: 'STRING'
+} as const
+
+/** Modbus 原始数据类型选项 */
+export const ModbusRawDataTypeOptions = [
+  { value: 'INT16', label: 'INT16', description: '有符号16位整数', registerCount: 1 },
+  { value: 'UINT16', label: 'UINT16', description: '无符号16位整数', registerCount: 1 },
+  { value: 'INT32', label: 'INT32', description: '有符号32位整数', registerCount: 2 },
+  { value: 'UINT32', label: 'UINT32', description: '无符号32位整数', registerCount: 2 },
+  { value: 'FLOAT', label: 'FLOAT', description: '32位浮点数', registerCount: 2 },
+  { value: 'DOUBLE', label: 'DOUBLE', description: '64位浮点数', registerCount: 4 },
+  { value: 'BOOLEAN', label: 'BOOLEAN', description: '布尔值', registerCount: 1 },
+  { value: 'STRING', label: 'STRING', description: '字符串', registerCount: 0 }
+]
+
+/** Modbus 字节序选项 - 16位 */
+export const ModbusByteOrder16Options = [
+  { value: 'AB', label: 'AB', description: '大端序' },
+  { value: 'BA', label: 'BA', description: '小端序' }
+]
+
+/** Modbus 字节序选项 - 32位 */
+export const ModbusByteOrder32Options = [
+  { value: 'ABCD', label: 'ABCD', description: '大端序' },
+  { value: 'CDAB', label: 'CDAB', description: '大端字交换' },
+  { value: 'DCBA', label: 'DCBA', description: '小端序' },
+  { value: 'BADC', label: 'BADC', description: '小端字交换' }
+]
+
+/** 根据数据类型获取字节序选项 */
+export const getByteOrderOptions = (rawDataType: string) => {
+  if (['INT32', 'UINT32', 'FLOAT'].includes(rawDataType)) {
+    return ModbusByteOrder32Options
+  }
+  if (rawDataType === 'DOUBLE') {
+    // 64位暂时复用32位字节序
+    return ModbusByteOrder32Options
+  }
+  return ModbusByteOrder16Options
+}

From 56a25258ee7f29935173716b7a2c95e59f7f3e01 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 17 Jan 2026 23:34:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat=EF=BC=9A=E3=80=90iot=E3=80=91modbus-tc?=
 =?UTF-8?q?p=20=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=85=A5=2040%=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E8=A1=A8=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=9F=BA=E4=BA=8E=20dreamy-stirring?=
 =?UTF-8?q?-kazoo.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/detail/DeviceModbusConfig.vue      |  40 ++--
 .../device/detail/DeviceModbusConfigForm.vue  |  43 ++--
 .../device/detail/DeviceModbusPointForm.vue   | 200 +++++++-----------
 3 files changed, 113 insertions(+), 170 deletions(-)

diff --git a/src/views/iot/device/device/detail/DeviceModbusConfig.vue b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
index d380fb2dc..67fea1c28 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfig.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
@@ -39,6 +39,7 @@
         <span class="text-lg font-medium">点位配置</span>
         <el-button type="primary" @click="handleAddPoint">
           <Icon icon="ep:plus" class="mr-1" />
+          <!-- TODO @AI：权限，需要和后端接口对齐 -->
           新增点位
         </el-button>
       </div>
@@ -106,16 +107,16 @@
         </el-table-column>
         <el-table-column label="状态" align="center" prop="status" min-width="80">
           <template #default="scope">
-            <!-- TODO @AI dict-tag -->
-            <el-tag :type="scope.row.status === 0 ? 'success' : 'danger'" size="small">
-              {{ scope.row.status === 0 ? '启用' : '禁用' }}
-            </el-tag>
+            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="120">
           <template #default="scope">
+            <!-- TODO @AI：权限，需要和后端接口对齐 -->
             <el-button link type="primary" @click="handleEditPoint(scope.row)">编辑</el-button>
-            <el-button link type="danger" @click="handleDeletePoint(scope.row.id)">删除</el-button>
+            <el-button link type="danger" @click="handleDeletePoint(scope.row.id, scope.row.name)">
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -149,6 +150,7 @@ import { ThingModelData } from '@/api/iot/thingmodel'
 import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
 import { DeviceModbusPointApi, DeviceModbusPointVO } from '@/api/iot/device/modbus/point'
 import { ModbusFunctionCodeOptions } from '@/views/iot/utils/constants'
+import { DICT_TYPE } from '@/utils/dict'
 import DeviceModbusConfigForm from './DeviceModbusConfigForm.vue'
 import DeviceModbusPointForm from './DeviceModbusPointForm.vue'
 
@@ -163,16 +165,7 @@ const props = defineProps<{
 const message = useMessage()
 
 // ======================= 连接配置 =======================
-// TODO @AI：默认应该都是空的
-const modbusConfig = ref<DeviceModbusConfigVO>({
-  deviceId: props.device.id,
-  ip: '',
-  port: 502,
-  slaveId: 1,
-  timeout: 3000,
-  retryInterval: 1000,
-  status: 0 // TODO @AI：使用 CommonStatus；
-})
+const modbusConfig = ref<DeviceModbusConfigVO>({} as DeviceModbusConfigVO)
 
 /** 获取连接配置 */
 const getModbusConfig = async () => {
@@ -245,13 +238,16 @@ const handleEditPoint = (row: DeviceModbusPointVO) => {
 }
 
 /** 删除点位 */
-const handleDeletePoint = async (id: number) => {
-  // TODO @AI：最好点位的名字带上。参考别的模块；
-  // TODO @AI：参考别的注释。
-  await message.confirm('确定要删除该点位配置吗？')
-  await DeviceModbusPointApi.deleteModbusPoint(id)
-  message.success('删除成功')
-  await getPointPage()
+const handleDeletePoint = async (id: number, name: string) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm('确定要删除点位【' + name + '】吗？')
+    // 发起删除
+    await DeviceModbusPointApi.deleteModbusPoint(id)
+    message.success('删除成功')
+    // 刷新列表
+    await getPointPage()
+  } catch {}
 }
 
 /** 初始化 */
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
index 0e9572a60..cb17230e0 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
@@ -11,9 +11,10 @@
       <el-form-item label="IP 地址" prop="ip">
         <el-input v-model="formData.ip" placeholder="请输入 Modbus 服务器 IP 地址" />
       </el-form-item>
-      <el-form-item label="请输入 Modbus 端口" prop="port">
+      <el-form-item label="端口" prop="port">
         <el-input-number
           v-model="formData.port"
+          placeholder="请输入端口"
           :min="1"
           :max="65535"
           controls-position="right"
@@ -26,42 +27,36 @@
           :min="1"
           :max="247"
           controls-position="right"
+          placeholder="请输入从站地址，范围 1-247"
           class="!w-full"
         />
-        <!-- TODO @AI：placehoder 需要写下 -->
       </el-form-item>
-      <el-form-item label="连接超时" prop="timeout">
+      <el-form-item label="连接超时(ms)" prop="timeout">
         <el-input-number
           v-model="formData.timeout"
           :min="1000"
           :step="1000"
           controls-position="right"
+          placeholder="请输入连接超时时间"
           class="!w-full"
         />
-        <!-- TODO @AI：placehoder 需要写下 -->
-        <div class="text-xs text-gray-400 mt-1">单位：毫秒</div>
-        <!-- TODO @AI：上面的毫秒，可以去掉 -->
       </el-form-item>
-      <el-form-item label="重试间隔" prop="retryInterval">
+      <el-form-item label="重试间隔(ms)" prop="retryInterval">
         <el-input-number
           v-model="formData.retryInterval"
           :min="1000"
           :step="1000"
           controls-position="right"
+          placeholder="请输入重试间隔"
           class="!w-full"
         />
-        <!-- TODO @AI：placehoder 需要写下 -->
-        <div class="text-xs text-gray-400 mt-1">单位：毫秒</div>
-        <!-- TODO @AI：上面的毫秒，可以去掉 -->
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <!-- TODO @AI：看看别的禁用，应该是怎么样的 -->
+        <!-- TODO @AI：参考别的模块，不要使用这个 -->
         <el-switch
           v-model="formData.status"
-          :active-value="0"
-          :inactive-value="1"
-          active-text="启用"
-          inactive-text="禁用"
+          :active-value="CommonStatusEnum.ENABLE"
+          :inactive-value="CommonStatusEnum.DISABLE"
         />
       </el-form-item>
     </el-form>
@@ -74,6 +69,7 @@
 
 <script lang="ts" setup>
 import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
+import { CommonStatusEnum } from '@/utils/constants'
 
 defineOptions({ name: 'DeviceModbusConfigForm' })
 
@@ -92,8 +88,6 @@ const dialogTitle = ref('编辑 Modbus 连接配置')
 const formLoading = ref(false)
 const formRef = ref()
 
-/** 表单数据 */
-// TODO @AI；
 const formData = ref<DeviceModbusConfigVO>({
   deviceId: props.deviceId,
   ip: '',
@@ -101,7 +95,7 @@ const formData = ref<DeviceModbusConfigVO>({
   slaveId: 1,
   timeout: 3000,
   retryInterval: 10000,
-  status: 0 // TODO @AI：commonstatusenum；
+  status: CommonStatusEnum.ENABLE
 })
 
 /** 表单校验规则 */
@@ -132,22 +126,23 @@ const resetForm = () => {
     slaveId: 1,
     timeout: 3000,
     retryInterval: 1000,
-    status: 0
+    status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
 }
 
 /** 提交表单 */
 const submitForm = async () => {
-  // TODO @AI：注释，需要补充下；参考别的模块
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
   try {
-    await formRef.value?.validate()
-    formLoading.value = true
-
     formData.value.deviceId = props.deviceId
     await DeviceModbusConfigApi.saveModbusConfig(formData.value)
     message.success('保存成功')
-
     dialogVisible.value = false
     emit('success')
   } finally {
diff --git a/src/views/iot/device/device/detail/DeviceModbusPointForm.vue b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
index db0b7b523..f1b6c46b9 100644
--- a/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
@@ -1,6 +1,5 @@
 <!-- Modbus 点位表单弹窗 -->
 <template>
-  <!-- TODO @AI：placeholder 都提供下 -->
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
     <el-form
       ref="formRef"
@@ -17,41 +16,33 @@
           class="!w-full"
           @change="handleThingModelChange"
         >
-          <!-- TODO @AI：增加 option 里的告警； -->
           <el-option
             v-for="item in propertyList"
-            :key="item.id"
+            :key="item.id!"
             :label="`${item.name} (${item.identifier})`"
-            :value="item.id"
+            :value="item.id!"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="功能码" prop="functionCode">
-        <!-- TODO @AI：select -->
-        <el-radio-group v-model="formData.functionCode">
-          <el-radio
+        <el-select v-model="formData.functionCode" placeholder="请选择功能码" class="!w-full">
+          <el-option
             v-for="item in ModbusFunctionCodeOptions"
             :key="item.value"
+            :label="item.label"
             :value="item.value"
-            class="!mr-4"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
+          />
+        </el-select>
       </el-form-item>
-      <!-- TODO @AI：不要转换，直接输入 -->
       <el-form-item label="寄存器地址" prop="registerAddress">
-        <el-input
-          v-model="registerAddressInput"
-          placeholder="请输入寄存器地址（支持十进制或十六进制如 0x0000）"
-          @blur="handleRegisterAddressBlur"
-        >
-          <template #append>
-            <span class="text-gray-500">
-              = {{ formatRegisterAddress(formData.registerAddress) }}
-            </span>
-          </template>
-        </el-input>
+        <el-input-number
+          v-model="formData.registerAddress"
+          :min="0"
+          :max="65535"
+          controls-position="right"
+          placeholder="请输入寄存器地址"
+          class="!w-full"
+        />
       </el-form-item>
       <el-form-item label="寄存器数量" prop="registerCount">
         <el-input-number
@@ -59,6 +50,7 @@
           :min="1"
           :max="125"
           controls-position="right"
+          placeholder="请输入寄存器数量"
           class="!w-full"
         />
       </el-form-item>
@@ -93,30 +85,25 @@
           :precision="6"
           :step="0.1"
           controls-position="right"
+          placeholder="请输入缩放因子"
           class="!w-full"
         />
-        <!-- TODO @AI：tip，使用默认的 el-input-number 里的 -->
-        <div class="text-xs text-gray-400 mt-1">
-          读取时：实际值 = 原始值 × 缩放因子；写入时：原始值 = 实际值 ÷ 缩放因子
-        </div>
       </el-form-item>
-      <el-form-item label="轮询间隔" prop="pollInterval">
+      <el-form-item label="轮询间隔(ms)" prop="pollInterval">
         <el-input-number
           v-model="formData.pollInterval"
           :min="100"
           :step="1000"
           controls-position="right"
+          placeholder="请输入轮询间隔"
           class="!w-full"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <!-- TODO @AI：参考下别的模块，开关 -->
         <el-switch
           v-model="formData.status"
-          :active-value="0"
-          :inactive-value="1"
-          active-text="启用"
-          inactive-text="禁用"
+          :active-value="CommonStatusEnum.ENABLE"
+          :inactive-value="CommonStatusEnum.DISABLE"
         />
       </el-form-item>
     </el-form>
@@ -135,6 +122,7 @@ import {
   ModbusRawDataTypeOptions,
   getByteOrderOptions
 } from '@/views/iot/utils/constants'
+import { CommonStatusEnum } from '@/utils/constants'
 
 defineOptions({ name: 'DeviceModbusPointForm' })
 
@@ -149,19 +137,13 @@ const emit = defineEmits<{
 
 const message = useMessage()
 
-const dialogVisible = ref(false)
-const dialogTitle = ref('')
-const formLoading = ref(false)
-const formType = ref<'create' | 'update'>('create')
-const formRef = ref()
-
-// TODO @AI：注释的风格，你看看是不是有些地方要尾注释（和别的模块保持一样的风格）
-
-/** 表单数据 */
-// TODO @AI：里面的枚举类型，改成直接用枚举
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<DeviceModbusPointVO>({
   deviceId: props.deviceId,
-  thingModelId: 0,
+  thingModelId: 0, // TODO @AI：不要有默认值；
   identifier: '',
   name: '',
   functionCode: 3,
@@ -171,13 +153,8 @@ const formData = ref<DeviceModbusPointVO>({
   rawDataType: 'INT16',
   scale: 1,
   pollInterval: 5000,
-  status: 0
-})
-
-/** 寄存器地址输入框（支持十六进制） */
-const registerAddressInput = ref('0')
-
-/** 表单校验规则 */
+  status: CommonStatusEnum.ENABLE
+}) // TODO @AI：registerAddress、registerAddress、registerCount、rawDataType 不要有默认值；
 const formRules = {
   thingModelId: [{ required: true, message: '请选择物模型属性', trigger: 'change' }],
   functionCode: [{ required: true, message: '请选择功能码', trigger: 'change' }],
@@ -186,10 +163,12 @@ const formRules = {
   rawDataType: [{ required: true, message: '请选择数据类型', trigger: 'change' }],
   pollInterval: [{ required: true, message: '请输入轮询间隔', trigger: 'blur' }]
 }
+const formRef = ref() // 表单 Ref
 
 /** 筛选属性类型的物模型 */
 const propertyList = computed(() => {
-  return props.thingModelList.filter((item) => item.type === 1) // type=1 为属性
+  // TODO @AI：1 使用枚举代替魔法数字
+  return props.thingModelList.filter((item) => item.type === 1)
 })
 
 /** 当前字节序选项（根据数据类型动态变化） */
@@ -197,53 +176,12 @@ const currentByteOrderOptions = computed(() => {
   return getByteOrderOptions(formData.value.rawDataType)
 })
 
-/** 打开弹窗 */
-const open = async (type: 'create' | 'update', id?: number) => {
-  dialogVisible.value = true
-  formType.value = type
-  // TODO @AI：参考别的模块，写法；
-  dialogTitle.value = type === 'create' ? '新增 Modbus 点位' : '编辑 Modbus 点位'
-  resetForm()
-
-  if (type === 'update' && id) {
-    formLoading.value = true
-    try {
-      const data = await DeviceModbusPointApi.getModbusPoint(id)
-      formData.value = data
-      registerAddressInput.value = formatRegisterAddress(data.registerAddress)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    deviceId: props.deviceId,
-    thingModelId: 0,
-    identifier: '',
-    name: '',
-    functionCode: 3,
-    registerAddress: 0,
-    registerCount: 1,
-    byteOrder: 'AB',
-    rawDataType: 'INT16',
-    scale: 1,
-    pollInterval: 5000,
-    status: 0
-  }
-  registerAddressInput.value = '0'
-  formRef.value?.resetFields()
-}
-
 /** 物模型属性变化 */
 const handleThingModelChange = (thingModelId: number) => {
   const thingModel = props.thingModelList.find((item) => item.id === thingModelId)
-  // TODO @AI：这里有 linter 告警，可以看看。
   if (thingModel) {
-    formData.value.identifier = thingModel.identifier
-    formData.value.name = thingModel.name
+    formData.value.identifier = thingModel.identifier!
+    formData.value.name = thingModel.name!
   }
 }
 
@@ -262,39 +200,33 @@ const handleRawDataTypeChange = (rawDataType: string) => {
   }
 }
 
-/** 寄存器地址输入框失焦 */
-const handleRegisterAddressBlur = () => {
-  const input = registerAddressInput.value.trim()
-  let address = 0
-
-  if (input.toLowerCase().startsWith('0x')) {
-    // 十六进制
-    address = parseInt(input, 16)
-  } else {
-    // 十进制
-    address = parseInt(input, 10)
+/** 打开弹窗 */
+const open = async (type: 'create' | 'update', id?: number) => {
+  dialogVisible.value = true
+  formType.value = type
+  // TODO @AI：dialogTitle.value = t('action.' + type)
+  dialogTitle.value = type === 'create' ? '新增 Modbus 点位' : '编辑 Modbus 点位'
+  resetForm()
+  // 修改时，设置数据
+  if (type === 'update' && id) {
+    formLoading.value = true
+    try {
+      formData.value = await DeviceModbusPointApi.getModbusPoint(id)
+    } finally {
+      formLoading.value = false
+    }
   }
-
-  if (isNaN(address) || address < 0) {
-    address = 0
-  }
-
-  formData.value.registerAddress = address
-  registerAddressInput.value = formatRegisterAddress(address)
-}
-
-/** 格式化寄存器地址为十六进制 */
-const formatRegisterAddress = (address: number) => {
-  return '0x' + address.toString(16).toUpperCase().padStart(4, '0')
 }
 
 /** 提交表单 */
 const submitForm = async () => {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
   try {
-    await formRef.value?.validate()
-    formLoading.value = true
-
-    // TODO @AI：这里的注释风格，可以看看。
     if (formType.value === 'create') {
       await DeviceModbusPointApi.createModbusPoint(formData.value)
       message.success('创建成功')
@@ -302,14 +234,34 @@ const submitForm = async () => {
       await DeviceModbusPointApi.updateModbusPoint(formData.value)
       message.success('更新成功')
     }
-
     dialogVisible.value = false
+    // 发送操作成功的事件
     emit('success')
   } finally {
     formLoading.value = false
   }
 }
 
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    deviceId: props.deviceId,
+    thingModelId: 0,
+    identifier: '',
+    name: '',
+    // TODO @AI：3、0、1、AB/INT16 使用枚举；
+    functionCode: 3,
+    registerAddress: 0,
+    registerCount: 1,
+    byteOrder: 'AB',
+    rawDataType: 'INT16',
+    scale: 1,
+    pollInterval: 5000,
+    status: CommonStatusEnum.ENABLE
+  }
+  formRef.value?.resetFields()
+}
+
 /** 暴露方法 */
 defineExpose({ open })
 </script>

From 972eb47610f25d70f436f29cdae656b9ecedc864 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 18 Jan 2026 00:07:23 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat=EF=BC=9A=E3=80=90iot=E3=80=91modbus-tc?=
 =?UTF-8?q?p=20=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=85=A5=20100%=EF=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E5=AE=9E=E7=8E=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20todo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/device/modbus/point/index.ts      | 12 +--
 .../device/detail/DeviceModbusConfig.vue      | 28 ++++---
 .../device/detail/DeviceModbusConfigForm.vue  | 29 ++++---
 .../device/detail/DeviceModbusPointForm.vue   | 77 ++++++++++++-------
 4 files changed, 87 insertions(+), 59 deletions(-)

diff --git a/src/api/iot/device/modbus/point/index.ts b/src/api/iot/device/modbus/point/index.ts
index 5dc05d1c1..0ae51bb94 100644
--- a/src/api/iot/device/modbus/point/index.ts
+++ b/src/api/iot/device/modbus/point/index.ts
@@ -4,14 +4,14 @@ import request from '@/config/axios'
 export interface DeviceModbusPointVO {
   id?: number // 主键
   deviceId: number // 设备编号
-  thingModelId: number // 物模型属性编号
+  thingModelId?: number // 物模型属性编号
   identifier: string // 属性标识符
   name: string // 属性名称
-  functionCode: number // Modbus 功能码
-  registerAddress: number // 寄存器起始地址
-  registerCount: number // 寄存器数量
-  byteOrder: string // 字节序
-  rawDataType: string // 原始数据类型
+  functionCode?: number // Modbus 功能码
+  registerAddress?: number // 寄存器起始地址
+  registerCount?: number // 寄存器数量
+  byteOrder?: string // 字节序
+  rawDataType?: string // 原始数据类型
   scale: number // 缩放因子
   pollInterval: number // 轮询间隔，单位：毫秒
   status: number // 状态
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfig.vue b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
index 67fea1c28..f9682f040 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfig.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
@@ -5,7 +5,9 @@
     <ContentWrap>
       <div class="flex items-center justify-between mb-4">
         <span class="text-lg font-medium">连接配置</span>
-        <el-button type="primary" @click="handleEditConfig">编辑</el-button>
+        <el-button type="primary" @click="handleEditConfig" v-hasPermi="['iot:device:create']">
+          编辑
+        </el-button>
       </div>
 
       <!-- 详情展示 -->
@@ -26,9 +28,7 @@
           {{ modbusConfig.retryInterval ? `${modbusConfig.retryInterval} ms` : '-' }}
         </el-descriptions-item>
         <el-descriptions-item label="状态">
-          <el-tag :type="modbusConfig.status === 0 ? 'success' : 'danger'">
-            {{ modbusConfig.status === 0 ? '启用' : '禁用' }}
-          </el-tag>
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="modbusConfig.status" />
         </el-descriptions-item>
       </el-descriptions>
     </ContentWrap>
@@ -37,9 +37,8 @@
     <ContentWrap class="mt-4">
       <div class="flex items-center justify-between mb-4">
         <span class="text-lg font-medium">点位配置</span>
-        <el-button type="primary" @click="handleAddPoint">
+        <el-button type="primary" @click="handleAddPoint" v-hasPermi="['iot:device:create']">
           <Icon icon="ep:plus" class="mr-1" />
-          <!-- TODO @AI：权限，需要和后端接口对齐 -->
           新增点位
         </el-button>
       </div>
@@ -112,9 +111,20 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="120">
           <template #default="scope">
-            <!-- TODO @AI：权限，需要和后端接口对齐 -->
-            <el-button link type="primary" @click="handleEditPoint(scope.row)">编辑</el-button>
-            <el-button link type="danger" @click="handleDeletePoint(scope.row.id, scope.row.name)">
+            <el-button
+              link
+              type="primary"
+              @click="handleEditPoint(scope.row)"
+              v-hasPermi="['iot:device:update']"
+            >
+              编辑
+            </el-button>
+            <el-button
+              link
+              type="danger"
+              @click="handleDeletePoint(scope.row.id, scope.row.name)"
+              v-hasPermi="['iot:device:delete']"
+            >
               删除
             </el-button>
           </template>
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
index cb17230e0..b59a7b507 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
@@ -1,6 +1,6 @@
 <!-- Modbus 连接配置弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+  <Dialog title="编辑 Modbus 连接配置" v-model="dialogVisible" width="600px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -52,12 +52,15 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <!-- TODO @AI：参考别的模块，不要使用这个 -->
-        <el-switch
-          v-model="formData.status"
-          :active-value="CommonStatusEnum.ENABLE"
-          :inactive-value="CommonStatusEnum.DISABLE"
-        />
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -69,6 +72,7 @@
 
 <script lang="ts" setup>
 import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 
 defineOptions({ name: 'DeviceModbusConfigForm' })
@@ -82,12 +86,8 @@ const emit = defineEmits<{
 }>()
 
 const message = useMessage()
-
-const dialogVisible = ref(false)
-const dialogTitle = ref('编辑 Modbus 连接配置')
-const formLoading = ref(false)
-const formRef = ref()
-
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单提交 loading 状态
 const formData = ref<DeviceModbusConfigVO>({
   deviceId: props.deviceId,
   ip: '',
@@ -97,8 +97,6 @@ const formData = ref<DeviceModbusConfigVO>({
   retryInterval: 10000,
   status: CommonStatusEnum.ENABLE
 })
-
-/** 表单校验规则 */
 const formRules = {
   ip: [{ required: true, message: '请输入 IP 地址', trigger: 'blur' }],
   port: [{ required: true, message: '请输入端口', trigger: 'blur' }],
@@ -106,6 +104,7 @@ const formRules = {
   timeout: [{ required: true, message: '请输入连接超时时间', trigger: 'blur' }],
   retryInterval: [{ required: true, message: '请输入重试间隔', trigger: 'blur' }]
 }
+const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (data?: DeviceModbusConfigVO) => {
diff --git a/src/views/iot/device/device/detail/DeviceModbusPointForm.vue b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
index f1b6c46b9..9934cf0d7 100644
--- a/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusPointForm.vue
@@ -35,14 +35,18 @@
         </el-select>
       </el-form-item>
       <el-form-item label="寄存器地址" prop="registerAddress">
-        <el-input-number
-          v-model="formData.registerAddress"
+        <el-input
+          v-model.number="formData.registerAddress"
+          type="number"
           :min="0"
           :max="65535"
-          controls-position="right"
           placeholder="请输入寄存器地址"
           class="!w-full"
-        />
+        >
+          <template #suffix>
+            <span class="text-gray-400">{{ registerAddressHex }}</span>
+          </template>
+        </el-input>
       </el-form-item>
       <el-form-item label="寄存器数量" prop="registerCount">
         <el-input-number
@@ -100,11 +104,15 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-switch
-          v-model="formData.status"
-          :active-value="CommonStatusEnum.ENABLE"
-          :inactive-value="CommonStatusEnum.DISABLE"
-        />
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -120,8 +128,10 @@ import { DeviceModbusPointApi, DeviceModbusPointVO } from '@/api/iot/device/modb
 import {
   ModbusFunctionCodeOptions,
   ModbusRawDataTypeOptions,
-  getByteOrderOptions
+  getByteOrderOptions,
+  IoTThingModelTypeEnum
 } from '@/views/iot/utils/constants'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 
 defineOptions({ name: 'DeviceModbusPointForm' })
@@ -135,26 +145,27 @@ const emit = defineEmits<{
   (e: 'success'): void
 }>()
 
+const { t } = useI18n()
 const message = useMessage()
-
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<DeviceModbusPointVO>({
   deviceId: props.deviceId,
-  thingModelId: 0, // TODO @AI：不要有默认值；
+  thingModelId: undefined,
   identifier: '',
   name: '',
-  functionCode: 3,
-  registerAddress: 0,
-  registerCount: 1,
-  byteOrder: 'AB',
-  rawDataType: 'INT16',
+  functionCode: undefined,
+  registerAddress: undefined,
+  registerCount: undefined,
+  byteOrder: undefined,
+  rawDataType: undefined,
   scale: 1,
   pollInterval: 5000,
   status: CommonStatusEnum.ENABLE
-}) // TODO @AI：registerAddress、registerAddress、registerCount、rawDataType 不要有默认值；
+})
+
 const formRules = {
   thingModelId: [{ required: true, message: '请选择物模型属性', trigger: 'change' }],
   functionCode: [{ required: true, message: '请选择功能码', trigger: 'change' }],
@@ -165,14 +176,24 @@ const formRules = {
 }
 const formRef = ref() // 表单 Ref
 
+/** 寄存器地址十六进制显示 */
+const registerAddressHex = computed(() => {
+  if (formData.value.registerAddress === undefined || formData.value.registerAddress === null) {
+    return ''
+  }
+  return '0x' + formData.value.registerAddress.toString(16).toUpperCase().padStart(4, '0')
+})
+
 /** 筛选属性类型的物模型 */
 const propertyList = computed(() => {
-  // TODO @AI：1 使用枚举代替魔法数字
-  return props.thingModelList.filter((item) => item.type === 1)
+  return props.thingModelList.filter((item) => item.type === IoTThingModelTypeEnum.PROPERTY)
 })
 
 /** 当前字节序选项（根据数据类型动态变化） */
 const currentByteOrderOptions = computed(() => {
+  if (!formData.value.rawDataType) {
+    return []
+  }
   return getByteOrderOptions(formData.value.rawDataType)
 })
 
@@ -204,8 +225,7 @@ const handleRawDataTypeChange = (rawDataType: string) => {
 const open = async (type: 'create' | 'update', id?: number) => {
   dialogVisible.value = true
   formType.value = type
-  // TODO @AI：dialogTitle.value = t('action.' + type)
-  dialogTitle.value = type === 'create' ? '新增 Modbus 点位' : '编辑 Modbus 点位'
+  dialogTitle.value = t('action.' + type)
   resetForm()
   // 修改时，设置数据
   if (type === 'update' && id) {
@@ -246,15 +266,14 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     deviceId: props.deviceId,
-    thingModelId: 0,
+    thingModelId: undefined,
     identifier: '',
     name: '',
-    // TODO @AI：3、0、1、AB/INT16 使用枚举；
-    functionCode: 3,
-    registerAddress: 0,
-    registerCount: 1,
-    byteOrder: 'AB',
-    rawDataType: 'INT16',
+    functionCode: undefined,
+    registerAddress: undefined,
+    registerCount: undefined,
+    byteOrder: undefined,
+    rawDataType: undefined,
     scale: 1,
     pollInterval: 5000,
     status: CommonStatusEnum.ENABLE

From 57a77b2ba9c55ab8e8b15574ee56c103561de449 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 4 Feb 2026 22:05:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat=EF=BC=88iot=EF=BC=89=EF=BC=9A=E3=80=90?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=94=B9=E9=80=A0=E3=80=91=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20codecType=EF=BC=8C=E4=BD=BF=E7=94=A8=20protocolType=20?=
 =?UTF-8?q?=E6=9B=BF=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/product/product/index.ts          | 22 +++++--
 src/utils/dict.ts                             |  3 +-
 src/views/iot/product/product/ProductForm.vue | 61 +++++++++++++------
 .../product/detail/ProductDetailsInfo.vue     |  7 ++-
 4 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/src/api/iot/product/product/index.ts b/src/api/iot/product/product/index.ts
index ba465efdc..2025884b7 100644
--- a/src/api/iot/product/product/index.ts
+++ b/src/api/iot/product/product/index.ts
@@ -16,7 +16,8 @@ export interface ProductVO {
   status: number // 产品状态
   deviceType: number // 设备类型
   netType: number // 联网方式
-  codecType: string // 数据格式（编解码器类型）
+  protocolType: string // 协议类型
+  serializeType: string // 序列化类型
   deviceCount: number // 设备数量
   createTime: Date // 创建时间
 }
@@ -27,9 +28,22 @@ export enum DeviceTypeEnum {
   GATEWAY_SUB = 1, // 网关子设备
   GATEWAY = 2 // 网关设备
 }
-// IOT 数据格式（编解码器类型）枚举类
-export enum CodecTypeEnum {
-  ALINK = 'Alink' // 阿里云 Alink 协议
+// IoT 协议类型枚举
+export enum ProtocolTypeEnum {
+  TCP = 'tcp',
+  UDP = 'udp',
+  WEBSOCKET = 'websocket',
+  HTTP = 'http',
+  MQTT = 'mqtt',
+  EMQX = 'emqx',
+  COAP = 'coap',
+  MODBUS_TCP = 'modbus_tcp'
+}
+
+// IoT 序列化类型枚举
+export enum SerializeTypeEnum {
+  JSON = 'json',
+  BINARY = 'binary'
 }
 
 // IoT 产品 API
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index b4f0c5870..e68f1384d 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -233,7 +233,8 @@ export enum DICT_TYPE {
   IOT_NET_TYPE = 'iot_net_type', // IOT 联网方式
   IOT_PRODUCT_STATUS = 'iot_product_status', // IOT 产品状态
   IOT_PRODUCT_DEVICE_TYPE = 'iot_product_device_type', // IOT 产品设备类型
-  IOT_CODEC_TYPE = 'iot_codec_type', // IOT 数据格式（编解码器类型）
+  IOT_PROTOCOL_TYPE = 'iot_protocol_type', // IOT 协议类型
+  IOT_SERIALIZE_TYPE = 'iot_serialize_type', // IOT 序列化类型
   IOT_LOCATION_TYPE = 'iot_location_type', // IOT 定位类型
   IOT_DEVICE_STATE = 'iot_device_state', // IOT 设备状态
   IOT_THING_MODEL_TYPE = 'iot_thing_model_type', // IOT 产品功能类型
diff --git a/src/views/iot/product/product/ProductForm.vue b/src/views/iot/product/product/ProductForm.vue
index 9cb7c5099..7bc3e4903 100644
--- a/src/views/iot/product/product/ProductForm.vue
+++ b/src/views/iot/product/product/ProductForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="110px"
+      label-width="120px"
       v-loading="formLoading"
     >
       <el-form-item label="ProductKey" prop="productKey">
@@ -49,11 +49,7 @@
         label="联网方式"
         prop="netType"
       >
-        <el-select
-          v-model="formData.netType"
-          placeholder="请选择联网方式"
-          :disabled="formType === 'update'"
-        >
+        <el-select v-model="formData.netType" placeholder="请选择联网方式">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.IOT_NET_TYPE)"
             :key="dict.value"
@@ -62,16 +58,36 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="数据格式" prop="codecType">
-        <el-radio-group v-model="formData.codecType" :disabled="formType === 'update'">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_CODEC_TYPE)"
+      <el-form-item label="协议类型" prop="protocolType">
+        <el-select v-model="formData.protocolType" placeholder="请选择协议类型">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_PROTOCOL_TYPE)"
             :key="dict.value"
-            :label="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="serializeType">
+        <template #label>
+          <el-tooltip
+            content="iot-gateway-server 默认根据接入的协议类型确定数据格式，仅 MQTT、EMQX 协议支持自定义序列化类型"
+            placement="top"
           >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
+            <span>
+              序列化类型
+              <Icon icon="ep:question-filled" class="ml-2px" />
+            </span>
+          </el-tooltip>
+        </template>
+        <el-select v-model="formData.serializeType" placeholder="请选择序列化类型">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_SERIALIZE_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-collapse>
         <el-collapse-item title="更多配置">
@@ -109,7 +125,13 @@
 </template>
 
 <script setup lang="ts">
-import { ProductApi, ProductVO, CodecTypeEnum, DeviceTypeEnum } from '@/api/iot/product/product'
+import {
+  ProductApi,
+  ProductVO,
+  ProtocolTypeEnum,
+  SerializeTypeEnum,
+  DeviceTypeEnum
+} from '@/api/iot/product/product'
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import { ProductCategoryApi, ProductCategoryVO } from '@/api/iot/product/category'
 import { UploadImg } from '@/components/UploadFile'
@@ -134,7 +156,8 @@ const formData = ref({
   description: undefined,
   deviceType: undefined,
   netType: undefined,
-  codecType: CodecTypeEnum.ALINK,
+  protocolType: ProtocolTypeEnum.MQTT,
+  serializeType: SerializeTypeEnum.JSON,
   registerEnabled: false
 })
 const formRules = reactive({
@@ -149,7 +172,8 @@ const formRules = reactive({
       trigger: 'change'
     }
   ],
-  codecType: [{ required: true, message: '数据格式不能为空', trigger: 'change' }]
+  protocolType: [{ required: true, message: '协议类型不能为空', trigger: 'change' }],
+  serializeType: [{ required: true, message: '序列化类型不能为空', trigger: 'change' }]
 })
 const formRef = ref()
 const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
@@ -209,7 +233,8 @@ const resetForm = () => {
     description: undefined,
     deviceType: undefined,
     netType: undefined,
-    codecType: CodecTypeEnum.ALINK,
+    protocolType: ProtocolTypeEnum.MQTT,
+    serializeType: SerializeTypeEnum.JSON,
     registerEnabled: false
   }
   formRef.value?.resetFields()
diff --git a/src/views/iot/product/product/detail/ProductDetailsInfo.vue b/src/views/iot/product/product/detail/ProductDetailsInfo.vue
index 38c523b6e..debcd85ee 100644
--- a/src/views/iot/product/product/detail/ProductDetailsInfo.vue
+++ b/src/views/iot/product/product/detail/ProductDetailsInfo.vue
@@ -9,8 +9,11 @@
       <el-descriptions-item label="创建时间">
         {{ formatDate(product.createTime) }}
       </el-descriptions-item>
-      <el-descriptions-item label="数据格式">
-        <dict-tag :type="DICT_TYPE.IOT_CODEC_TYPE" :value="product.codecType" />
+      <el-descriptions-item label="协议类型">
+        <dict-tag :type="DICT_TYPE.IOT_PROTOCOL_TYPE" :value="product.protocolType" />
+      </el-descriptions-item>
+      <el-descriptions-item label="序列化类型">
+        <dict-tag :type="DICT_TYPE.IOT_SERIALIZE_TYPE" :value="product.serializeType" />
       </el-descriptions-item>
       <el-descriptions-item label="产品状态">
         <dict-tag :type="DICT_TYPE.IOT_PRODUCT_STATUS" :value="product.status" />

From 3aeb719ec22eec61fa939f713f04ebfc52fe16fe Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 7 Feb 2026 19:45:27 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=88mall=EF=BC=89=EF=BC=9AOrderDeta?=
 =?UTF-8?q?il=20detailData=20=E4=B8=BA=20null=20=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pay/order/OrderDetail.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/pay/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue
index 90d4ccbce..0109e1571 100644
--- a/src/views/pay/order/OrderDetail.vue
+++ b/src/views/pay/order/OrderDetail.vue
@@ -13,15 +13,15 @@
         <dict-tag :type="DICT_TYPE.PAY_ORDER_STATUS" :value="detailData.status" size="small" />
       </el-descriptions-item>
       <el-descriptions-item label="支付金额">
-        <el-tag type="success" size="small">￥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
+        <el-tag type="success" size="small">￥{{ ((detailData.price || 0) / 100.0).toFixed(2) }}</el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="手续费">
         <el-tag type="warning" size="small">
-          ￥{{ (detailData.channelFeePrice / 100.0).toFixed(2) }}
+          ￥{{ ((detailData.channelFeePrice || 0) / 100.0).toFixed(2) }}
         </el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="手续费比例">
-        {{ detailData.channelFeeRate.toFixed(2) }}%
+        {{ (detailData.channelFeeRate || 0).toFixed(2) }}%
       </el-descriptions-item>
       <el-descriptions-item label="支付时间">
         {{ formatDate(detailData.successTime) }}
@@ -53,7 +53,7 @@
       <el-descriptions-item label="渠道用户">{{ detailData.channelUserId }}</el-descriptions-item>
       <el-descriptions-item label="退款金额">
         <el-tag size="mini" type="danger">
-          ￥{{ (detailData.refundPrice / 100.0).toFixed(2) }}
+          ￥{{ ((detailData.refundPrice || 0) / 100.0).toFixed(2) }}
         </el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>

From 155edc41a9e860ea943468bcf26403c412aa3032 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 8 Feb 2026 23:33:10 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat=EF=BC=88iot=EF=BC=89=EF=BC=9AModbus=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20Master/Slave=20=E5=8F=8C=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8C=89=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=9E=8B=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. ProtocolTypeEnum 拆分：MODBUS_TCP → MODBUS_TCP_MASTER + MODBUS_TCP_SLAVE
2. Slave 模式新增 mode（工作模式）、frameFormat（帧格式）字段，使用字典管理
3. 配置表单和详情页按 Master/Slave 模式条件展示不同字段，表单校验规则动态适配
4. 新增 DICT_TYPE：IOT_MODBUS_MODE、IOT_MODBUS_FRAME_FORMAT
5. 修复设备卡片 deviceName 过长溢出问题，添加文本截断

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/api/iot/device/modbus/config/index.ts     |   2 +
 src/api/iot/product/product/index.ts          |   3 +-
 src/utils/dict.ts                             |   4 +-
 .../device/detail/DeviceModbusConfig.vue      |  52 +++++--
 .../device/detail/DeviceModbusConfigForm.vue  | 133 ++++++++++++------
 src/views/iot/device/device/detail/index.vue  |   8 +-
 src/views/iot/device/device/index.vue         |   2 +-
 src/views/iot/utils/constants.ts              |  20 ++-
 8 files changed, 160 insertions(+), 64 deletions(-)

diff --git a/src/api/iot/device/modbus/config/index.ts b/src/api/iot/device/modbus/config/index.ts
index fa0e0a802..7db9e69f9 100644
--- a/src/api/iot/device/modbus/config/index.ts
+++ b/src/api/iot/device/modbus/config/index.ts
@@ -9,6 +9,8 @@ export interface DeviceModbusConfigVO {
   slaveId: number // 从站地址
   timeout: number // 连接超时时间，单位：毫秒
   retryInterval: number // 重试间隔，单位：毫秒
+  mode: number // 模式
+  frameFormat: number // 帧格式
   status: number // 状态
 }
 
diff --git a/src/api/iot/product/product/index.ts b/src/api/iot/product/product/index.ts
index 2025884b7..a5fff456e 100644
--- a/src/api/iot/product/product/index.ts
+++ b/src/api/iot/product/product/index.ts
@@ -37,7 +37,8 @@ export enum ProtocolTypeEnum {
   MQTT = 'mqtt',
   EMQX = 'emqx',
   COAP = 'coap',
-  MODBUS_TCP = 'modbus_tcp'
+  MODBUS_TCP_MASTER = 'modbus_tcp_master',
+  MODBUS_TCP_SLAVE = 'modbus_tcp_slave'
 }
 
 // IoT 序列化类型枚举
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index e68f1384d..ec54b408b 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -248,5 +248,7 @@ export enum DICT_TYPE {
   IOT_ALERT_RECEIVE_TYPE = 'iot_alert_receive_type', // IoT 告警接收类型
   IOT_OTA_TASK_DEVICE_SCOPE = 'iot_ota_task_device_scope', // IoT OTA任务设备范围
   IOT_OTA_TASK_STATUS = 'iot_ota_task_status', // IoT OTA 任务状态
-  IOT_OTA_TASK_RECORD_STATUS = 'iot_ota_task_record_status' // IoT OTA 记录状态
+  IOT_OTA_TASK_RECORD_STATUS = 'iot_ota_task_record_status', // IoT OTA 记录状态
+  IOT_MODBUS_MODE = 'iot_modbus_mode', // IoT Modbus 工作模式
+  IOT_MODBUS_FRAME_FORMAT = 'iot_modbus_frame_format' // IoT Modbus 帧格式
 }
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfig.vue b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
index f9682f040..a039aaa8b 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfig.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
@@ -12,21 +12,38 @@
 
       <!-- 详情展示 -->
       <el-descriptions :column="3" border direction="horizontal">
-        <el-descriptions-item label="IP 地址">
-          {{ modbusConfig.ip || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="端口">
-          {{ modbusConfig.port || '-' }}
-        </el-descriptions-item>
+        <!-- Master 模式专有字段 -->
+        <template v-if="isMaster">
+          <el-descriptions-item label="IP 地址">
+            {{ modbusConfig.ip || '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="端口">
+            {{ modbusConfig.port || '-' }}
+          </el-descriptions-item>
+        </template>
+        <!-- 公共字段 -->
         <el-descriptions-item label="从站地址">
           {{ modbusConfig.slaveId || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="连接超时">
-          {{ modbusConfig.timeout ? `${modbusConfig.timeout} ms` : '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="重试间隔">
-          {{ modbusConfig.retryInterval ? `${modbusConfig.retryInterval} ms` : '-' }}
-        </el-descriptions-item>
+        <!-- Master 模式专有字段 -->
+        <template v-if="isMaster">
+          <el-descriptions-item label="连接超时">
+            {{ modbusConfig.timeout ? `${modbusConfig.timeout} ms` : '-' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="重试间隔">
+            {{ modbusConfig.retryInterval ? `${modbusConfig.retryInterval} ms` : '-' }}
+          </el-descriptions-item>
+        </template>
+        <!-- Slave 模式专有字段 -->
+        <template v-if="isSlave">
+          <el-descriptions-item label="工作模式">
+            <dict-tag :type="DICT_TYPE.IOT_MODBUS_MODE" :value="modbusConfig.mode" />
+          </el-descriptions-item>
+          <el-descriptions-item label="帧格式">
+            <dict-tag :type="DICT_TYPE.IOT_MODBUS_FRAME_FORMAT" :value="modbusConfig.frameFormat" />
+          </el-descriptions-item>
+        </template>
+        <!-- 公共字段 -->
         <el-descriptions-item label="状态">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="modbusConfig.status" />
         </el-descriptions-item>
@@ -141,7 +158,12 @@
     </ContentWrap>
 
     <!-- 连接配置弹窗 -->
-    <DeviceModbusConfigForm ref="configFormRef" :device-id="device.id" @success="getModbusConfig" />
+    <DeviceModbusConfigForm
+      ref="configFormRef"
+      :device-id="device.id"
+      :protocol-type="product.protocolType"
+      @success="getModbusConfig"
+    />
 
     <!-- 点位表单弹窗 -->
     <DeviceModbusPointForm
@@ -155,7 +177,7 @@
 
 <script lang="ts" setup>
 import { DeviceVO } from '@/api/iot/device/device'
-import { ProductVO } from '@/api/iot/product/product'
+import { ProductVO, ProtocolTypeEnum } from '@/api/iot/product/product'
 import { ThingModelData } from '@/api/iot/thingmodel'
 import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
 import { DeviceModbusPointApi, DeviceModbusPointVO } from '@/api/iot/device/modbus/point'
@@ -175,6 +197,8 @@ const props = defineProps<{
 const message = useMessage()
 
 // ======================= 连接配置 =======================
+const isMaster = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_MASTER) // 是否为 Master 模式
+const isSlave = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_SLAVE) // 是否为 Slave 模式
 const modbusConfig = ref<DeviceModbusConfigVO>({} as DeviceModbusConfigVO)
 
 /** 获取连接配置 */
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
index b59a7b507..15e6ef970 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
@@ -8,19 +8,23 @@
       label-width="120px"
       v-loading="formLoading"
     >
-      <el-form-item label="IP 地址" prop="ip">
-        <el-input v-model="formData.ip" placeholder="请输入 Modbus 服务器 IP 地址" />
-      </el-form-item>
-      <el-form-item label="端口" prop="port">
-        <el-input-number
-          v-model="formData.port"
-          placeholder="请输入端口"
-          :min="1"
-          :max="65535"
-          controls-position="right"
-          class="!w-full"
-        />
-      </el-form-item>
+      <!-- Master 模式专有字段：IP、端口、超时、重试 -->
+      <template v-if="isMaster">
+        <el-form-item label="IP 地址" prop="ip">
+          <el-input v-model="formData.ip" placeholder="请输入 Modbus 服务器 IP 地址" />
+        </el-form-item>
+        <el-form-item label="端口" prop="port">
+          <el-input-number
+            v-model="formData.port"
+            placeholder="请输入端口"
+            :min="1"
+            :max="65535"
+            controls-position="right"
+            class="!w-full"
+          />
+        </el-form-item>
+      </template>
+      <!-- 公共字段：从站地址 -->
       <el-form-item label="从站地址" prop="slaveId">
         <el-input-number
           v-model="formData.slaveId"
@@ -31,26 +35,55 @@
           class="!w-full"
         />
       </el-form-item>
-      <el-form-item label="连接超时(ms)" prop="timeout">
-        <el-input-number
-          v-model="formData.timeout"
-          :min="1000"
-          :step="1000"
-          controls-position="right"
-          placeholder="请输入连接超时时间"
-          class="!w-full"
-        />
-      </el-form-item>
-      <el-form-item label="重试间隔(ms)" prop="retryInterval">
-        <el-input-number
-          v-model="formData.retryInterval"
-          :min="1000"
-          :step="1000"
-          controls-position="right"
-          placeholder="请输入重试间隔"
-          class="!w-full"
-        />
-      </el-form-item>
+      <!-- Master 模式专有字段：超时、重试 -->
+      <template v-if="isMaster">
+        <el-form-item label="连接超时(ms)" prop="timeout">
+          <el-input-number
+            v-model="formData.timeout"
+            :min="1000"
+            :step="1000"
+            controls-position="right"
+            placeholder="请输入连接超时时间"
+            class="!w-full"
+          />
+        </el-form-item>
+        <el-form-item label="重试间隔(ms)" prop="retryInterval">
+          <el-input-number
+            v-model="formData.retryInterval"
+            :min="1000"
+            :step="1000"
+            controls-position="right"
+            placeholder="请输入重试间隔"
+            class="!w-full"
+          />
+        </el-form-item>
+      </template>
+      <!-- Slave 模式专有字段：模式、帧格式 -->
+      <template v-if="isSlave">
+        <el-form-item label="工作模式" prop="mode">
+          <el-radio-group v-model="formData.mode">
+            <el-radio
+              v-for="dict in getIntDictOptions(DICT_TYPE.IOT_MODBUS_MODE)"
+              :key="dict.value"
+              :label="dict.value"
+            >
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="帧格式" prop="frameFormat">
+          <el-radio-group v-model="formData.frameFormat">
+            <el-radio
+              v-for="dict in getIntDictOptions(DICT_TYPE.IOT_MODBUS_FRAME_FORMAT)"
+              :key="dict.value"
+              :label="dict.value"
+            >
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </template>
+      <!-- 公共字段：状态 -->
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
@@ -72,13 +105,16 @@
 
 <script lang="ts" setup>
 import { DeviceModbusConfigApi, DeviceModbusConfigVO } from '@/api/iot/device/modbus/config'
+import { ProtocolTypeEnum } from '@/api/iot/product/product'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
+import { ModbusModeEnum, ModbusFrameFormatEnum } from '@/views/iot/utils/constants'
 
 defineOptions({ name: 'DeviceModbusConfigForm' })
 
 const props = defineProps<{
   deviceId: number
+  protocolType: string
 }>()
 
 const emit = defineEmits<{
@@ -88,6 +124,8 @@ const emit = defineEmits<{
 const message = useMessage()
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单提交 loading 状态
+const isMaster = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_MASTER) // 是否为 Master 模式
+const isSlave = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_SLAVE) // 是否为 Slave 模式
 const formData = ref<DeviceModbusConfigVO>({
   deviceId: props.deviceId,
   ip: '',
@@ -95,15 +133,26 @@ const formData = ref<DeviceModbusConfigVO>({
   slaveId: 1,
   timeout: 3000,
   retryInterval: 10000,
+  mode: ModbusModeEnum.POLLING,
+  frameFormat: ModbusFrameFormatEnum.MODBUS_TCP,
   status: CommonStatusEnum.ENABLE
 })
-const formRules = {
-  ip: [{ required: true, message: '请输入 IP 地址', trigger: 'blur' }],
-  port: [{ required: true, message: '请输入端口', trigger: 'blur' }],
-  slaveId: [{ required: true, message: '请输入从站地址', trigger: 'blur' }],
-  timeout: [{ required: true, message: '请输入连接超时时间', trigger: 'blur' }],
-  retryInterval: [{ required: true, message: '请输入重试间隔', trigger: 'blur' }]
-}
+const formRules = computed(() => {
+  const rules: Record<string, any[]> = {
+    slaveId: [{ required: true, message: '请输入从站地址', trigger: 'blur' }]
+  }
+  if (isMaster.value) {
+    rules.ip = [{ required: true, message: '请输入 IP 地址', trigger: 'blur' }]
+    rules.port = [{ required: true, message: '请输入端口', trigger: 'blur' }]
+    rules.timeout = [{ required: true, message: '请输入连接超时时间', trigger: 'blur' }]
+    rules.retryInterval = [{ required: true, message: '请输入重试间隔', trigger: 'blur' }]
+  }
+  if (isSlave.value) {
+    rules.mode = [{ required: true, message: '请选择工作模式', trigger: 'change' }]
+    rules.frameFormat = [{ required: true, message: '请选择帧格式', trigger: 'change' }]
+  }
+  return rules
+})
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -124,7 +173,9 @@ const resetForm = () => {
     port: 502,
     slaveId: 1,
     timeout: 3000,
-    retryInterval: 1000,
+    retryInterval: 10000,
+    mode: ModbusModeEnum.POLLING,
+    frameFormat: ModbusFrameFormatEnum.MODBUS_TCP,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
diff --git a/src/views/iot/device/device/detail/index.vue b/src/views/iot/device/device/detail/index.vue
index 417dd615e..b53ae8cfa 100644
--- a/src/views/iot/device/device/detail/index.vue
+++ b/src/views/iot/device/device/detail/index.vue
@@ -45,7 +45,11 @@
       <el-tab-pane
         label="Modbus 配置"
         name="modbus"
-        v-if="product.codecType === 'ModbusTcp'"
+        v-if="
+          [ProtocolTypeEnum.MODBUS_TCP_MASTER, ProtocolTypeEnum.MODBUS_TCP_SLAVE].includes(
+            product.protocolType as ProtocolTypeEnum
+          )
+        "
       >
         <DeviceModbusConfig
           v-if="activeTab === 'modbus'"
@@ -60,7 +64,7 @@
 <script lang="ts" setup>
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { DeviceApi, DeviceVO } from '@/api/iot/device/device'
-import { DeviceTypeEnum, ProductApi, ProductVO } from '@/api/iot/product/product'
+import { DeviceTypeEnum, ProductApi, ProductVO, ProtocolTypeEnum } from '@/api/iot/product/product'
 import { ThingModelApi, ThingModelData } from '@/api/iot/thingmodel'
 import DeviceDetailsHeader from './DeviceDetailsHeader.vue'
 import DeviceDetailsInfo from './DeviceDetailsInfo.vue'
diff --git a/src/views/iot/device/device/index.vue b/src/views/iot/device/device/index.vue
index 1406b21be..77824179c 100644
--- a/src/views/iot/device/device/index.vue
+++ b/src/views/iot/device/device/index.vue
@@ -173,7 +173,7 @@
                 <div class="mr-2.5 flex items-center">
                   <el-image :src="defaultIconUrl" class="w-[18px] h-[18px]" />
                 </div>
-                <div class="text-[16px] font-600 flex-1">{{ item.deviceName }}</div>
+                <div class="text-[16px] font-600 flex-1 overflow-hidden text-ellipsis whitespace-nowrap">{{ item.deviceName }}</div>
                 <!-- 添加设备状态标签 -->
                 <div class="inline-flex items-center">
                   <div
diff --git a/src/views/iot/utils/constants.ts b/src/views/iot/utils/constants.ts
index c6966c5c2..a499f831c 100644
--- a/src/views/iot/utils/constants.ts
+++ b/src/views/iot/utils/constants.ts
@@ -600,7 +600,19 @@ export const JSON_PARAMS_EXAMPLE_VALUES = {
   DEFAULT: { display: '""', value: '' }
 } as const
 
-// ========== Modbus 相关常量 ==========
+// ========== Modbus 通用常量 ==========
+
+/** Modbus 模式枚举 */
+export const ModbusModeEnum = {
+  POLLING: 1, // 云端轮询
+  ACTIVE_REPORT: 2 // 主动上报
+} as const
+
+/** Modbus 帧格式枚举 */
+export const ModbusFrameFormatEnum = {
+  MODBUS_TCP: 1, // Modbus TCP
+  MODBUS_RTU: 2 // Modbus RTU
+} as const
 
 /** Modbus 功能码枚举 */
 export const ModbusFunctionCodeEnum = {
@@ -614,8 +626,8 @@ export const ModbusFunctionCodeEnum = {
 export const ModbusFunctionCodeOptions = [
   { value: 1, label: '01 - 读线圈 (Coils)', description: '可读写布尔值' },
   { value: 2, label: '02 - 读离散输入 (Discrete Inputs)', description: '只读布尔值' },
-  { value: 3, label: '03 - 读保持寄存器 (Holding Registers)', description: '可读写16位数据' },
-  { value: 4, label: '04 - 读输入寄存器 (Input Registers)', description: '只读16位数据' }
+  { value: 3, label: '03 - 读保持寄存器 (Holding Registers)', description: '可读写 16 位数据' },
+  { value: 4, label: '04 - 读输入寄存器 (Input Registers)', description: '只读 16 位数据' }
 ]
 
 /** Modbus 原始数据类型枚举 */
@@ -662,7 +674,7 @@ export const getByteOrderOptions = (rawDataType: string) => {
     return ModbusByteOrder32Options
   }
   if (rawDataType === 'DOUBLE') {
-    // 64位暂时复用32位字节序
+    // 64 位暂时复用 32 位字节序
     return ModbusByteOrder32Options
   }
   return ModbusByteOrder16Options

From deed7eaff2f7093c2eeb29e2b21ae5c6072001e2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 13 Feb 2026 15:35:41 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feat=EF=BC=88iot=EF=BC=89=EF=BC=9AModbus=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20Master/Slave=20=E5=8F=8C=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E5=92=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8C=89=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=9E=8B=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/product/product/index.ts          |  4 ++--
 .../device/detail/DeviceModbusConfig.vue      | 16 +++++++--------
 .../device/detail/DeviceModbusConfigForm.vue  | 20 +++++++++----------
 src/views/iot/device/device/detail/index.vue  |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/api/iot/product/product/index.ts b/src/api/iot/product/product/index.ts
index a5fff456e..73eb0f99b 100644
--- a/src/api/iot/product/product/index.ts
+++ b/src/api/iot/product/product/index.ts
@@ -37,8 +37,8 @@ export enum ProtocolTypeEnum {
   MQTT = 'mqtt',
   EMQX = 'emqx',
   COAP = 'coap',
-  MODBUS_TCP_MASTER = 'modbus_tcp_master',
-  MODBUS_TCP_SLAVE = 'modbus_tcp_slave'
+  MODBUS_TCP_CLIENT = 'modbus_tcp_client',
+  MODBUS_TCP_SERVER = 'modbus_tcp_server'
 }
 
 // IoT 序列化类型枚举
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfig.vue b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
index a039aaa8b..7e3719e30 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfig.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfig.vue
@@ -12,8 +12,8 @@
 
       <!-- 详情展示 -->
       <el-descriptions :column="3" border direction="horizontal">
-        <!-- Master 模式专有字段 -->
-        <template v-if="isMaster">
+        <!-- Client 模式专有字段 -->
+        <template v-if="isClient">
           <el-descriptions-item label="IP 地址">
             {{ modbusConfig.ip || '-' }}
           </el-descriptions-item>
@@ -25,8 +25,8 @@
         <el-descriptions-item label="从站地址">
           {{ modbusConfig.slaveId || '-' }}
         </el-descriptions-item>
-        <!-- Master 模式专有字段 -->
-        <template v-if="isMaster">
+        <!-- Client 模式专有字段 -->
+        <template v-if="isClient">
           <el-descriptions-item label="连接超时">
             {{ modbusConfig.timeout ? `${modbusConfig.timeout} ms` : '-' }}
           </el-descriptions-item>
@@ -34,8 +34,8 @@
             {{ modbusConfig.retryInterval ? `${modbusConfig.retryInterval} ms` : '-' }}
           </el-descriptions-item>
         </template>
-        <!-- Slave 模式专有字段 -->
-        <template v-if="isSlave">
+        <!-- Server 模式专有字段 -->
+        <template v-if="isServer">
           <el-descriptions-item label="工作模式">
             <dict-tag :type="DICT_TYPE.IOT_MODBUS_MODE" :value="modbusConfig.mode" />
           </el-descriptions-item>
@@ -197,8 +197,8 @@ const props = defineProps<{
 const message = useMessage()
 
 // ======================= 连接配置 =======================
-const isMaster = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_MASTER) // 是否为 Master 模式
-const isSlave = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_SLAVE) // 是否为 Slave 模式
+const isClient = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_CLIENT) // 是否为 Client 模式
+const isServer = computed(() => props.product.protocolType === ProtocolTypeEnum.MODBUS_TCP_SERVER) // 是否为 Server 模式
 const modbusConfig = ref<DeviceModbusConfigVO>({} as DeviceModbusConfigVO)
 
 /** 获取连接配置 */
diff --git a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
index 15e6ef970..4a2493ee9 100644
--- a/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
+++ b/src/views/iot/device/device/detail/DeviceModbusConfigForm.vue
@@ -8,8 +8,8 @@
       label-width="120px"
       v-loading="formLoading"
     >
-      <!-- Master 模式专有字段：IP、端口、超时、重试 -->
-      <template v-if="isMaster">
+      <!-- Client 模式专有字段：IP、端口、超时、重试 -->
+      <template v-if="isClient">
         <el-form-item label="IP 地址" prop="ip">
           <el-input v-model="formData.ip" placeholder="请输入 Modbus 服务器 IP 地址" />
         </el-form-item>
@@ -35,8 +35,8 @@
           class="!w-full"
         />
       </el-form-item>
-      <!-- Master 模式专有字段：超时、重试 -->
-      <template v-if="isMaster">
+      <!-- Client 模式专有字段：超时、重试 -->
+      <template v-if="isClient">
         <el-form-item label="连接超时(ms)" prop="timeout">
           <el-input-number
             v-model="formData.timeout"
@@ -58,8 +58,8 @@
           />
         </el-form-item>
       </template>
-      <!-- Slave 模式专有字段：模式、帧格式 -->
-      <template v-if="isSlave">
+      <!-- Server 模式专有字段：模式、帧格式 -->
+      <template v-if="isServer">
         <el-form-item label="工作模式" prop="mode">
           <el-radio-group v-model="formData.mode">
             <el-radio
@@ -124,8 +124,8 @@ const emit = defineEmits<{
 const message = useMessage()
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单提交 loading 状态
-const isMaster = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_MASTER) // 是否为 Master 模式
-const isSlave = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_SLAVE) // 是否为 Slave 模式
+const isClient = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_CLIENT) // 是否为 Client 模式
+const isServer = computed(() => props.protocolType === ProtocolTypeEnum.MODBUS_TCP_SERVER) // 是否为 Server 模式
 const formData = ref<DeviceModbusConfigVO>({
   deviceId: props.deviceId,
   ip: '',
@@ -141,13 +141,13 @@ const formRules = computed(() => {
   const rules: Record<string, any[]> = {
     slaveId: [{ required: true, message: '请输入从站地址', trigger: 'blur' }]
   }
-  if (isMaster.value) {
+  if (isClient.value) {
     rules.ip = [{ required: true, message: '请输入 IP 地址', trigger: 'blur' }]
     rules.port = [{ required: true, message: '请输入端口', trigger: 'blur' }]
     rules.timeout = [{ required: true, message: '请输入连接超时时间', trigger: 'blur' }]
     rules.retryInterval = [{ required: true, message: '请输入重试间隔', trigger: 'blur' }]
   }
-  if (isSlave.value) {
+  if (isServer.value) {
     rules.mode = [{ required: true, message: '请选择工作模式', trigger: 'change' }]
     rules.frameFormat = [{ required: true, message: '请选择帧格式', trigger: 'change' }]
   }
diff --git a/src/views/iot/device/device/detail/index.vue b/src/views/iot/device/device/detail/index.vue
index b53ae8cfa..8682b5aa8 100644
--- a/src/views/iot/device/device/detail/index.vue
+++ b/src/views/iot/device/device/detail/index.vue
@@ -46,7 +46,7 @@
         label="Modbus 配置"
         name="modbus"
         v-if="
-          [ProtocolTypeEnum.MODBUS_TCP_MASTER, ProtocolTypeEnum.MODBUS_TCP_SLAVE].includes(
+          [ProtocolTypeEnum.MODBUS_TCP_CLIENT, ProtocolTypeEnum.MODBUS_TCP_SERVER].includes(
             product.protocolType as ProtocolTypeEnum
           )
         "