From 8a2e5d910454536b5c316746134b4274b53bb086 Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Wed, 8 Jul 2026 14:52:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E5=8F=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=86=E6=9E=90=E5=8D=A1=E7=89=87=E6=94=B9=E9=80=A0?=
 =?UTF-8?q?-=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/device/DeviceForm.vue           |   1 +
 src/views/iot/device/index.vue                |  66 ++++-----
 .../iot/historyData/HistorySingleAnalyse.vue  | 134 ++++++++++++++----
 .../historyData/HistorySingleDeviceDialog.vue | 101 ++++++++++++-
 src/views/iot/historyData/index.vue           |  35 ++++-
 5 files changed, 270 insertions(+), 67 deletions(-)

diff --git a/src/views/iot/device/DeviceForm.vue b/src/views/iot/device/DeviceForm.vue
index 5c70ef19..2bbb84e3 100644
--- a/src/views/iot/device/DeviceForm.vue
+++ b/src/views/iot/device/DeviceForm.vue
@@ -17,6 +17,7 @@
       :rules="activeRules"
       label-width="120px"
       v-loading="formLoading"
+      class="pb-20px"
     >
       <template v-if="formType === 'create' || formType === 'update'">
         <el-form-item :label="t('DataCollection.Device.deviceCode')" prop="deviceCode">
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 8c9eba62..d60e9ffe 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <div v-show="!showPointPage">
   <ContentWrap>
     <div class="device-statistics">
       <div
@@ -249,7 +250,7 @@
             <div class="content">
               <div class="info-row">
                 <div class="info-label">
-                  <i>📡</i>
+                  <Icon icon="ep:connection" />
                   采集协议
                 </div>
                 <div class="info-value">
@@ -258,7 +259,7 @@
               </div>
               <div class="info-row">
                 <div class="info-label">
-                  <i>⏱️</i>
+                  <Icon icon="ep:timer" />
                   采集时间
                 </div>
                 <div class="info-value">
@@ -268,7 +269,7 @@
 
               <div class="toggle-container"  @click.stop>
                 <div class="toggle-label">
-                  <i>🔘️</i>
+                  <Icon icon="ep:switch" />
                   是否启用
                 </div>
                 <el-switch
@@ -286,11 +287,11 @@
             <div class="footer"  @click.stop>
               <div class="action-icons">
                 <el-button class="action-btn btn-primary" @click.stop="openDetailForm(item?.id,item?.deviceName)" >
-                  <i>📍</i>
+                  <Icon icon="ep:location" />
                   {{ t('DataCollection.Device.attributeModuleName') }}
                 </el-button>
                 <el-button class="action-btn btn-success"  @click.stop="openForm('setting', item?.id)"  v-hasPermi="['iot:device:update']">
-                  <i>⚙️</i>
+                  <Icon icon="ep:setting" />
                   {{ t('DataCollection.Device.settingDialogTitle') }}
                 </el-button>
 
@@ -306,7 +307,7 @@
                     @click="handleCopy(item?.id)"
                     v-hasPermi="['iot:device:create']"
                   >
-                    📋
+                    <Icon icon="ep:document-copy" />
                   </el-button>
                 </el-tooltip>
                 <el-tooltip
@@ -320,7 +321,7 @@
                     @click.stop="handleEdit(item)"
                     v-hasPermi="['iot:device:update']"
                   >
-                    ✏️
+                    <Icon icon="ep:edit" />
                   </el-button>
                 </el-tooltip>
                 <el-tooltip
@@ -328,7 +329,7 @@
                   placement="top"
                   effect="dark"
                 >
-                <el-button class="icon-btn" @click.stop="changeTable">🏠</el-button>
+                <el-button class="icon-btn" @click.stop="changeTable"><Icon icon="ep:list" /></el-button>
                 </el-tooltip>
               </div>
             </div>
@@ -342,13 +343,19 @@
 
 
   </ContentWrap>
+  </div>
 
   <!-- 表单弹窗：添加/修改 -->
   <DeviceForm ref="formRef" @success="getListOne" />
