diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index eb1eebf..29f61e5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -253,5 +253,6 @@ export enum DICT_TYPE {
   IOT_MODBUS_FRAME_FORMAT = 'iot_modbus_frame_format', // IoT Modbus 帧格式
   IOT_PROTOCOL = 'iot_protocol',
   IOT_DEVICE_DATA_TYPE = 'iot_device_data_type',
-  PRIMARY_FLAG = 'primary_flag'
+  PRIMARY_FLAG = 'primary_flag',
+  IOT_ALARM_REGISTRATION = 'alarm_registration'
 }
diff --git a/src/views/iot/device/components/DeviceAttributeForm.vue b/src/views/iot/device/components/DeviceAttributeForm.vue
index 31b3a27..e263cb6 100644
--- a/src/views/iot/device/components/DeviceAttributeForm.vue
+++ b/src/views/iot/device/components/DeviceAttributeForm.vue
@@ -1,49 +1,83 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" v-loading="formLoading">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
       <el-form-item :label="t('DataCollection.Device.attributeCode')" prop="attributeCode">
         <el-input
-v-model="formData.attributeCode" :placeholder="t('DataCollection.Device.placeholderAttributeCode')"
-          @input="handleAttributeCodeInput" :disabled="formType === 'update'" />
+          v-model="formData.attributeCode"
+          :placeholder="t('DataCollection.Device.placeholderAttributeCode')"
+          :disabled="formType === 'update'"
+        />
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.attributeName')" prop="attributeName">
-        <el-input v-model="formData.attributeName" :placeholder="t('DataCollection.Device.placeholderAttributeName')" />
+        <el-input
+          v-model="formData.attributeName"
+          :placeholder="t('DataCollection.Device.placeholderAttributeName')"
+        />
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.attributeType')" prop="attributeType">
         <el-select
-v-model="formData.attributeType" clearable filterable
-          :placeholder="t('DataCollection.Device.placeholderAttributeType')" @change="handleAttributeTypeChange">
+          v-model="formData.attributeType"
+          clearable
+          filterable
+          :placeholder="t('DataCollection.Device.placeholderAttributeType')"
+          @change="handleAttributeTypeChange"
+        >
           <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.dataType')" prop="dataType">
         <el-select
-v-model="formData.dataType" :placeholder="t('DataCollection.Device.placeholderDataType')"
-          :disabled="formType === 'update'">
+          v-model="formData.dataType"
+          :placeholder="t('DataCollection.Device.placeholderDataType')"
+          :disabled="formType === 'update'"
+        >
           <el-option
-v-for="dict in getStrDictOptions(DICT_TYPE.IOT_DEVICE_DATA_TYPE)" :key="dict.value"
-            :label="dict.label" :value="dict.value" />
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_DEVICE_DATA_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.address')" prop="address">
-        <el-input v-model="formData.address" :placeholder="t('DataCollection.Device.placeholderAddress')" />
+        <el-input
+          v-model="formData.address"
+          :placeholder="t('DataCollection.Device.placeholderAddress')"
+        />
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.dataUnit')" prop="dataUnit">
         <el-select
-v-model="formData.dataUnit" clearable
-          :placeholder="t('DataCollection.DeviceModel.placeholderDataUnit')" class="w-1/1">
+          v-model="formData.dataUnit"
+          clearable
+          :placeholder="t('DataCollection.DeviceModel.placeholderDataUnit')"
+          class="w-1/1"
+        >
           <el-option v-for="unit in unitList" :key="unit.id" :label="unit.name" :value="unit.id" />
         </el-select>
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.ratio')" prop="ratio">
         <el-input-number
-v-model="formData.ratio" :placeholder="t('DataCollection.Device.placeholderRatio')" :min="0.00"
-          :decision="2" :step="0.01" class="!w-full" :disabled="!ratioEnabled" />
+          v-model="formData.ratio"
+          :placeholder="t('DataCollection.Device.placeholderRatio')"
+          :min="0.0"
+          :decision="2"
+          :step="0.01"
+          class="!w-full"
+          :disabled="!ratioEnabled"
+        />
       </el-form-item>
       <el-form-item :label="t('DataCollection.Device.remark')" prop="remark">
         <el-input
-v-model="formData.remark" :placeholder="t('DataCollection.Device.placeholderRemark')"
-          type="textarea" />
+          v-model="formData.remark"
+          :placeholder="t('DataCollection.Device.placeholderRemark')"
+          type="textarea"
+        />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -74,7 +108,10 @@ const loadTypeList = async () => {
     return
   }
   try {
-    const data = await DeviceAttributeTypeApi.getDeviceAttributeTypePage({ pageNo: 1, pageSize: 10 })
+    const data = await DeviceAttributeTypeApi.getDeviceAttributeTypePage({
+      pageNo: 1,
+      pageSize: 10
+    })
     typeList.value = data?.list ?? []
   } catch {
     typeList.value = []
@@ -122,22 +159,18 @@ watch(
   }
 )
 
