From ad87591274d604e631231e9f6db7f7ded3c2f8a8 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Wed, 9 Aug 2023 15:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9element=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/basic/detail.vue    | 257 +++++++++++++-----
 .../pile/station/components/SiteInfo.vue      |  21 +-
 2 files changed, 198 insertions(+), 80 deletions(-)

diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue
index 057cd558a..8de244b9b 100644
--- a/jsowell-ui/src/views/pile/basic/detail.vue
+++ b/jsowell-ui/src/views/pile/basic/detail.vue
@@ -1,22 +1,31 @@
 <template>
     <div class="app-container">
         <!-- 标签页 -->
-        <el-tabs
-            value="first"
-            type="border-card"
-            @tab-click="handleClick"
-        >
+        <el-tabs value="first" type="border-card" @tab-click="handleClick">
             <el-tab-pane label="基本信息" name="first">
                 <el-row type="flex" justify="space-between">
                     <!-- 左侧内容 -->
                     <el-col :span="5">
                         <!-- 充电设备 -->
                         <div class="advContent">
-                            <el-card class="box-card" shadow="hover" v-loading="pileDetailLoading">
+                            <el-card
+                                class="box-card"
+                                shadow="hover"
+                                v-loading="pileDetailLoading"
+                            >
                                 <div slot="header" class="clearfix">
-                                    <span>充电设备(<span style="color: #bf1c1c">{{ status }}</span>)</span>
-                                    <el-button icon="el-icon-refresh-right" style="float: right; padding: 3px 0"
-                                               type="text" @click="getPileDetail">刷新
+                                    <span
+                                        >充电设备(<span
+                                            style="color: #bf1c1c"
+                                            >{{ status }}</span
+                                        >)</span
+                                    >
+                                    <el-button
+                                        icon="el-icon-refresh-right"
+                                        style="float: right; padding: 3px 0"
+                                        type="text"
+                                        @click="getPileDetail"
+                                        >刷新
                                     </el-button>
                                 </div>
                                 <!--二维码-->
@@ -37,29 +46,44 @@
                                             label="SN"
                                             labelStyle="width: 80px"
                                             contentStyle="width: 150px"
-                                        >{{ pileDetail.pileSn }}
+                                            >{{ pileDetail.pileSn }}
                                         </el-descriptions-item>
                                         <el-descriptions-item>
                                             <template slot="label">
                                                 别名
-                                                <el-button type="text" icon="el-icon-edit" size="medium" circle
-                                                           @click="openEdit" v-hasPermi="['pile:basic:edit']"/>
+                                                <el-button
+                                                    type="text"
+                                                    icon="el-icon-edit"
+                                                    size="medium"
+                                                    circle
+                                                    @click="openEdit"
+                                                    v-hasPermi="[
+                                                        'pile:basic:edit',
+                                                    ]"
+                                                />
                                             </template>
-                                            <el-input v-model="pileDetail.name" size="medium" clearable
-                                                      :disabled="clearableFlag">
+                                            <el-input
+                                                v-model="pileDetail.name"
+                                                size="medium"
+                                                clearable
+                                                :disabled="clearableFlag"
+                                            >
                                                 <template slot="append">
-                                                    <el-button type="text" icon="el-icon-check" size="medium"
-                                                               circle @click="updateName"/>
+                                                    <el-button
+                                                        type="text"
+                                                        size="medium"
+                                                        circle
+                                                        @click="updateName"
+                                                        >保存</el-button
+                                                    >
                                                 </template>
                                             </el-input>
                                         </el-descriptions-item>
-                                        <el-descriptions-item label="运营商">{{
-                                                pileDetail.merchantName
-                                            }}
+                                        <el-descriptions-item label="运营商"
+                                            >{{ pileDetail.merchantName }}
                                         </el-descriptions-item>
-                                        <el-descriptions-item label="站点">{{
-                                                pileDetail.stationName
-                                            }}
+                                        <el-descriptions-item label="站点"
+                                            >{{ pileDetail.stationName }}
                                         </el-descriptions-item>
                                         <!--<el-descriptions-item label="厂商">
                                           <el-tag size="small">举视</el-tag>
