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

added 'optional' tips to meter,virtual meter and offline meter setting in admin UI

pull/19/MERGE
13621160019@163.com 2021-03-17 17:24:34 +08:00
parent 409617ff75
commit 373c2a1fb1
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
admin/views/settings/meter/meter.html
View File

@ -15,12 +15,12 @@
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th> <th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th> <th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th> <th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th> <th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th> <th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'METER.MASTER_METER' | translate}}</th> <th class="text-center">{{'METER.MASTER_METER' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th> <th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.ACTION' | translate}}</th> <th class="text-center">{{'SETTING.ACTION' | translate}}</th>
@ -167,18 +167,12 @@
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} <th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
</th> <th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center"> <th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
{{'SETTING.IS_INPUT_COUNTED' | translate}}</th> <th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}} <th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
</th> <th class="text-center">{{'METER.MASTER_METER' | translate}}</th>
<th class="text-center">
{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
</th>
<th class="text-center">{{'METER.MASTER_METER' | translate}}
</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th> <th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
</tr> </tr>
</thead> </thead>
@ -218,7 +212,7 @@
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th> <th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th> <th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th> <th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th> <th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
@ -259,7 +253,7 @@
<th class="text-center">{{'SETTING.ID' | translate}}</th> <th class="text-center">{{'SETTING.ID' | translate}}</th>
<th class="text-center">{{'SETTING.NAME' | translate}}</th> <th class="text-center">{{'SETTING.NAME' | translate}}</th>
<th class="text-center">{{'SETTING.CATEGORY' | translate}}</th> <th class="text-center">{{'SETTING.CATEGORY' | translate}}</th>
<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th> <th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th> <th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th> <th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th> <th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>

4
admin/views/settings/meter/meter.model.html
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8"> <div class="col-sm-8">
<ui-select ng-model="meter.energy_item.id" name="meter.energy_item_id" theme="bootstrap"> <ui-select ng-model="meter.energy_item.id" name="meter.energy_item_id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match> <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
@ -79,7 +79,7 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'METER.MASTER_METER' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'METER.MASTER_METER' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8"> <div class="col-sm-8">
<ui-select ng-model="meter.master_meter.id" name="meter.master_meter_id" theme="bootstrap"> <ui-select ng-model="meter.master_meter.id" name="meter.master_meter_id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match> <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>

2
admin/views/settings/meter/offline-meter.model.html
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label> <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-8"> <div class="col-sm-8">
<ui-select ng-model="offlinemeter.energy_item.id" name="offlinemeter.energy_item_id" theme="bootstrap"> <ui-select ng-model="offlinemeter.energy_item.id" name="offlinemeter.energy_item_id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match> <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>

2
admin/views/settings/meter/virtual-meter.model.html
View File

@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.ENERGY_ITEM' | translate}}</label> <div class="form-group"><label class="col-sm-5 control-label">{{'SETTING.ENERGY_ITEM' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7"> <div class="col-sm-7">
<ui-select ng-model="virtualmeter.energy_item.id" name="virtualmeter.energy_item_id" theme="bootstrap"> <ui-select ng-model="virtualmeter.energy_item.id" name="virtualmeter.energy_item_id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match> <ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>