From 2cb4dbcd84596920935b778062f36f056b94a01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?=
 <43331987+JiaLiBai@users.noreply.github.com>
Date: Thu, 18 Sep 2025 10:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E4=BD=8D=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ems/site.js                    |  4 +-
 src/views/ems/site/sblb/PointTable.vue | 55 ++++++++++++++------------
 src/views/ems/site/sblb/index.vue      |  2 +-
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/api/ems/site.js b/src/api/ems/site.js
index 73a7f74..0465b0b 100644
--- a/src/api/ems/site.js
+++ b/src/api/ems/site.js
@@ -64,9 +64,9 @@ export function getDeviceList(siteId) {
 }
 
 //获取设备点位table
-export function getDevicePointList({siteId,deviceCategory,pageNum,pageSize}) {
+export function getDevicePointList({siteId,deviceId,deviceCategory,pageNum,pageSize}) {
   return request({
-    url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}`,
+    url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&deviceId=${deviceId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}`,
     method: 'get',
   })
 }
\ No newline at end of file
diff --git a/src/views/ems/site/sblb/PointTable.vue b/src/views/ems/site/sblb/PointTable.vue
index 17c9b19..61774d5 100644
--- a/src/views/ems/site/sblb/PointTable.vue
+++ b/src/views/ems/site/sblb/PointTable.vue
@@ -2,52 +2,52 @@
 <template>
   <el-dialog
       v-loading="loading"
-      :visible.sync="show"
-      title="点位列表"
       :close-on-click-modal="false"
-      show-close
+      :visible.sync="show"
+      append-to-body
+      class="ems-dialog"
       destroy-on-close
       lock-scroll
-      append-to-body
+      show-close
+      title="点位列表"
       width="800px"
-      class="ems-dialog"
   >
     <el-table
-        class="common-table"
         :data="tableData"
-        stripe
+        class="common-table"
         max-height="400px"
+        stripe
         style="width: 100%;">
       <el-table-column
-          prop="dataPoint"
-          label="数据点位">
+          label="数据点位"
+          prop="dataPoint">
       </el-table-column>
       <el-table-column
-          prop="dataPointName"
-          label="数据点位名称">
+          label="数据点位名称"
+          prop="dataPointName">
       </el-table-column>
       <el-table-column
-          prop="pointValue"
-          label="最新值">
+          label="最新值"
+          prop="pointValue">
       </el-table-column>
       <el-table-column
-          prop="updateTime"
-          label="更新时间">
+          label="更新时间"
+          prop="updateTime">
       </el-table-column>
     </el-table>
     <el-pagination
         v-show="tableData.length>0"
-        small
-        background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :pager-count="5"
         :current-page="pageNum"
         :page-size="pageSize"
         :page-sizes="[10, 20, 30, 40]"
-        layout="total, sizes, prev, pager, next, jumper"
+        :pager-count="5"
         :total="totalSize"
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        small
         style="margin-top:15px;text-align: center"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
     >
     </el-pagination>
   </el-dialog>
@@ -82,16 +82,21 @@ export default {
     }
   },
   methods:{
-    showTable({deviceCategory,siteId}){
+    showTable({deviceCategory,siteId,deviceId}){
       this.deviceCategory =deviceCategory
       this.siteId=siteId
+      this.deviceId=deviceId
+      this.tableData=[]
+      this.pageSize=10//分页栏当前每个数据总数
+      this.pageNum=1//分页栏当前页数
+      this.totalSize=0//table表格数据总数
       this.show=true
       this.getData()
     },
     getData(){
       this.loading=true
-      const {siteId,deviceCategory,pageNum,pageSize} =this
-      getDevicePointList({siteId,deviceCategory,pageNum,pageSize}).then(response => {
+      const {siteId,deviceId,deviceCategory,pageNum,pageSize} =this
+      getDevicePointList({siteId,deviceId,deviceCategory,pageNum,pageSize}).then(response => {
         this.tableData=response?.rows || [];
         this.totalSize = response?.total || 0
       }).finally(() => {this.loading=false})
@@ -112,7 +117,7 @@ export default {
   }
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 ::v-deep {
   .card-title .el-radio{
     line-height: 40px;
diff --git a/src/views/ems/site/sblb/index.vue b/src/views/ems/site/sblb/index.vue
index cca460d..108c303 100644
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@@ -152,7 +152,7 @@ export default {
   methods:{
     // 查看设备电位表格
     pointDetail(row){
-      this.$refs.pointTable.showTable({deviceCategory:row.deviceCategory,siteId:row.siteId})
+      this.$refs.pointTable.showTable({deviceCategory:row.deviceCategory,siteId:row.siteId,deviceId:row.deviceId})
     },
     clearEditDeviceData(){
       this.mode = '';