@@ -67,33 +91,37 @@
                                         <!--                    <el-descriptions-item label="使用车辆类型">{{
                                           pileDetail.matchCars
                                         }}</el-descriptions-item>-->
-                                        <el-descriptions-item label="设备型号">{{ pileDetail.modelName }}
+                                        <el-descriptions-item label="设备型号"
+                                            >{{ pileDetail.modelName }}
                                         </el-descriptions-item>
-                                        <el-descriptions-item label="额定功率(kW)">{{
-                                                pileDetail.ratedPower
-                                            }}
+                                        <el-descriptions-item
+                                            label="额定功率(kW)"
+                                            >{{ pileDetail.ratedPower }}
                                         </el-descriptions-item>
                                         <!--<el-descriptions-item label="额定电压(V)">{{pileDetail.sn}}</el-descriptions-item>-->
-                                        <el-descriptions-item label="额定电流(A)">{{
-                                                pileDetail.ratedCurrent
-                                            }}
+                                        <el-descriptions-item
+                                            label="额定电流(A)"
+                                            >{{ pileDetail.ratedCurrent }}
                                         </el-descriptions-item>
 
-                                        <el-descriptions-item label="iccid">{{
-                                                pileDetail.iccid
-                                            }}
+                                        <el-descriptions-item label="iccid"
+                                            >{{ pileDetail.iccid }}
                                         </el-descriptions-item>
 
                                         <el-descriptions-item label="sim卡商">
                                             <dict-tag
-                                                :options="dict.type.sim_supplier"
+                                                :options="
+                                                    dict.type.sim_supplier
+                                                "
                                                 :value="pileDetail.simSupplier"
                                             />
                                         </el-descriptions-item>
 
                                         <el-descriptions-item label="卡运营商">
                                             <dict-tag
-                                                :options="dict.type.sim_operator"
+                                                :options="
+                                                    dict.type.sim_operator
+                                                "
                                                 :value="pileDetail.operator"
                                             />
                                         </el-descriptions-item>
@@ -116,8 +144,12 @@
                         <el-card class="box-card" shadow="hover">
                             <div style="margin: 12px 0">
                                 <span>接口列表</span>
-                                <el-button icon="el-icon-refresh-right" style="float: right; padding: 3px 0" type="text"
-                                           @click="refreshPileConnectorList">刷新
+                                <el-button
+                                    icon="el-icon-refresh-right"
+                                    style="float: right; padding: 3px 0"
+                                    type="text"
+                                    @click="refreshPileConnectorList"
+                                    >刷新
                                 </el-button>
                             </div>
                             <!--<div style="margin-top: 20px">
@@ -150,10 +182,15 @@
                                         align="center"
                                     >
                                         <template slot-scope="scope">
-                                            <el-link @click="qrcodeClick(scope.row)">
+                                            <el-link
+                                                @click="qrcodeClick(scope.row)"
+                                            >
                                                 <vue-qr
                                                     ref="Qrcode"
-                                                    :text="scope.row.connectorQrCodeUrl"
+                                                    :text="
+                                                        scope.row
+                                                            .connectorQrCodeUrl
+                                                    "
                                                     qid="scope.row.connectorId"
                                                     :width="qrWidth"
                                                 />
@@ -168,7 +205,9 @@
                                     >
                                         <template slot-scope="scope">
                                             <dict-tag
-                                                :options="dict.type.connector_status"
+                                                :options="
+                                                    dict.type.connector_status
+                                                "
                                                 :value="scope.row.status"
                                             />
                                         </template>
@@ -181,7 +220,9 @@
                                     >
                                         <template slot-scope="scope">
                                             <dict-tag
-                                                :options="dict.type.connector_type"
+                                                :options="
+                                                    dict.type.connector_type
+                                                "
                                                 :value="scope.row.type"
                                             />
                                         </template>
@@ -192,7 +233,11 @@
                                         prop="instantPower"
                                         label="即时功率（kW）"
                                     />
-                                    <el-table-column prop="soc" label="SOC(°C)" align="center"/>
+                                    <el-table-column
+                                        prop="soc"
+                                        label="SOC(°C)"
+                                        align="center"
+                                    />
                                     <el-table-column
                                         prop="equipmentOrderNum"
                                         label="设备订单号"
