Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nengyuanzhang committed Dec 26, 2024
2 parents 5911021 + 32cc31d commit 69f31dc
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 75 deletions.
6 changes: 3 additions & 3 deletions myems-admin/app/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -2572,7 +2572,7 @@ function config($translateProvider) {
TOTAL_ACTIVE_POWER_POINT: '总有功功率数据点',
ACTIVE_POWER_A_POINT: 'A相有功功率数据点',
ACTIVE_POWER_B_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'C相有功功率数据点',
TOTAL_REACTIVE_POWER_POINT: '总无功功率数据点',
REACTIVE_POWER_A_POINT: 'A相无功功率数据点',
REACTIVE_POWER_B_POINT: 'B相无功功率数据点',
Expand Down Expand Up @@ -2711,7 +2711,7 @@ function config($translateProvider) {
TOTAL_ACTIVE_POWER_POINT: '总有功功率数据点',
ACTIVE_POWER_A_POINT: 'A相有功功率数据点',
ACTIVE_POWER_B_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'C相有功功率数据点',
TOTAL_REACTIVE_POWER_POINT: '总无功功率数据点',
REACTIVE_POWER_A_POINT: 'A相无功功率数据点',
REACTIVE_POWER_B_POINT: 'B相无功功率数据点',
Expand Down Expand Up @@ -23625,7 +23625,7 @@ function config($translateProvider) {
TOTAL_ACTIVE_POWER_POINT: '总有功功率数据点',
ACTIVE_POWER_A_POINT: 'A相有功功率数据点',
ACTIVE_POWER_B_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'B相有功功率数据点',
ACTIVE_POWER_C_POINT: 'C相有功功率数据点',
TOTAL_REACTIVE_POWER_POINT: '总无功功率数据点',
REACTIVE_POWER_A_POINT: 'A相无功功率数据点',
REACTIVE_POWER_B_POINT: 'B相无功功率数据点',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.TOTAL_ACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.total_active_power_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.total_active_power_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -67,7 +67,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_power_a_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_power_a_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -78,7 +78,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_power_b_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_power_b_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -89,7 +89,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_power_c_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_power_c_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -100,7 +100,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.TOTAL_REACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.total_reactive_power_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.total_reactive_power_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -111,7 +111,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.REACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.reactive_power_a_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.reactive_power_a_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -122,7 +122,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.REACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.reactive_power_b_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.reactive_power_b_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -133,7 +133,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.REACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.reactive_power_c_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.reactive_power_c_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -144,7 +144,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.TOTAL_APPARENT_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.total_apparent_power_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.total_apparent_power_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -155,7 +155,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.APPARENT_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.apparent_power_a_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.apparent_power_a_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -166,7 +166,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.APPARENT_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.apparent_power_b_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.apparent_power_b_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -177,7 +177,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.APPARENT_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.apparent_power_c_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.apparent_power_c_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -188,7 +188,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.TOTAL_POWER_FACTOR_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.total_power_factor_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.total_power_factor_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -199,7 +199,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_ENERGY_IMPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_energy_import_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_energy_import_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -210,7 +210,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_ENERGY_EXPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_energy_export_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_energy_export_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand All @@ -221,7 +221,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainergri
<div class="form-group">
<label class="col-sm-5 control-label">{{'ENERGY_STORAGE_CONTAINER.ACTIVE_ENERGY_NET_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
<div class="col-sm-7">
<ui-select ng-model="form_energystoragecontainergrid.active_energy_net_point.id" theme="bootstrap">
<ui-select ng-model="energystoragecontainergrid.active_energy_net_point.id" theme="bootstrap">
<ui-select-match allow-clear="true" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
<div ng-bind-html="point.name | highlight: $select.search"></div>
Expand Down
Loading

0 comments on commit 69f31dc

Please sign in to comment.