From a7fb91181a063d2cd183d068ae5859f84e2b1186 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Mon, 7 Aug 2023 15:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E6=A8=A1=E6=9D=BF=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=AB=99=E6=A1=A9=E6=94=B6=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/components/addBilling.vue        | 102 +++++++++++-------
 1 file changed, 63 insertions(+), 39 deletions(-)

diff --git a/jsowell-ui/src/views/billing/template/components/addBilling.vue b/jsowell-ui/src/views/billing/template/components/addBilling.vue
index 556990a49..ec6ae355e 100644
--- a/jsowell-ui/src/views/billing/template/components/addBilling.vue
+++ b/jsowell-ui/src/views/billing/template/components/addBilling.vue
@@ -175,37 +175,30 @@
             <el-button type="primary" @click="onSubmit">确 定</el-button>
           </div>-->
         </div>
-        <el-dialog
-          title="设置计费时段"
-          :visible.sync="reviseVisible"
-          width="40%"
-          append-to-body
-        >
-          <p>开始时间</p>
-          <el-time-select
-            v-model="startTime"
-            :picker-options="{
-              start: '00:00',
-              step: '00:30',
-              end: '24:00',
-            }"
-            placeholder="选择开始时间"
-            :disabled="selectDisabled"
-          />
-          <p>标签</p>
-          <el-radio-group v-model="radio">
-            <el-radio :label="1">尖</el-radio>
-            <el-radio :label="2">峰</el-radio>
-            <el-radio :label="3">平</el-radio>
-            <el-radio :label="4">谷</el-radio>
-          </el-radio-group>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="reviseVisible = false">取 消</el-button>
-            <el-button type="primary" @click="clickSelectStartTimeConfirm"
-              >确 定</el-button
-            >
-          </span>
-        </el-dialog>
+          <el-divider />
+          <el-row :gutter="20">
+              <el-col :span="10">
+                  <el-form-item label="站桩免费时长" prop="freeTime">
+                      <el-input
+                          v-model="form.freeTime"
+                          type="text"
+                          placeholder="0"
+                          clearable
+                      />
+                  </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                  <el-form-item label="站桩费率" prop="stationRate">
+                      <el-input
+                          v-model="form.stationRate"
+                          placeholder="0"
+                          clearable
+                          type="text"
+                      />
+                  </el-form-item>
+              </el-col>
+          </el-row>
+
       </div>
       <div v-else>
         <!-- 电单车页面 -->
@@ -269,10 +262,44 @@
           style="width: 170px"
           type="text"
           @click="dialogFormVisible = true"
-          >增加功率分段</el-button
-        >
-
-        <el-dialog
+          >增加测试功率分段</el-button>
+          测试
+      <el-divider />
+      </div>
+    </el-form>
+    <!--   电动汽车设置计费时段   -->
+      <el-dialog
+          title="设置计费时段"
+          :visible.sync="reviseVisible"
+          width="40%"
+          append-to-body
+      >
+          <p>开始时间</p>
+          <el-time-select
+              v-model="startTime"
+              :picker-options="{
+              start: '00:00',
+              step: '00:30',
+              end: '24:00',
+            }"
+              placeholder="选择开始时间"
+              :disabled="selectDisabled"
+          />
+          <p>标签</p>
+          <el-radio-group v-model="radio">
+              <el-radio :label="1">尖</el-radio>
+              <el-radio :label="2">峰</el-radio>
+              <el-radio :label="3">平</el-radio>
+              <el-radio :label="4">谷</el-radio>
+          </el-radio-group>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="reviseVisible = false">取 消</el-button>
+            <el-button type="primary" @click="clickSelectStartTimeConfirm"
+            >确 定</el-button
+            >
+          </span>
+      </el-dialog>
+      <el-dialog
           title="设置功率分段"
           :visible.sync="dialogFormVisible"
           append-to-body
@@ -303,11 +330,8 @@
             >
           </div>
         </el-dialog>
-      </div>
-    </el-form>
-
     <!-- 电动汽车 电动自行车 公用一组按钮 -->
-    <div style="position: absolute; bottom: 0px; right: 30px">
+    <div style="position: absolute; bottom: 18px; right: 60px">
       <el-button @click="hCancel">取 消</el-button>
       <el-button type="primary" @click="onSubmit">确 定</el-button>
     </div>