@@ -210,14 +255,36 @@
                                     <!--                      <span>{{scope.row.businessType === '1' ? '运营桩':'个人桩'}}</span>-->
                                     <!--                    </template>-->
                                     <!--                  </el-table-column>-->
-                                    <el-table-column label="地锁操作" align="center" v-hasRole="['admin', 'common']"
-                                                     class-name="small-padding fixed-width">
+                                    <el-table-column
+                                        label="地锁操作"
+                                        align="center"
+                                        v-hasRole="['admin', 'common']"
+                                        class-name="small-padding fixed-width"
+                                    >
                                         <template slot-scope="scope">
-                                            <el-button size="mini" type="text" icon="el-icon-caret-bottom"
-                                                       @click="remoteControlGroundLock(scope.row, '0')">降锁
+                                            <el-button
+                                                size="mini"
+                                                type="text"
+                                                icon="el-icon-caret-bottom"
+                                                @click="
+                                                    remoteControlGroundLock(
+                                                        scope.row,
+                                                        '0'
+                                                    )
+                                                "
+                                                >降锁
                                             </el-button>
-                                            <el-button size="mini" type="text" icon="el-icon-caret-top"
-                                                       @click="remoteControlGroundLock(scope.row, '1')">升锁
+                                            <el-button
+                                                size="mini"
+                                                type="text"
+                                                icon="el-icon-caret-top"
+                                                @click="
+                                                    remoteControlGroundLock(
+                                                        scope.row,
+                                                        '1'
+                                                    )
+                                                "
+                                                >升锁
                                             </el-button>
                                         </template>
                                     </el-table-column>
@@ -227,14 +294,37 @@
                         <el-card style="margin-top: 20px" shadow="hover">
                             <div style="margin: 12px 0">
                                 <span>充电桩通信日志</span>
-                                <el-button icon="el-icon-refresh-right" style="float: right; padding: 3px 0" type="text"
-                                           @click="getFeedList">刷新
+                                <el-button
+                                    icon="el-icon-refresh-right"
+                                    style="float: right; padding: 3px 0"
+                                    type="text"
+                                    @click="getFeedList"
+                                    >刷新
                                 </el-button>
                             </div>
-                            <el-table :data="feedList" stripe style="width: 100%" v-loading="feedListLoading">
-                                <el-table-column prop="createTime" label="触发时间" align="center" width="200"/>
-                                <el-table-column prop="description" label="描述" align="center" width="200"/>
-                                <el-table-column prop="originalMsg" label="原始报文" align="center"/>
+                            <el-table
+                                :data="feedList"
+                                stripe
+                                style="width: 100%"
+                                v-loading="feedListLoading"
+                            >
+                                <el-table-column
+                                    prop="createTime"
+                                    label="触发时间"
+                                    align="center"
+                                    width="200"
+                                />
+                                <el-table-column
+                                    prop="description"
+                                    label="描述"
+                                    align="center"
+                                    width="200"
+                                />
+                                <el-table-column
+                                    prop="originalMsg"
+                                    label="原始报文"
+                                    align="center"
+                                />
                             </el-table>
                             <!--分页-->
                             <pagination
@@ -257,22 +347,29 @@
 </template>
 
 <script>
-import remoteUpgrade from './components/remoteUpgrade.vue';
+import remoteUpgrade from "./components/remoteUpgrade.vue";
 import {
     getPileDetailById,
     getPileFeedList,
-    listBasic, updateBasic, updatePileName,
+    listBasic,
+    updateBasic,
+    updatePileName,
 } from "@/api/pile/basic";
-import {queryConnectorListByParams} from "@/api/pile/connector";
+import { queryConnectorListByParams } from "@/api/pile/connector";
 // 二维码组件
 import VueQr from "vue-qr";
