From 0ddf3eb46bfb8815a98f8be70683430d440ef136 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 8 Aug 2023 15:55:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E7=AB=99=E7=82=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=A1=A9=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/pile/PileConnectorInfoMapper.xml |  1 +
 jsowell-ui/src/views/pile/station/pileList.vue        | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
index 73d60bbe8..5e8fecae6 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml
@@ -140,6 +140,7 @@
         t1.id as connectorId,
         t1.station_id as stationId,
         t1.sn as pileSn,
+        t1.name as name,
         t2.pile_connector_code as pileConnectorCode,
         t2.status,
         t1.merchant_id as merchantId,
diff --git a/jsowell-ui/src/views/pile/station/pileList.vue b/jsowell-ui/src/views/pile/station/pileList.vue
index df958ef09..38e5a69e7 100644
--- a/jsowell-ui/src/views/pile/station/pileList.vue
+++ b/jsowell-ui/src/views/pile/station/pileList.vue
@@ -64,6 +64,14 @@
                     </router-link>
                 </template>
             </el-table-column>
+            <el-table-column label="运营类型" align="center" prop="businessType">
+                <template slot-scope="scope">
+                    <dict-tag
+                        :options="dict.type.pile_business_type"
+                        :value="scope.row.businessType"
+                    />
+                </template>
+            </el-table-column>
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag
@@ -73,6 +81,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="接口数量" align="center" prop="gunNum" />
+            <el-table-column label="密钥" align="center" prop="secretKey" />
             <el-table-column label="电桩类型" align="center" prop="pileType">
                 <template slot-scope="scope">
                     <dict-tag
@@ -202,7 +211,7 @@ import { listModel } from "@/api/pile/model";
 
 export default {
     name: "PileList",
-    dicts: ["pile_status", "software_protocol", "connector_type"],
+    dicts: ["pile_status", "software_protocol", "connector_type", "pile_business_type"],
     props: {
         stationId: "",
     },