-  <!-- 子表的列表 -->
-<!--  <ContentWrap v-if="ifShow">
+  <!-- 子表的列表：点位管理整页 -->
+  <ContentWrap v-show="showPointPage">
     <template v-if="attributeDeviceId">
       <div class="mb-10px flex items-center justify-between text-sm text-gray-500">
+        <div>
+          <el-button type="primary" link @click="closePointPage">
+            <Icon icon="ep:arrow-left" class="mr-5px" /> 返回设备列表
+          </el-button>
+        </div>
         <div>
           {{ t('DataCollection.Device.currentDeviceLabel') }}<span class="font-medium text-gray-700">{{ attributeDeviceName || '-' }}</span>
         </div>
@@ -735,7 +742,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
@@ -835,9 +842,6 @@
       />
     </div>
   </Dialog>
-
-  <!-- 表单弹窗：弹出设备属性 -->
-  <DetailForm  ref="detailFormRef"  />
 </template>
 
 <script setup lang="ts">
@@ -856,10 +860,10 @@ import {
   Location
 } from '@element-plus/icons-vue'
 import {useRouter} from "vue-router";
-import DetailForm from "@/views/iot/device/detailForm.vue";
-import {ProductUnitApi, ProductUnitVO} from "@/api/erp/product/unit";
-const ifShow =ref(true)
-const currentView = ref('table') // 'table' 或 'grid'
+
+const ifShow =ref(false)
+const currentView = ref('grid') // 'table' 或 'grid'
+const showPointPage = ref(false) // 是否显示点位管理整页
 // 在 script setup 中
 const noImageUrl =
   'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIHZpZXdCb3g9IjAgMCA4MCA4MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iODAiIGhlaWdodD0iODAiIGZpbGw9IiNFOUVDRUYiLz48dGV4dCB4PSI0MCIgeT0iNDUiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IiM5OTkiIGZvbnQtc2l6ZT0iMTQiPuWbvueJh+WKoOi9veWksei0pTwvdGV4dD48L3N2Zz4='
@@ -1134,13 +1138,18 @@ const formRef = ref()
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
-/** 设备属性弹出框 */
-const detailFormRef = ref()
-const openDetailForm = (id?: number,deviceName?:string) => {
+/** 设备属性弹出框 - 改为整页内嵌显示 */
+const openDetailForm = (id?: number, deviceName?: string) => {
+  if (!id) return
+  attributeDeviceId.value = id
+  attributeDeviceName.value = deviceName || ''
+  deviceTabActive.value = 'deviceAttribute'
+  showPointPage.value = true
+}
+const closePointPage = () => {
+  showPointPage.value = false
   attributeDeviceId.value = undefined
   attributeDeviceName.value = ''
-  detailFormRef.value.open(id,deviceName)
-  //formRef.value.open(id,deviceName)
 }
 
 const enabledChange = (row: DeviceVO, value: boolean) => {
@@ -1252,16 +1261,7 @@ 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
-        }
-  });
-
+  openDetailForm(row?.id, row?.deviceName)
 }
 
 const ruleLoading = ref(false)
diff --git a/src/views/iot/historyData/HistorySingleAnalyse.vue b/src/views/iot/historyData/HistorySingleAnalyse.vue
index 99d1d40b..6a468a70 100644
--- a/src/views/iot/historyData/HistorySingleAnalyse.vue
+++ b/src/views/iot/historyData/HistorySingleAnalyse.vue
@@ -125,33 +125,24 @@
                 </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 v-for="group in filteredPointGroups" :key="group.group" class="point-group-card">
+                    <div class="point-group-header">{{ group.group }} ({{ group.points.length }})</div>
+                    <div class="point-card-grid">
+                      <div
+                        v-for="point in group.points"
+                        :key="point.code"
+                        :class="['point-card', { 'point-card--selected': selectedPointCodes.includes(point.code) }]"
+                        @click="togglePoint(point.code)"
+                      >
+                        <div class="point-card-name">{{ point.name }}</div>
+                        <div class="point-card-code">{{ point.code }}</div>
+                        <div class="point-card-meta">
+                          <span class="point-card-unit">{{ point.unit }}</span>
+                          <span class="point-card-range">{{ point.lower }} ~ {{ point.upper }}</span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </el-form-item>
@@ -465,6 +456,15 @@ const pointKeyword = ref('')
 const activePointGroup = ref([])
 const selectedPointCodes = ref([])
 