-import {remoteControlGroundLock} from "@/api/pile/pileRemote";
+import { remoteControlGroundLock } from "@/api/pile/pileRemote";
 import Template from "@/views/billing/template";
 
 export default {
-    components: {Template, VueQr, remoteUpgrade},
+    components: { Template, VueQr, remoteUpgrade },
     name: "pile-detail",
-    dicts: ["connector_status", "connector_type", "sim_supplier", "sim_operator"],
+    dicts: [
+        "connector_status",
+        "connector_type",
+        "sim_supplier",
+        "sim_operator",
+    ],
     data() {
         return {
             clearableFlag: true,
@@ -285,7 +382,7 @@ export default {
             connectorList: [],
             stationId: 1,
             // 充电桩详情 竖向 表格渲染的数据
-            pileDetail: {url: ""},
+            pileDetail: { url: "" },
             feedListLoading: false,
             qrWidth: 60,
             flag: true,
@@ -326,8 +423,7 @@ export default {
         this.queryPileConnectorList();
     },
     mounted() {
-        setTimeout(() => {
-        }, 300);
+        setTimeout(() => {}, 300);
     },
     methods: {
         // 遥控地锁
@@ -337,9 +433,9 @@ export default {
             const pileConnectorCode = row.pileConnectorCode;
             const connectorCode = pileConnectorCode.replace(pileSn, "");
             var data = {
-                "pileSn": pileSn,
-                "connectorCode": connectorCode,
-                "operate": operate
+                pileSn: pileSn,
+                connectorCode: connectorCode,
+                operate: operate,
             };
             remoteControlGroundLock(data).then((response) => {
                 console.log("后管遥控地锁结果：", response);
@@ -388,22 +484,22 @@ export default {
                 id: this.pileDetail.pileId,
                 name: this.pileDetail.name,
                 sn: this.pileDetail.pileSn,
-                stationId: this.pileDetail.stationId
-            }
-            console.log("params", params)
+                stationId: this.pileDetail.stationId,
+            };
+            console.log("params", params);
             updatePileName(params).then((response) => {
-                console.log("response", response)
+                console.log("response", response);
                 this.resCode = response.resCode;
-                this.msg = response.msg
-                if (this.resCode !== '00100000') {
+                this.msg = response.msg;
+                if (this.resCode !== "00100000") {
                     this.$message({
-                        type: 'error',
+                        type: "error",
                         message: this.msg,
                     });
                 }
                 this.clearableFlag = true;
                 this.getPileDetail();
-            })
+            });
         },
         // 查询充电桩详情接口
         getPileDetail() {
@@ -421,7 +517,7 @@ export default {
         },
         handleClick(tab) {
             // console.log(tab.name, event);
-            if (tab.name === 'second') {
+            if (tab.name === "second") {
                 this.$refs.second.getList();
             }
             // this.initializeData(tab.name);
@@ -470,4 +566,17 @@ export default {
     height: 80px;
     width: 80px;
 }
+::v-deep .el-input-group--append .el-input__inner {
+    // background-color: #fff;
+    // border-color: #fff;
+    color: #606266;
+    border-top-right-radius: 5px;
+    border-bottom-right-radius: 5px;
+}
+::v-deep .el-input-group__append,
+.el-input-group__prepend {
+    background-color: #fff;
+    border-color: #fff;
+    color: #606266;
+}
 </style>
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index 529fb46ea..c47f94809 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -115,11 +115,6 @@
                         ></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6">
-                    <el-form-item prop="parkingNumber" label="停车场库编号">
-                        <el-input v-model="station.parkingNumber" required="true"></el-input>
-                    </el-form-item>
-                </el-col>
             </el-row>
 
             <el-row :gutter="24">
@@ -213,6 +208,14 @@
                         <el-input v-model="station.businessHours"></el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="parkingNumber" label="停车场库编号">
+                        <el-input
+                            v-model="station.parkingNumber"
+                            required="true"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
         <el-button
@@ -456,7 +459,7 @@ export default {
         },
         // 渲染表格数据
         async queryStationInfo() {
-            this.fileList=[];
+            this.fileList = [];
             const res = await getStationInfo(this.stationId);
             console.log(res);
             this.station = res.data;
@@ -532,3 +535,9 @@ export default {
     },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select > .el-input,
+::v-deep .el-cascader .el-input {
+    width: 283px;
+}
+</style>