From 493f34afa69f918afaf41107594379092557a28c Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 1 Aug 2024 10:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=98=E7=94=B5?=
 =?UTF-8?q?=E7=AB=99=E5=8F=B0=E8=B4=A6=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../terminal/components/substationLedger.vue  | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/pqs/supervise/terminal/components/substationLedger.vue b/src/views/pqs/supervise/terminal/components/substationLedger.vue
index 7abcc799..7c14e259 100644
--- a/src/views/pqs/supervise/terminal/components/substationLedger.vue
+++ b/src/views/pqs/supervise/terminal/components/substationLedger.vue
@@ -5,7 +5,7 @@
                 <el-form-item label="信息查询">
                     <el-input
                         style="width: 200px"
-                        placeholder="电站名称，终端编号，型号"
+                        placeholder="请输入变电站名称"
                         v-model="tableStore.table.params.searchValue"
                         clearable
                     ></el-input>
@@ -33,14 +33,26 @@ const tableStore = new TableStore({
     isWebPaging: true,
     column: [
         { field: 'substationName', title: '变电站名称', minWidth: 100 },
-        { field: 'dwLineList', title: '电网侧监测点名称', minWidth: 150 },
-        { field: 'yhLineList', title: '非电网侧监测点名称', minWidth: 150 },
+        {
+            field: 'dwLineList',
+            title: '电网侧监测点名称',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                return obj.cellValue.length == 0 ? '/' : obj.cellValue.join('\n')
+            }
+        },
+        {
+            field: 'yhLineList',
+            title: '非电网侧监测点名称',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                return obj.cellValue.length == 0 ? '/' : obj.cellValue.join('\n')
+            }
+        },
         { field: 'alarmFreq', title: '告警频次', minWidth: 80 },
         { field: 'vpollutionData', title: '谐波电压污染值', minWidth: 80 },
         { field: 'ipollutionData', title: '谐波电流污染值', minWidth: 80 }
-    ],
-
-    beforeSearchFun: () => {}
+    ]
 })
 
 tableStore.table.params.searchValue = ''