From f92457b1fb6ec8285a4677c0e37d92c8ab39142a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 10 Mar 2023 02:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E7=94=B5=E6=A1=A9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machine/addChargeMachine/addChargeMachine.html          | 4 ++--
 .../components/machine/addChargeMachine/addChargeMachine.js | 4 ++--
 .../machine/editChargeMachine/editChargeMachine.html        | 4 ++--
 .../machine/editChargeMachine/editChargeMachine.js          | 4 ++--
 .../machine/chargeMachineManage/chargeMachineManage.html    | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/components/machine/addChargeMachine/addChargeMachine.html b/public/components/machine/addChargeMachine/addChargeMachine.html
index 05d9b9b8b..133a6c514 100644
--- a/public/components/machine/addChargeMachine/addChargeMachine.html
+++ b/public/components/machine/addChargeMachine/addChargeMachine.html
@@ -62,7 +62,7 @@
                     :placeholder="vc.i18n('必填，请填写小时电价','addChargeMachine')" class="form-control">
                 </div>
               </div>
-              <div class="form-group row">
+              <!-- <div class="form-group row">
                 <label class="col-sm-2 col-form-label"><span>
                     <vc:i18n name='用量电价' namespace='addChargeMachine'></vc:i18n>
                   </span></label>
@@ -70,7 +70,7 @@
                   <input v-model="addChargeMachineInfo.energyPrice" type="text"
                     :placeholder="vc.i18n('必填，请填写用量电价','addChargeMachine')" class="form-control">
                 </div>
-              </div>
+              </div> -->
 
               <div class="ibox-content">
                 <button class="btn btn-primary float-right" type="button" v-on:click="saveChargeMachineInfo()"><i
diff --git a/public/components/machine/addChargeMachine/addChargeMachine.js b/public/components/machine/addChargeMachine/addChargeMachine.js
index ba9b3b2ec..cb2efc4eb 100644
--- a/public/components/machine/addChargeMachine/addChargeMachine.js
+++ b/public/components/machine/addChargeMachine/addChargeMachine.js
@@ -12,7 +12,7 @@
                 machineCode: '',
                 implBean: '',
                 durationPrice: '',
-                energyPrice: '',
+                energyPrice: '1',
                 factorys:[],
                 specs: [],
                 portCount:'',
@@ -136,7 +136,7 @@
                     machineCode: '',
                     implBean: '',
                     durationPrice: '',
-                    energyPrice: '',
+                    energyPrice: '1',
                     factorys:[],
                     specs: [],
                     portCount:'',
diff --git a/public/components/machine/editChargeMachine/editChargeMachine.html b/public/components/machine/editChargeMachine/editChargeMachine.html
index fcf6e7091..b6486e3dd 100644
--- a/public/components/machine/editChargeMachine/editChargeMachine.html
+++ b/public/components/machine/editChargeMachine/editChargeMachine.html
@@ -53,7 +53,7 @@
                     :placeholder="vc.i18n('必填，请填写小时电价','editChargeMachine')" class="form-control">
                 </div>
               </div>
-              <div class="form-group row">
+              <!-- <div class="form-group row">
                 <label class="col-sm-2 col-form-label"><span>
                     <vc:i18n name='用量电价' namespace='editChargeMachine'></vc:i18n>
                   </span> </label>
@@ -61,7 +61,7 @@
                   <input v-model="editChargeMachineInfo.energyPrice" type="text"
                     :placeholder="vc.i18n('必填，请填写用量电价','editChargeMachine')" class="form-control">
                 </div>
-              </div>
+              </div> -->
 
               <div class="ibox-content">
                 <button class="btn btn-primary float-right" type="button" v-on:click="editChargeMachine()"><i
diff --git a/public/components/machine/editChargeMachine/editChargeMachine.js b/public/components/machine/editChargeMachine/editChargeMachine.js
index 097a3b414..5c309a46c 100644
--- a/public/components/machine/editChargeMachine/editChargeMachine.js
+++ b/public/components/machine/editChargeMachine/editChargeMachine.js
@@ -8,7 +8,7 @@
                 machineCode: '',
                 implBean: '',
                 durationPrice: '',
-                energyPrice: '',
+                energyPrice: '1',
                 factorys:[],
                 specs: [],
             }
@@ -135,7 +135,7 @@
                     machineCode: '',
                     implBean: '',
                     durationPrice: '',
-                    energyPrice: '',
+                    energyPrice: '1',
                     factorys:[],
                     specs: [],
                 }
diff --git a/public/pages/machine/chargeMachineManage/chargeMachineManage.html b/public/pages/machine/chargeMachineManage/chargeMachineManage.html
index 0bd0dfd0f..fb314fb7a 100644
--- a/public/pages/machine/chargeMachineManage/chargeMachineManage.html
+++ b/public/pages/machine/chargeMachineManage/chargeMachineManage.html
@@ -70,9 +70,9 @@
                                 <th class="text-center"><span>
                                         <vc:i18n name='小时电价' namespace='chargeMachineManage'></vc:i18n>
                                     </span></th>
-                                <th class="text-center"><span>
+                                <!-- <th class="text-center"><span>
                                         <vc:i18n name='用量电价' namespace='chargeMachineManage'></vc:i18n>
-                                    </span></th>
+                                    </span></th> -->
                                 <th class="text-center"><span>
                                         <vc:i18n name='操作'></vc:i18n>
                                     </span></th>
@@ -85,7 +85,7 @@
                                 <td class="text-center">{{chargeMachine.factoryName}}</td>
                                 <td class="text-center">{{chargeMachine.portCount || 0}}(<a href="javascript:void(0)" @click="_viewPort(chargeMachine)">查看</a>)</td>
                                 <td class="text-center">{{chargeMachine.durationPrice}}</td>
-                                <td class="text-center">{{chargeMachine.energyPrice}}</td>
+                                <!-- <td class="text-center">{{chargeMachine.energyPrice}}</td> -->
                                 <td class="text-center">
                                     <div class="btn-group">
                                         <button class="btn-white btn btn-xs"