-const handleAttributeCodeInput = (val: string) => {
-  const sanitized = (val || '').replace(/[^A-Za-z0-9_]/g, '')
-  formData.value.attributeCode = sanitized.replace(/^[0-9]+/, '')
-}
-
-
 const handleAttributeTypeChange = (val: number | string) => {
-  const matched = typeList.value.find(
-    (item) => item.id === val || String(item.id) === String(val)
-  )
+  const matched = typeList.value.find((item) => item.id === val || String(item.id) === String(val))
   formData.value.typeName = matched?.name
 }
 
 const formRules = reactive({
   attributeCode: [
-    { required: true, message: t('DataCollection.Device.attributeValidatorCodeRequired'), trigger: 'blur' },
+    {
+      required: true,
+      message: t('DataCollection.Device.attributeValidatorCodeRequired'),
+      trigger: 'blur'
+    },
     {
       validator: (_rule: any, value: string, callback: any) => {
         if (!value) {
@@ -158,10 +191,18 @@ const formRules = reactive({
     }
   ],
   attributeName: [
-    { required: true, message: t('DataCollection.Device.attributeValidatorNameRequired'), trigger: 'blur' }
+    {
+      required: true,
+      message: t('DataCollection.Device.attributeValidatorNameRequired'),
+      trigger: 'blur'
+    }
   ],
   dataType: [
-    { required: true, message: t('DataCollection.DeviceModel.validatorDataTypeRequired'), trigger: 'change' }
+    {
+      required: true,
+      message: t('DataCollection.DeviceModel.validatorDataTypeRequired'),
+      trigger: 'change'
+    }
   ],
   remark: [
     {
@@ -227,7 +268,7 @@ const open = async (type: string, id?: number, deviceId: number) => {
     try {
       formData.value = await DeviceApi.getDeviceAttribute(id)
       if (!(formData.value as any)?.deviceId) {
-        ; (formData.value as any).deviceId = deviceId
+        ;(formData.value as any).deviceId = deviceId
       }
 
       const currentType = (formData.value as any)?.attributeType
@@ -240,8 +281,8 @@ const open = async (type: string, id?: number, deviceId: number) => {
             item.code === currentType
         )
         if (matched) {
-          ; (formData.value as any).attributeType = matched.id
-            ; (formData.value as any).typeName = matched.name
+          ;(formData.value as any).attributeType = matched.id
+          ;(formData.value as any).typeName = matched.name
         }
       }
     } finally {
diff --git a/src/views/iot/device/management/index.vue b/src/views/iot/device/management/index.vue
index fdb0f88..830789f 100644
--- a/src/views/iot/device/management/index.vue
+++ b/src/views/iot/device/management/index.vue
@@ -47,9 +47,6 @@
                     {{ getNodeTypeLabel(data.nodeType) }}
                   </span>
                 </div>
-                <template v-if="data.type === 'device'">
-                  <span class="device-mgmt__treeNodeMeta">{{ data.code }}</span>
-                </template>
                 <div class="device-mgmt__treeNodeActions">
                   <el-button
                     v-if="canCreateChild(data)"
@@ -133,7 +130,7 @@
           <el-card shadow="never" class="device-mgmt__panel device-mgmt__header">
             <div class="device-mgmt__headerMain">
               <div class="device-mgmt__titleRow">
-                <el-button link type="primary" @click="backToList">返回列表</el-button>
+                <el-button :icon="Back" @click="backToList">返回</el-button>
                 <span
                   class="device-mgmt__dot device-mgmt__dot--lg"
                   :class="
@@ -312,35 +309,39 @@
               <el-card shadow="never" class="device-mgmt__panel" v-loading="historyLoading">
                 <div class="device-mgmt__filters">
                   <div class="device-mgmt__filter">
-                    <div class="device-mgmt__filterLabel">参数选择</div>
-                    <el-select v-model="historyMetricKey" class="!w-160px" clearable>
-                      <el-option
-                        v-for="m in historyMetricOptions"
-                        :key="m.id"
-                        :label="m.attributeName"
-                        :value="m.id"
+                    <div class="device-mgmt__filter">
+                      <div class="device-mgmt__filterLabel">参数选择</div>
+                      <el-select v-model="historyMetricKey" class="!w-160px" clearable>
+                        <el-option
+                          v-for="m in historyMetricOptions"
+                          :key="m.id"
+                          :label="m.attributeName"
+                          :value="m.id"
+                        />
+                      </el-select>
+                    </div>
+                    <div class="device-mgmt__filter">
+                      <div class="device-mgmt__filterLabel">时间范围</div>
+                      <el-date-picker
+                        v-model="historyTimeRange"
+                        type="datetimerange"
+                        range-separator="-"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                        :disabled-date="historyDisabledDate"
+                        @change="handleHistoryRangeChange"
+                        class="!w-320px"
                       />
-                    </el-select>
-                  </div>
-                  <div class="device-mgmt__filter">
-                    <div class="device-mgmt__filterLabel">时间范围</div>
-                    <el-date-picker
-                      v-model="historyTimeRange"
-                      type="datetimerange"
-                      range-separator="-"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                      value-format="YYYY-MM-DD HH:mm:ss"
-                      class="!w-320px"
-                    />
+                      <el-button type="primary" @click="loadHistoryData">查询</el-button>
+                    </div>
                   </div>
-                  <el-button type="primary" @click="loadHistoryData">查询</el-button>
+
                   <div class="device-mgmt__filterActions">
                     <el-radio-group v-model="historyViewType" class="ml-16px">
                       <el-radio-button label="chart">曲线</el-radio-button>
                       <el-radio-button label="list">列表</el-radio-button>
                     </el-radio-group>
-                    <el-button class="ml-16px">导出</el-button>
                   </div>
                 </div>
 
@@ -403,13 +404,7 @@
                               : 'info'
                         "
                       >
-                        {{
-                          String(row.alarmLevel) === '1'
-                            ? '高级'
-                            : String(row.alarmLevel) === '2'
-                              ? '中级'
-                              : '低级'
-                        }}
+                        {{ getAlarmLevelLabel(row.alarmLevel) }}
                       </el-tag>
                     </template>
                   </el-table-column>
@@ -449,7 +444,8 @@ import { useRoute } from 'vue-router'
 import NodeForm from './NodeForm.vue'
 import DeviceForm from '../DeviceForm.vue'
 import { formatDate } from '@/utils/formatTime'
-import { OfficeBuilding, Monitor, Refresh } from '@element-plus/icons-vue'
+import { getIntDictOptions } from '@/utils/dict'
+import { OfficeBuilding, Monitor, Refresh, Back } from '@element-plus/icons-vue'
 defineOptions({ name: 'IoTDeviceManagement' })
 
 type TreeNodeType = 'company' | 'line' | 'device'
@@ -661,6 +657,13 @@ const getOperatingStatusLabel = (status?: string | number) => {
   return String(status)
 }
 
+const alarmLevelOptions = computed(() => getIntDictOptions('alarm_registration'))
+
+const getAlarmLevelLabel = (value?: string | number) => {
+  const item = alarmLevelOptions.value.find((option) => String(option.value) === String(value))
+  return item?.label || String(value ?? '-')
+}
+
 const loadNodeDeviceList = async () => {
   if (!selectedNode.value) return
   nodeDeviceLoading.value = true
@@ -837,10 +840,57 @@ watch([() => activeTab.value, () => selectedDeviceDetail.value.id], ([tab, devic
 
 const historyMetricOptions = ref<any[]>([])
 const historyMetricKey = ref<string | number>('')
-const historyTimeRange = ref<string[]>([])
 const historyViewType = ref<'chart' | 'list'>('chart')
 const historyList = ref<any[]>([])
 const historyLoading = ref(false)
+const HISTORY_MAX_RANGE_MS = 8 * 60 * 60 * 1000
+
+const formatDateTimeText = (date: Date) => {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  const hours = String(date.getHours()).padStart(2, '0')
+  const minutes = String(date.getMinutes()).padStart(2, '0')
+  const seconds = String(date.getSeconds()).padStart(2, '0')
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}
+
+const buildDefaultHistoryRange = () => {
+  const end = new Date()
+  const start = new Date(end.getTime() - 2 * 60 * 60 * 1000)
+  return [formatDateTimeText(start), formatDateTimeText(end)]
+}
+
+const historyTimeRange = ref<string[]>(buildDefaultHistoryRange())
+
+const toTimeStamp = (value?: string) => {
+  if (!value) return 0
+  const ts = new Date(value).getTime()
+  return Number.isNaN(ts) ? 0 : ts
+}
+
+const historyDisabledDate = (time: Date) => {
+  const endOfDay = new Date(time)
+  endOfDay.setHours(23, 59, 59, 999)
+  return endOfDay.getTime() > Date.now()
+}
+
+const handleHistoryRangeChange = (range?: string[]) => {
+  if (!range || range.length !== 2) return
+  const startTime = toTimeStamp(range[0])
+  const endTime = Math.min(toTimeStamp(range[1]), Date.now())
+  if (!startTime || !endTime) return
+  if (endTime - startTime > HISTORY_MAX_RANGE_MS) {
+    const fixedStart = formatDateTimeText(new Date(endTime - HISTORY_MAX_RANGE_MS))
+    const fixedEnd = formatDateTimeText(new Date(endTime))
+    historyTimeRange.value = [fixedStart, fixedEnd]
+    message.warning('时间范围最多 8 小时，已自动调整')
+    return
+  }
+  if (endTime !== toTimeStamp(range[1])) {
+    historyTimeRange.value = [range[0], formatDateTimeText(new Date(endTime))]
+  }
+}
 
 const parseHistoryTime = (timeText?: string) => {
   if (!timeText) return { display: '-', timestamp: 0 }
@@ -888,6 +938,7 @@ const loadHistoryData = async () => {
       modelId: Number(historyMetricKey.value)
     }
     if (historyTimeRange.value && historyTimeRange.value.length === 2) {
+      handleHistoryRangeChange(historyTimeRange.value)
       params.collectionStartTime = historyTimeRange.value[0]
       params.collectionEndTime = historyTimeRange.value[1]
     }
@@ -986,6 +1037,9 @@ watch([() => activeTab.value, () => selectedDeviceDetail.value.id], ([tab, devic
 </script>
 
 <style scoped lang="scss">
+:deep(.el-tree-node__content) {
+  margin: 2px 0;
+}
 .device-mgmt {
   display: flex;
   gap: 16px;
diff --git a/src/views/iot/device/point/index.vue b/src/views/iot/device/point/index.vue
index 028a1b3..003609b 100644
--- a/src/views/iot/device/point/index.vue
+++ b/src/views/iot/device/point/index.vue
@@ -1,7 +1,6 @@
 <template>
   <ContentWrap>
     <div class="point-dict">
-      <!-- 左侧设备树 -->
       <div class="point-dict__left">
         <el-card shadow="never" class="point-dict__panel left-panel">
           <div class="left-panel__search">
@@ -14,17 +13,20 @@
           </div>
           <div class="left-panel__stats">
             <div class="stat-item">
-              <el-icon><OfficeBuilding /></el-icon> 客户: 3
+              <el-icon><OfficeBuilding /></el-icon> 客户: {{ customerNodeTotal }}
             </div>
             <div class="stat-item">
-              <el-icon><Monitor /></el-icon> 设备: 8
+              <el-icon><Monitor /></el-icon> 设备: {{ deviceNodeTotal }}
             </div>
+            <el-button class="stat-refresh-btn" text :loading="treeLoading" @click="getTreeData">
+              <el-icon><Refresh /></el-icon>
+              刷新
+            </el-button>
           </div>
-
           <el-tree
             ref="treeRef"
             :data="treeData"
-            node-key="id"
+            node-key="nodeKey"
             default-expand-all
             :props="treeProps"
             highlight-current
@@ -32,24 +34,15 @@
             @node-click="handleNodeClick"
             class="left-panel__tree"
           >
-            <template #default="{ node, data }">
+            <template #default="{ data }">
               <div class="custom-tree-node">
                 <div class="node-left">
-                  <el-icon v-if="data.type !== 'device'" class="node-icon folder-icon">
-                    <FolderOpened v-if="node.expanded" />
-                    <Folder v-else />
-                  </el-icon>
-                  <span
-                    v-if="data.type === 'device'"
-                    class="node-status-dot"
-                    :class="{ 'is-online': data.online }"
-                  ></span>
                   <span class="node-label" :class="{ 'is-device': data.type === 'device' }">{{
                     data.name
                   }}</span>
-                </div>
-                <div v-if="data.type === 'device'" class="node-right">
-                  <span class="node-code-tag">{{ data.code }}</span>
+                  <span class="node-type-tag" :class="getNodeTypeClass(data.nodeType)">
+                    {{ getNodeTypeLabel(data.nodeType) }}
+                  </span>
                 </div>
               </div>
             </template>
@@ -57,67 +50,295 @@
         </el-card>
       </div>
 
-      <!-- 右侧点位配置 -->
       <div class="point-dict__right">
         <template v-if="currentDevice">
-          <!-- 顶部设备信息卡片 -->
           <div class="right-header">
             <div class="header-left">
               <div class="header-title-row">
-                <span class="header-dot" :class="{ 'is-online': currentDevice.online }"></span>
                 <span class="header-title">{{ currentDevice.name }}</span>
               </div>
               <div class="header-code-row">
-                <span class="header-code">{{ currentDevice.code }}</span>
+                <span class="header-code">{{ currentDevice.deviceCode || '-' }}</span>
               </div>
             </div>
             <div class="header-right">
-              <el-button class="header-add-btn">
-                <el-icon class="mr-4px"><Plus /></el-icon> 新增点位
-              </el-button>
               <div class="header-count-box">
                 <div class="count-label">点位数量</div>
-                <div class="count-value">{{ totalPoints }}</div>
+                <div class="count-value">{{ pointTotal }}</div>
               </div>
             </div>
           </div>
 
-          <!-- 点位分组列表 -->
           <div class="right-content">
-            <div v-for="group in pointGroups" :key="group.name" class="point-group">
-              <div class="group-header">
-                <div class="group-title">
-                  <el-icon class="group-icon"><Folder /></el-icon>
-                  <span>{{ group.name }}</span>
+            <el-tabs v-model="deviceTabActive" class="right-tabs">
+              <el-tab-pane label="设备属性" name="deviceAttribute">
+                <DeviceAttributeList :device-id="selectedDeviceId" />
+              </el-tab-pane>
+              <el-tab-pane label="点位规则" name="deviceRule">
+                <el-form
+                  class="-mb-15px"
+                  :model="ruleQueryParams"
+                  ref="ruleQueryFormRef"
+                  :inline="true"
+                  label-width="96px"
+                >
+                  <el-form-item label="标识符" prop="identifier">
+                    <el-input
+                      v-model="ruleQueryParams.identifier"
+                      clearable
+                      @keyup.enter="handleRuleQuery"
+                      class="!w-200px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="字段名" prop="fieldName">
+                    <el-input
+                      v-model="ruleQueryParams.fieldName"
+                      clearable
+                      @keyup.enter="handleRuleQuery"
+                      class="!w-200px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="默认值" prop="defaultValue">
+                    <el-input
+                      v-model="ruleQueryParams.defaultValue"
+                      clearable
+                      @keyup.enter="handleRuleQuery"
+                      class="!w-200px"
+                    />
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button @click="handleRuleQuery">查询</el-button>
+                    <el-button @click="resetRuleQuery">重置</el-button>
+                  </el-form-item>
+                </el-form>
+
+                <div class="mb-10px text-right">
+                  <el-button type="primary" @click="openCreateRuleForm">新增规则</el-button>
                 </div>
-                <div class="group-count">{{ group.points.length }} 个点位</div>
-              </div>
 
-              <div class="group-list">
-                <div v-for="point in group.points" :key="point.id" class="point-card">
-                  <div class="point-card__main">
-                    <span class="point-code">{{ point.code }}</span>
-                    <span class="point-name">{{ point.name }}</span>
-                    <div class="point-value-wrap">
-                      <span class="point-value">{{ point.value }}</span>
-                      <span class="point-unit">{{ point.unit }}</span>
+                <el-table
+                  v-loading="ruleLoading"
+                  :data="ruleList"
+                  :stripe="true"
+                  :show-overflow-tooltip="true"
+                  row-key="id"
+                >
+                  <el-table-column label="标识符" align="center" prop="identifier" />
+                  <el-table-column label="字段名" align="center" prop="fieldName" sortable />
+                  <el-table-column label="字段规则" align="center" prop="fieldRule" />
+                  <el-table-column label="默认值" align="center" prop="defaultValue" />
+                  <el-table-column
+                    label="创建时间"
+                    align="center"
+                    prop="createTime"
+                    :formatter="dateFormatter"
+                    width="180px"
+                    sortable
+                  />
+                  <el-table-column label="操作" align="center" width="160px">
+                    <template #default="scope">
+                      <el-button link type="primary" @click="openRuleForm(scope.row)"
+                        >编辑</el-button
+                      >
+                      <el-button
+                        v-if="(scope.row.identifier || '').toString().toUpperCase() === 'ALARM'"
+                        link
+                        type="danger"
+                        @click="handleRuleDelete(scope.row.id)"
+                      >
+                        删除
+                      </el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <Pagination
+                  :total="ruleTotal"
+                  v-model:page="ruleQueryParams.pageNo"
+                  v-model:limit="ruleQueryParams.pageSize"
+                  @pagination="getRuleList"
+                />
+
+                <el-dialog v-model="ruleDialogVisible" title="编辑规则" width="880px" draggable>
+                  <el-form :model="ruleForm" ref="ruleFormRef" label-width="120px">
+                    <el-form-item label="标识符">
+                      <el-input v-model="ruleForm.identifier" disabled />
+                    </el-form-item>
+                    <el-form-item label="字段名">
+                      <el-input v-model="ruleForm.fieldName" disabled />
+                    </el-form-item>
+                    <el-form-item label="默认值">
+                      <el-input v-model="ruleForm.defaultValue" disabled />
+                    </el-form-item>
+                    <el-form-item
+                      v-if="(ruleForm.identifier || '').toString().toUpperCase() === 'ALARM'"
+                      label="报警级别"
+                    >
+                      <el-select v-model="ruleForm.alarmLevel" placeholder="请选择报警级别">
+                        <el-option
+                          v-for="dict in getStrDictOptions('alarm_registration')"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+
+                    <div class="flex flex-col w-full">
+                      <div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
+                        <el-form-item label="字段规则">
+                          <el-select
+                            v-model="ruleForm.fieldRule"
+                            class="!w-240px"
+                            :disabled="!currentRuleOptions.length"
+                          >
+                            <el-option
+                              v-for="item in currentRuleOptions"
+                              :key="item.value"
+                              :label="item.label"
+                              :value="item.value"
+                              :disabled="isRuleDisabled(item.value, ruleForm.fieldRule)"
+                            />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="规则">
+                          <div class="flex items-center gap-8px">
+                            <el-select v-model="ruleForm.ruleAttributeId" class="!w-240px">
+                              <el-option
+                                v-for="item in ruleAttributeOptions"
+                                :key="item.id"
+                                :label="item.attributeName || item.attributeCode"
+                                :value="item.id"
+                              />
+                            </el-select>
+                            <el-select v-model="ruleForm.ruleOperator" class="!w-160px">
+                              <el-option
+                                v-for="item in ruleOperatorOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                              />
+                            </el-select>
+                            <el-input
+                              v-if="
+                                ruleForm.ruleOperator !== 'TRUE' &&
+                                ruleForm.ruleOperator !== 'FALSE'
+                              "
+                              v-model="ruleForm.ruleValue"
+                              class="!w-200px"
+                            />
+                          </div>
+                        </el-form-item>
+                      </div>
+
+                      <div
+                        v-for="(item, index) in extraPointRules"
+                        :key="index"
+                        class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px mt-10px"
+                      >
+                        <el-form-item label="字段规则">
+                          <el-select v-model="item.rule" class="!w-240px">
+                            <el-option
+                              v-for="opt in currentRuleOptions"
+                              :key="opt.value"
+                              :label="opt.label"
+                              :value="opt.value"
+                              :disabled="isRuleDisabled(opt.value, item.rule)"
+                            />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="规则">
+                          <div class="flex items-center gap-8px">
+                            <el-select v-model="item.id" class="!w-240px">
+                              <el-option
+                                v-for="attr in ruleAttributeOptions"
+                                :key="attr.id"
+                                :label="attr.attributeName || attr.attributeCode"
+                                :value="attr.id"
+                              />
+                            </el-select>
+                            <el-select v-model="item.operator" class="!w-160px">
+                              <el-option
+                                v-for="opt in ruleOperatorOptions"
+                                :key="opt.value"
+                                :label="opt.label"
+                                :value="opt.value"
+                              />
+                            </el-select>
+                            <el-input
+                              v-if="item.operator !== 'TRUE' && item.operator !== 'FALSE'"
+                              v-model="item.operatorRule"
+                              class="!w-200px"
+                            />
+                            <el-button type="danger" link @click="handleRemovePointRule(index)">
+                              删除
+                            </el-button>
+                          </div>
+                        </el-form-item>
+                      </div>
+
+                      <el-form-item v-if="isRunningIdentifier" label=" ">
+                        <el-button type="primary" link @click="handleAddPointRule"
+                          >+ 新增规则</el-button
+                        >
+                      </el-form-item>
                     </div>
-                    <el-tag size="small" class="point-type-tag" round>{{ point.type }}</el-tag>
-                  </div>
-                  
-                  <div class="point-card__actions">
-                    <el-checkbox v-model="point.history" size="small" class="action-checkbox">历史数据</el-checkbox>
-                    <el-button link type="warning" size="small" class="action-btn">编辑</el-button>
-                    <el-button link type="danger" size="small" class="action-btn">删除</el-button>
-                  </div>
-                  
-                  <div class="point-card__meta">
-                    <span class="meta-item">更新: {{ point.updatedAt }}</span>
-                    <span class="meta-item">{{ point.desc }}</span>
-                  </div>
-                </div>
-              </div>
-            </div>
+                  </el-form>
+                  <template #footer>
+                    <span class="dialog-footer">
+                      <el-button @click="ruleDialogVisible = false">取消</el-button>
+                      <el-button
+                        type="primary"
+                        :loading="ruleFormLoading"
+                        @click="handleRuleSubmit"
+                      >
+                        保存
+                      </el-button>
+                    </span>
+                  </template>
+                </el-dialog>
+
+                <el-dialog
+                  v-model="createRuleDialogVisible"
+                  title="新增规则"
+                  width="520px"
+                  draggable
+                >
+                  <el-form :model="createRuleForm" ref="createRuleFormRef" label-width="120px">
+                    <el-form-item label="标识符">
+                      <el-input v-model="createRuleForm.identifier" disabled />
+                    </el-form-item>
+                    <el-form-item label="字段名">
+                      <el-input v-model="createRuleForm.fieldName" />
+                    </el-form-item>
+                    <el-form-item label="默认值">
+                      <el-input v-model="createRuleForm.defaultValue" disabled />
+                    </el-form-item>
+                    <el-form-item label="报警级别">
+                      <el-select v-model="createRuleForm.alarmLevel" placeholder="请选择报警级别">
+                        <el-option
+                          v-for="dict in getStrDictOptions('alarm_registration')"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </el-form>
+                  <template #footer>
+                    <span class="dialog-footer">
+                      <el-button @click="createRuleDialogVisible = false">取消</el-button>
+                      <el-button
+                        type="primary"
+                        :loading="createRuleFormLoading"
+                        @click="handleCreateRuleSubmit"
+                      >
+                        保存
+                      </el-button>
+                    </span>
+                  </template>
+                </el-dialog>
+              </el-tab-pane>
+            </el-tabs>
           </div>
         </template>
         <div v-else class="empty-wrap">
@@ -129,175 +350,561 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
-import { Search, OfficeBuilding, Monitor, Folder, FolderOpened, Plus } from '@element-plus/icons-vue'
+import { computed, reactive, ref, watch, watchEffect } from 'vue'
+import { Search, OfficeBuilding, Monitor, Plus, Refresh } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
+import request from '@/config/axios'
+import { OrgNodeApi } from '@/api/iot/orgNode'
+import { DeviceApi } from '@/api/iot/device'
+import { dateFormatter } from '@/utils/formatTime'
+import { getStrDictOptions } from '@/utils/dict'
+import DeviceAttributeList from '../components/DeviceAttributeList.vue'
 
 defineOptions({ name: 'IoTDevicePointDict' })
 
+type TreeNodeType = 'company' | 'line' | 'device'
+type TreeNode = {
+  id: string
+  parentId?: string
+  parentKey?: string
+  nodeKey?: string
+  customerId?: string
+  nodeType?: number
+  deviceId?: string
+  type: TreeNodeType
+  name: string
+  code?: string
+  online?: boolean
+  deviceCode?: string
+  children?: TreeNode[]
+}
+
+interface DevicePointRuleVO {
+  id: number
+  identifier: string
+  fieldName: string
+  fieldRule: string
+  defaultValue: string
+  deviceId: number
+  createTime?: string | number | Date
+  ruleAttributeId?: number
+  ruleOperator?: string
+  ruleValue?: string | number
+  pointRulesVOList?: any[]
+  alarmLevel?: string
+}
+
+const message = useMessage()
+const route = useRoute()
+
 const searchKeyword = ref('')
 const treeRef = ref()
+const treeLoading = ref(false)
+const treeData = ref<TreeNode[]>([])
+const selectedNode = ref<TreeNode>()
+const selectedDeviceId = ref<number>()
+const deviceTabActive = ref('deviceAttribute')
+const pointTotal = ref(0)
 
 const treeProps = {
   children: 'children',
   label: 'name'
 }
 
-// Mock Tree Data
-const treeData = ref([
-  {
-    id: 'c1',
-    type: 'company',
-    name: '北京科技有限公司',
-    children: [
-      {
-        id: 'c1-l1',
-        type: 'line',
-        name: 'SMT产线A',
-        children: [
-          {
-            id: 'd-1001',
-            type: 'device',
-            name: '贴片机#1',
-            code: 'BJ-PL01-DEV01',
-            online: true
-          },
-          {
-            id: 'd-1002',
-            type: 'device',
-            name: '贴片机#2',
-            code: 'BJ-PL01-DEV02',
-            online: true
-          }
-        ]
-      },
-      {
-        id: 'c1-l2',
-        type: 'line',
-        name: 'SMT产线B',
-        children: []
-      }
-    ]
-  },
-  {
-    id: 'c2',
-    type: 'company',
-    name: '上海智能科技股份公司',
-    children: []
-  },
-  {
-    id: 'c3',
-    type: 'company',
-    name: '广州数据服务有限公司',
-    children: []
+const toNodeType = (nodeType?: number | string): TreeNodeType => {
+  const value = Number(nodeType)
+  if (value === 1) return 'company'
+  if (value === 2) return 'line'
+  return 'device'
+}
+
+const getNodeTypeLabel = (nodeType?: number | string) => {
+  const value = Number(nodeType)
+  if (value === 2) return '车间'
+  if (value === 3) return '产线'
+  if (value === 4) return '设备'
+  return '客户'
+}
+
+const getNodeTypeClass = (nodeType?: number | string) => {
+  const value = Number(nodeType)
+  if (value === 2) return 'node-type-tag--workshop'
+  if (value === 3) return 'node-type-tag--line'
+  if (value === 4) return 'node-type-tag--device'
+  return 'node-type-tag--default'
+}
+
+const toBooleanStatus = (raw: any): boolean => {
+  if (typeof raw.online === 'boolean') return raw.online
+  if (typeof raw.isOnline === 'boolean') return raw.isOnline
+  if (typeof raw.status === 'number') return raw.status === 1
+  if (typeof raw.status === 'string') return ['online', '1', 'true', '在线'].includes(raw.status)
+  return false
+}
+
+const normalizeNode = (raw: any): TreeNode => {
+  const id = String(raw.id ?? raw.nodeId ?? '')
+  return {
+    id,
+    parentId: raw.parentId !== undefined ? String(raw.parentId) : undefined,
+    parentKey: raw.parentKey !== undefined ? String(raw.parentKey) : undefined,
+    nodeKey: raw.nodeKey !== undefined ? String(raw.nodeKey) : undefined,
+    customerId: raw.customerId !== undefined ? String(raw.customerId) : undefined,
+    nodeType: Number(raw.nodeType ?? raw.type ?? 3),
+    deviceId: raw.deviceId !== undefined ? String(raw.deviceId) : undefined,
+    type: toNodeType(raw.nodeType ?? raw.type),
+    name: raw.name ?? raw.nodeName ?? '-',
+    deviceCode: raw.deviceCode,
+    online: toBooleanStatus(raw),
+    children: Array.isArray(raw.children)
+      ? raw.children.map((child: any) => normalizeNode(child))
+      : []
   }
-])
+}
 
-const currentDeviceId = ref('d-1001')
+const customerId = computed(() => String(route.query.customerId || '') || undefined)
 
-const flattenDevices = (nodes: any[]) => {
-  let list: any[] = []
-  nodes.forEach(node => {
-    if (node.type === 'device') {
-      list.push(node)
-    }
-    if (node.children) {
-      list = list.concat(flattenDevices(node.children))
+const getCustomerId = () => {
+  return customerId.value || treeData.value[0]?.customerId || ''
+}
+
+const customerNodeTotal = computed(() => {
+  let total = 0
+  const walk = (nodes: TreeNode[]) => {
+    nodes.forEach((node) => {
+      if (Number(node.nodeType) === 1) total += 1
+      if (node.children?.length) walk(node.children)
+    })
+  }
+  walk(treeData.value)
+  return total
+})
+
+const deviceNodeTotal = computed(() => {
+  let total = 0
+  const walk = (nodes: TreeNode[]) => {
+    nodes.forEach((node) => {
+      if (Number(node.nodeType) === 4) total += 1
+      if (node.children?.length) walk(node.children)
+    })
+  }
+  walk(treeData.value)
+  return total
+})
+
+const filterNode = (value: string, data: TreeNode) => {
+  if (!value) return true
+  const v = value.trim().toLowerCase()
+  if (!v) return true
+  return data.name?.toLowerCase().includes(v) || data.code?.toLowerCase().includes(v)
+}
+
+watchEffect(() => {
+  treeRef.value?.filter?.(searchKeyword.value)
+})
+
+const findNodeByNodeKey = (nodeKey?: string): TreeNode | undefined => {
+  if (!nodeKey) return undefined
+  const stack = [...treeData.value]
+  while (stack.length) {
+    const node = stack.shift()!
+    if (node.nodeKey === nodeKey) return node
+    if (node.children?.length) stack.push(...node.children)
+  }
+  return undefined
+}
+
+const handleNodeClick = (data: TreeNode) => {
+  selectedNode.value = data
+  if (data.type !== 'device') {
+    selectedDeviceId.value = undefined
+    pointTotal.value = 0
+    ruleList.value = []
+    ruleTotal.value = 0
+    return
+  }
+  const resolved = Number(data.deviceId || data.id || 0)
+  selectedDeviceId.value = resolved > 0 ? resolved : undefined
+}
+
+const currentDevice = computed(() => {
+  if (!selectedNode.value || selectedNode.value.type !== 'device') return undefined
+  return selectedNode.value
+})
+
+const getTreeData = async () => {
+  treeLoading.value = true
+  try {
+    const params = getCustomerId() ? { customerId: getCustomerId() } : {}
+    const data = await OrgNodeApi.getOrgNodeTree(params)
+    treeData.value = Array.isArray(data) ? data.map((item: any) => normalizeNode(item)) : []
+    const existed = selectedNode.value?.nodeKey
+    const matched = existed ? findNodeByNodeKey(existed) : undefined
+    if (matched && matched.type === 'device') {
+      selectedNode.value = matched
+      const resolved = Number(matched.deviceId || matched.id || 0)
+      selectedDeviceId.value = resolved > 0 ? resolved : undefined
+    } else {
+      selectedNode.value = undefined
+      selectedDeviceId.value = undefined
     }
+  } finally {
+    treeLoading.value = false
+  }
+}
+
+const loadPointTotal = async () => {
+  if (!selectedDeviceId.value) {
+    pointTotal.value = 0
+    return
+  }
+  const data = await DeviceApi.getDeviceAttributePage({
+    pageNo: 1,
+    pageSize: 1,
+    deviceId: selectedDeviceId.value
   })
-  return list
+  pointTotal.value = Number(data?.total || 0)
 }
 
-const allDevices = computed(() => flattenDevices(treeData.value))
-const currentDevice = computed(() => allDevices.value.find(d => d.id === currentDeviceId.value))
+const ruleLoading = ref(false)
+const ruleList = ref<DevicePointRuleVO[]>([])
+const ruleTotal = ref(0)
+const ruleQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  identifier: undefined as string | undefined,
+  fieldName: undefined as string | undefined,
+  fieldRule: undefined as string | undefined,
+  defaultValue: undefined as string | undefined,
+  alarmLevel: undefined as string | undefined,
+  deviceId: undefined as number | undefined
+})
+const ruleQueryFormRef = ref()
+const ruleAttributeOptions = ref<any[]>([])
 
-const filterNode = (value: string, data: any) => {
-  if (!value) return true
-  return data.name.includes(value) || (data.code && data.code.includes(value))
+const getRuleList = async () => {
+  if (!selectedDeviceId.value) return
+  ruleLoading.value = true
+  try {
+    const params = {
+      ...ruleQueryParams,
+      deviceId: selectedDeviceId.value
+    }
+    const data = await request.get({ url: '/iot/device-point-rules/page', params })
+    const listData = Array.isArray((data as any)?.list)
+      ? (data as any).list
+      : Array.isArray(data)
+        ? data
+        : []
+    const totalData = (data as any)?.total ?? listData.length
+    ruleList.value = listData as DevicePointRuleVO[]
+    ruleTotal.value = totalData
+  } finally {
+    ruleLoading.value = false
+  }
+}
+
+const handleRuleQuery = () => {
+  if (!selectedDeviceId.value) return
+  ruleQueryParams.pageNo = 1
+  getRuleList()
+}
+
+const resetRuleQuery = () => {
+  if (!selectedDeviceId.value) return
+  ruleQueryFormRef.value?.resetFields?.()
+  handleRuleQuery()
+}
+
+const loadRuleAttributeOptions = async (deviceId: number) => {
+  try {
+    const res = await request.get({
+      url: '/iot/device-contact-model/list',
+      params: { id: deviceId }
+    })
+    const data = Array.isArray(res) ? res : ((res as any)?.list ?? [])
+    ruleAttributeOptions.value = data as any[]
+  } catch {
+    ruleAttributeOptions.value = []
+  }
 }
 
-watch(searchKeyword, (val) => {
-  treeRef.value?.filter(val)
+const ruleDialogVisible = ref(false)
+const ruleFormLoading = ref(false)
+const ruleFormRef = ref()
+const ruleForm = reactive<Partial<DevicePointRuleVO>>({
+  id: undefined,
+  identifier: '',
+  fieldName: '',
+  fieldRule: '',
+  defaultValue: '',
+  deviceId: undefined,
+  ruleAttributeId: undefined,
+  ruleOperator: undefined,
+  ruleValue: undefined,
+  alarmLevel: ''
 })
 
-const handleNodeClick = (data: any) => {
-  if (data.type === 'device') {
-    currentDeviceId.value = data.id
-  }
-}
-
-// Mock Point Groups Data
-const pointGroups = ref([
-  {
-    name: '环境参数',
-    points: [
-      {
-        id: 'p1',
-        code: 'temperature',
-        name: '温度',
-        value: 45.2,
-        unit: '℃',
-        type: '数值',
-        history: true,
-        updatedAt: '2026-03-10 10:30:00',
-        desc: '设备环境温度'
-      },
-      {
-        id: 'p2',
-        code: 'humidity',
-        name: '湿度',
-        value: 65.8,
-        unit: '%',
-        type: '数值',
-        history: true,
-        updatedAt: '2026-03-10 10:30:00',
-        desc: '设备环境湿度'
-      },
-      {
-        id: 'p3',
-        code: 'pressure',
-        name: '压力',
-        value: 0.85,
-        unit: 'MPa',
-        type: '数值',
-        history: true,
-        updatedAt: '2026-03-10 10:30:00',
-        desc: '系统压力'
+const extraPointRules = ref<
+  Array<{
+    id?: number
+    rule?: string
+    operator?: string
+    operatorRule?: string | number
+  }>
+>([])
+
+const runningRuleOptions = [
+  { value: '1', label: '运行' },
+  { value: '2', label: '待机中（不运行、没故障）' },
+  { value: '3', label: '故障中（故障且待机）' }
+]
+const alarmRuleOptions = [{ value: '5', label: '报警' }]
+
+const currentRuleOptions = computed(() => {
+  const id = (ruleForm.identifier || '').toString().toUpperCase()
+  if (id === 'RUNNING') return runningRuleOptions
+  if (id === 'ALARM') return alarmRuleOptions
+  return []
+})
+
+const isRuleDisabled = (value: string, selfRule?: string | number) => {
+  if (!value) return false
+  const v = String(value)
+  const self = selfRule != null ? String(selfRule) : undefined
+  if (self === v) return false
+  if (ruleForm.fieldRule && String(ruleForm.fieldRule) === v && self !== v) return true
+  if (
+    extraPointRules.value.some(
+      (item) => item.rule != null && String(item.rule) === v && String(item.rule) !== self
+    )
+  ) {
+    return true
+  }
+  return false
+}
+
+const ruleOperatorOptions = computed(() => getStrDictOptions('czsb_rules_conditions'))
+const isRunningIdentifier = computed(
+  () => (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING'
+)
+
+const openRuleForm = async (row: DevicePointRuleVO & { pointRulesVOList?: any[] }) => {
+  const deviceId = row.deviceId || selectedDeviceId.value
+  if (!deviceId) {
+    message.error('请先选择设备')
+    return
+  }
+
+  await loadRuleAttributeOptions(deviceId)
+
+  ruleForm.id = row.id
+  ruleForm.identifier = row.identifier
+  ruleForm.fieldName = row.fieldName
+  ruleForm.defaultValue = row.defaultValue
+  ruleForm.deviceId = row.deviceId
+  ruleForm.alarmLevel = (row as any).alarmLevel
+  extraPointRules.value = []
+
+  const list = Array.isArray(row.pointRulesVOList) ? row.pointRulesVOList : []
+  if (list.length) {
+    const first = list[0] as any
+    const firstRule = first.rule ?? row.fieldRule
+    const firstAttrId = (() => {
+      if (first && first.code != null) {
+        const target = ruleAttributeOptions.value.find((item) => item.attributeCode === first.code)
+        return target?.id
       }
-    ]
-  },
-  {
-    name: '运行参数',
-    points: [
-      {
-        id: 'p4',
-        code: 'speed',
-        name: '运行速度',
-        value: 120,
-        unit: 'm/min',
-        type: '数值',
-        history: true,
-        updatedAt: '2026-03-10 10:30:00',
-        desc: '设备运行速度'
-      },
-      {
-        id: 'p5',
-        code: 'power',
-        name: '功率',
-        value: 8.5,
-        unit: 'kW',
-        type: '数值',
-        history: true,
-        updatedAt: '2026-03-10 10:30:00',
-        desc: '设备功率'
+      if (first && first.id != null) return first.id
+      return undefined
+    })()
+    ruleForm.fieldRule = firstRule as any
+    ruleForm.ruleAttributeId = firstAttrId as any
+    ruleForm.ruleOperator = first.operator as any
+    ruleForm.ruleValue = first.operatorRule as any
+    extraPointRules.value = list.slice(1).map((item: any) => ({
+      id: (() => {
+        if (item && item.code != null) {
+          const target = ruleAttributeOptions.value.find((opt) => opt.attributeCode === item.code)
+          return target?.id
+        }
+        if (item && item.id != null) return item.id
+        return undefined
+      })(),
+      rule: item.rule,
+      operator: item.operator,
+      operatorRule: item.operatorRule
+    }))
+  } else {
+    ruleForm.fieldRule = row.fieldRule
+    ruleForm.ruleAttributeId = row.ruleAttributeId
+    ruleForm.ruleOperator = row.ruleOperator
+    ruleForm.ruleValue = row.ruleValue as any
+  }
+  const options = currentRuleOptions.value
+  if (options.length && !options.some((item) => item.value === ruleForm.fieldRule)) {
+    ruleForm.fieldRule = options[0].value
+  }
+  ruleDialogVisible.value = true
+}
+
+const handleRuleSubmit = async () => {
+  if (!ruleForm.id) return
+  try {
+    ruleFormLoading.value = true
+    const pointRulesVOList: any[] = []
+    if (ruleForm.ruleAttributeId && ruleForm.ruleOperator) {
+      const attr = ruleAttributeOptions.value.find((item) => item.id === ruleForm.ruleAttributeId)
+      if (attr && attr.attributeCode) {
+        pointRulesVOList.push({
+          code: attr.attributeCode,
+          rule: ruleForm.fieldRule,
+          operator: ruleForm.ruleOperator,
+          operatorRule: ruleForm.ruleValue
+        })
       }
-    ]
+    }
+    extraPointRules.value.forEach((item) => {
+      if (!item.id || !item.operator) return
+      const attr = ruleAttributeOptions.value.find((opt) => opt.id === item.id)
+      if (!attr || !attr.attributeCode) return
+      pointRulesVOList.push({
+        code: attr.attributeCode,
+        rule: item.rule ?? ruleForm.fieldRule,
+        operator: item.operator,
+        operatorRule: item.operatorRule
+      })
+    })
+
+    const payload = {
+      id: ruleForm.id,
+      identifier: ruleForm.identifier,
+      fieldName: ruleForm.fieldName,
+      fieldRule: ruleForm.fieldRule,
+      defaultValue: ruleForm.defaultValue,
+      deviceId: ruleForm.deviceId ?? selectedDeviceId.value,
+      alarmLevel: ruleForm.alarmLevel,
+      pointRulesVOList
+    }
+    await request.put({ url: '/iot/device-point-rules/update', data: payload })
+    message.success('更新成功')
+    ruleDialogVisible.value = false
+    await getRuleList()
+  } finally {
+    ruleFormLoading.value = false
   }
-])
+}
+
+const handleRuleDelete = async (id: number) => {
+  if (!id) return
+  try {
+    await message.delConfirm()
+    await request.delete({ url: '/iot/device-point-rules/delete?id=' + id })
+    message.success('删除成功')
+    await getRuleList()
+  } catch {}
+}
 
-const totalPoints = computed(() => {
-  return pointGroups.value.reduce((sum, group) => sum + group.points.length, 0)
+const handleAddPointRule = () => {
+  if (!isRunningIdentifier.value) return
+  const allOptions = currentRuleOptions.value || []
+  const used = new Set<string>()
+  if (ruleForm.fieldRule) used.add(String(ruleForm.fieldRule))
+  extraPointRules.value.forEach((item) => {
+    if (item.rule != null) used.add(String(item.rule))
+  })
+  const next = allOptions.find((opt) => !used.has(String(opt.value)))
+  if (!next) {
+    message.warning('已没有可用的点位规则可选')
+    return
+  }
+  extraPointRules.value.push({
+    rule: next.value as any,
+    id: undefined,
+    operator: undefined,
+    operatorRule: undefined
+  })
+}
+
+const handleRemovePointRule = (index: number) => {
+  if (index < 0 || index >= extraPointRules.value.length) return
+  extraPointRules.value.splice(index, 1)
+}
+
+const createRuleDialogVisible = ref(false)
+const createRuleFormLoading = ref(false)
+const createRuleFormRef = ref()
+const createRuleForm = reactive({
+  identifier: 'ALARM',
+  fieldName: '',
+  defaultValue: '报警',
+  alarmLevel: ''
 })
 
+const openCreateRuleForm = () => {
+  if (!selectedDeviceId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  createRuleForm.identifier = 'ALARM'
+  createRuleForm.fieldName = '报警'
+  createRuleForm.defaultValue = '报警'
+  createRuleForm.alarmLevel = ''
+  createRuleDialogVisible.value = true
+}
+
+const handleCreateRuleSubmit = async () => {
+  if (!selectedDeviceId.value) return
+  if (!createRuleForm.fieldName) {
+    message.warning('请输入名称')
+    return
+  }
+  try {
+    createRuleFormLoading.value = true
+    const payload = {
+      identifier: createRuleForm.identifier,
+      fieldName: createRuleForm.fieldName,
+      defaultValue: createRuleForm.defaultValue,
+      alarmLevel: createRuleForm.alarmLevel,
+      deviceId: selectedDeviceId.value
+    }
+    await request.post({ url: '/iot/device-point-rules/create', data: payload })
+    message.success('新增成功')
+    createRuleDialogVisible.value = false
+    await getRuleList()
+  } finally {
+    createRuleFormLoading.value = false
+  }
+}
+
+watch(
+  () => selectedDeviceId.value,
+  async (val) => {
+    ruleQueryParams.deviceId = val ?? undefined
+    if (!val) {
+      ruleList.value = []
+      ruleTotal.value = 0
+      ruleAttributeOptions.value = []
+      return
+    }
+    await loadPointTotal()
+    await loadRuleAttributeOptions(val)
+    ruleQueryParams.pageNo = 1
+    await getRuleList()
+  },
+  { immediate: true }
+)
+
+watch(
+  () => currentDevice.value?.nodeKey,
+  () => {
+    deviceTabActive.value = 'deviceAttribute'
+  }
+)
+
+onMounted(async () => {
+  await getTreeData()
+})
 </script>
 
 <style scoped lang="scss">
@@ -309,7 +916,7 @@ const totalPoints = computed(() => {
 }
 
 .point-dict__left {
-  flex: 0 0 280px;
+  flex: 0 0 300px;
   display: flex;
   flex-direction: column;
 }
@@ -337,6 +944,7 @@ const totalPoints = computed(() => {
   display: flex;
   gap: 12px;
   margin-bottom: 16px;
+  align-items: center;
   .stat-item {
     background-color: var(--el-fill-color-light);
     padding: 6px 12px;
@@ -347,6 +955,9 @@ const totalPoints = computed(() => {
     align-items: center;
     gap: 6px;
   }
+  .stat-refresh-btn {
+    margin-left: auto;
+  }
 }
 
 .left-panel__tree {
@@ -354,13 +965,13 @@ const totalPoints = computed(() => {
   overflow-y: auto;
   margin-right: -8px;
   padding-right: 8px;
-  
+
   :deep(.el-tree-node__content) {
     height: 36px;
     border-radius: 6px;
     margin-bottom: 2px;
   }
-  
+
   :deep(.el-tree-node.is-current > .el-tree-node__content) {
     background-color: var(--el-color-primary-light-9);
     color: var(--el-color-primary);
@@ -388,11 +999,6 @@ const totalPoints = computed(() => {
   overflow: hidden;
 }
 
-.folder-icon {
-  color: var(--el-text-color-secondary);
-  font-size: 14px;
-}
-
 .node-status-dot {
   width: 8px;
   height: 8px;
@@ -413,6 +1019,39 @@ const totalPoints = computed(() => {
   }
 }
 
+.node-type-tag {
+  flex-shrink: 0;
+  padding: 0 6px;
+  line-height: 18px;
+  border-radius: 4px;
+  font-size: 12px;
+  border: 1px solid transparent;
+}
+
+.node-type-tag--workshop {
+  color: var(--el-color-warning);
+  background: var(--el-color-warning-light-9);
+  border-color: var(--el-color-warning-light-7);
+}
+
+.node-type-tag--line {
+  color: var(--el-color-primary);
+  background: var(--el-color-primary-light-9);
+  border-color: var(--el-color-primary-light-7);
+}
+
+.node-type-tag--device {
+  color: var(--el-color-success);
+  background: var(--el-color-success-light-9);
+  border-color: var(--el-color-success-light-7);
+}
+
+.node-type-tag--default {
+  color: var(--el-text-color-secondary);
+  background: var(--el-fill-color-light);
+  border-color: var(--el-border-color-light);
+}
+
 .node-right {
   flex-shrink: 0;
 }
@@ -535,137 +1174,18 @@ const totalPoints = computed(() => {
 .right-content {
   flex: 1;
   overflow-y: auto;
-  padding: 24px 32px;
+  padding: 24px 0;
   background-color: var(--el-fill-color-blank);
 }
-
-.point-group {
-  margin-bottom: 32px;
-}
-
-.group-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16px;
-  padding-bottom: 12px;
-  border-bottom: 1px solid var(--el-border-color-lighter);
-}
-
-.group-title {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  font-size: 16px;
-  font-weight: bold;
-  color: var(--el-text-color-primary);
-  .group-icon {
-    color: #e6a23c;
-    font-size: 18px;
-  }
-}
-
-.group-count {
-  font-size: 13px;
-  color: var(--el-text-color-secondary);
-}
-
-.group-list {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.point-card {
-  background-color: var(--el-bg-color);
-  border: 1px solid var(--el-border-color-light);
-  border-left: 4px solid #f5c05c;
-  border-radius: 8px;
-  padding: 16px 20px;
-  transition: all 0.3s;
-  
-  &:hover {
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
-    border-color: var(--el-border-color);
-    border-left-color: #f5c05c;
+.right-tabs {
+  :deep(.el-tabs__header) {
+    margin-bottom: 16px;
   }
-}
-
-.point-card__main {
-  display: flex;
-  align-items: center;
-  margin-bottom: 16px;
-}
-
-.point-code {
-  background-color: var(--el-fill-color);
-  color: var(--el-text-color-secondary);
-  font-family: monospace;
-  font-size: 13px;
-  padding: 4px 10px;
-  border-radius: 4px;
-}
-
-.point-name {
-  font-size: 16px;
-  font-weight: bold;
-  color: var(--el-text-color-primary);
-  margin-left: 16px;
-  min-width: 80px;
-}
-
-.point-value-wrap {
-  margin-left: 40px;
-  display: flex;
-  align-items: baseline;
-  gap: 4px;
-}
-
-.point-value {
-  font-size: 22px;
-  font-weight: bold;
-  color: var(--el-color-primary);
-}
-
-.point-unit {
-  font-size: 13px;
-  color: var(--el-text-color-secondary);
-}
-
-.point-type-tag {
-  margin-left: 24px;
-  background-color: var(--el-color-primary-light-9);
-  color: var(--el-color-primary);
-  border: none;
-}
-
-.point-card__actions {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  margin-bottom: 8px;
-}
-
-.action-checkbox {
-  :deep(.el-checkbox__label) {
-    color: var(--el-color-primary);
-    font-size: 13px;
+  :deep(.el-tabs__content) {
+    padding-bottom: 8px;
   }
 }
 
-.action-btn {
-  font-size: 13px;
-  padding: 0;
-  height: auto;
-}
-
-.point-card__meta {
-  display: flex;
-  gap: 16px;
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-}
-
 @media (max-width: 1200px) {
   .point-dict {
     flex-direction: column;