From 8baee9be64eedde9f890f0c6b639f0f3c00374af Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 30 Jun 2023 11:14:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/homeIndex/homeIndex.vue  | 32 +++++++++++++++++--
 .../views/pile/station/components/billing.vue | 22 ++++++++-----
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/jsowell-ui/src/views/homeIndex/homeIndex.vue b/jsowell-ui/src/views/homeIndex/homeIndex.vue
index d1f499220..4617464c6 100644
--- a/jsowell-ui/src/views/homeIndex/homeIndex.vue
+++ b/jsowell-ui/src/views/homeIndex/homeIndex.vue
@@ -1,9 +1,12 @@
 <template>
+    <el-row :gutter="0" type="flex" style="flex-wrap:wrap">
+
   <div>
     <h1>概况</h1>
     <hr />
     <div style="display: flex;justify-content: space-between;flex-wrap: wrap;margin-top: 10px">
-      <div class="box" style="background-color: #ffba00;">
+        <el-col :span="4">
+        <div class="box" style="background-color: #ffba00;">
         <el-image class="box-image"
             :src="require('@/assets/images/lightning.png')"
            />
@@ -12,6 +15,8 @@
           <div>总充电电量(度)</div>
         </div>
       </div>
+        </el-col>
+        <el-col :span="4">
       <div class="box" style="background-color: #c74542;">
          <el-image class="box-image"
             :src="require('@/assets/images/zongfeiyong.png')" />
@@ -20,6 +25,9 @@
             <div>总充电费用(元)</div>
           </div>
       </div>
+        </el-col>
+
+        <el-col :span="4">
       <div class="box" style="background-color: #12ce65;">
         <el-image
             class="box-image"
@@ -27,8 +35,11 @@
         <div class="flex1">
           <b class="box-h1">{{ generalSituation.totalChargingQuantity}}</b>
           <div>总充电订单数(笔)</div>
-        </div>    
+        </div>
       </div>
+        </el-col>
+
+        <el-col :span="4">
       <div class="box" style="background-color: #909399;">
         <el-image
             class="box-image"
@@ -38,6 +49,9 @@
           <div>总充电设备数量(座)</div>
         </div>
       </div>
+        </el-col>
+
+        <el-col :span="4">
       <div class="box"  v-hasRole="['admin', 'common']" style="background-color: #ff4949;">
         <el-image
             class="box-image"
@@ -46,8 +60,9 @@
         <div class="flex1">
           <b class="box-h1">{{ generalSituation.totalMemberAmount }}</b>
           <div>总客户余额(元)</div>
-        </div>  
         </div>
+        </div>
+        </el-col>
 <!--      <div class="box">-->
 <!--        <div>总服务费金额</div>-->
 <!--        <div class="box-text">-->
@@ -74,6 +89,7 @@
     <!-- <hr /> -->
     <!-- <h1>设备</h1> -->
   </div>
+    </el-row>
 </template>
 <script>
 import Echarts from "echarts";
@@ -387,4 +403,14 @@ export default {
   border: 3px solid #fff;
   margin-top: 5px;
 }
+.el-row {
+    margin-bottom: 20px;
+    &:last-child {
+        margin-bottom: 0;
+    }
+}
+.el-col {
+    border-radius: 4px;
+}
+
 </style>
diff --git a/jsowell-ui/src/views/pile/station/components/billing.vue b/jsowell-ui/src/views/pile/station/components/billing.vue
index 35b780bf6..04fd5c9fc 100644
--- a/jsowell-ui/src/views/pile/station/components/billing.vue
+++ b/jsowell-ui/src/views/pile/station/components/billing.vue
@@ -90,14 +90,20 @@
       <el-table-column label="名称" prop="templateName" />
         <el-table-column label="模板状态" prop="status" >
             <template slot-scope="scope">
-                <el-switch
-                    v-model="scope.row.status"
-                    active-value="1"
-                    inactive-value="0"
-                    disabled="disabled"
-                >
-                </el-switch>
+                <dict-tag
+                    :options="dict.type.template_status"
+                    :value="scope.row.status"
+                />
             </template>
+<!--            <template slot-scope="scope">-->
+<!--                <el-switch-->
+<!--                    v-model="scope.row.status"-->
+<!--                    active-value="1"-->
+<!--                    inactive-value="0"-->
+<!--                    disabled="disabled"-->
+<!--                >-->
+<!--                </el-switch>-->
+<!--            </template>-->
         </el-table-column>
       <!-- matchCars 使用车辆描述 -->
       <el-table-column label="描述" prop="remark" />
@@ -213,7 +219,7 @@ import {updateStation} from "@/api/pile/station";
 
 export default {
   components: { BondedDevice, Expenses, AddBilling },
-  dicts: ["charger_pile_type"],
+  dicts: ["charger_pile_type", "template_status"],
   data() {
     return {
       tableData: [],