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

deleted slim-scroll from and added maxheight to panel of views in Admin UI

pull/31/head
13621160019@163.com 2021-04-07 22:10:37 +08:00
parent b092caff50
commit bfb2fcd2e5
7 changed files with 95 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,11 +74,11 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentCombinedEquipment.name}}{{'COMBINED_EQUIPMENT.N_S_EQUIPMENT' | translate}}
</div>
<div class="panel-body"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairEquipment(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
@ -145,11 +145,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentCombinedEquipment.name}}{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">

3
admin/views/settings/costcenter/costcenter.html
View File

@ -53,7 +53,7 @@
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentCostCenter.name}}{{'SETTING.N_S_TARIFF' | translate}}
</div>
@ -61,6 +61,7 @@
x-hjc-drop-target="true"
x-on-drop="pairTariff(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
ng-repeat="costcentertariff in costcentertariffs"
x-hjc-draggable="true"> {{costcentertariff.name}}</div>

4
admin/views/settings/equipment/equipment.html
View File

@ -59,11 +59,11 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentEquipment.name}}{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >

20
admin/views/settings/shopfloor/shopfloor.html
View File

@ -73,11 +73,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentShopfloor.name}}{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
@ -158,11 +159,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentShopfloor.name}}{{'SHOPFLOOR.N_S_EQUIPMENT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairEquipment(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -230,11 +232,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentShopfloor.name}}{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -317,11 +320,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentShopfloor.name}}{{'SETTING.N_S_SENSOR' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairSensor(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"

42
admin/views/settings/space/space.html
View File

@ -144,13 +144,14 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}"">
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-rounded btn-block"
ng-class="colorMeterType(spacemeter.metertype)"
@ -215,11 +216,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_EQUIPMENT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairEquipment(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -271,11 +273,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_COMBINED_EQUIPMENT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairCombinedEquipment(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -327,11 +330,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -399,11 +403,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SETTING.N_S_SENSOR' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairSensor(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -455,11 +460,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_TENANT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairTenant(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -510,11 +516,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_STORE' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairStore(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
@ -565,11 +572,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_SHOPFLOOR' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairShopfloor(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"

15
admin/views/settings/store/store.html
View File

@ -69,11 +69,11 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentStore.name}}{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
@ -147,19 +147,19 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentStore.name}}{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
<div class="btn btn-primary btn-rounded btn-block"
title="{{'COMMON.STORE' | translate}}:{{storepoint.data_source.name}}"
ng-repeat="storepoint in storepoints"
x-hjc-draggable="true"> {{storepoint.name}}
</div>
x-hjc-draggable="true"> {{storepoint.name}}</div>
</div>
</div>
<div class="panel panel-danger">
@ -224,7 +224,7 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentStore.name}}{{'SETTING.N_S_SENSOR' | translate}}
</div>
@ -232,6 +232,7 @@
x-hjc-drop-target="true"
x-on-drop="pairSensor(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
<div class="btn btn-primary btn-rounded btn-block"
title="{{'COMMON.STORE' | translate}}:{{storesensor.data_source.name}}"
ng-repeat="storesensor in storesensors"

19
admin/views/settings/tenant/tenant.html
View File

@ -95,17 +95,19 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentTenant.name}}{{'SETTING.N_S_METER' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairMeter(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-rounded btn-block"
ng-class="colorMeterType(tenantmeter.metertype)"
ng-repeat="tenantmeter in tenantmeters" x-hjc-draggable="true"
ng-repeat="tenantmeter in tenantmeters"
x-hjc-draggable="true"
title="{{tenantmeter.metertype}}">
({{tenantmeter.energy_category.name}}){{tenantmeter.name}}</div>
</div>
@ -179,13 +181,15 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentTenant.name}}{{'SETTING.N_S_POINT' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairPoint(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
title="{{'COMMON.TENANT' | translate}}:{{tenantpoint.data_source.name}}"
ng-repeat="tenantpoint in tenantpoints" x-hjc-draggable="true">
@ -265,11 +269,12 @@
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary" slim-scroll box-height="500px">
<div class="panel panel-primary">
<div class="panel-heading">
{{currentTenant.name}}{{'SETTING.N_S_SENSOR' | translate}}
</div>
<div class="panel-body" x-hjc-drop-target="true"
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairSensor(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"