+const togglePoint = (code: string) => {
+  const idx = selectedPointCodes.value.indexOf(code)
+  if (idx > -1) {
+    selectedPointCodes.value.splice(idx, 1)
+  } else {
+    selectedPointCodes.value.push(code)
+  }
+}
+
 // 计算属性
 const selectedPoints = computed(() => {
   const allPoints = pointGroups.value.flatMap(g => g.points)
@@ -1177,9 +1177,87 @@ window.addEventListener('resize', () => {
     }
 
     .point-list {
-      max-height: 230px;
+      max-height: 320px;
       overflow: auto;
       padding: 12px;
+
+      .point-group-card {
+        margin-bottom: 12px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .point-group-header {
+        margin-bottom: 8px;
+        padding: 4px 0;
+        font-size: 13px;
+        font-weight: 600;
+        color: #344054;
+      }
+
+      .point-card-grid {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+        gap: 8px;
+      }
+
+      .point-card {
+        padding: 10px 12px;
+        background: #fff;
+        border: 1px solid var(--el-border-color);
+        border-radius: 6px;
+        cursor: pointer;
+        transition: all 0.15s ease;
+
+        &:hover {
+          border-color: var(--el-color-primary-light-3);
+          box-shadow: 0 2px 8px rgba(15, 23, 42, 0.06);
+        }
+
+        &--selected {
+          border-color: var(--el-color-primary);
+          background: var(--el-color-primary-light-9);
+          box-shadow: 0 2px 8px rgba(var(--el-color-primary-rgb, 64, 158, 255), 0.12);
+        }
+
+        .point-card-name {
+          font-size: 14px;
+          font-weight: 600;
+          color: #1d2939;
+          margin-bottom: 4px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .point-card-code {
+          font-size: 11px;
+          color: var(--el-text-color-placeholder);
+          margin-bottom: 6px;
+          word-break: break-all;
+          overflow-wrap: break-word;
+          line-height: 1.4;
+        }
+
+        .point-card-meta {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          gap: 6px;
+          font-size: 11px;
+
+          .point-card-unit {
+            color: var(--el-color-primary);
+            font-weight: 500;
+          }
+
+          .point-card-range {
+            color: var(--el-text-color-secondary);
+          }
+        }
+      }
     }
   }
 }
diff --git a/src/views/iot/historyData/HistorySingleDeviceDialog.vue b/src/views/iot/historyData/HistorySingleDeviceDialog.vue
index a53905ac..ab53a28f 100644
--- a/src/views/iot/historyData/HistorySingleDeviceDialog.vue
+++ b/src/views/iot/historyData/HistorySingleDeviceDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="1100" :scroll="true" max-height="80vh" align-center>
+  <Dialog v-if="mode === 'dialog'" v-model="dialogVisible" :title="dialogTitle" width="1100" :scroll="true" max-height="80vh" align-center>
     <div class="single-device-dialog">
       <el-form class="-mb-15px history-single-device-form" :inline="true" label-width="auto">
         <el-form-item :label="t('DataCollection.HistoryData.dialogCollectionTimeLabel')">
@@ -85,6 +85,91 @@ v-for="col in section.columns" :key="col.prop" :prop="col.prop" :label="col.labe
       />
     </template>
   </Dialog>
+
+  <ContentWrap v-else>
+    <div class="single-device-dialog">
+      <el-form class="-mb-15px history-single-device-form" :inline="true" label-width="auto">
+        <el-form-item :label="t('DataCollection.HistoryData.dialogCollectionTimeLabel')">
+          <el-date-picker
+            v-model="collectionTimeRange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="datetimerange"
+            :start-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeStartPlaceholder')"
+            :end-placeholder="t('DataCollection.HistoryData.dialogCollectionTimeEndPlaceholder')"
+            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+            class="!w-280px"
+          />
+        </el-form-item>
+        <el-form-item :label="t('DataCollection.HistoryData.dialogPointFilterLabel')">
+          <el-select
+            v-model="attributeCodes"
+            class="!w-280px"
+            multiple
+            :max-collapse-tags="1"
+            collapse-tags
+            collapse-tags-tooltip
+            filterable
+            clearable
+            :loading="attributeLoading"
+            :placeholder="t('DataCollection.HistoryData.dialogPointFilterPlaceholder')"
+          >
+            <el-option
+              v-for="item in attributeOptions"
+              :key="item.attributeCode"
+              :label="item.label"
+              :value="item.attributeCode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery">{{ t('DataCollection.HistoryData.dialogSearchButtonText') }}</el-button>
+          <el-button @click="resetQuery">{{ t('DataCollection.HistoryData.dialogResetButtonText') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <ContentWrap v-loading="loading">
+        <div v-if="recordGroups.length" class="single-device-dialog__record-list">
+          <div v-for="group in recordGroups" :key="group.key" class="single-device-dialog__record">
+            <div class="single-device-dialog__record-title">
+              {{ t('DataCollection.HistoryData.dialogRecordCollectionTimePrefix') }}{{ group.collectTime || '-' }}
+            </div>
+            <div v-if="group.sections.length" class="single-device-dialog__table-grid">
+              <div
+v-for="section in group.sections" :key="`${group.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"
+                  :description="t('DataCollection.HistoryData.emptyDescription')"
+                />
+                <el-table
+v-else :data="section.rows" :border="true" :header-cell-style="headerCellStyle"
+                  :cell-style="bodyCellStyle" size="small">
+                  <el-table-column
+v-for="col in section.columns" :key="col.prop" :prop="col.prop" :label="col.label"
+                    align="center">
+                    <template #default="scope">
+                      <span>{{ formatCell(scope.row[col.prop]) }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+            <el-empty v-else :description="t('DataCollection.HistoryData.emptyDescription')" />
+          </div>
+        </div>
+        <el-empty v-else :description="t('DataCollection.HistoryData.emptyDescription')" />
+      </ContentWrap>
+    </div>
+    <Pagination
+      v-if="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="fetchHistory"
+    />
+  </ContentWrap>
 </template>
 
 <script setup lang="ts">
@@ -116,7 +201,9 @@ const props = defineProps<{
   modelValue: boolean
   deviceId?: string | number
   deviceName?: string
+  mode?: 'dialog' | 'inline'
 }>()
+const mode = computed(() => props.mode ?? 'dialog')
 
 const emit = defineEmits<{
   (e: 'update:modelValue', value: boolean): void
@@ -325,9 +412,12 @@ const resetQuery = () => {
 }
 
 watch(
-  () => [props.modelValue, props.deviceId],
-  ([visible]) => {
-    if (!visible) {
+  () => [props.modelValue, props.deviceId, mode.value],
+  ([visible, deviceIdVal]) => {
+    if (mode.value === 'dialog' && !visible) {
+      return
+    }
+    if (deviceIdVal === undefined || deviceIdVal === null || deviceIdVal === '') {
       return
     }
     collectionTimeRange.value = buildLastHoursRange(4)
@@ -336,7 +426,8 @@ watch(
     queryParams.pageSize = 10
     fetchDeviceAttributes()
     fetchHistory()
-  }
+  },
+  { immediate: true }
 )
 </script>
 
diff --git a/src/views/iot/historyData/index.vue b/src/views/iot/historyData/index.vue
index a5bd3918..60c2363a 100644
--- a/src/views/iot/historyData/index.vue
+++ b/src/views/iot/historyData/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <div v-show="!showHistoryPage">
   <ContentWrap>
     <el-form
       class="-mb-15px history-data-form"
@@ -135,6 +136,28 @@
       @pagination="getList"
     />
   </ContentWrap>
+  </div>
+
+  <!-- 历史记录整页 -->
+  <ContentWrap v-show="showHistoryPage">
+    <div class="mb-10px flex items-center justify-between text-sm text-gray-500">
+      <div>
+        <el-button type="primary" link @click="closeHistoryPage">
+          <Icon icon="ep:arrow-left" class="mr-5px" /> 返回历史记录列表
+        </el-button>
+      </div>
+      <div>
+        {{ t('DataCollection.HistoryData.dialogTitlePrefix') }}<span class="font-medium text-gray-700">{{ singleDeviceName || '-' }}</span>
+      </div>
+      <div></div>
+    </div>
+    <HistorySingleDeviceDialog
+      v-model="historyInlineVisible"
+      :device-id="singleDeviceId"
+      :device-name="singleDeviceName"
+      mode="inline"
+    />
+  </ContentWrap>
 
   <HistorySingleDeviceDialog
     v-model="singleDialogVisible"
@@ -202,6 +225,8 @@ const handleSelectionChange = (rows: LineDeviceVO[]) => {
 const singleDialogVisible = ref(false)
 const singleDeviceId = ref<string | number>()
 const singleDeviceName = ref<string>('')
+const showHistoryPage = ref(false)
+const historyInlineVisible = ref(false)
 
 const buildQueryParams = (): LineDevicePageParams => {
   const params: LineDevicePageParams = {
@@ -254,7 +279,15 @@ const handleSingleView = (row: LineDeviceVO) => {
   }
   singleDeviceId.value = deviceId
   singleDeviceName.value = row.deviceName || ''
-  singleDialogVisible.value = true
+  historyInlineVisible.value = true
+  showHistoryPage.value = true
+}
+
+const closeHistoryPage = () => {
+  showHistoryPage.value = false
+  historyInlineVisible.value = false
+  singleDeviceId.value = ''
+  singleDeviceName.value = ''
 }
 
 const handleSingleAnalyseView = (row: LineDeviceVO) => {

From 4fc2af244447702f5f7040befb136aa36058d0c0 Mon Sep 17 00:00:00 2001
From: zhongwenkai <3478244299@qq.com>
Date: Wed, 8 Jul 2026 16:42:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=9A=84=E4=BA=A7=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81-=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=20&=20=E5=8D=95=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/DeviceAttributeList.vue | 21 +++++++++-
 src/views/iot/deviceattributetype/index.vue   |  1 +
 src/views/iot/historyData/index.vue           | 38 +++++++++++++++---
 .../SingleDeviceMonitorDialog.vue             | 12 +++++-
 src/views/iot/realTimeMonitoring/index.vue    | 39 +++++++++++++++----
 5 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue
index bc29675f..486f439f 100644
--- a/src/views/iot/device/components/DeviceAttributeList.vue
+++ b/src/views/iot/device/components/DeviceAttributeList.vue
@@ -82,7 +82,7 @@
 
   <ContentWrap>
     <el-table
-ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
+ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" :max-height="planTableMaxHeight" row-key="id"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" reserve-selection />
       <el-table-column
@@ -185,6 +185,7 @@ ref="tableRef" v-loading="loading" :data="list" :stripe="true" :show-overflow-to
       </el-table-column>
     </el-table>
     <Pagination
+ref="planPaginationRef"
 :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
   </ContentWrap>
@@ -207,6 +208,17 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const tableRef = ref()
+const planTableMaxHeight = ref(520)
+const planPaginationRef = ref<HTMLElement>()
+
+const updatePlanTableMaxHeight = async () => {
+  await nextTick()
+  const tableTop = tableRef.value?.$el?.getBoundingClientRect().top ?? 0
+  const paginationHeight = planPaginationRef.value?.getBoundingClientRect().height ?? 72
+  const pageBottomGap = 56
+  const availableHeight = window.innerHeight - tableTop - paginationHeight - pageBottomGap
+  planTableMaxHeight.value = Math.min(window.innerHeight, Math.max(240, Math.floor(availableHeight)))
+}
 
 const props = defineProps<{
   deviceId?: number // 设备id（主表的关联字段）
@@ -279,6 +291,7 @@ async function getList() {
     total.value = data.total
   } finally {
     loading.value = false
+    updatePlanTableMaxHeight()
   }
 }
 
@@ -380,5 +393,11 @@ onMounted(async () => {
   } catch {
     typeList.value = []
   }
+  updatePlanTableMaxHeight()
+  window.addEventListener('resize', updatePlanTableMaxHeight)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', updatePlanTableMaxHeight)
 })
 </script>
diff --git a/src/views/iot/deviceattributetype/index.vue b/src/views/iot/deviceattributetype/index.vue
index ec626fff..1a8dbb9c 100644
--- a/src/views/iot/deviceattributetype/index.vue
+++ b/src/views/iot/deviceattributetype/index.vue
@@ -133,6 +133,7 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
+      ref="planPaginationRef"
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
diff --git a/src/views/iot/historyData/index.vue b/src/views/iot/historyData/index.vue
index 60c2363a..65728f9a 100644
--- a/src/views/iot/historyData/index.vue
+++ b/src/views/iot/historyData/index.vue
@@ -27,20 +27,26 @@
         />
       </el-form-item>
        <el-form-item :label="t('DataCollection.HistoryData.searchLineCodeLabel')" prop="lineNode">
-        <el-input
+        <el-tree-select
           v-model="queryParams.lineNode"
-          :placeholder="t('DataCollection.HistoryData.searchLineCodePlaceholder')"
+          :data="lineTreeData"
+          :props="{ label: 'code', value: 'code', children: 'children' }"
+          check-strictly
+          placeholder="请选择产线编码"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
           class="!w-240px"
         />
       </el-form-item>
       <el-form-item :label="t('DataCollection.HistoryData.searchLineNameLabel')" prop="lineName" v-show="showAllFilters">
-        <el-input
+        <el-tree-select
           v-model="queryParams.lineName"
-          :placeholder="t('DataCollection.HistoryData.searchLineNamePlaceholder')"
+          :data="lineTreeData"
+          :props="{ label: 'name', value: 'name', children: 'children' }"
+          check-strictly
+          placeholder="请选择产线名称"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
           class="!w-240px"
         />
       </el-form-item>
@@ -130,6 +136,7 @@
       </el-table-column>
     </el-table>
     <Pagination
+      ref="planPaginationRef"
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
@@ -170,6 +177,7 @@
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DeviceApi, LineDeviceVO, LineDevicePageParams } from '@/api/iot/device'
+import { DeviceLineApi, DeviceLineTreeVO } from '@/api/mes/deviceline'
 import HistorySingleDeviceDialog from './HistorySingleDeviceDialog.vue'
 import {useRouter} from "vue-router";
 // 路由
@@ -213,6 +221,21 @@ const queryParams = reactive({
 })
 
 const queryFormRef = ref()
+const lineTreeData = ref<DeviceLineTreeVO[]>([])
+const lineTreeLoading = ref(false)
+
+/** 获取产线树数据 */
+const fetchLineTree = async () => {
+  lineTreeLoading.value = true
+  try {
+    const res = await DeviceLineApi.getDeviceLineTree()
+    lineTreeData.value = Array.isArray(res) ? res : (res?.data || res?.list || [])
+  } catch (e) {
+    console.error('获取产线树失败', e)
+  } finally {
+    lineTreeLoading.value = false
+  }
+}
 
 const selectedIds = ref<(string | number)[]>([])
 const handleSelectionChange = (rows: LineDeviceVO[]) => {
@@ -269,6 +292,8 @@ const handleQuery = () => {
 
 const resetQuery = () => {
   queryFormRef.value?.resetFields()
+  queryParams.lineNode = undefined
+  queryParams.lineName = undefined
   handleQuery()
 }
 
@@ -313,6 +338,7 @@ const handleSingleAnalyseView = (row: LineDeviceVO) => {
 
 onMounted(() => {
   getList()
+  fetchLineTree()
   updatePlanTableMaxHeight()
   window.addEventListener('resize', updatePlanTableMaxHeight)
 })
diff --git a/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue b/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
index d1db069a..92b06b84 100644
--- a/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
+++ b/src/views/iot/realTimeMonitoring/SingleDeviceMonitorDialog.vue
@@ -3,7 +3,10 @@
     <div class="single-device-dialog">
       <div class="single-device-dialog__header">
         <div>{{ t('DataCollection.RealTimeMonitoring.dialogDeviceNameLabel') }}{{ deviceName || '-' }}</div>
-        <div>{{ t('DataCollection.RealTimeMonitoring.dialogCollectionTimeLabel') }}{{ displayTime }}</div>
+        <div class="single-device-dialog__header-right">
+          <el-button :icon="Refresh" :loading="loading" size="small" @click="fetchList">刷新</el-button>
+          <span>{{ t('DataCollection.RealTimeMonitoring.dialogCollectionTimeLabel') }}{{ displayTime }}</span>
+        </div>
       </div>
       <ContentWrap v-loading="loading">
         <div v-if="sections.length" class="single-device-dialog__table-grid">
@@ -53,6 +56,7 @@ v-for="col in section.columns" :key="col.prop" :prop="col.prop" :label="col.labe
 
 <script setup lang="ts">
 import { formatDate } from '@/utils/formatTime'
+import { Refresh } from '@element-plus/icons-vue'
 import { DeviceApi } from '@/api/iot/device'
 
 type SectionColumn = {
@@ -270,6 +274,12 @@ watch(
   color: var(--el-text-color-primary);
 }
 
+.single-device-dialog__header-right {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
 .single-device-dialog__table-grid {
   display: grid;
   grid-template-columns: repeat(1, minmax(0, 1fr));
diff --git a/src/views/iot/realTimeMonitoring/index.vue b/src/views/iot/realTimeMonitoring/index.vue
index 06644b7e..e11255d1 100644
--- a/src/views/iot/realTimeMonitoring/index.vue
+++ b/src/views/iot/realTimeMonitoring/index.vue
@@ -26,20 +26,26 @@
         />
       </el-form-item>
        <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineCodeLabel')" prop="lineNode">
-        <el-input
+        <el-tree-select
           v-model="queryParams.lineNode"
-          :placeholder="t('DataCollection.RealTimeMonitoring.searchLineCodePlaceholder')"
+          :data="lineTreeData"
+          :props="{ label: 'code', value: 'code', children: 'children' }"
+          check-strictly
+          placeholder="请选择产线编码"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
           class="!w-240px"
         />
       </el-form-item>
       <el-form-item :label="t('DataCollection.RealTimeMonitoring.searchLineNameLabel')" prop="lineName" v-show="showAllFilters">
-        <el-input
+        <el-tree-select
           v-model="queryParams.lineName"
-          :placeholder="t('DataCollection.RealTimeMonitoring.searchLineNamePlaceholder')"
+          :data="lineTreeData"
+          :props="{ label: 'name', value: 'name', children: 'children' }"
+          check-strictly
+          placeholder="请选择产线名称"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
           class="!w-240px"
         />
       </el-form-item>
@@ -153,6 +159,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DeviceApi, LineDeviceVO } from '@/api/iot/device'
+import { DeviceLineApi, DeviceLineTreeVO } from '@/api/mes/deviceline'
 import SingleDeviceMonitorDialog from './SingleDeviceMonitorDialog.vue'
 
 defineOptions({ name: 'RealTimeMonitoring' })
@@ -195,6 +202,21 @@ const queryParams = reactive({
   collectionTime: undefined
 })
 const queryFormRef = ref()
+const lineTreeData = ref<DeviceLineTreeVO[]>([])
+const lineTreeLoading = ref(false)
+
+/** 获取产线树数据 */
+const fetchLineTree = async () => {
+  lineTreeLoading.value = true
+  try {
+    const res = await DeviceLineApi.getDeviceLineTree()
+    lineTreeData.value = Array.isArray(res) ? res : (res?.data || res?.list || [])
+  } catch (e) {
+    console.error('获取产线树失败', e)
+  } finally {
+    lineTreeLoading.value = false
+  }
+}
 
 const selectedIds = ref<(string | number)[]>([])
 const handleSelectionChange = (rows: LineDeviceVO[]) => {
@@ -243,7 +265,9 @@ const handleQuery = () => {
 }
 
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
+  queryParams.lineNode = undefined
+  queryParams.lineName = undefined
   handleQuery()
 }
 
@@ -277,6 +301,7 @@ const handleExport = async () => {
 
 onMounted(() => {
   getList()
+  fetchLineTree()
   updatePlanTableMaxHeight()
   window.addEventListener('resize', updatePlanTableMaxHeight)
 })