diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts
index 6b5407cc..1a441511 100644
--- a/src/api/iot/device/index.ts
+++ b/src/api/iot/device/index.ts
@@ -102,6 +102,9 @@ export const DeviceApi = {
   getAvailableList: async () => {
     return await request.get({ url: `/iot/device/available-list` })
   },
+  getAvailableListPage: async (params: any) => {
+    return await request.get({ url: `/iot/device/available-page` , params})
+  },
   // 新增物联设备
   createDevice: async (data: DeviceVO) => {
     return await request.post({ url: `/iot/device/create`, data })
@@ -147,6 +150,10 @@ export const DeviceApi = {
     return await request.get({ url: `/iot/device/singleDevice`, params })
   },
 
+  getSingleDeviceFrom: async (params: SingleDeviceParams) => {
+    return await request.get({ url: `/iot/device/singleDeviceFrom`, params })
+  },
+
   getHistoryRecord: async (params: HistoryRecordParams) => {
     return await request.get({
       url: `/iot/device/historyRecord`,
@@ -155,6 +162,15 @@ export const DeviceApi = {
     })
   },
 
+
+  getHistoryAnalyse: async (params: HistoryRecordParams) => {
+    return await request.get({
+      url: `/iot/device/historyAnalyse`,
+      params,
+      paramsSerializer: (p) => qs.stringify(p, { allowDots: true, arrayFormat: 'repeat' })
+    })
+  },
+
   devicePointList: async () => {
     return await request.get({ url: `/iot/device/devicePointList` })
   },
@@ -170,6 +186,10 @@ export const DeviceApi = {
   getDeviceAttributePage: async (params) => {
     return await request.get({ url: `/iot/device/device-attribute/page`, params })
   },
+  // 获得设备属性按类型分租
+  getDeviceAttributeGroupList: async (params) => {
+    return await request.get({ url: `/iot/device/device-attribute/groupList`, params })
+  },
   // 获得设备属性列表
   getDeviceAttributeList: async (deviceId: number | string) => {
     return await request.get({ url: `/iot/device/device-attribute/list?deviceId=` + deviceId })
diff --git a/src/components/TableSelectDialog/TableSelectDialog.vue b/src/components/TableSelectDialog/TableSelectDialog.vue
index bed9363b..edc0cfab 100644
--- a/src/components/TableSelectDialog/TableSelectDialog.vue
+++ b/src/components/TableSelectDialog/TableSelectDialog.vue
@@ -64,13 +64,16 @@ const props = withDefaults(
     pageSize?: number
     initialRows?: any[]
     queryParams?: Record<string, any>  // 新增
+    /** ✅ 新增 */
+    defaultSelectedKeys?: (string | number)[]
   }>(),
   {
     selectionType: 'multiple',
     rowKey: 'id',
     pageSize: 10,
     initialRows: () => [],
-    queryParams: () => ({})  // 默认值
+    queryParams: () => ({}),  // 默认值
+    defaultSelectedKeys: () => []
   }
 )
 
@@ -111,6 +114,16 @@ const refreshSelectionOnTable = async () => {
     syncingSelection.value = false
   }
 }
+/**
+ * ✅ 新增：根据 defaultSelectedKeys 初始化选中状态
+ */
+const initDefaultSelection = () => {
+  if (!props.defaultSelectedKeys.length) return
+
+  props.defaultSelectedKeys.forEach((key) => {
+    selectedMap.value.set(key, { [props.rowKey]: key })
+  })
+}
 
 const getList = async () => {
   loading.value = true
@@ -161,12 +174,30 @@ const handleRowClick = (row: any) => {
 }
 
 const open = async (rows?: any[]) => {
+ /* selectedMap.value.clear()
+  const initialRows = rows || props.initialRows
+  const nextRows = isSingleSelect.value ? initialRows.slice(0, 1) : initialRows
+  nextRows.forEach((row) => {
+    selectedMap.value.set(resolveRowKey(row), row)
+  })
+  queryParams.pageNo = 1
+  queryParams.pageSize = props.pageSize
+  dialogVisible.value = true
+  await getList()*/
   selectedMap.value.clear()
+
+  // ✅ 优先使用 defaultSelectedKeys
+  if (props.defaultSelectedKeys.length) {
+    initDefaultSelection()
+  }
+
+  // ✅ 兼容原来的 initialRows / rows
   const initialRows = rows || props.initialRows
   const nextRows = isSingleSelect.value ? initialRows.slice(0, 1) : initialRows
   nextRows.forEach((row) => {
     selectedMap.value.set(resolveRowKey(row), row)
   })
+
   queryParams.pageNo = 1
   queryParams.pageSize = props.pageSize
   dialogVisible.value = true
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 5c7a1810..a1eebaa9 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1848,6 +1848,8 @@ export default {
       moduleName: 'Product Material Information',
       searchNameLabel: 'Name',
       searchNamePlaceholder: 'Please enter name',
+      searchCodeLabel: 'Code',
+      searchCodePlaceholder: 'Please enter code',
       searchButtonText: 'Search',
       resetButtonText: 'Reset',
       addButtonText: 'Add',
@@ -4227,9 +4229,11 @@ export default {
       tableCollectionTimeColumn: 'Collection Time',
       tableOperateColumn: 'Operation',
       tableActionHistoryLabel: 'History',
-
+      tableActionHistoryAnalyseLabel: 'History Data Analysis',
       dialogTitlePrefix: 'History: ',
       dialogCollectionTimeLabel: 'Collection Time',
+      dialogPointFilterLabel:'Point Filter',
+      dialogPointFilterPlaceholder: 'Please enter point name',
       dialogCollectionTimeStartPlaceholder: 'Start Time',
       dialogCollectionTimeEndPlaceholder: 'End Time',
       dialogSearchButtonText: 'Search',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 8b896efa..2bee9216 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2680,6 +2680,8 @@ export default {
       moduleName: '产品物料信息',
       searchNameLabel: '名称',
       searchNamePlaceholder: '请输入名称',
+      searchCodeLabel: '编码',
+      searchCodePlaceholder: '请输入编码',
       searchButtonText: '搜索',
       resetButtonText: '重置',
       addButtonText: '新增',
@@ -4070,9 +4072,11 @@ export default {
       tableCollectionTimeColumn: '采集时间',
       tableOperateColumn: '操作',
       tableActionHistoryLabel: '历史记录',
-
+      tableActionHistoryAnalyseLabel: '数据分析',
       dialogTitlePrefix: '历史记录：',
       dialogCollectionTimeLabel: '采集时间',
+      dialogPointFilterLabel: '点位筛选',
+      dialogPointFilterPlaceholder: '请输入点位名称',
       dialogCollectionTimeStartPlaceholder: '开始时间',
       dialogCollectionTimeEndPlaceholder: '结束时间',
       dialogSearchButtonText: '查询',
@@ -4442,9 +4446,11 @@ export default {
         tableCollectionTimeColumn: '采集时间',
         tableOperateColumn: '操作',
         tableActionHistoryLabel: '历史记录',
-
+        tableActionHistoryAnalyseLabel: '数据分析',
         dialogTitlePrefix: '历史记录：',
         dialogCollectionTimeLabel: '采集时间',
+        dialogPointFilterLabel: '点位筛选',
+        dialogPointFilterPlaceholder: '请输入点位名称',
         dialogCollectionTimeStartPlaceholder: '开始时间',
         dialogCollectionTimeEndPlaceholder: '结束时间',
         dialogSearchButtonText: '查询',
diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue
index b821a479..82e7df02 100644
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@@ -2,41 +2,29 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="120px"
-      @submit.prevent
-    >
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto" @submit.prevent>
+      <el-form-item :label="t('FactoryModeling.ProductInformation.searchCodeLabel')" prop="barCode">
+        <el-input v-model="queryParams.barCode"
+          :placeholder="t('FactoryModeling.ProductInformation.searchCodePlaceholder')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
       <el-form-item :label="t('FactoryModeling.ProductInformation.searchNameLabel')" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.name"
+          :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')" clearable
+          @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['erp:product:create']"
-        >
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }}
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }}
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:product:create']">
           <Icon icon="ep:plus" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.addButtonText') }}
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['erp:product:export']"
-        >
+        <el-button type="success" plain @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['erp:product:export']">
           <Icon icon="ep:download" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.exportButtonText') }}
         </el-button>
       </el-form-item>
@@ -47,12 +35,7 @@
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <!-- 使用 v-for 动态生成 el-tab-pane -->
-    <el-tab-pane
-      v-for="item in parentList"
-      :key="item.id"
-      :label="item.name"
-      :name="item.id.toString()"
-    />
+      <el-tab-pane v-for="item in parentList" :key="item.id" :label="item.name" :name="item.id.toString()" />
       <!-- <el-tab-pane label="产品" name="2" />
       <el-tab-pane label="原料" name="1" />
       <el-tab-pane label="备件" name="5" />
@@ -62,60 +45,46 @@
       <el-tab-pane label="其他" name="0" /> -->
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name"  width="220px" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center" prop="standard" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center" prop="subCategoryName" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName" sortable/>
-      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status" sortable>
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode"
+        sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name"
+        width="220px" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center"
+        prop="standard" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center"
+        prop="subCategoryName" sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName"
+        sortable />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status"
+        sortable>
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column
-        :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-        sortable
-      />
+      <el-table-column :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')" align="center"
+        prop="createTime" :formatter="dateFormatter" width="180px" sortable />
       <el-table-column :label="t('FactoryModeling.ProductInformation.tableOperateColumn')" align="center" width="150px">
         <template #default="scope">
-<!--          <el-button-->
-<!--            v-if="scope.row.categoryId ===2"-->
-<!--            link-->
-<!--            type="primary"-->
-<!--            @click="openBomForm('detail', scope.row.id)"-->
-<!--          >-->
-<!--            BOM-->
-<!--          </el-button>-->
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['erp:product:update']"
-          >
+          <!--          <el-button-->
+          <!--            v-if="scope.row.categoryId ===2"-->
+          <!--            link-->
+          <!--            type="primary"-->
+          <!--            @click="openBomForm('detail', scope.row.id)"-->
+          <!--          >-->
+          <!--            BOM-->
+          <!--          </el-button>-->
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['erp:product:update']">
             {{ t('FactoryModeling.ProductInformation.tableEditAction') }}
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['erp:product:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:product:delete']">
             {{ t('FactoryModeling.ProductInformation.tableDeleteAction') }}
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -148,6 +117,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined,
+  barCode: undefined,
   categoryId: undefined
 })
 const queryFormRef = ref() // 搜索的表单
@@ -195,7 +165,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
diff --git a/src/views/iot/device/DevicePoint.vue b/src/views/iot/device/DevicePoint.vue
new file mode 100644
index 00000000..8f03049a
--- /dev/null
+++ b/src/views/iot/device/DevicePoint.vue
@@ -0,0 +1,1214 @@
+<template>
+  <ContentWrap>
+  <div class="mb-10px flex items-center justify-between text-sm text-gray-500">
+    <div>
+      {{ t('DataCollection.Device.currentDeviceLabel') }}<span class="font-medium text-gray-700">{{ attributeDeviceName || '-' }}</span>
+    </div>
+    <div>
+      <el-button type="primary" link @click="handleShowDeviceAlarmHistory">
+        {{ t('DataCollection.Device.alarmHistoryTitle') }}
+      </el-button>
+    </div>
+  </div>
+  <el-tabs v-model="deviceTabActive">
+    <el-tab-pane :label="deviceAttributeTabLabel" name="deviceAttribute">
+      <DeviceAttributeList :device-id="attributeDeviceId" />
+    </el-tab-pane>
+    <el-tab-pane :label="deviceRuleTabLabel" name="deviceRule">
+      <el-form
+        class="-mb-15px"
+        :model="ruleQueryParams"
+        ref="ruleQueryFormRef"
+        :inline="true"
+        label-width="120px"
+      >
+        <el-form-item :label="t('DataCollection.DeviceModel.ruleIdentifier')" prop="identifier">
+          <el-input
+            v-model="ruleQueryParams.identifier"
+            :placeholder="t('DataCollection.DeviceModel.ruleSearchIdentifierPlaceholder')"
+            clearable
+            @keyup.enter="handleRuleQuery"
+            class="!w-200px"
+          />
+        </el-form-item>
+        <el-form-item :label="t('DataCollection.DeviceModel.ruleFieldName')" prop="fieldName">
+          <el-input
+            v-model="ruleQueryParams.fieldName"
+            :placeholder="t('DataCollection.DeviceModel.ruleSearchFieldNamePlaceholder')"
+            clearable
+            @keyup.enter="handleRuleQuery"
+            class="!w-200px"
+          />
+        </el-form-item>
+        <el-form-item :label="t('DataCollection.DeviceModel.ruleDefaultValue')" prop="defaultValue">
+          <el-input
+            v-model="ruleQueryParams.defaultValue"
+            :placeholder="t('DataCollection.DeviceModel.ruleSearchDefaultValuePlaceholder')"
+            clearable
+            @keyup.enter="handleRuleQuery"
+            class="!w-200px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleRuleQuery">
+            <Icon icon="ep:search" class="mr-5px" /> {{ t('DataCollection.DeviceModel.ruleSearch') }}
+          </el-button>
+          <el-button @click="resetRuleQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> {{ t('DataCollection.DeviceModel.ruleReset') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+
+      <div class="mb-10px flex justify-end gap-8px">
+        <el-button type="primary" plain @click="openCreateCountRuleForm">
+          新增产量
+        </el-button>
+        <el-button type="primary" @click="openCreateRuleForm">
+          {{ t('DataCollection.DeviceModel.ruleCreateButton') }}
+        </el-button>
+      </div>
+
+      <el-table
+        v-loading="ruleLoading"
+        :data="ruleList"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        row-key="id"
+      >
+        <el-table-column :label="t('DataCollection.DeviceModel.ruleIdentifier')" align="center" prop="identifier" />
+        <el-table-column :label="t('DataCollection.DeviceModel.ruleFieldName')" align="center" prop="fieldName"  sortable />
+        <el-table-column :label="t('DataCollection.DeviceModel.ruleFieldRule')" align="center" prop="fieldRule" />
+        <el-table-column :label="t('DataCollection.DeviceModel.ruleDefaultValue')" align="center" prop="defaultValue" />
+        <el-table-column
+          :label="t('DataCollection.DeviceModel.ruleCreateTime')"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="180px"
+          sortable
+        />
+        <el-table-column :label="t('DataCollection.DeviceModel.ruleOperate')" align="center" width="160px">
+          <template #default="scope">
+            <el-button link type="primary" @click="openRuleForm(scope.row)">
+              {{ t('DataCollection.DeviceModel.ruleEditRuleButton') }}
+            </el-button>
+            <el-button
+              v-if="scope.row.identifier === 'ALARM' || scope.row.identifier === 'COUNT'"
+              link
+              type="danger"
+              @click="handleRuleDelete(scope.row.id)"
+            >
+              {{ t('DataCollection.DeviceModel.ruleDeleteRuleButton') }}
+            </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="t('DataCollection.DeviceModel.ruleDialogTitle')" width="880px" draggable>
+        <el-form :model="ruleForm" ref="ruleFormRef" label-width="120px">
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogIdentifier')">
+            <el-input v-model="ruleForm.identifier" disabled />
+          </el-form-item>
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldName')">
+            <el-input v-model="ruleForm.fieldName" disabled />
+          </el-form-item>
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogDefaultValue')">
+            <el-input v-model="ruleForm.defaultValue" disabled />
+          </el-form-item>
+          <el-form-item
+            v-if="(ruleForm.identifier || '').toString().toUpperCase() === 'ALARM'"
+            :label="t('DataCollection.DeviceModel.ruleDialogAlarmLevel')"
+          >
+            <el-select
+              v-model="ruleForm.alarmLevel"
+              :placeholder="t('DataCollection.DeviceModel.ruleDialogAlarmLevelPlaceholder')"
+            >
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.IOT_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
+                v-if="!isCountIdentifier"
+                :label="t('DataCollection.DeviceModel.ruleDialogFieldRule')"
+              >
+                <el-select
+                  v-model="ruleForm.fieldRule"
+                  :placeholder="t('DataCollection.DeviceModel.ruleDialogFieldRulePlaceholder')"
+                  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="isCountIdentifier ? '四则运算规则' : t('DataCollection.DeviceModel.ruleDialogRule')">
+                <div v-if="isCountIdentifier" class="w-full flex flex-col gap-8px">
+                  <div
+                    v-for="(item, index) in countArithmeticRules"
+                    :key="index"
+                    class="flex items-center gap-8px"
+                  >
+                    <el-select
+                      v-model="item.ruleAttributeId"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleAttributePlaceholder')"
+                      class="!w-240px"
+                      clearable
+                    >
+                      <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.ruleOperator"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
+                      class="!w-160px"
+                      clearable
+                    >
+                      <el-option
+                        v-for="operator in currentRuleOperatorOptions"
+                        :key="operator.value"
+                        :label="operator.label"
+                        :value="operator.value"
+                      />
+                    </el-select>
+                    <el-input
+                      v-model="item.ruleValue"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
+                      class="!w-200px"
+                      clearable
+                    />
+                    <template v-if="index < countArithmeticRules.length - 1">
+                      <el-select
+                        v-model="countArithmeticRules[index].bigOperator"
+                        :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
+                        class="!w-110px"
+                        clearable
+                      >
+                        <el-option
+                          v-for="operator in countOperatorOptions"
+                          :key="operator.value"
+                          :label="operator.label"
+                          :value="operator.value"
+                        />
+                      </el-select>
+                    </template>
+                    <template v-else>
+                      <div class="flex items-center gap-4px">
+                        <el-button link type="primary" @click="handleAddCountArithmeticRule">
+                          <Icon icon="ep:plus" />
+                        </el-button>
+                        <el-button
+                          link
+                          type="danger"
+                          :disabled="countArithmeticRules.length <= 1"
+                          @click="handleRemoveCountArithmeticRule(index)"
+                        >
+                          <Icon icon="ep:minus" />
+                        </el-button>
+                      </div>
+                    </template>
+                  </div>
+                  <div class="text-12px text-[#909399] leading-20px">按“四则运算规则”添加顺序从上到下依次计算，不按乘除优先。</div>
+                </div>
+                <div v-else class="flex items-center gap-8px">
+                  <el-select
+                    v-model="ruleForm.ruleAttributeId"
+                    :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleAttributePlaceholder')"
+                    class="!w-240px"
+                    clearable
+                  >
+                    <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"
+                    :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
+                    class="!w-160px"
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in currentRuleOperatorOptions"
+                      :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"
+                    :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
+                    class="!w-200px"
+                    clearable
+                  />
+                </div>
+              </el-form-item>
+            </div>
+
+            <template v-if="isRunningIdentifier">
+              <div
+                v-for="(item, index) in extraPointRules"
+                :key="index"
+                class="border border-gray-200 dark:border-gray-600 rounded-md px-16px py-12px"
+              >
+                <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldRule')">
+                  <el-select
+                    v-model="item.rule"
+                    :placeholder="t('DataCollection.DeviceModel.ruleDialogFieldRulePlaceholder')"
+                    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="t('DataCollection.DeviceModel.ruleDialogRule')">
+                  <div class="flex items-center gap-8px">
+                    <el-select
+                      v-model="item.id"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleAttributePlaceholder')"
+                      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"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleOperatorPlaceholder')"
+                      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="isCountIdentifier || (item.operator !== 'TRUE' && item.operator !== 'FALSE')"
+                      v-model="item.operatorRule"
+                      :placeholder="t('DataCollection.DeviceModel.ruleDialogRuleValuePlaceholder')"
+                      class="!w-200px"
+                    />
+                    <el-button type="danger" link @click="handleRemovePointRule(index)">
+                      {{ t('DataCollection.DeviceModel.ruleDeleteRuleButton') }}
+                    </el-button>
+                  </div>
+                </el-form-item>
+              </div>
+            </template>
+
+            <el-form-item v-if="isRunningIdentifier" label=" ">
+              <el-button type="primary" link @click="handleAddPointRule">
+                + {{ t('DataCollection.DeviceModel.ruleCreateButton') }}
+              </el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+        <template #footer>
+              <span class="dialog-footer">
+                <el-button @click="ruleDialogVisible = false">{{ t('DataCollection.DeviceModel.dialogCancel') }}</el-button>
+                <el-button type="primary" :loading="ruleFormLoading" @click="handleRuleSubmit">{{ t('DataCollection.DeviceModel.dialogOk') }}</el-button>
+              </span>
+        </template>
+      </el-dialog>
+
+      <el-dialog v-model="createRuleDialogVisible" :title="createRuleDialogTitle" width="520px" draggable>
+        <el-form :model="createRuleForm" ref="createRuleFormRef" label-width="120px">
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogIdentifier')">
+            <el-input v-model="createRuleForm.identifier" disabled />
+          </el-form-item>
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogFieldName')">
+            <el-input
+              v-model="createRuleForm.fieldName"
+              :placeholder="t('DataCollection.DeviceModel.ruleSearchFieldNamePlaceholder')"
+              :disabled="isCreateCountRule"
+            />
+          </el-form-item>
+          <el-form-item :label="t('DataCollection.DeviceModel.ruleDialogDefaultValue')">
+            <el-input v-model="createRuleForm.defaultValue" disabled />
+          </el-form-item>
+          <el-form-item v-if="!isCreateCountRule" :label="t('DataCollection.DeviceModel.ruleDialogAlarmLevel')">
+            <el-select
+              v-model="createRuleForm.alarmLevel"
+              :placeholder="t('DataCollection.DeviceModel.ruleDialogAlarmLevelPlaceholder')"
+            >
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.IOT_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">{{ t('DataCollection.DeviceModel.dialogCancel') }}</el-button>
+                <el-button type="primary" :loading="createRuleFormLoading" @click="handleCreateRuleSubmit">
+                  {{ t('DataCollection.DeviceModel.dialogOk') }}
+                </el-button>
+              </span>
+        </template>
+      </el-dialog>
+    </el-tab-pane>
+  </el-tabs>
+  <Dialog :title="t('DataCollection.Device.alarmHistoryTitle')" v-model="deviceAlarmDialogVisible" width="1200px">
+    <el-form
+      class="-mb-15px"
+      :model="deviceAlarmQueryParams"
+      ref="deviceAlarmQueryFormRef"
+      :inline="true"
+      label-width="80px"
+    >
+      <el-form-item :label="t('DataCollection.Device.alarmRuleName')" prop="ruleId">
+        <el-select
+          v-model="deviceAlarmQueryParams.ruleId"
+          :loading="deviceAlarmRuleLoading"
+          clearable
+          filterable
+          class="!w-220px"
+          :placeholder="t('DataCollection.DeviceModel.ruleSearchFieldNamePlaceholder')"
+        >
+          <el-option
+            v-for="item in deviceAlarmRuleOptions"
+            :key="item.id"
+            :label="item.fieldName || item.ruleName || item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('DataCollection.Device.alarmPointName')" prop="modelId">
+        <el-select
+          v-model="deviceAlarmQueryParams.modelId"
+          :loading="deviceAlarmPointLoading"
+          clearable
+          filterable
+          class="!w-220px"
+          :placeholder="t('DataCollection.Device.placeholderAttributeName')"
+        >
+          <el-option
+            v-for="item in deviceAlarmPointOptions"
+            :key="item.id"
+            :label="item.attributeName || item.attributeCode || item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="t('DataCollection.Device.alarmTime')" prop="createTime">
+        <el-date-picker
+          v-model="deviceAlarmQueryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          :start-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeStartPlaceholder')"
+          :end-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeEndPlaceholder')"
+          class="!w-260px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleDeviceAlarmQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          {{ t('DataCollection.Device.search') }}
+        </el-button>
+        <el-button @click="resetDeviceAlarmQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          {{ t('DataCollection.Device.reset') }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :data="deviceAlarmList"
+      v-loading="deviceAlarmLoading"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      :max-height="700"
+      class="mt-10px"
+    >
+      <el-table-column :label="t('DataCollection.Device.alarmRuleName')" align="center" prop="ruleName"  sortable />
+      <el-table-column :label="t('DataCollection.Device.alarmPointName')" align="center" prop="modelName"  sortable />
+      <el-table-column :label="t('DataCollection.Device.alarmPointValue')" align="center" prop="addressValue" />
+      <el-table-column :label="t('DataCollection.Device.alarmLevel')" align="center" prop="alarmLevel">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.IOT_ALARM_REGISTRATION" :value="scope.row.alarmLevel" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="t('DataCollection.Device.alarmTime')"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+        sortable />
+    </el-table>
+    <div class="mt-10px pb-10px flex justify-end">
+      <Pagination
+        :total="deviceAlarmTotal"
+        v-model:page="deviceAlarmQueryParams.pageNo"
+        v-model:limit="deviceAlarmQueryParams.pageSize"
+        @pagination="getDeviceAlarmList"
+      />
+    </div>
+  </Dialog>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from 'vue-router';
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+const route = useRoute();
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import request from '@/config/axios'
+import { DeviceApi, DeviceConnectParams, DeviceVO } from '@/api/iot/device'
+import DeviceForm from './DeviceForm.vue'
+import DeviceAttributeList from './components/DeviceAttributeList.vue'
+import {
+  Refresh,
+  Grid,
+  Menu,
+  Search,
+  Location
+} from '@element-plus/icons-vue'
+import {useRouter} from "vue-router";
+import DetailForm from "@/views/iot/device/detailForm.vue";
+// 获取 Query 参数（如 ?id=123）
+const id = route.query.id; // 类型是 string | string[]，需转换
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const attributeDeviceName = ref(route.query.name as string);
+const attributeDeviceId = ref<number | undefined>(undefined)
+attributeDeviceId.value = Number(id)
+const deviceAlarmDialogVisible = ref(false)
+const deviceAlarmList = ref<any[]>([])
+const deviceAlarmTotal = ref(0)
+const ruleList = ref<DevicePointRuleVO[]>([])
+const ruleTotal = ref(0)
+const deviceTabActive = ref('deviceAttribute')
+const deviceAttributeTabLabel = computed(() => {
+  return t('DataCollection.Device.deviceAttributeTabLabel')
+})
+const createRuleFormLoading = ref(false)
+const ruleFormLoading = ref(false)
+const ruleQueryFormRef = ref()
+const ruleLoading = ref(false)
+const deviceRuleTabLabel = computed(() => {
+  return t('DataCollection.Device.deviceRuleTabLabel')
+})
+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
+}
+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 deviceAlarmQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  deviceId: undefined as number | undefined,
+  modelId: undefined as number | undefined,
+  rule: undefined as string | undefined,
+  alarmLevel: undefined as string | undefined,
+  addressValue: undefined as string | undefined,
+  createTime: [] as string[],
+  ruleId: undefined as number | undefined,
+})
+const runningRuleOptions = [
+  { value: '1', label: '运行' },
+  { value: '2', label: '待机中（不运行、没故障）' },
+  { value: '3', label: '故障中（故障且待机）' },
+  // { value: '4', label: '报警中（故障且运行）' },
+]
+
+const alarmRuleOptions = [{ value: '5', label: '报警' }]
+const countOperatorOptions = [
+  { value: '+', label: '+' },
+  { value: '-', label: '-' },
+  { value: '*', label: '*' },
+  { value: '/', label: '/' },
+]
+const createRuleForm = reactive({
+  identifier: 'ALARM',
+  fieldName: '',
+  defaultValue: '报警',
+  alarmLevel: '',
+})
+const ruleForm = reactive<Partial<DevicePointRuleVO>>({
+  id: undefined,
+  identifier: '',
+  fieldName: '',
+  fieldRule: '',
+  defaultValue: '',
+  deviceId: undefined,
+  ruleAttributeId: undefined,
+  ruleOperator: undefined,
+  ruleValue: undefined,
+  alarmLevel: '',
+})
+type CountArithmeticRule = {
+  ruleAttributeId?: number
+  ruleOperator?: string
+  ruleValue?: string | number
+  bigOperator?: string
+}
+const createEmptyCountArithmeticRule = (): CountArithmeticRule => ({
+  ruleAttributeId: undefined,
+  ruleOperator: undefined,
+  ruleValue: undefined,
+})
+
+const extraPointRules = ref<
+  Array<{
+    id?: number
+    rule?: string
+    operator?: string
+    operatorRule?: string | number
+  }>
+  >([])
+const ruleOperatorOptions = computed(() => getStrDictOptions('czsb_rules_conditions'))
+const currentRuleOptions = computed(() => {
+  const id = (ruleForm.identifier || '').toString().toUpperCase()
+  if (id === 'RUNNING') return runningRuleOptions
+  if (id === 'ALARM') return alarmRuleOptions
+  return []
+})
+const isCountIdentifier = computed(() => {
+  return (ruleForm.identifier || '').toString().toUpperCase() === 'COUNT'
+})
+const currentRuleOperatorOptions = computed(() => {
+  if (isCountIdentifier.value) return countOperatorOptions
+  return ruleOperatorOptions.value
+})
+
+const handleRemovePointRule = (index: number) => {
+  if (index < 0 || index >= extraPointRules.value.length) return
+  extraPointRules.value.splice(index, 1)
+}
+
+const handleAddCountArithmeticRule = () => {
+  countArithmeticRules.value.push(createEmptyCountArithmeticRule())
+}
+const handleRemoveCountArithmeticRule = (index: number) => {
+  if (countArithmeticRules.value.length <= 1) return
+  if (index < 0 || index >= countArithmeticRules.value.length) return
+  countArithmeticRules.value.splice(index, 1)
+  const list = countArithmeticRules.value
+  if (list.length > 0) {
+    list[list.length - 1].bigOperator = undefined
+  }
+}
+
+const handleRuleSubmit = async () => {
+  if (!ruleForm.id) return
+  try {
+    ruleFormLoading.value = true
+    if (isCountIdentifier.value) {
+      const hasIncompleteRule = countArithmeticRules.value.some((item) => {
+        return !item.ruleAttributeId || !item.ruleOperator || String(item.ruleValue ?? '').trim() === ''
+      })
+      if (hasIncompleteRule) {
+        message.warning('请完整填写每一组四则运算规则')
+        return
+      }
+      const normalizedRules = countArithmeticRules.value.filter((item) => {
+        return item.ruleAttributeId && item.ruleOperator && String(item.ruleValue ?? '').trim() !== ''
+      })
+      if (!normalizedRules.length) {
+        message.warning('请至少填写一组四则运算规则')
+        return
+      }
+      for (let i = 0; i < normalizedRules.length - 1; i++) {
+        if (!normalizedRules[i].bigOperator) {
+          message.warning(`请为第${i + 1}组选择连接运算符`)
+          return
+        }
+      }
+      for (let i = 0; i < normalizedRules.length; i++) {
+        const item = normalizedRules[i]
+        if (item.ruleOperator !== '/') continue
+        const valueText = String(item.ruleValue ?? '').trim()
+        if (valueText !== '' && !Number.isNaN(Number(valueText)) && Number(valueText) === 0) {
+          message.warning(`第${i + 1}组为除法时，数值不能为0`)
+          return
+        }
+      }
+      const fieldRule = buildCountFieldRule(normalizedRules)
+      if (!fieldRule) {
+        message.warning('四则运算规则格式不正确')
+        return
+      }
+      const payload = {
+        id: ruleForm.id,
+        identifier: ruleForm.identifier,
+        fieldName: ruleForm.fieldName,
+        fieldRule,
+        defaultValue: ruleForm.defaultValue,
+        deviceId: ruleForm.deviceId ?? attributeDeviceId.value,
+      }
+      await request.put({ url: '/iot/device-point-rules/update', data: payload })
+      message.success(t('common.updateSuccess'))
+      ruleDialogVisible.value = false
+      await getRuleList()
+      return
+    }
+    const alarmRunningFieldRule = buildAlarmRunningFieldRule()
+    if (!alarmRunningFieldRule || alarmRunningFieldRule === '[]') {
+      message.warning('请至少填写一组规则')
+      return
+    }
+    const payload = {
+      id: ruleForm.id,
+      identifier: ruleForm.identifier,
+      fieldName: ruleForm.fieldName,
+      fieldRule: alarmRunningFieldRule,
+      defaultValue: ruleForm.defaultValue,
+      deviceId: ruleForm.deviceId ?? attributeDeviceId.value,
+    } as any
+    if (!isCountIdentifier.value) {
+      payload.alarmLevel = ruleForm.alarmLevel
+    }
+
+    await request.put({ url: '/iot/device-point-rules/update', data: payload })
+    message.success(t('common.updateSuccess'))
+    ruleDialogVisible.value = false
+    await getRuleList()
+  } finally {
+    ruleFormLoading.value = false
+  }
+}
+
+const buildAlarmRunningFieldRule = () => {
+  const list: Array<{
+    code: string
+    operator: string
+    operatorRule: string | number
+    rule: string
+  }> = []
+  if (ruleForm.ruleAttributeId && ruleForm.ruleOperator) {
+    const attr = ruleAttributeOptions.value.find((item) => item.id === ruleForm.ruleAttributeId)
+    if (attr?.attributeCode) {
+      list.push({
+        code: attr.attributeCode,
+        operator: String(ruleForm.ruleOperator),
+        operatorRule: (ruleForm.ruleValue as any) ?? '',
+        rule: String(ruleForm.fieldRule ?? ''),
+      })
+    }
+  }
+  extraPointRules.value.forEach((item) => {
+    if (!item.id || !item.operator) return
+    const attr = ruleAttributeOptions.value.find((opt) => opt.id === item.id)
+    if (!attr?.attributeCode) return
+    list.push({
+      code: attr.attributeCode,
+      operator: String(item.operator),
+      operatorRule: (item.operatorRule as any) ?? '',
+      rule: String(item.rule ?? ruleForm.fieldRule ?? ''),
+    })
+  })
+  return JSON.stringify(list)
+}
+const buildCountFieldRule = (rules: CountArithmeticRule[]) => {
+  const validRules = rules.filter((item) => {
+    return item.ruleAttributeId && item.ruleOperator && String(item.ruleValue ?? '').trim() !== ''
+  })
+  if (!validRules.length) return ''
+  const list = validRules.map((item, index) => {
+    const attr = ruleAttributeOptions.value.find((opt) => opt.id === item.ruleAttributeId)
+    if (!attr?.attributeCode) return undefined
+    const row: any = {
+      code: attr.attributeCode,
+      operator: String(item.ruleOperator),
+      value: toCountRuleValue(item.ruleValue),
+    }
+    if (index < validRules.length - 1 && item.bigOperator) {
+      row.bigOperator = String(item.bigOperator)
+    }
+    return row
+  }).filter(Boolean)
+  if (!list.length) return ''
+  return JSON.stringify(list)
+}
+const isCreateCountRule = computed(() => {
+  return createRuleForm.identifier.toString().toUpperCase() === 'COUNT'
+})
+const createRuleDialogTitle = computed(() => {
+  if (isCreateCountRule.value) return '新增产量'
+  return t('DataCollection.DeviceModel.ruleCreateButton')
+})
+
+
+const toCountRuleValue = (value: any) => {
+  const text = String(value ?? '').trim()
+  if (!text) return ''
+  if (/^-?\d+(\.\d+)?$/.test(text)) {
+    return Number(text)
+  }
+  return text
+}
+const handleCreateRuleSubmit = async () => {
+  if (!attributeDeviceId.value) return
+  if (!createRuleForm.fieldName) {
+    message.warning('请输入名称')
+    return
+  }
+  try {
+    createRuleFormLoading.value = true
+    const payload = {
+      identifier: createRuleForm.identifier,
+      fieldName: createRuleForm.fieldName,
+      defaultValue: createRuleForm.defaultValue,
+      deviceId: attributeDeviceId.value,
+    } as any
+    if (!isCreateCountRule.value) {
+      payload.alarmLevel = createRuleForm.alarmLevel
+    }
+    await request.post({ url: '/iot/device-point-rules/create', data: payload })
+    message.success('新增成功')
+    createRuleDialogVisible.value = false
+    await getRuleList()
+  } finally {
+    createRuleFormLoading.value = false
+  }
+}
+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 isRunningIdentifier = computed(() => {
+  return (ruleForm.identifier || '').toString().toUpperCase() === 'RUNNING'
+})
+const createRuleDialogVisible = ref(false)
+const deviceAlarmLoading = ref(false)
+const deviceAlarmQueryFormRef = ref()
+const deviceAlarmRuleOptions = ref<any[]>([])
+const deviceAlarmPointOptions = ref<any[]>([])
+const deviceAlarmRuleLoading = ref(false)
+const deviceAlarmPointLoading = ref(false)
+const countArithmeticRules = ref<CountArithmeticRule[]>([createEmptyCountArithmeticRule()])
+const ruleAttributeOptions = ref<any[]>([])
+const ruleDialogVisible = ref(false)
+const loadDeviceAlarmRuleOptions = async () => {
+  if (!attributeDeviceId.value) return
+  deviceAlarmRuleLoading.value = true
+  try {
+    const res = await request.get({
+      url: '/iot/device-point-rules/getList',
+      params: { id: attributeDeviceId.value },
+    })
+    const data = (res as any)?.data ?? res
+    const listData = Array.isArray((data as any)?.list)
+      ? (data as any).list
+      : Array.isArray(data)
+        ? data
+        : []
+    deviceAlarmRuleOptions.value = listData as any[]
+  } finally {
+    deviceAlarmRuleLoading.value = false
+  }
+}
+const openCreateRuleForm = () => {
+  if (!attributeDeviceId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  createRuleForm.identifier = 'ALARM'
+  createRuleForm.fieldName = '报警'
+  createRuleForm.defaultValue = '报警'
+  createRuleForm.alarmLevel = ''
+  createRuleDialogVisible.value = true
+}
+
+const loadDeviceAlarmPointOptions = async () => {
+  if (!attributeDeviceId.value) return
+  deviceAlarmPointLoading.value = true
+  try {
+    const res = await request.get({
+      url: '/iot/device/device-attribute/list',
+      params: { deviceId: attributeDeviceId.value },
+    })
+    const data = (res as any)?.data ?? res
+    const listData = Array.isArray((data as any)?.list)
+      ? (data as any).list
+      : Array.isArray(data)
+        ? data
+        : []
+    deviceAlarmPointOptions.value = listData as any[]
+  } finally {
+    deviceAlarmPointLoading.value = false
+  }
+}
+const handleShowDeviceAlarmHistory = async () => {
+  if (!attributeDeviceId.value) {
+    message.error(t('DataCollection.Device.messageSelectDeviceRequired'))
+    return
+  }
+  deviceAlarmQueryParams.pageNo = 1
+  deviceAlarmQueryParams.pageSize = 10
+  deviceAlarmQueryParams.modelId = undefined
+  deviceAlarmQueryParams.rule = undefined
+  deviceAlarmQueryParams.alarmLevel = undefined
+  deviceAlarmQueryParams.addressValue = undefined
+  deviceAlarmQueryParams.createTime = []
+  deviceAlarmQueryParams.ruleId = undefined
+  deviceAlarmDialogVisible.value = true
+  await Promise.all([loadDeviceAlarmRuleOptions(), loadDeviceAlarmPointOptions()])
+  await getDeviceAlarmList()
+}
+
+const getDeviceAlarmList = async () => {
+  if (!attributeDeviceId.value) return
+  deviceAlarmLoading.value = true
+  try {
+    deviceAlarmQueryParams.deviceId = attributeDeviceId.value
+    const params = {
+      pageNo: deviceAlarmQueryParams.pageNo,
+      pageSize: deviceAlarmQueryParams.pageSize,
+      deviceId: deviceAlarmQueryParams.deviceId,
+      modelId: deviceAlarmQueryParams.modelId,
+      rule: deviceAlarmQueryParams.rule,
+      alarmLevel: deviceAlarmQueryParams.alarmLevel,
+      addressValue: deviceAlarmQueryParams.addressValue,
+      createTime: deviceAlarmQueryParams.createTime,
+      ruleId: deviceAlarmQueryParams.ruleId,
+    }
+    const data = await request.get({
+      url: '/iot/device-warinning-record/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
+    deviceAlarmList.value = listData as any[]
+    deviceAlarmTotal.value = totalData
+  } finally {
+    deviceAlarmLoading.value = false
+  }
+}
+const openCreateCountRuleForm = () => {
+  if (!attributeDeviceId.value) {
+    message.error('请先选择设备')
+    return
+  }
+  createRuleForm.identifier = 'COUNT'
+  createRuleForm.fieldName = '产能'
+  createRuleForm.defaultValue = '产能'
+  createRuleForm.alarmLevel = ''
+  createRuleDialogVisible.value = true
+}
+const handleRuleQuery = () => {
+  if (!attributeDeviceId.value) return
+  ruleQueryParams.pageNo = 1
+  getRuleList()
+}
+
+const resetRuleQuery = () => {
+  if (!attributeDeviceId.value) return
+  ruleQueryFormRef.value?.resetFields?.()
+  handleRuleQuery()
+}
+
+const getRuleList = async () => {
+  if (!attributeDeviceId.value) return
+  ruleLoading.value = true
+  try {
+    const params = {
+      ...ruleQueryParams,
+      deviceId: attributeDeviceId.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 parseAlarmRunningFieldRule = (fieldRule: any) => {
+  if (!fieldRule) return [] as any[]
+  if (Array.isArray(fieldRule)) return fieldRule
+  if (typeof fieldRule === 'string') {
+    try {
+      const parsed = JSON.parse(fieldRule)
+      return Array.isArray(parsed) ? parsed : []
+    } catch {
+      return []
+    }
+  }
+  return []
+}
+const resolveRuleAttributeIdByCode = (code: any) => {
+  if (code == null) return undefined
+  const targetCode = String(code).trim().toUpperCase()
+  const target = ruleAttributeOptions.value.find(
+    (item) => String(item?.attributeCode ?? '').trim().toUpperCase() === targetCode
+  )
+  return target?.id
+}
+
+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 openRuleForm = async (row: DevicePointRuleVO & { pointRulesVOList?: any[] }) => {
+  const deviceId = row.deviceId || attributeDeviceId.value
+  if (!deviceId) {
+    message.error(t('DataCollection.Device.messageDeviceInfoMissingForRules'))
+    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
+  countArithmeticRules.value = [createEmptyCountArithmeticRule()]
+
+  extraPointRules.value = []
+
+  const list = Array.isArray(row.pointRulesVOList) ? row.pointRulesVOList : []
+  const parsedAlarmRunningList = parseAlarmRunningFieldRule(row.fieldRule)
+  const identifier = (row.identifier || '').toString().toUpperCase()
+
+  if (identifier !== 'COUNT' && parsedAlarmRunningList.length) {
+    const first = parsedAlarmRunningList[0] as any
+    ruleForm.fieldRule = first?.rule ?? ''
+    ruleForm.ruleAttributeId = resolveRuleAttributeIdByCode(first?.code) as any
+    ruleForm.ruleOperator = first?.operator as any
+    ruleForm.ruleValue = first?.operatorRule as any
+    extraPointRules.value = parsedAlarmRunningList.slice(1).map((item: any) => ({
+      id: resolveRuleAttributeIdByCode(item?.code),
+      rule: item?.rule,
+      operator: item?.operator,
+      operatorRule: item?.operatorRule,
+    }))
+  } else 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
+      }
+      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,
+    }))
+    if (identifier === 'COUNT') {
+      const parsedFieldRule = parseCountFieldRule(row.fieldRule)
+      if (parsedFieldRule.length) {
+        countArithmeticRules.value = parsedFieldRule
+      } else {
+        const parsedList = list.map((item: any) => ({
+          ruleAttributeId: resolveRuleAttributeIdByCode(item?.code),
+          ruleOperator: item?.operator,
+          ruleValue: item?.operatorRule,
+        }))
+        const filteredParsedList = parsedList.filter((item) => {
+          return item.ruleAttributeId && item.ruleOperator && String(item.ruleValue ?? '').trim() !== ''
+        })
+        countArithmeticRules.value = filteredParsedList.length
+          ? filteredParsedList
+          : [createEmptyCountArithmeticRule()]
+      }
+    }
+  } else {
+    ruleForm.fieldRule = row.fieldRule
+    ruleForm.ruleAttributeId = row.ruleAttributeId
+    ruleForm.ruleOperator = row.ruleOperator
+    ruleForm.ruleValue = row.ruleValue as any
+    if (identifier === 'COUNT') {
+      const parsedFieldRule = parseCountFieldRule(row.fieldRule)
+      countArithmeticRules.value = parsedFieldRule.length
+        ? parsedFieldRule
+        : [
+          {
+            ruleAttributeId: row.ruleAttributeId,
+            ruleOperator: row.ruleOperator,
+            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 parseCountFieldRule = (fieldRule: any): CountArithmeticRule[] => {
+  if (!fieldRule) return []
+  const parsed = (() => {
+    if (typeof fieldRule !== 'string') return fieldRule
+    try {
+      return JSON.parse(fieldRule)
+    } catch {
+      return undefined
+    }
+  })() as any
+  if (Array.isArray(parsed)) {
+    return parsed
+      .map((item: any) => {
+        const pointId = resolveRuleAttributeIdByCode(item?.code) ?? item?.pointId
+        return {
+          ruleAttributeId: pointId != null ? Number(pointId) : undefined,
+          ruleOperator: item?.operator,
+          ruleValue: item?.value ?? item?.operatorRule,
+          bigOperator: item?.bigOperator,
+        } as CountArithmeticRule
+      })
+      .filter((item) => item.ruleAttributeId || item.ruleOperator || item.ruleValue != null || item.bigOperator)
+  }
+  const root = parsed?.expr ?? parsed
+  if (!root || typeof root !== 'object') return []
+  const rows: CountArithmeticRule[] = []
+  const walk = (node: any) => {
+    if (!node || typeof node !== 'object' || !node.op) return
+    if (node.left && typeof node.left === 'object' && node.left.op) {
+      walk(node.left)
+    }
+    const attrId = resolveRuleAttributeIdByCode(node?.left?.field)
+    const rightValue =
+      node?.right?.field != null
+        ? String(node.right.field)
+        : node?.right?.value != null
+          ? node.right.value
+          : undefined
+    rows.push({
+      ruleAttributeId: attrId,
+      ruleOperator: node.op,
+      ruleValue: rightValue,
+    })
+  }
+  walk(root)
+  return rows.filter((item) => item.ruleOperator || item.ruleAttributeId || item.ruleValue != null)
+}
+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 = []
+  }
+}
+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(t('common.delSuccess'))
+    await getRuleList()
+  } catch { }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 29a77974..acd67889 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -322,7 +322,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <DeviceForm ref="formRef" @success="getList" />
   <!-- 子表的列表 -->
-  <ContentWrap v-if="ifShow">
+<!--  <ContentWrap v-if="ifShow">
     <template v-if="attributeDeviceId">
       <div class="mb-10px flex items-center justify-between text-sm text-gray-500">
         <div>
@@ -711,7 +711,7 @@
       </el-tabs>
     </template>
     <el-empty v-else :description="t('DataCollection.Device.emptyDescription')" />
-  </ContentWrap>
+  </ContentWrap>-->
 
   <Dialog :title="t('DataCollection.Device.alarmHistoryTitle')" v-model="deviceAlarmDialogVisible" width="1200px">
     <el-form
@@ -1141,6 +1141,14 @@ const deviceRuleTabLabel = computed(() => {
 const handleShowAttribute = (row: any) => {
   attributeDeviceId.value = row?.id
   attributeDeviceName.value = row?.deviceName ?? ''
+  router.push({
+    path: '/iot/pointManagement',
+        query: {
+          id: row?.id,
+          name: row?.deviceName
+        }
+  });
+
 }
 
 const ruleLoading = ref(false)
diff --git a/src/views/iot/historyData/HistorySingleAnalyse.vue b/src/views/iot/historyData/HistorySingleAnalyse.vue
new file mode 100644
index 00000000..db15bfa9
--- /dev/null
+++ b/src/views/iot/historyData/HistorySingleAnalyse.vue
@@ -0,0 +1,1333 @@
+<template>
+  <div class="app-container">
+    <!-- 顶部设备信息栏 -->
+    <el-card class="top-card" shadow="never">
+      <el-page-header :content="pageTitle" @back="goBack" />
+
+      <el-descriptions class="device-info" :column="5" border>
+        <el-descriptions-item label="设备名称">{{ deviceData.name }}</el-descriptions-item>
+        <el-descriptions-item label="设备编码">{{ deviceData.code }}</el-descriptions-item>
+<!--        <el-descriptions-item label="设备类型">{{ deviceData.type }}</el-descriptions-item>-->
+        <el-descriptions-item label="所属产线">{{ deviceData.productionLine }}</el-descriptions-item>
+        <el-descriptions-item label="最新采集时间">{{ deviceData.lastCollectTime }}</el-descriptions-item>
+      </el-descriptions>
+
+      <div class="action-buttons">
+        <el-button type="primary" @click="handleSaveAnalysis">
+          <Icon icon="ep:document-checked" />
+          保存分析方案
+        </el-button>
+<!--        <el-button @click="handleExport">
+          <Icon icon="ep:download" />
+          导出分析结果
+        </el-button>-->
+        <el-button @click="handleRefresh">
+          <Icon icon="ep:refresh" />
+          刷新
+        </el-button>
+      </div>
+    </el-card>
+
+    <!-- 分析条件 -->
+    <el-card class="filter-card" shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">分析条件</span>
+        </div>
+      </template>
+
+<!--      <el-row :gutter="20">-->
+<!--        <el-col :span="6">
+          <el-card class="device-info-card">
+            <h3>当前设备</h3>
+            <el-descriptions :column="1" size="small">
+              <el-descriptions-item label="设备名称">{{ deviceData.name }}</el-descriptions-item>
+              <el-descriptions-item label="设备编码">{{ deviceData.code }}</el-descriptions-item>
+              <el-descriptions-item label="设备类型">{{ deviceData.type }}</el-descriptions-item>
+              <el-descriptions-item label="所属产线">{{ deviceData.productionLine }}</el-descriptions-item>
+              <el-descriptions-item label="采集状态">
+                <el-tag type="success" size="small">在线</el-tag>
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-card>
+        </el-col>-->
+
+<!--        <el-col :span="18">-->
+          <el-form ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="开始时间">
+                  <el-date-picker
+                    v-model="queryParams.startTime"
+                    type="datetime"
+                    placeholder="选择开始时间"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 100%"
+                    @change="handleStartTimeChange"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="结束时间">
+                  <el-date-picker
+                    v-model="queryParams.endTime"
+                    type="datetime"
+                    placeholder="选择结束时间"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    style="width: 100%"
+                    @change="handleEndTimeChange"
+                    :picker-options="endTimeOptions"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+<!--                <el-form-item label="时间粒度">
+                  <el-radio-group v-model="queryParams.granularity">
+                    <el-radio-button label="original">原始值</el-radio-button>
+                    <el-radio-button label="1min">1分钟</el-radio-button>
+                    <el-radio-button label="5min">5分钟</el-radio-button>
+                    <el-radio-button label="1hour">1小时</el-radio-button>
+                  </el-radio-group>
+                </el-form-item>-->
+              </el-col>
+            </el-row>
+
+            <el-form-item label="点位选择">
+              <div class="point-selector-card">
+                <div class="selector-header">
+                  <el-input
+                    v-model="pointKeyword"
+                    placeholder="搜索点位名称或编码"
+                    clearable
+                    style="width: 200px; margin-right: 10px"
+                    @input="handlePointSearch"
+                  />
+                  <el-button @click="selectAllTemperature">选择工艺参数</el-button>
+                  <el-button @click="clearAllPoints">清空</el-button>
+                </div>
+
+                <div class="selected-tags">
+                  <el-tag
+                    v-for="point in selectedPoints"
+                    :key="point.code"
+                    closable
+                    @close="removePoint(point.code)"
+                  >
+                    {{ point.name }}
+                  </el-tag>
+                  <span v-if="selectedPoints.length === 0" style="color: #98a2b3">
+                    未选择点位
+                  </span>
+                </div>
+
+                <div class="point-list">
+                  <el-collapse v-model="activePointGroup">
+                    <el-collapse-item
+                      v-for="group in filteredPointGroups"
+                      :key="group.group"
+                      :title="`${group.group} (${group.points.length})`"
+                      :name="group.group"
+                    >
+                      <el-checkbox-group v-model="selectedPointCodes">
+                        <el-space wrap>
+                          <el-checkbox
+                            v-for="point in group.points"
+                            :key="point.code"
+                            :label="point.code"
+                          >
+                            <div class="point-info">
+                              <div class="point-name">{{ point.name }}</div>
+                              <div class="point-detail">
+                                <span class="point-code">{{ point.code }}</span>
+                                <span class="point-unit">{{ point.unit }}</span>
+                                <span class="point-range">({{ point.lower }} ~ {{ point.upper }})</span>
+                              </div>
+                            </div>
+                          </el-checkbox>
+                        </el-space>
+                      </el-checkbox-group>
+                    </el-collapse-item>
+                  </el-collapse>
+                </div>
+              </div>
+            </el-form-item>
+
+<!--            <el-form-item label="分析规则">
+              <el-checkbox-group v-model="queryParams.rules">
+                <el-checkbox label="max">最大值</el-checkbox>
+                <el-checkbox label="min">最小值</el-checkbox>
+                <el-checkbox label="avg">平均值</el-checkbox>
+                <el-checkbox label="range">波动值</el-checkbox>
+&lt;!&ndash;                <el-checkbox label="upperCount">超上限次数</el-checkbox>
+                <el-checkbox label="lowerCount">超下限次数</el-checkbox>
+                <el-checkbox label="continuousAbnormal">连续异常时长</el-checkbox>&ndash;&gt;
+              </el-checkbox-group>
+            </el-form-item>-->
+
+            <el-form-item>
+              <el-button type="primary" @click="handleAnalyze">
+                <Icon icon="ep:search" />
+                开始分析
+              </el-button>
+              <el-button @click="resetQuery">
+                <Icon icon="ep:refresh" />
+                重置条件
+              </el-button>
+            </el-form-item>
+          </el-form>
+<!--        </el-col>
+      </el-row>-->
+    </el-card>
+
+    <!-- 概览卡片 -->
+    <el-row :gutter="20" class="summary-row">
+      <el-col v-for="item in summaryData" :key="item.title" :span="4">
+        <el-card :class="['summary-card', item.warn ? 'summary-warn' : '']">
+          <div class="summary-title">{{ item.title }}</div>
+          <div class="summary-value">{{ item.value }}</div>
+          <div class="summary-desc">{{ item.desc }}</div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- 多点位历史趋势分析 -->
+    <el-card class="chart-card" shadow="never">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">多点位历史趋势分析</span>
+          <div class="chart-toolbar">
+            <el-radio-group v-model="chartMode" size="small">
+<!--              <el-radio-button label="all">全部显示</el-radio-button>-->
+<!--              <el-radio-button label="abnormal">仅异常点位</el-radio-button>-->
+            </el-radio-group>
+          </div>
+        </div>
+      </template>
+      <div id="historyTrendChart" class="chart-container"></div>
+<!--      <el-descriptions :column="4" border class="chart-note">
+        <el-descriptions-item label="当前展示点位">
+          {{ chartNote.currentPoints }}
+        </el-descriptions-item>
+        <el-descriptions-item label="是否有异常">
+          <el-tag :type="chartNote.hasAbnormal ? 'warning' : 'success'">
+            {{ chartNote.hasAbnormal ? `发现 ${chartNote.abnormalCount} 个异常点位` : '未发现明显异常' }}
+          </el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="最高值出现时间">
+          {{ chartNote.maxTime }}
+        </el-descriptions-item>
+        <el-descriptions-item label="最大波动区间">
+          {{ chartNote.maxRange }}
+        </el-descriptions-item>
+      </el-descriptions>-->
+    </el-card>
+    <div class="table-container">
+    <!-- 分析结果表格 -->
+    <el-card class="result-card" shadow="never" style="width: 44%; margin-right: 0.6%; display: inline-block; vertical-align: top;">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">分析结果</span>
+          <span style="color: #667085; font-size: 13px">
+            按点位聚合统计，异常结果已高亮
+          </span>
+        </div>
+      </template>
+
+      <el-table :data="resultData" style="width: 100%">
+        <el-table-column prop="name" label="点位名称" width="120" />
+        <el-table-column prop="code" label="点位编码" width="140" />
+        <el-table-column prop="unit" label="单位" width="70" />
+        <el-table-column prop="max" label="最大值" width="110">
+          <template #default="{ row }">
+            <span :class="row.maxClass">{{ formatValue(row.max, row.unit) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="min" label="最小值" width="110">
+          <template #default="{ row }">
+            <span :class="row.minClass">{{ formatValue(row.min, row.unit) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="avg" label="平均值" width="110">
+          <template #default="{ row }">
+            {{ formatValue(row.avg, row.unit) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="range" label="波动值" width="110">
+          <template #default="{ row }">
+            <span :class="row.rangeClass">{{ formatValue(row.range, row.unit) }}</span>
+          </template>
+        </el-table-column>
+<!--        <el-table-column prop="upperCount" label="超上限次数" width="100">
+          <template #default="{ row }">
+            <span :class="row.upperCount > 0 ? 'text-danger' : ''">
+              {{ row.upperCount }}
+            </span>
+          </template>
+        </el-table-column>-->
+<!--        <el-table-column prop="lowerCount" label="超下限次数" width="100">
+          <template #default="{ row }">
+            <span :class="row.lowerCount > 0 ? 'text-warning' : ''">
+              {{ row.lowerCount }}
+            </span>
+          </template>
+        </el-table-column>-->
+<!--        <el-table-column prop="continuousAbnormal" label="连续异常时长" width="120">
+          <template #default="{ row }">
+            {{ row.continuousAbnormal }}分钟
+          </template>
+        </el-table-column>-->
+<!--        <el-table-column prop="conclusion" label="分析结论" width="120">
+          <template #default="{ row }">
+            <el-tag :type="row.statusType" size="small">
+              {{ row.conclusion }}
+            </el-tag>
+          </template>
+        </el-table-column>-->
+      </el-table>
+    </el-card>
+
+    <!-- 历史明细 -->
+    <el-card class="detail-card" shadow="never" style="width: 55.4%; display: inline-block; vertical-align: top;">
+      <template #header>
+        <div class="card-header">
+          <span class="card-title">历史明细</span>
+          <span style="color: #667085; font-size: 13px">
+            展示部分原始采集数据
+          </span>
+        </div>
+      </template>
+
+      <el-table :data="historyData" style="width: 100%" height="360">
+        <el-table-column prop="time" label="采集时间" width="150" />
+        <el-table-column
+          v-for="point in displayPoints"
+          :key="point.code.toLowerCase()"
+          :prop="point.code.toLowerCase()"
+          :label="point.name"
+          :min-width="100"
+        >
+          <template #default="{ row }">
+            <span :class="getValueClass(row[point.code.toLowerCase()], point)">
+              {{ formatValue(row[point.code.toLowerCase()], point.unit) }} {{ point.unit }}
+            </span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    </div>
+    <!-- 侧边栏 -->
+<!--    <el-aside width="320px" class="suggest-aside">
+      <el-card class="suggest-card" shadow="never">
+        <template #header>
+          <div class="card-header">
+            <span class="card-title">分析说明/建议</span>
+          </div>
+        </template>
+
+        <div class="health-score">
+          <div class="score-ring">
+            <strong>{{ healthScore }}</strong>
+            <span>稳定性评分</span>
+          </div>
+        </div>
+
+        <div class="suggest-list">
+          <el-alert
+            v-for="(suggest, index) in suggestions"
+            :key="index"
+            :title="suggest.content"
+            :type="suggest.type"
+            :closable="false"
+            show-icon
+            class="suggest-item"
+          />
+        </div>
+
+        <div class="event-list">
+          <h4>关键事件记录</h4>
+          <el-timeline>
+            <el-timeline-item
+              v-for="event in keyEvents"
+              :key="event.time"
+              :timestamp="event.time"
+            >
+              {{ event.text }}
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </el-card>
+    </el-aside>-->
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted, nextTick } from 'vue'
+import {useRoute, useRouter} from 'vue-router'
+import * as echarts from 'echarts'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import {DeviceApi, DeviceVO} from "@/api/iot/device";
+const router = useRouter()
+const route = useRoute();
+let query = route.query;
+
+// 页面数据
+const pageTitle = '单设备多点位历史数据分析'
+
+// 设备信息
+const deviceData = reactive({
+  name: query.name as string,
+  code: query.deviceCode as string,
+  productionLine: query.lineName as string,
+  lastCollectTime: query.collectionTime as string,
+})
+
+// 查询参数
+const queryParams = reactive({
+  startTime: '2026-04-22 08:00:00',
+  endTime: '2026-04-22 11:30:00',
+  granularity: 'original',
+  rules: ['max', 'min', 'avg', 'range', 'upperCount', 'lowerCount', 'continuousAbnormal']
+})
+
+// 点位数据
+const pointGroups = ref([
+  {
+    group: '温度类',
+    points: [
+      { name: '上层温度', code: 'UpperTemp', unit: '℃', upper: 86, lower: 72 },
+      { name: '中层温度', code: 'MiddleTemp', unit: '℃', upper: 86, lower: 72 },
+      { name: '下层温度', code: 'LowerTemp', unit: '℃', upper: 84, lower: 70 },
+      { name: '回风温度', code: 'ReturnAirTemp', unit: '℃', upper: 78, lower: 62 },
+      { name: '实际温度', code: 'ActualTemp', unit: '℃', upper: 86, lower: 72 },
+    ]
+  },
+  {
+    group: '工艺类',
+    points: [
+      { name: '输送速度', code: 'ConveyorSpeed', unit: 'm/min', upper: 18, lower: 10 },
+      { name: '主缸水位', code: 'MainTankLevel', unit: 'mm', upper: 680, lower: 520 }
+    ]
+  },
+  {
+    group: '能耗类',
+    points: [
+      { name: '干燥柜用电量', code: 'DryerPower', unit: 'kWh', upper: 48, lower: 20 }
+    ]
+  }
+])
+
+const filteredPointGroups = computed(() => {
+  if (!pointKeyword.value.trim()) return pointGroups.value
+
+  const keyword = pointKeyword.value.toLowerCase()
+  return pointGroups.value
+    .map(group => {
+      const matchedPoints = group.points.filter(point =>
+        String(point.name || '').toLowerCase().includes(keyword) ||
+        String(point.code || '').toLowerCase().includes(keyword)
+      )
+      return matchedPoints.length > 0 ? { ...group, points: matchedPoints } : null
+    })
+    .filter((group): group is { group: string; points: any[] } => group !== null)
+})
+
+function handlePointSearch() {
+  // 搜索时自动展开所有分组
+  activePointGroup.value = filteredPointGroups.value.map(g => g.group)
+}
+// 图表相关
+const chartRef = ref()
+const chartInstance = ref<echarts.ECharts>()
+const chartMode = ref('all')
+const pointKeyword = ref('')
+const activePointGroup = ref([])
+const selectedPointCodes = ref([])
+
+// 计算属性
+const selectedPoints = computed(() => {
+  const allPoints = pointGroups.value.flatMap(g => g.points)
+  return allPoints.filter(p => selectedPointCodes.value.includes(p.code))
+})
+
+const displayPoints = computed(() => {
+  return selectedPoints.value
+})
+
+// 历史数据
+const historyData = ref([
+/*
+  {time:"2026-04-22 08:00",UpperTemp:78.2,MiddleTemp:79.1,LowerTemp:76.8,ReturnAirTemp:68.4,ActualTemp:78.7,SetTemp:80,ConveyorSpeed:14.1,MainTankLevel:612,DryerPower:31.2},
+  {time:"2026-04-22 08:12",UpperTemp:78.8,MiddleTemp:80.3,LowerTemp:77.2,ReturnAirTemp:69,ActualTemp:79.4,SetTemp:80,ConveyorSpeed:14.3,MainTankLevel:615,DryerPower:32},
+  {time:"2026-04-22 08:24",UpperTemp:79.5,MiddleTemp:81.4,LowerTemp:77.9,ReturnAirTemp:69.5,ActualTemp:80.2,SetTemp:80,ConveyorSpeed:14.5,MainTankLevel:618,DryerPower:32.7},
+  {time:"2026-04-22 08:36",UpperTemp:80.1,MiddleTemp:82.6,LowerTemp:78.4,ReturnAirTemp:70.3,ActualTemp:81,SetTemp:80,ConveyorSpeed:14.2,MainTankLevel:621,DryerPower:33.3},
+  {time:"2026-04-22 08:48",UpperTemp:80.8,MiddleTemp:83.2,LowerTemp:79,ReturnAirTemp:70.8,ActualTemp:81.8,SetTemp:80,ConveyorSpeed:13.8,MainTankLevel:624,DryerPower:34.1},
+  {time:"2026-04-22 09:00",UpperTemp:81.4,MiddleTemp:84.5,LowerTemp:79.7,ReturnAirTemp:71.6,ActualTemp:82.5,SetTemp:80,ConveyorSpeed:13.4,MainTankLevel:628,DryerPower:35.8},
+  {time:"2026-04-22 09:12",UpperTemp:82.1,MiddleTemp:85.8,LowerTemp:80.2,ReturnAirTemp:72.4,ActualTemp:83.2,SetTemp:80,ConveyorSpeed:13.2,MainTankLevel:631,DryerPower:37.4},
+  {time:"2026-04-22 09:24",UpperTemp:82.8,MiddleTemp:87.4,LowerTemp:80.8,ReturnAirTemp:73.2,ActualTemp:84.7,SetTemp:80,ConveyorSpeed:12.8,MainTankLevel:636,DryerPower:39.1},
+  {time:"2026-04-22 09:36",UpperTemp:83,MiddleTemp:86.9,LowerTemp:81.2,ReturnAirTemp:74.1,ActualTemp:85.6,SetTemp:80,ConveyorSpeed:12.5,MainTankLevel:640,DryerPower:40.5},
+  {time:"2026-04-22 09:48",UpperTemp:82.4,MiddleTemp:85.6,LowerTemp:80.5,ReturnAirTemp:73.6,ActualTemp:84.9,SetTemp:80,ConveyorSpeed:12.9,MainTankLevel:637,DryerPower:39.3},
+  {time:"2026-04-22 10:00",UpperTemp:81.7,MiddleTemp:84.4,LowerTemp:79.8,ReturnAirTemp:72.8,ActualTemp:83.8,SetTemp:80,ConveyorSpeed:13.5,MainTankLevel:633,DryerPower:37.8},
+  {time:"2026-04-22 10:12",UpperTemp:80.9,MiddleTemp:83.5,LowerTemp:79.1,ReturnAirTemp:72,ActualTemp:82.4,SetTemp:80,ConveyorSpeed:14,MainTankLevel:629,DryerPower:36.2},
+  {time:"2026-04-22 10:24",UpperTemp:80.2,MiddleTemp:82.6,LowerTemp:78.3,ReturnAirTemp:71.4,ActualTemp:81.3,SetTemp:80,ConveyorSpeed:14.6,MainTankLevel:625,DryerPower:34.9},
+  {time:"2026-04-22 10:36",UpperTemp:79.8,MiddleTemp:81.8,LowerTemp:77.8,ReturnAirTemp:70.7,ActualTemp:80.6,SetTemp:80,ConveyorSpeed:15.2,MainTankLevel:620,DryerPower:33.5},
+  {time:"2026-04-22 10:48",UpperTemp:79.3,MiddleTemp:81,LowerTemp:77.4,ReturnAirTemp:70,ActualTemp:79.8,SetTemp:80,ConveyorSpeed:15.7,MainTankLevel:616,DryerPower:32.6},
+  {time:"2026-04-22 11:00",UpperTemp:78.7,MiddleTemp:80.2,LowerTemp:76.9,ReturnAirTemp:69.2,ActualTemp:79.1,SetTemp:80,ConveyorSpeed:16.1,MainTankLevel:611,DryerPower:31.9},
+  {time:"2026-04-22 11:12",UpperTemp:78.4,MiddleTemp:79.8,LowerTemp:76.4,ReturnAirTemp:68.7,ActualTemp:78.5,SetTemp:80,ConveyorSpeed:16.4,MainTankLevel:608,DryerPower:31.1},
+  {time:"2026-04-22 11:24",UpperTemp:78,MiddleTemp:79.2,LowerTemp:76.1,ReturnAirTemp:68.3,ActualTemp:78.1,SetTemp:80,ConveyorSpeed:16.2,MainTankLevel:605,DryerPower:30.8}
+*/
+
+  // ... 其他数据
+])
+
+// 分析结果
+const resultData = ref([])
+const summaryData = ref([])
+const chartNote = ref({})
+const healthScore = ref(86)
+const suggestions = ref([])
+const keyEvents = ref([
+  { time: '09:26', text: '中层温度出现短时偏高' },
+  { time: '10:14', text: '实际温度与设定温度偏差扩大' },
+  { time: '10:58', text: '回风温度与输送速度联动变化明显' }
+])
+const tagsViewStore = useTagsViewStore()
+
+// 方法
+function goBack() {
+  tagsViewStore.delView(router.currentRoute.value)
+  router.push('/iot/historyData')
+
+
+}
+
+function selectAllTemperature() {
+  const tempPoints = pointGroups.value.find(g => g.group === '工艺参数')?.points || []
+  selectedPointCodes.value = tempPoints.map(p => p.code)
+}
+
+function clearAllPoints() {
+  selectedPointCodes.value = []
+}
+
+function removePoint(code) {
+  selectedPointCodes.value = selectedPointCodes.value.filter(c => c !== code)
+}
+
+function formatValue(value, unit) {
+  if (unit === 'mm') {
+    return Math.round(value)
+  } else if (unit === 'kWh') {
+    return value.toFixed(1)
+  } else {
+    return Number(value).toFixed(1)
+  }
+}
+
+function getValueClass(value, point) {
+  if (value > point.upper) {
+    return 'text-danger'
+  } else if (value < point.lower) {
+    return 'text-warning'
+  }
+  return ''
+}
+const analyzing = ref(false)
+async function handleAnalyze() {
+  if (selectedPointCodes.value.length === 0) {
+    ElMessage.warning('请至少选择一个点位')
+    return
+  }
+  // 验证时间范围
+  if (!validateTimeRange(queryParams.startTime, queryParams.endTime)) {
+    ElMessage.warning('时间范围不能超过24小时，且结束时间必须晚于开始时间')
+    return
+  }
+  analyzing.value = true
+  try {
+  const params: any = {
+    deviceId: query.id,
+    pageNo: 1,
+    pageSize: 10
+  }
+  params.collectionStartTime = queryParams.startTime
+  params.collectionEndTime = queryParams.endTime
+  if (Array.isArray(selectedPointCodes.value) && selectedPointCodes.value.length) {
+    params.attributeCodes = selectedPointCodes.value
+  }
+  const res: any = await DeviceApi.getHistoryAnalyse(params)
+  //oneHistoryData.value = res;
+  //historyData.value = res.data;
+    if (res && res.analyseData) {
+    resultData.value = res.analyseData;
+    // 2. 重要：转换API返回数据的格式，适配图表
+    if (res && res.data) {
+      // 转换数据格式
+      transformApiDataToChartFormat(res.data)
+    }
+  // 模拟异步分析
+  //setTimeout(() => {
+    updateChart()
+    calculateAnalysis()
+
+    ElMessage.success('已重新分析，图表与统计结果已更新')
+    } else {
+      // 如果接口返回空数据
+      ElMessage.warning('未查询到相关数据')
+      initializeEmptyCharts()
+    }
+  } catch (error) {
+    console.error('分析失败:', error)
+    ElMessage.error('分析失败，请检查网络连接或参数设置')
+    // 出错时显示空状态
+    initializeEmptyCharts()
+  } finally {
+    analyzing.value = false
+  }
+    //analyzing.value = false
+  //}, 800)
+}
+
+
+// 新增函数：转换API返回数据为图表需要的格式
+function transformApiDataToChartFormat(apiData) {
+  if (!apiData || apiData.length === 0) {
+    historyData.value = []
+    oneHistoryData.value = {
+      time: [],
+      series: []
+    }
+    return
+  }
+  historyData.value = apiData;
+
+  // 假设API返回的数据格式：[{time: '08:00', point1: 78.2, point2: 79.1, ...}, ...]
+  const timeArray = apiData.map(item => item.time || '')
+
+  // 获取所有点位名称（排除time字段）
+  const pointNames = []
+  if (apiData.length > 0) {
+    const firstItem = apiData[0]
+    Object.keys(firstItem).forEach(key => {
+      if (key !== 'time' && key !== 'timestamp') {
+        pointNames.push(key)
+      }
+    })
+  }
+
+  // 为每个点位创建数据序列
+  const seriesArray = pointNames.map(pointName => {
+    const pointData = apiData.map(item => item[pointName] || 0)
+
+    // 查找对应的点位信息获取颜色
+    const pointInfo = pointGroups.value
+      .flatMap(g => g.points)
+      .find(p => p.code.toLowerCase() === pointName.toLowerCase())
+
+    // 颜色分配逻辑
+    const colors = ['#4888FF', '#00C853', '#FF6B6B', '#FFD93D', '#9C27B0', '#00BCD4', '#FF9800', '#795548']
+    const colorIndex = pointNames.indexOf(pointName) % colors.length
+
+    return {
+      name: pointInfo?.name || pointName,
+      type: 'line',
+      data: pointData,
+      color: pointInfo?.color || colors[colorIndex]
+    }
+  })
+
+  // 更新oneHistoryData
+  oneHistoryData.value = {
+    time: timeArray,
+    series: seriesArray
+  }
+}
+
+async function calculateAnalysis() {
+
+/*  const params: any = {
+    deviceId: query.id,
+    pageNo: 1,
+    pageSize: 10
+  }
+  params.collectionStartTime = queryParams.startTime
+  params.collectionEndTime = queryParams.endTime
+  //const keyword = pointKeyword.value.toLowerCase()
+  if (Array.isArray(selectedPointCodes.value) && selectedPointCodes.value.length) {
+    params.attributeCodes = selectedPointCodes.value
+
+  }
+  const res: any = await DeviceApi.getHistoryAnalyse(params)
+  oneHistoryData.value = res;
+  historyData.value = res.data;*/
+  // 计算时间间隔
+  const timeInterval = calculateTimeInterval(queryParams.startTime, queryParams.endTime)
+  const intervalText = timeInterval > 0 ? `${timeInterval}小时` : '未设置'
+
+  // 查找最大和最小波动点位
+  let maxRangePoint = null
+  let minRangePoint = null
+  let maxValuePoint = null
+  let minValuePoint = null
+  if (resultData.value && resultData.value.length > 0) {
+    // 遍历所有点位，找出波动值和数值的极值
+    resultData.value.forEach(point => {
+      // 波动值比较
+      if (maxRangePoint === null || point.range > maxRangePoint.range) {
+        maxRangePoint = point
+      }
+      if (minRangePoint === null || point.range < minRangePoint.range) {
+        minRangePoint = point
+      }
+
+      // 数值比较
+      if (maxValuePoint === null || point.max > maxValuePoint.max) {
+        maxValuePoint = point
+      }
+      if (minValuePoint === null || point.min < minValuePoint.min) {
+        minValuePoint = point
+      }
+    })
+  }
+  // 这里实现分析计算逻辑
+  // 模拟计算...
+  summaryData.value = [
+    {title: '已选点位数', value: selectedPoints.value.length, desc: '当前参与趋势与统计分析'},
+    {title: '分析时间跨度', value: intervalText, desc: queryParams.startTime && queryParams.endTime
+        ? `${queryParams.startTime.substring(0, 16)} 至 ${queryParams.endTime.substring(0, 16)}`
+        : '未设置时间范围' },
+    /* { title: '异常点位数', value: 1, desc: '存在超限或波动异常', warn: true },*/
+    /*{title: '最大波动点位', value: '中层温度', desc: '波动 8.3℃'},*/
+    {
+      title: '最大波动点位',
+      value: maxRangePoint ? maxRangePoint.name : '-',
+      desc: maxRangePoint ? `波动 ${formatValue(maxRangePoint.range, maxRangePoint.unit)}` : '-',
+      warn: maxRangePoint && maxRangePoint.range > 0
+    },
+    /*{title: '最小波动点位', value: '中层温度', desc: '波动 8.3℃'},*/
+    {
+      title: '最小波动点位',
+      value: minRangePoint ? minRangePoint.name : '-',
+      desc: minRangePoint ? `波动 ${formatValue(minRangePoint.range, minRangePoint.unit)}` : '-'
+    },
+    /*{title: '最高值点位', value: '中层温度', desc: '最高 87.4℃'},
+    /!* { title: '平均稳定性评分', value: 86, desc: '基于超限次数和波动幅度' }*!/*/
+    {
+      title: '最高值点位',
+      value: maxValuePoint ? maxValuePoint.name : '-',
+      desc: maxValuePoint ? `最高 ${formatValue(maxValuePoint.max, maxValuePoint.unit)}` : '-',
+      warn: maxValuePoint && maxValuePoint.max > 85  // 示例：超过85显示警告
+    },
+  ]
+
+  healthScore.value = 86
+  suggestions.value = [
+    {content: '当前设备温度整体波动处于可控范围，建议保持现有采集频率。', type: 'info'},
+    {content: '中层温度存在短时偏高，建议检查热风分布与风门开度。', type: 'warning'},
+    {content: '实际温度与设定温度偏差较大，建议复核 PID 参数或温控探头校准状态。', type: 'error'},
+    {content: '建议重点关注回风温度与输送速度联动关系，用于判断干燥效率变化。', type: 'warning'}
+  ]
+}
+// 图表实例
+let oneChartInstance = null
+// 模拟历史数据（实际项目中从后端接口获取）
+const oneHistoryData = ref({})
+function updateChart() {
+  const chartDom = document.getElementById('historyTrendChart')
+  // 1. 如果图表实例已存在，先销毁
+  if (oneChartInstance) {
+    oneChartInstance.dispose()
+  }
+  // 3. 检查是否有数据
+  if (!oneHistoryData.value || !oneHistoryData.value.series || oneHistoryData.value.series.length === 0) {
+    // 显示无数据提示
+/*    oneChartInstance.setOption({
+      title: {
+        text: '暂无数据',
+        left: 'center',
+        top: 'center',
+        textStyle: { color: '#999', fontSize: 16 }
+      },
+      xAxis: { show: false },
+      yAxis: { show: false },
+      series: []
+    })*/
+    return
+  }
+  oneChartInstance = echarts.init(chartDom)
+
+  const option = {
+    tooltip: {
+      trigger: 'axis', // 触发类型：坐标轴触发（支持多系列）
+      axisPointer: { type: 'cross' }, // 十字准星指示器
+      backgroundColor: 'rgba(0, 0, 0, 0.7)', // 深色背景
+      textStyle: { color: '#fff' }, // 文字白色
+      formatter: (params) => {
+        // 自定义 tooltip 内容，模仿截图样式
+        let html = `<div style="font-weight: bold; margin-bottom: 8px;">${params[0].name}</div>`
+        params.forEach(item => {
+          html += `
+            <div style="display: flex; align-items: center; margin: 4px 0;">
+              <span style="display: inline-block; width: 10px; height: 10px; border-radius: 50%; background-color: ${item.color}; margin-right: 6px;"></span>
+              <span style="flex: 1;">${item.seriesName}</span>
+              <span style="margin-left: 10px;">${item.value}</span>
+            </div>
+          `
+        })
+        return html
+      }
+    },
+    legend: {
+      data: oneHistoryData.value.series.map(s => s.name),
+      top: 30,
+      right: 20,
+      textStyle: { fontSize: 12 }
+    },
+    grid: { left: '3%', right: '4%', bottom: '3%', top: '60px', containLabel: true },
+    xAxis: {
+      type: 'category',
+      boundaryGap: false,
+      data: oneHistoryData.value.time,
+      axisLine: { lineStyle: { color: '#ccc' } },
+      axisLabel: { color: '#666' }
+    },
+    yAxis: {
+      type: 'value',
+      axisLine: { show: false },
+      axisTick: { show: false },
+      splitLine: { lineStyle: { color: '#eee' } },
+      axisLabel: { color: '#666' }
+    },
+    series: oneHistoryData.value.series.map(s => ({
+      name: s.name,
+      type: 'line',
+      data: s.data,
+      smooth: true, // 平滑曲线
+      symbol: 'circle', // 标记点样式
+      symbolSize: 6, // 标记点大小
+      itemStyle: { color: s.color },
+      lineStyle: { color: s.color, width: 2 },
+      emphasis: { // 高亮时的样式
+        itemStyle: { color: s.color, borderColor: '#fff', borderWidth: 2 },
+        lineStyle: { width: 3 }
+      }
+    }))
+  }
+
+  oneChartInstance.setOption(option)
+
+  // 窗口resize时自适应
+  window.addEventListener('resize', () => {
+    oneChartInstance && oneChartInstance.resize()
+  })
+}
+
+function resetQuery() {
+  selectedPointCodes.value = []
+  pointKeyword.value = ''
+  chartMode.value = 'all'
+}
+const formLoading = ref(false)
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const message = useMessage() // 消息弹窗
+const { t } = useI18n()
+async function handleSaveAnalysis() {
+  // 提交请求
+  formLoading.value = true
+  try {
+    const contactInfo={
+      startTime: queryParams.startTime,
+        endTime: queryParams.endTime,
+        codes: selectedPointCodes.value
+    }
+    const jsonString = JSON.stringify(contactInfo);
+    const data: any = {
+      id: route.query.id,
+      deviceCode:route.query.deviceCode,
+      deviceName:route.query.name,
+      isEnable: true,
+      contactInfo:jsonString.valueOf()
+    }
+    await DeviceApi.updateDevice(data)
+    message.success(t('common.updateSuccess'))
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+ //ElMessage.success('分析方案已保存')
+}
+
+function handleExport() {
+  ElMessage.success('分析结果已生成导出任务')
+}
+
+function handleRefresh() {
+  handleAnalyze()
+}
+const loading = ref(true) // 列表的加载中
+/** 查询列表 */
+const getDiviceList = async () => {
+  loading.value = true
+  try {
+    const data = await DeviceApi.getDeviceAttributeGroupList({deviceId: route.query.id})
+     pointGroups.value = data;
+      activePointGroup.value = data[0]?.typeNames;
+
+    let deviceDO = data[0]?.deviceDO;
+    if (deviceDO && deviceDO.contactInfo) {
+      selectedPointCodes.value = data[0]?.codes;
+      const contactInfo = JSON.parse(deviceDO.contactInfo)
+
+      // 设置查询参数
+      if (contactInfo.startTime) {
+        queryParams.startTime = contactInfo.startTime
+      }
+      if (contactInfo.endTime) {
+        queryParams.endTime = contactInfo.endTime
+      }
+      if (contactInfo.codes && Array.isArray(contactInfo.codes)) {
+        selectedPointCodes.value = contactInfo.codes
+        await handleAnalyze()  // 自动调用分析
+      }
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+// 验证时间范围是否在1天内
+function validateTimeRange(startTime, endTime) {
+  if (!startTime || !endTime) return true // 允许为空
+
+  const start = new Date(startTime)
+  const end = new Date(endTime)
+  const diffInHours = (end - start) / (1000 * 60 * 60)
+
+  // 检查是否超过24小时
+  if (diffInHours > 24) {
+    return false
+  }
+
+  // 检查结束时间是否晚于开始时间
+  if (end < start) {
+    return false
+  }
+
+  return true
+}
+
+// 计算时间间隔（小时）
+function calculateTimeInterval(startTime, endTime) {
+  if (!startTime || !endTime) return 0
+
+  const start = new Date(startTime)
+  const end = new Date(endTime)
+  const diffInMilliseconds = Math.abs(end - start)
+  const diffInHours = diffInMilliseconds / (1000 * 60 * 60)
+
+  return parseFloat(diffInHours.toFixed(1))
+}
+
+// 格式化日期时间
+function formatDateTime(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}`
+}
+
+// 开始时间变化处理
+function handleStartTimeChange(value) {
+  if (value && queryParams.endTime) {
+    if (!validateTimeRange(value, queryParams.endTime)) {
+      const start = new Date(value)
+      const end = new Date(start.getTime() + 24 * 60 * 60 * 1000 - 1000) // 23:59:59
+      queryParams.endTime = formatDateTime(end)
+      ElMessage.warning('时间范围超过24小时，已自动调整结束时间')
+    }
+  }
+}
+
+// 结束时间变化处理
+function handleEndTimeChange(value) {
+  if (queryParams.startTime && value) {
+    if (!validateTimeRange(queryParams.startTime, value)) {
+      const end = new Date(value)
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000 + 1000) // 00:00:00
+      queryParams.startTime = formatDateTime(start)
+      ElMessage.warning('时间范围超过24小时，已自动调整开始时间')
+    }
+  }
+}
+// 新增：页面加载标志
+const pageLoaded = ref(false)
+
+// 结束时间选择器选项
+const endTimeOptions = computed(() => {
+  if (!queryParams.startTime) return {}
+
+  const start = new Date(queryParams.startTime)
+  const maxEndTime = new Date(start.getTime() + 24 * 60 * 60 * 1000 - 1000) // 23:59:59
+
+  return {
+    disabledDate: (date) => {
+      return date.getTime() < start.getTime() || date.getTime() > maxEndTime.getTime()
+    }
+  }
+})
+
+// 新增：初始化空图表
+function initializeEmptyCharts() {
+  const chartDom = document.getElementById('historyTrendChart')
+  if (chartDom && !oneChartInstance) {
+    oneChartInstance = echarts.init(chartDom)
+  }
+
+  // 显示无数据提示
+  if (oneChartInstance) {
+    oneChartInstance.setOption({
+      title: {
+        text: '请选择分析条件后点击"开始分析"',
+        left: 'center',
+        top: 'center',
+        textStyle: {
+          color: '#909399',
+          fontSize: 16,
+          fontWeight: 'normal'
+        }
+      },
+      xAxis: { show: false },
+      yAxis: { show: false },
+      series: []
+    })
+  }
+
+  // 清空表格数据
+  resultData.value = []
+  historyData.value = []
+  summaryData.value = [
+    {
+      title: '已选点位数',
+      value: 0,
+      desc: '请先选择点位'
+    },
+    {
+      title: '分析时间跨度',
+      value: '未设置',
+      desc: '请设置开始和结束时间'
+    },
+    {
+      title: '最大波动点位',
+      value: '-',
+      desc: '无数据'
+    },
+    {
+      title: '最小波动点位',
+      value: '-',
+      desc: '无数据'
+    },
+    {
+      title: '最高值点位',
+      value: '-',
+      desc: '无数据'
+    }
+  ]
+}
+
+// 生命周期
+onMounted(async () => {
+  getDiviceList()
+  // 2. 检查是否有保存的查询参数
+  const hasContactInfo = selectedPointCodes.value && selectedPointCodes.value.length > 0
+
+  if (hasContactInfo) {
+    // 3. 如果有保存的参数，自动调用接口
+    console.log('检测到保存的分析条件，自动查询...')
+    await handleAnalyze()  // 自动调用分析
+  } else {
+    // 4. 如果没有保存的参数，只初始化图表（显示无数据状态）
+    console.log('无保存的分析条件，显示空状态')
+    initializeEmptyCharts()
+    calculateAnalysis()  // 计算空的统计结果
+  }
+
+  // 设置页面加载完成标志
+  pageLoaded.value = true
+  /*  calculateAnalysis()
+    nextTick(() => {
+      updateChart()
+    })*/
+})
+
+// 监听窗口变化
+window.addEventListener('resize', () => {
+  if (chartInstance.value) {
+    chartInstance.value.resize()
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  min-width: 1180px;
+}
+
+.top-card {
+  margin-bottom: 10px;
+  background: linear-gradient(180deg, #fff 0%, #f9fbff 100%);
+  border: 1px solid var(--el-border-color);
+  border-radius: 8px;
+  box-shadow: 0 8px 24px rgba(15, 23, 42, 0.06);
+
+  .device-info {
+    margin-top: 20px;
+  }
+
+  .action-buttons {
+    margin-top: 20px;
+    display: flex;
+    gap: 10px;
+    justify-content: flex-end;
+  }
+}
+
+.filter-card {
+  margin-bottom: 10px;
+
+  .card-header {
+    display: flex;
+    align-items: center;
+    gap: 9px;
+    font-size: 16px;
+    font-weight: 700;
+    color: #1d2939;
+
+    &::before {
+      content: '';
+      width: 4px;
+      height: 16px;
+      border-radius: 2px;
+      background: var(--el-color-primary);
+    }
+  }
+
+  .device-info-card {
+    height: 100%;
+    padding: 14px;
+    background: #f8fbff;
+    border: 1px solid #e0e9f6;
+    border-radius: 8px;
+
+    h3 {
+      margin: 0 0 12px;
+      font-size: 15px;
+    }
+  }
+
+  .point-selector-card {
+    border: 1px solid var(--el-border-color);
+    border-radius: 8px;
+    background: #fff;
+    overflow: hidden;
+    width: 100%;
+    .selector-header {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      padding: 10px;
+      border-bottom: 1px solid var(--el-border-color-lighter);
+      background: #fbfcfe;
+    }
+
+    .selected-tags {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 8px;
+      min-height: 30px;
+      padding: 10px;
+      border-bottom: 1px solid var(--el-border-color-lighter);
+    }
+
+    .point-list {
+      max-height: 230px;
+      overflow: auto;
+      padding: 12px;
+    }
+  }
+}
+
+.summary-row {
+  margin-bottom: 10px;
+
+  .summary-card {
+    padding: 16px;
+    border: 1px solid var(--el-border-color);
+    border-radius: 8px;
+    box-shadow: 0 4px 16px rgba(15, 23, 42, 0.04);
+    transition: all 0.18s ease;
+
+    &:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 8px 24px rgba(15, 23, 42, 0.08);
+    }
+
+    &.summary-warn {
+      border-color: #ffd89b;
+      background: linear-gradient(180deg, #fff 0%, #fff9ef 100%);
+    }
+
+    .summary-title {
+      color: var(--el-text-color-secondary);
+      font-size: 13px;
+      font-weight: 600;
+    }
+
+    .summary-value {
+      margin-top: 9px;
+      color: #142033;
+      font-size: 25px;
+      font-weight: 800;
+      line-height: 1.1;
+    }
+
+    .summary-desc {
+      margin-top: 8px;
+      color: var(--el-text-color-placeholder);
+      font-size: 12px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+
+.chart-card {
+  margin-bottom: 10px;
+
+  .card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .chart-container {
+    width: 100%;
+    height: 430px;
+  }
+
+  .chart-note {
+    margin-top: 20px;
+  }
+}
+
+.result-card, .detail-card {
+  margin-bottom: 10px;
+
+  .card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+
+.suggest-aside {
+  position: sticky;
+  top: 20px;
+  height: fit-content;
+
+  .suggest-card {
+    .health-score {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 148px;
+      margin-bottom: 16px;
+      background: radial-gradient(circle at center, #fff 0%, #eef6ff 100%);
+      border: 1px solid #dce9fb;
+      border-radius: 8px;
+
+      .score-ring {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 112px;
+        height: 112px;
+        border-radius: 50%;
+        background: radial-gradient(circle at center, #fff 58%, transparent 59%),
+        conic-gradient(var(--el-color-primary) 0 86%, #dbe7f6 86% 100%);
+        color: #15375f;
+
+        strong {
+          font-size: 30px;
+          line-height: 1;
+        }
+
+        span {
+          margin-top: 5px;
+          color: var(--el-text-color-secondary);
+          font-size: 12px;
+        }
+      }
+    }
+
+    .suggest-list {
+      display: grid;
+      gap: 10px;
+      margin-bottom: 10px;
+
+      .suggest-item {
+        padding: 12px;
+        border-left: 4px solid var(--el-color-primary);
+        border-radius: 7px;
+        background: #fbfdff;
+        font-size: 13px;
+        line-height: 1.55;
+
+        &.el-alert--warning {
+          border-left-color: var(--el-color-warning);
+          background: #fffaf0;
+        }
+
+        &.el-alert--error {
+          border-left-color: var(--el-color-error);
+          background: #fff5f5;
+        }
+      }
+    }
+
+    .event-list {
+      h4 {
+        margin: 0 0 15px;
+        font-size: 14px;
+        font-weight: 600;
+      }
+    }
+  }
+}
+
+.text-danger {
+  color: var(--el-color-danger);
+  font-weight: 700;
+  background: var(--el-color-danger-light-9);
+  padding: 2px 4px;
+  border-radius: 4px;
+}
+
+.text-warning {
+  color: var(--el-color-warning);
+  font-weight: 700;
+  background: var(--el-color-warning-light-9);
+  padding: 2px 4px;
+  border-radius: 4px;
+}
+
+</style>
diff --git a/src/views/iot/historyData/index.vue b/src/views/iot/historyData/index.vue
index c815878e..0f137ed8 100644
--- a/src/views/iot/historyData/index.vue
+++ b/src/views/iot/historyData/index.vue
@@ -108,12 +108,15 @@
         :label="t('DataCollection.HistoryData.tableOperateColumn')"
         align="center"
         fixed="right"
-        width="150px"
+        width="300px"
       >
         <template #default="scope">
           <el-button link type="primary" @click="handleSingleView(scope.row)">
             {{ t('DataCollection.HistoryData.tableActionHistoryLabel') }}
           </el-button>
+          <el-button link type="primary" @click="handleSingleAnalyseView(scope.row)">
+            {{ t('DataCollection.HistoryData.tableActionHistoryAnalyseLabel') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -137,9 +140,10 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DeviceApi, LineDeviceVO, LineDevicePageParams } from '@/api/iot/device'
 import HistorySingleDeviceDialog from './HistorySingleDeviceDialog.vue'
-
+import {useRouter} from "vue-router";
+// 路由
+const router = useRouter()
 defineOptions({ name: 'HistoryData' })
-
 const message = useMessage()
 const { t } = useI18n()
 
@@ -225,6 +229,27 @@ const handleSingleView = (row: LineDeviceVO) => {
   singleDialogVisible.value = true
 }
 
+const handleSingleAnalyseView = (row: LineDeviceVO) => {
+  const deviceId = (row as any)?.deviceId ?? row?.id
+  if (deviceId === undefined || deviceId === null || deviceId === '') {
+    return
+  }
+  singleDeviceId.value = deviceId
+  singleDeviceName.value = row.deviceName || ''
+  router.push({
+    path: '/iot/historySingleAnalyse',
+    query: {
+      id: deviceId,
+      name: singleDeviceName.value,
+      deviceCode: row.deviceCode,
+      lineNode: row.lineNode,
+      lineName: row.lineName,
+      collectionTime: row.collectionTime
+    }
+  });
+}
+
+
 onMounted(() => {
   getList()
 })
diff --git a/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue b/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
index 2fe7cb1c..d1db069a 100644
--- a/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
+++ b/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
@@ -7,15 +7,15 @@
       </div>
       <ContentWrap v-loading="loading">
         <div v-if="sections.length" class="single-device-dialog__table-grid">
-          <div v-for="section in sections" :key="section.key" class="single-device-dialog__section">
+<!--          <div v-for="section in sections" :key="section.key" class="single-device-dialog__section">
             <div class="single-device-dialog__section-title">
               {{ section.title }}
-            </div>
-            <el-empty
-              v-if="!section.columns.length"
+            </div>-->
+<!--            <el-empty
+              v-if="!section.length"
               :description="t('DataCollection.RealTimeMonitoring.emptyDescription')"
-            />
-            <el-table
+            />-->
+<!--            <el-table
 v-else :data="section.rows" :border="true" :header-cell-style="headerCellStyle"
               :cell-style="bodyCellStyle" size="small">
               <el-table-column
@@ -25,8 +25,22 @@ v-for="col in section.columns" :key="col.prop" :prop="col.prop" :label="col.labe
                   <span>{{ formatCell(scope.row[col.prop]) }}</span>
                 </template>
               </el-table-column>
-            </el-table>
-          </div>
+            </el-table>-->
+            <div v-for="section in sections" :key="section.id" class="form-section">
+              <h3 v-if="section.title" class="section-title">{{ section.title }}</h3>
+
+              <div class="form-grid">
+                <div
+                  v-for="item in section.items"
+                  :key="item.prop"
+                  class="form-item"
+                >
+                  <div class="form-label">{{ item.label }}:</div>
+                  <div class="form-value">{{ formatCellTwo(item.value) }}</div>
+                </div>
+              </div>
+            </div>
+<!--          </div>-->
         </div>
         <el-empty
           v-else
@@ -49,10 +63,14 @@ type SectionColumn = {
 type SectionRow = Record<string, string | number | null>
 
 type Section = {
-  key: string
-  title: string
-  columns: SectionColumn[]
-  rows: SectionRow[]
+  id: number
+  title?: string
+  items: FormItem[]
+}
+interface FormItem {
+  prop: string
+  label: string
+  value: any
 }
 
 const { t } = useI18n()
@@ -83,8 +101,44 @@ const dialogTitle = computed(() => {
 
 const loading = ref(false)
 const deviceName = computed(() => props.deviceName)
-const sections = ref<Section[]>([])
+const sections = ref<Section[]>([
+  {
+    id: 1,
+    title: '工艺参数监控',
+    items: [
+      { prop: 'addressValue', label: '系统运行', value: 1, unit: '℃' },
+      { prop: 'attributeName', label: '烘干湿度', value: 2, unit: '%' },
+      { prop: 'attributeName', label: '输送速度', value: 3, unit: 'm/min' },
+      { prop: 'attributeName', label: '回风温度', value: 4, unit: '℃' },
+      { prop: 'attributeName', label: '排风温度', value: 5, unit: '℃' },
+      { prop: 'attributeName', label: '呼叫状态', value: 6 },
+      { prop: 'attributeName', label: '在线状态', value: 7 },
+      { prop: 'attributeName', label: '运行状态', value: 3 },
+      { prop: 'attributeName', label: '主缸速度', value: 0, unit: '%' },
+      { prop: 'attributeName', label: '提布辊速度', value: 0 },
+      { prop: 'fanSpeed', label: '风机速度', value: '暂无数据' },
+      { prop: 'mainLevel', label: '主缸水位', value: 1, unit: '%' },
+      { prop: 'mainWater', label: '主缸水量', value: 145, unit: 'L' },
+      { prop: 'setTemp', label: '设定温度', value: 0.0, unit: '℃' },
+      { prop: 'actualTemp', label: '实际温度', value: 0.0, unit: '℃' },
+    ],
+  },
+])
+
+const formatValue = (item: FormItem) => {
+  let value = item.value
+  if (value === null || value === undefined) return '--'
+
+  if (typeof value === 'number') {
+    value = Number.isInteger(value) ? value.toString() : value.toFixed(2)
+  }
+
+  if (item.unit) {
+    value += ` ${item.unit}`
+  }
 
+  return value
+}
 const toGroupMap = (value: any): Record<string, any[]> => {
   if (!value || typeof value !== 'object' || Array.isArray(value)) {
     return {}
@@ -136,6 +190,14 @@ const formatCell = (value: string | number | null | undefined) => {
   return value
 }
 
+const formatCellTwo = (value: any) => {
+  // 示例：如果是数字保留两位小数，否则原样返回
+  if (typeof value === 'number') {
+    return value.toFixed(2)
+  }
+  return value
+}
+
 const buildSectionsFromGroups = (groups: Record<string, any[]>): Section[] => {
   const result: Section[] = []
   for (const [key, list] of Object.entries(groups)) {
@@ -150,12 +212,12 @@ const buildSectionsFromGroups = (groups: Record<string, any[]>): Section[] => {
         row[prop] = item?.addressValue ?? '-'
       })
     }
-    result.push({
+/*    result.push({
       key,
       title: key,
       columns,
       rows: columns.length ? [row] : []
-    })
+    })*/
   }
   return result
 }
@@ -167,15 +229,16 @@ const fetchList = async () => {
   }
   loading.value = true
   try {
-    const res: any = await DeviceApi.getSingleDevice({ deviceId: props.deviceId })
-    const groups = Array.isArray(res)
+    const res: any = await DeviceApi.getSingleDeviceFrom({ deviceId: props.deviceId })
+  /*  const groups = Array.isArray(res)
       ? { [t('DataCollection.RealTimeMonitoring.defaultGroupName')]: res }
       : {
           ...toGroupMap(res?.data),
           ...toGroupMap(res?.data?.data),
           ...toGroupMap(res)
         }
-    sections.value = buildSectionsFromGroups(groups)
+    //sections.value = buildSectionsFromGroups(groups)*/
+    sections.value = res
   } finally {
     loading.value = false
   }
@@ -222,4 +285,84 @@ watch(
 .single-device-dialog__section :deep(.el-table__inner-wrapper) {
   border-radius: 0;
 }
+
+/* 表单容器 */
+.form-section {
+  margin-bottom: 24px;
+}
+
+/* 标题样式 */
+.section-title {
+  font-size: 13px;
+  font-weight: bold;
+  margin-bottom: 12px;
+  color: var(--el-text-color-primary);
+}
+
+/* 三列网格容器 */
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr); /* 三列等宽 */
+  /*gap: 16px;*/ /* 列间距和行间距 */
+ /* padding: 8px;*/
+  background-color: #fff;
+/*  border: 1px solid #dcdfe6; !* 外边框 *!*/
+  border-radius: 4px;
+  min-height: 35px;
+}
+
+/* 表单项：标签 + 值 */
+.form-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 100%;
+  min-height: 35px;
+ /* padding: 8px 0;*/
+  border: 1px solid #dcdfe6;
+ /* border-right: 1px solid #dcdfe6; !* 右边框 *!
+  border-bottom: 1px solid #dcdfe6; !* 下边框 *!*/
+}
+
+/* 标签样式 */
+.form-label {
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #666;
+  height: 100%;
+  min-height: 35px;
+  width: 150px; /* 固定标签宽度，避免错位 */
+  background-color: #f5f7fa; /* 背景色 */
+}
+
+/* 值样式 */
+.form-value {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  padding: 6px 12px;
+  background: white;
+  min-height: 35px;
+  box-sizing: border-box;
+  overflow: hidden;
+  cursor: default;
+  transition: all 0.2s;
+}
+
+/* 响应式：小屏幕下改为两列或单列 */
+@media (max-width: 768px) {
+  .form-grid {
+    grid-template-columns: repeat(2, 1fr); /* 平板改为两列 */
+  }
+}
+
+@media (max-width: 480px) {
+  .form-grid {
+    grid-template-columns: 1fr; /* 手机改为单列 */
+  }
+}
 </style>
diff --git a/src/views/mes/organization/OrganizationForm.vue b/src/views/mes/organization/OrganizationForm.vue
index 74f247f6..9c11c945 100644
--- a/src/views/mes/organization/OrganizationForm.vue
+++ b/src/views/mes/organization/OrganizationForm.vue
@@ -79,7 +79,7 @@
               </el-tooltip>
             </span>
         </template>
-        <el-select v-model="formData.orgType" @change="handleOrgTypeChange" :placeholder="t('FactoryModeling.FactoryStructure.dialogOrgTypePlaceholder')">
+        <el-select v-model="formData.orgType" :placeholder="t('FactoryModeling.FactoryStructure.dialogOrgTypePlaceholder')">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
             :key="dict.value"
@@ -89,25 +89,20 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="t('FactoryModeling.FactoryStructure.dialogMachineLabel')" v-if="formData.orgClass == 'workplace'" prop="machineId">
-        <!-- <el-tree-select
-          v-model="formData.machineId"
-          :data="machineComponentTree"
-          :props="defaultProps"
-          check-strictly
-          default-expand-all
-          placeholder="请选择机台"
-        /> -->
-        <el-select v-model="formData.machineId" :placeholder="t('FactoryModeling.FactoryStructure.dialogMachinePlaceholder')" clearable>
+<!--        <el-select v-model="formData.machineId" :placeholder="t('FactoryModeling.FactoryStructure.dialogMachinePlaceholder')" clearable>
           <el-option
             v-for="item in deviceList"
             :key="item.id"
             :label="item.deviceName"
             :value="item.id"
           />
-        </el-select>
+        </el-select>-->
+        <el-input :model-value="displayItemDevice" readonly clearable class="device-ledger-selection-input"
+                  :placeholder="t('FactoryModeling.FactoryStructure.dialogMachinePlaceholder')"
+                  @click="openCriticalComponentDialog"   />
       </el-form-item>
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.dvName')" prop="dvId" v-if="formData.orgClass == 'workplace'">
-        <el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')" clearable>
+<!--        <el-select v-model="formData.dvId" filterable :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')" clearable>
           <el-option
             v-for="item in dvList"
             :key="item.id"
@@ -115,7 +110,10 @@
             :value="item.id"
             :disabled="item.selected === true"
           />
-        </el-select>
+        </el-select>-->
+            <el-input :model-value="dvIdItemDevice" readonly clearable class="device-ledger-selection-input"
+                      :placeholder="t('EquipmentManagement.EquipmentLedger.dvId')"
+                      @click="openCaijiComponentDialog"   />
       </el-form-item>
       <!-- <el-form-item label="组织状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -134,6 +132,61 @@
       <el-button @click="dialogVisible = false">{{ t('FactoryModeling.FactoryStructure.dialogCancelButton') }}</el-button>
     </template>
   </Dialog>
+  <TableSelectDialog
+    ref="deviceSelectDialogRef"
+    title="选择设备"
+    :columns="deviceColumns"
+    :fetch-api="fetchDeviceLedgerPage"
+    row-key="id"
+    @confirm="handleDeviceSelectConfirm"
+    :query-params="mergedQueryParams"
+    :selection-type="'single'"
+    :default-selected-keys="ids"
+  >
+    <!-- 使用 header 插槽插入查询表单 -->
+    <template #header>
+      <el-form ref="searchFormRef" :model="searchParams" :inline="true" >
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="searchParams.deviceCode" placeholder="请输入编号" clearable />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="searchParams.deviceName" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSearch">{{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
+          <el-button @click="resetSearch">{{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </TableSelectDialog>
+
+  <TableSelectDialog
+    ref="caiJiSelectDialogRef"
+    title="选择采集设备"
+    :columns="caiJiColumns"
+    :fetch-api="fetchCaiJILedgerPage"
+    row-key="id"
+    @confirm="handleCaiJISelectConfirm"
+    :query-params="mergedQueryParams"
+    :selection-type="'single'"
+    :default-selected-keys="CJIds"
+  >
+    <!-- 使用 header 插槽插入查询表单 -->
+    <template #header>
+      <el-form ref="searchFormRef" :model="searchParams" :inline="true" >
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="searchParams.deviceCode" placeholder="请输入编号" clearable />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="searchParams.deviceName" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleCJSearch">{{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
+          <el-button @click="resetCJSearch">{{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </TableSelectDialog>
 </template>
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
@@ -142,13 +195,14 @@ import { defaultProps, handleTree } from '@/utils/tree'
 import {MachineComponentApi} from "@/api/mes/machine";
 import {DeviceLedgerApi, DeviceLedgerVO} from "@/api/mes/deviceledger";
 import { DeviceApi,DeviceVO } from '@/api/iot/device'
-
+import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
 /** 产线工位 表单 */
 defineOptions({ name: 'OrganizationForm' })
-
+const loading = ref(true)
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const deviceSelectDialogRef = ref(false)
+const caiJiSelectDialogRef = ref(false)
 const dvList = ref<DeviceVO[]>([]) // 列表
 const deviceList = ref<DeviceLedgerVO[]>([]) // 列表
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -179,22 +233,70 @@ const formRules = reactive({
   parentId: [{ required: true, message: t('FactoryModeling.FactoryStructure.validatorParentRequired'), trigger: 'blur' }],
   orgClass: [{ required: true, message: t('FactoryModeling.FactoryStructure.validatorOrgClassRequired'), trigger: 'blur' }]
 })
+const itemList = ref<DeviceLedgerVO[]>([])
+const CJList = ref<DeviceVO[]>([]) // 列表
+const mergedQueryParams = computed(() => ({ ...searchParams }))
 const formRef = ref() // 表单 Ref
 const organizationTree = ref() // 树形结构
+const deviceColumns = [
+  { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
+  { label: '设备名称', prop: 'deviceName', minWidth: 160 },
+  { label: '设备型号', prop: 'deviceModel', minWidth: 140 },
+  { label: '所属车间', prop: 'workshop', minWidth: 140 }
+]
+const caiJiColumns = [
+  { label: '设备编号', prop: 'deviceCode', minWidth: 140 },
+  { label: '设备名称', prop: 'deviceName', minWidth: 160 },
+]
+
+// 1. 自定义表单的查询参数
+const searchParams = reactive({
+  deviceCode: undefined,
+  deviceName: undefined,
+})
+
+const handleSearch = () => {
+  // 触发弹窗内部重新加载数据
+  deviceSelectDialogRef.value?.reload?.()
+}
+const searchFormRef = ref()
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
+
+const handleCJSearch = () => {
+  // 触发弹窗内部重新加载数据
+  caiJiSelectDialogRef.value?.reload?.()
+}
+const searchCJFormRef = ref()
+const resetCJSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleCJSearch()
+}
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  initSelectedItems()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await OrganizationApi.getOrganization(id)
+      ids.value=formData.value.machineId != undefined
+        ? formData.value.machineId.toString().split(",").map(Number)
+        : []
+      CJIds.value=formData.value.dvId!=undefined?formData.value.dvId.toString().split(",").map(Number):[]
     } finally {
       formLoading.value = false
     }
+  }else{
+    ids.value=[]
+    CJIds.value=[]
   }
   await getOrganizationTree()
   if (type == 'create'  || typeof formData.value.machineId != 'number') {
@@ -283,8 +385,115 @@ const getMachineComponentTree = async () => {
   root.children = handleTree(data, 'id', 'parentId')
   machineComponentTree.value.push(root)
 }
+const ids = ref([])
+const CJIds = ref([])
+const displayItemDevice = computed( () => {
+  if (!ids.value.length)return ''
+  if (!itemList.value.length) {
+    return formData.value.machineId ? String(formData.value.machineId) : ''
+  }
+  const map = new Map(itemList.value.map((item) => [item.id, item.deviceName]))
+  const names = ids.value
+    .map((id) => map.get(id))
+    .filter((name) => name)
+  return names.join(',')
+})
+
+const dvIdItemDevice = computed( () => {
+  if (!CJIds.value.length)return ''
+  if (!CJList.value.length) {
+    return formData.value.dvId ? String(formData.value.dvId) : ''
+  }
+  const map = new Map(CJList.value.map((item) => [item.id, item.deviceName]))
+  const names = CJIds.value
+    .map((id) => map.get(id))
+    .filter((name) => name)
+  return names.join(',')
+})
+
+const fetchDeviceLedgerPage = (params: Record<string, any>) => {
+  return DeviceLedgerApi.getDeviceLedgerPage({
+    ...params,
+  })
+}
 
+const fetchCaiJILedgerPage = (params: Record<string, any>) => {
+  return DeviceApi.getAvailableListPage({
+    ...params,
+  })
+}
+const selectedDeviceRows = ref<any[]>([])
+const selectedCaiJiRows = ref<any[]>([])
+/*打开关联设备确认*/
+const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
+  formData.value.devices = payload.rows
+    .map((item) => {
+      const id = Number(item.id)
+      if (!Number.isFinite(id)) return undefined
+      return {
+        id,
+        name: item.deviceName || item.name || item.code || `设备ID:${id}`
+      }
+    })
+    .filter((item): item is { id: number; name: string } => Boolean(item))
+  selectedDeviceRows.value = payload.rows
+  formData.value.machineId = payload.ids.join(',')
+  ids.value = payload.ids.map((id) => Number(id))
+}
+/*打开关联设备*/
+const openCriticalComponentDialog = async () => {
+  searchParams.deviceCode=''
+  searchParams.deviceName=''
+  const rows = selectedDeviceRows.value.map((item) => ({ ...item, id: Number(item.id) }))
+  deviceSelectDialogRef.value?.open(rows)
+  let initIds= formData.value.machineId!=undefined?formData.value.machineId.toString().split(","):[]
+  ids.value=initIds.map((id) => Number(id))
+}
+/*打开采集设备确认*/
+const handleCaiJISelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
+  formData.value.devices = payload.rows
+    .map((item) => {
+      const id = Number(item.id)
+      if (!Number.isFinite(id)) return undefined
+      return {
+        id,
+        name: item.deviceName || item.name || item.code || `设备ID:${id}`
+      }
+    })
+    .filter((item): item is { id: number; name: string } => Boolean(item))
+  selectedCaiJiRows.value = payload.rows
+  formData.value.dvId = payload.ids.join(',')
+  CJIds.value = payload.ids.map((id) => Number(id))
+}
+/*打开采集设备*/
+const openCaijiComponentDialog = async () => {
+  searchParams.deviceCode=''
+  searchParams.deviceName=''
+  const rows = selectedCaiJiRows.value.map((item) => ({ ...item, id: Number(item.id) }))
+  caiJiSelectDialogRef.value?.open(rows)
+  let initIds= formData.value.dvId!=undefined?formData.value.dvId.toString().split(","):[]
+  CJIds.value=initIds.map((id) => Number(id))
+}
 
+
+const initSelectedItems = async () => {
+  if (!itemList.value.length) {
+    loading.value = true
+    try {
+      itemList.value = await DeviceLedgerApi.getDeviceLedgerList()
+    } finally {
+      loading.value = false
+    }
+  }
+  if (!CJList.value.length) {
+    loading.value = true
+    try {
+      CJList.value = await DeviceApi.getAvailableList()
+    } finally {
+      loading.value = false
+    }
+  }
+}
 /** 初始化 **/
 onMounted(async () => {
   //console.log("ssss")
diff --git a/src/views/mold/inspectionPlan/InspectionPlanForm.vue b/src/views/mold/inspectionPlan/InspectionPlanForm.vue
index 4718fbdb..1daef361 100644
--- a/src/views/mold/inspectionPlan/InspectionPlanForm.vue
+++ b/src/views/mold/inspectionPlan/InspectionPlanForm.vue
@@ -34,7 +34,7 @@
       </el-form-item>
 
       <el-form-item :label="t('MoldManagement.MoldInspectionPlan.subjectName')" prop="subjectIds">
-        <el-select
+<!--        <el-select
           v-model="formData.subjectIds"
           multiple
           filterable
@@ -43,7 +43,10 @@
           class="!w-full"
         >
           <el-option v-for="item in subjectOptions" :key="item.id" :label="item.subjectName" :value="item.id" />
-        </el-select>
+        </el-select>-->
+        <el-input :model-value="displayItemDevice" readonly clearable class="device-ledger-selection-input"
+                  :placeholder="t('MoldManagement.MoldInspectionPlan.placeholderSubjectSelect')"
+                  @click="openCriticalComponentDialog"   />
       </el-form-item>
     </el-form>
 
@@ -52,13 +55,40 @@
       <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button>
     </template>
   </Dialog>
+  <TableSelectDialog
+    ref="deviceSelectDialogRef"
+    title="选择设备"
+    :columns="deviceColumns"
+    :fetch-api="fetchDeviceLedgerPage"
+    row-key="id"
+    @confirm="handleDeviceSelectConfirm"
+    :query-params="mergedQueryParams"
+    :default-selected-keys="ids"
+  >
+    <!-- 使用 header 插槽插入查询表单 -->
+    <template #header>
+      <el-form ref="searchFormRef" :model="searchParams" :inline="true" >
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="searchParams.deviceCode" placeholder="请输入编号" clearable />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="searchParams.deviceName" placeholder="请输入名称" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleSearch">{{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
+          <el-button @click="resetSearch">{{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+  </TableSelectDialog>
 </template>
 
 <script setup lang="ts">
 import type { FormRules } from 'element-plus'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mold/inspectionItems'
 import { PlanMaintenanceApi, PlanMaintenanceVO } from '@/api/mold/planmaintenance'
-
+import {DeviceLedgerApi, DeviceLedgerVO} from "@/api/mes/deviceledger";
+import TableSelectDialog from '@/components/TableSelectDialog/TableSelectDialog.vue'
 defineOptions({ name: 'MoldInspectionPlanForm' })
 
 const { t } = useI18n()
@@ -74,6 +104,7 @@ const ensureSubjectOptionsLoaded = async () => {
   if (subjectOptions.value.length) return
   const res = await DvSubjectApi.getMoldSubjectAllList()
   const list = Array.isArray(res) ? res : res?.list
+  itemList.value = (list ?? []) as DvSubjectVO[]
   subjectOptions.value = (list ?? []) as DvSubjectVO[]
 }
 
@@ -97,7 +128,94 @@ const parseIds = (value: any): Array<number | string> => {
     })
     .filter((v): v is number | string => v !== undefined)
 }
+const ids = ref([])
+const itemList = ref<DvSubjectVO[]>([])
+const selectedDeviceRows = ref<any[]>([])
+const deviceSelectDialogRef = ref(false)
+const mergedQueryParams = computed(() => ({ ...searchParams }))
+const deviceColumns = [
+  { label: '项目编码', prop: 'subjectCode', minWidth: 140 },
+  { label: '项目名称', prop: 'subjectName', minWidth: 160 },
+  { label: '项目类型', prop: 'subjectType', minWidth: 140 },
+  { label: '项目内容', prop: 'subjectContent', minWidth: 140 }
+]
+
+const fetchDeviceLedgerPage = async (params: Record<string, any>) => {
+  const res = await DvSubjectApi.getDvSubjectPage({
+    ...params,
+  })
+
+  const list = res.list || []
+
+  // 合并已选数据（防止分页丢失）
+  const selectedMap = new Map(
+    selectedDeviceRows.value.map((item) => [item.id, item])
+  )
+
+  return {
+    ...res,
+    list: list.map((item) => ({
+      ...item,
+      ...selectedMap.get(item.id)
+    }))
+  }
+}
+// 1. 自定义表单的查询参数
+const searchParams = reactive({
+  subjectCode: undefined,
+  subjectName: undefined,
+})
+const displayItemDevice = computed( () => {
+  if (!ids.value.length)return ''
+  if (!itemList.value.length) {
+    return formData.value.subjectIds ? String(formData.value.subjectIds) : ''
+  }
+  const map = new Map(itemList.value.map((item) => [item.id, item.subjectName]))
+  const names = ids.value
+    .map((id) => map.get(id))
+    .filter((name) => name)
+  return names.join(',')
+})
+
+const openCriticalComponentDialog = async () => {
+  searchParams.subjectCode=''
+  searchParams.subjectName=''
+  const rows = selectedDeviceRows.value.length
+
+
+  //deviceSelectDialogRef.value?.open(rows)
+  let initIds= formData.value.subjectIds!=undefined?formData.value.subjectIds.toString().split(","):[]
+  deviceSelectDialogRef.value?.open([], {
+    defaultSelectedKeys: initIds
+  })
+  ids.value=initIds.map((id) => Number(id))
+}
 
+const handleDeviceSelectConfirm = (payload: { ids: (number | string)[]; rows: any[] }) => {
+  formData.value.subjectIds = payload.rows
+    .map((item) => {
+      const id = Number(item.id)
+      if (!Number.isFinite(id)) return undefined
+      return {
+        id,
+        name: item.subjectName || item.name || item.code || `设备ID:${id}`
+      }
+    })
+    .filter((item): item is { id: number; name: string } => Boolean(item))
+  selectedDeviceRows.value = payload.rows
+  formData.value.subjectIds = payload.ids.join(',')
+  ids.value = payload.ids.map((id) => Number(id))
+}
+
+const handleSearch = () => {
+  // 触发弹窗内部重新加载数据
+  deviceSelectDialogRef.value?.reload?.()
+}
+const searchFormRef = ref()
+const resetSearch = () => {
+  searchFormRef.value?.resetFields()
+  handleSearch()
+}
 const initFormData = () => ({
   id: undefined as PlanMaintenanceVO['id'],
   planName: '' as string,
@@ -141,6 +259,9 @@ const open = async (type: 'create' | 'update', row?: Partial<PlanMaintenanceVO>)
       description: (row.description as any) ?? '',
       subjectIds: parseIds((row as any).subjectIds ?? (row as any).subjectIdS)
     }
+    ids.value=parseIds((row as any).subjectIds ?? (row as any).subjectIdS)
+  }else{
+    ids.value=[]
   }
 }