From 75ad3997507a5812ee59e2ee0af62e9e09aa4f1e Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 7 Apr 2021 21:01:34 +0800
Subject: [PATCH] updated panel width and height of combinedequipment view in
 Admin UI

---
 .../combinedequipment/combinedequipment.html    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/admin/views/settings/combinedequipment/combinedequipment.html b/admin/views/settings/combinedequipment/combinedequipment.html
index d96692fa..54fc4a03 100644
--- a/admin/views/settings/combinedequipment/combinedequipment.html
+++ b/admin/views/settings/combinedequipment/combinedequipment.html
@@ -73,8 +73,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="col-lg-3">
-									<div class="panel panel-primary">
+								<div class="col-lg-4">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentCombinedEquipment.name}}{{'COMBINED_EQUIPMENT.N_S_EQUIPMENT' | translate}}
 										</div>
@@ -100,11 +100,12 @@
 									</div>
 								</div>
 
-								<div class="col-lg-3">
+								<div class="col-lg-4">
 									<!-- according panel-->
 									<div class="panel panel-primary">
 										<div class="panel-heading"> {{'COMBINED_EQUIPMENT.EQUIPMENT_LIST' | translate}}	</div>
-										<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}" slim-scroll box-height="600px">
+										<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}" 
+										slim-scroll box-height="765px">
 											<div class="source btn btn-info btn-rounded btn-block" 	ng-repeat="equipment in equipments" x-hjc-draggable="true">
 													 {{equipment.name}}
 										  </div>
@@ -143,8 +144,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="col-lg-3">
-									<div class="panel panel-primary">
+								<div class="col-lg-4">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentCombinedEquipment.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
@@ -171,14 +172,14 @@
 									</div>
 								</div>
 
-								<div class="col-lg-3">
+								<div class="col-lg-4">
 									<!-- according panel-->
 									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SETTING.METER' | translate}}
 										</div>
 										<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}"
-											slim-scroll box-height="600px">
+											slim-scroll box-height="765px">
 											<div class="form-group no-margin">
 												<label>{{'SETTING.METER_TYPE' | translate}}</label>
 												<select ng-change="changeMeterType()" ng-model="currentMeterType"