seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated panel width and height of combinedequipment view in Admin UI

pull/31/head
13621160019@163.com 2021-04-07 21:01:34 +08:00
parent da45ba0f68
commit 75ad399750
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/views/settings/combinedequipment/combinedequipment.html
View File

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