From 32cc31d3395474a1c91bc4be665a03b3cf71bba6 Mon Sep 17 00:00:00 2001
From: nengyuanzhang <13011132526@163.com>
Date: Thu, 26 Dec 2024 14:59:50 +0800
Subject: [PATCH] updated power station

---
 myems-admin/app/translations.js               |  6 ++--
 .../energystoragecontainergrid.model.html     | 32 +++++++++----------
 .../energystoragecontainerload.model.html     | 32 +++++++++----------
 .../photovoltaicpowerstationgrid.model.html   | 32 +++++++++----------
 .../photovoltaicpowerstationload.model.html   | 32 +++++++++----------
 myems-api/core/energystoragecontainer.py      |  8 ++---
 myems-api/core/photovoltaicpowerstation.py    |  8 ++---
 7 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/myems-admin/app/translations.js b/myems-admin/app/translations.js
index 1b6c195f08..740030d8d9 100644
--- a/myems-admin/app/translations.js
+++ b/myems-admin/app/translations.js
@@ -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相无功功率数据点',
@@ -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相无功功率数据点',
@@ -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相无功功率数据点',
diff --git a/myems-admin/views/settings/energystoragecontainer/energystoragecontainergrid.model.html b/myems-admin/views/settings/energystoragecontainer/energystoragecontainergrid.model.html
index a7513d17b7..6c1bc361af 100644
--- a/myems-admin/views/settings/energystoragecontainer/energystoragecontainergrid.model.html
+++ b/myems-admin/views/settings/energystoragecontainer/energystoragecontainergrid.model.html
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/myems-admin/views/settings/energystoragecontainer/energystoragecontainerload.model.html b/myems-admin/views/settings/energystoragecontainer/energystoragecontainerload.model.html
index df1164bf4a..f22417b7a9 100644
--- a/myems-admin/views/settings/energystoragecontainer/energystoragecontainerload.model.html
+++ b/myems-admin/views/settings/energystoragecontainer/energystoragecontainerload.model.html
@@ -45,7 +45,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.total_active_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -56,7 +56,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -67,7 +67,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -78,7 +78,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -89,7 +89,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.total_reactive_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -100,7 +100,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.reactive_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -111,7 +111,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.reactive_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -122,7 +122,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.reactive_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -133,7 +133,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.total_apparent_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -144,7 +144,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.apparent_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -155,7 +155,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.apparent_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -166,7 +166,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.apparent_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -177,7 +177,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.total_power_factor_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -188,7 +188,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_energy_import_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -199,7 +199,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_energy_export_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
@@ -210,7 +210,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{energystoragecontainerloa
             <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_energystoragecontainerload.active_energy_net_point.id" theme="bootstrap">
+                    <ui-select ng-model="energystoragecontainerload.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>
diff --git a/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationgrid.model.html b/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationgrid.model.html
index e8840f9c57..60990e9e03 100644
--- a/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationgrid.model.html
+++ b/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationgrid.model.html
@@ -56,7 +56,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_ACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.total_active_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -67,7 +67,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -78,7 +78,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -89,7 +89,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -100,7 +100,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_REACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.total_reactive_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -111,7 +111,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.reactive_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -122,7 +122,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.reactive_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -133,7 +133,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.reactive_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -144,7 +144,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_APPARENT_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.total_apparent_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -155,7 +155,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.apparent_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -166,7 +166,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.apparent_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -177,7 +177,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.apparent_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -188,7 +188,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_POWER_FACTOR_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.total_power_factor_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -199,7 +199,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_IMPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_energy_import_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -210,7 +210,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_EXPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_energy_export_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
@@ -221,7 +221,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationg
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_NET_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationgrid.active_energy_net_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationgrid.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>
diff --git a/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationload.model.html b/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationload.model.html
index 4cd8c2c4d2..85f90c6665 100644
--- a/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationload.model.html
+++ b/myems-admin/views/settings/photovoltaicpowerstation/photovoltaicpowerstationload.model.html
@@ -45,7 +45,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_ACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.total_active_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -56,7 +56,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -67,7 +67,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -78,7 +78,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -89,7 +89,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_REACTIVE_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.total_reactive_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -100,7 +100,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.reactive_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -111,7 +111,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.reactive_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -122,7 +122,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.REACTIVE_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.reactive_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -133,7 +133,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_APPARENT_POWER_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.total_apparent_power_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -144,7 +144,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_A_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.apparent_power_a_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -155,7 +155,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_B_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.apparent_power_b_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -166,7 +166,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.APPARENT_POWER_C_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.apparent_power_c_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -177,7 +177,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.TOTAL_POWER_FACTOR_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.total_power_factor_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -188,7 +188,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_IMPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_energy_import_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -199,7 +199,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_EXPORT_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_energy_export_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
@@ -210,7 +210,7 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{photovoltaicpowerstationl
             <div class="form-group">
                 <label class="col-sm-5 control-label">{{'PHOTOVOLTAIC_POWER_STATION.ACTIVE_ENERGY_NET_POINT' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-7">
-                    <ui-select ng-model="form_photovoltaicpowerstationload.active_energy_net_point.id" theme="bootstrap">
+                    <ui-select ng-model="photovoltaicpowerstationload.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>
diff --git a/myems-api/core/energystoragecontainer.py b/myems-api/core/energystoragecontainer.py
index 5424d79606..059ddb662e 100644
--- a/myems-api/core/energystoragecontainer.py
+++ b/myems-api/core/energystoragecontainer.py
@@ -2351,12 +2351,12 @@ def on_post(req, resp, id_):
         if 'active_power_c_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['active_power_c_point_id'], int) and \
                 new_values['data']['active_power_c_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['active_power_c_point_id']
+            active_power_c_point_id = new_values['data']['active_power_c_point_id']
 
         if 'total_reactive_power_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['total_reactive_power_point_id'], int) and \
                 new_values['data']['total_reactive_power_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['total_reactive_power_point_id']
+            total_reactive_power_point_id = new_values['data']['total_reactive_power_point_id']
 
         if 'reactive_power_a_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['reactive_power_a_point_id'], int) and \
@@ -2775,12 +2775,12 @@ def on_put(req, resp, id_, gid):
         if 'active_power_c_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['active_power_c_point_id'], int) and \
                 new_values['data']['active_power_c_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['active_power_c_point_id']
+            active_power_c_point_id = new_values['data']['active_power_c_point_id']
 
         if 'total_reactive_power_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['total_reactive_power_point_id'], int) and \
                 new_values['data']['total_reactive_power_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['total_reactive_power_point_id']
+            total_reactive_power_point_id = new_values['data']['total_reactive_power_point_id']
 
         if 'reactive_power_a_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['reactive_power_a_point_id'], int) and \
diff --git a/myems-api/core/photovoltaicpowerstation.py b/myems-api/core/photovoltaicpowerstation.py
index 489f5e5b85..f05f241f0d 100644
--- a/myems-api/core/photovoltaicpowerstation.py
+++ b/myems-api/core/photovoltaicpowerstation.py
@@ -1190,12 +1190,12 @@ def on_post(req, resp, id_):
         if 'active_power_c_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['active_power_c_point_id'], int) and \
                 new_values['data']['active_power_c_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['active_power_c_point_id']
+            active_power_c_point_id = new_values['data']['active_power_c_point_id']
 
         if 'total_reactive_power_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['total_reactive_power_point_id'], int) and \
                 new_values['data']['total_reactive_power_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['total_reactive_power_point_id']
+            total_reactive_power_point_id = new_values['data']['total_reactive_power_point_id']
 
         if 'reactive_power_a_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['reactive_power_a_point_id'], int) and \
@@ -1618,12 +1618,12 @@ def on_put(req, resp, id_, gid):
         if 'active_power_c_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['active_power_c_point_id'], int) and \
                 new_values['data']['active_power_c_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['active_power_c_point_id']
+            active_power_c_point_id = new_values['data']['active_power_c_point_id']
 
         if 'total_reactive_power_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['total_reactive_power_point_id'], int) and \
                 new_values['data']['total_reactive_power_point_id'] > 0:
-            active_power_b_point_id = new_values['data']['total_reactive_power_point_id']
+            total_reactive_power_point_id = new_values['data']['total_reactive_power_point_id']
 
         if 'reactive_power_a_point_id' in new_values['data'].keys() and \
                 isinstance(new_values['data']['reactive_power_a_point_id'], int) and \