From fdf5b4453c855d57e4d5c5b34438def15b9a155b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 5 Sep 2023 13:12:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meterMachineManage.html                   | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/public/pages/machine/meterMachineManage/meterMachineManage.html b/public/pages/machine/meterMachineManage/meterMachineManage.html
index afd7d9e98..d8f558848 100644
--- a/public/pages/machine/meterMachineManage/meterMachineManage.html
+++ b/public/pages/machine/meterMachineManage/meterMachineManage.html
@@ -14,14 +14,12 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请选择名称','meterMachineManage')"
-                                    v-model="meterMachineManageInfo.conditions.machineNameLike" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请选择名称','meterMachineManage')" v-model="meterMachineManageInfo.conditions.machineNameLike" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请选择表号','meterMachineManage')"
-                                    v-model="meterMachineManageInfo.conditions.address" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请选择表号','meterMachineManage')" v-model="meterMachineManageInfo.conditions.address" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -36,8 +34,7 @@
                             </div>
                         </div>
                         <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm"
-                                v-on:click="_queryMeterMachineMethod()">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryMeterMachineMethod()">
                                 <i class="glyphicon glyphicon-search"></i> <span>
                                     <vc:i18n name="查询"></vc:i18n>
                                 </span>
@@ -57,8 +54,7 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请填写房屋编号 楼栋-单元-房屋','meterMachineManage')"
-                                    v-model="meterMachineManageInfo.conditions.roomNameLike" class=" form-control">
+                                <input type="text" :placeholder="vc.i18n('请填写房屋编号 楼栋-单元-房屋','meterMachineManage')" v-model="meterMachineManageInfo.conditions.roomNameLike" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
@@ -100,7 +96,7 @@
                             <i class="glyphicon glyphicon-plus"></i>
                             <vc:i18n name="添加" namespace="meterMachineManage"></vc:i18n>
                         </button>
-                      
+
                     </div>
                 </div>
                 <div class="ibox-content">
@@ -157,7 +153,7 @@
                                 <td class="text-center">{{meterMachine.feeConfigName}}</td>
                                 <td class="text-center">{{meterMachine.implBeanName}}</td>
                                 <td class="text-center" v-if="meterMachine.machineModel == '1001'">
-                                    {{meterMachine.degree?meterMachine.degree:meterMachine.prestoreDegrees}}</td>
+                                    {{meterMachine.prestoreDegrees}}</td>
                                 <td class="text-center" v-else>-</td>
                                 <td class="text-center" v-if="meterMachine.machineModel == '1001'">-</td>
                                 <td class="text-center" v-else>
@@ -166,14 +162,12 @@
                                 <td class="text-center">{{meterMachine.curReadingTime}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditMeterMachineModel(meterMachine)">
+                                        <button class="btn-white btn btn-xs" v-on:click="_openEditMeterMachineModel(meterMachine)">
                                             <vc:i18n name='修改'></vc:i18n>
                                         </button>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteMeterMachineModel(meterMachine)"><span>
+                                        <button class="btn-white btn btn-xs" v-on:click="_openDeleteMeterMachineModel(meterMachine)"><span>
                                                 <vc:i18n name='删除'></vc:i18n>
                                             </span></button>
                                     </div>