Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nengyuanzhang
nengyuanzhang committed Jun 1, 2024
2 parents 139a8a2 + a7054f4 commit 2d54f8a
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 15 deletions.
16 changes: 15 additions & 1 deletion ...pp/controllers/settings/energystoragepowerstation/energystoragepowerstation.controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ app.controller('EnergyStoragePowerStationController', function(
});
};

$scope.getAllPhaseOfLifecycle = function() {
$scope.phaseoflifecycle = [
{"id":"1use", "name": "Use_Phase"},
{"id":"2commissioning", "name": "Commissioning_Phase"},
{"id":"3construction", "name": "Construction_Phase"}

];
};

$scope.addEnergyStoragePowerStation = function() {
var modalInstance = $uibModal.open({
templateUrl: 'views/settings/energystoragepowerstation/energystoragepowerstation.model.html',
Expand All @@ -58,6 +67,7 @@ app.controller('EnergyStoragePowerStationController', function(
return {
costcenters: angular.copy($scope.costcenters),
contacts: angular.copy($scope.contacts),
phaseoflifecycle: angular.copy($scope.phaseoflifecycle)
};
}
}
Expand Down Expand Up @@ -100,7 +110,8 @@ app.controller('EnergyStoragePowerStationController', function(
return {
energystoragepowerstation: angular.copy(energystoragepowerstation),
costcenters:angular.copy($scope.costcenters),
contacts:angular.copy($scope.contacts)
contacts:angular.copy($scope.contacts),
phaseoflifecycle: angular.copy($scope.phaseoflifecycle)
};
}
}
Expand Down Expand Up @@ -264,6 +275,7 @@ app.controller('EnergyStoragePowerStationController', function(
$scope.getAllEnergyStoragePowerStations();
$scope.getAllCostCenters();
$scope.getAllContacts();
$scope.getAllPhaseOfLifecycle();
$scope.$on('handleBroadcastEnergyStoragePowerStationChanged', function(event) {
$scope.getAllEnergyStoragePowerStations();
});
Expand All @@ -273,6 +285,7 @@ app.controller('ModalAddEnergyStoragePowerStationCtrl', function($scope, $uibMod
$scope.operation = "SETTING.ADD_ENERGY_STORAGE_POWER_STATION";
$scope.costcenters=params.costcenters;
$scope.contacts=params.contacts;
$scope.phaseoflifecycle=params.phaseoflifecycle;
$scope.energystoragepowerstation = {
is_cost_data_displayed: false
};
Expand All @@ -290,6 +303,7 @@ app.controller('ModalEditEnergyStoragePowerStationCtrl', function($scope, $uibMo
$scope.energystoragepowerstation = params.energystoragepowerstation;
$scope.costcenters=params.costcenters;
$scope.contacts=params.contacts;
$scope.phaseoflifecycle=params.phaseoflifecycle;
$scope.ok = function() {
$uibModalInstance.close($scope.energystoragepowerstation);
};
Expand Down
64 changes: 64 additions & 0 deletions myems-admin/app/translations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Input Longitude',
INPUT_SVG: 'Input SVG',
BIND_USER: 'Bind User',
PHASE_OF_LIFECYCLE: 'Phase of Lifecycle',
PHASE_1use: 'Use Phase',
PHASE_2commissioning: 'Commissioning Phase',
PHASE_3construction: 'Construction Phase',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Address',
Expand Down Expand Up @@ -2302,6 +2306,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: '输入维度',
INPUT_SVG: '输入SVG',
BIND_USER: '绑定用户',
PHASE_OF_LIFECYCLE: '阶段',
PHASE_1use: '投用',
PHASE_2commissioning: '调试',
PHASE_3construction: '在建',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: '地址',
Expand Down Expand Up @@ -2834,6 +2842,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -3928,6 +3937,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Längengrad eingeben',
INPUT_SVG: 'SVG eingeben',
BIND_USER: 'BIND-BENUTZER',
PHASE_OF_LIFECYCLE: 'Phase des Lebenszyklus',
PHASE_1use: 'Anwendungsphase',
PHASE_2commissioning: 'Phase der Inbetriebnahme',
PHASE_3construction: 'Bauphase',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Adresse',
Expand Down Expand Up @@ -4457,6 +4470,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -5569,6 +5583,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'saisir la longitude',
INPUT_SVG: 'saisir SVG',
BIND_USER: 'Utilisateurs liés',
PHASE_OF_LIFECYCLE: 'Phases du cycle de vie',
PHASE_1use: 'Phase d\'utilisation',
PHASE_2commissioning: 'Phase de mise en service',
PHASE_3construction: 'Phase de construction',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Adresse',
Expand Down Expand Up @@ -6078,6 +6096,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -7192,6 +7211,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Introduzca la longitud',
INPUT_SVG: 'Introduzca SVG',
BIND_USER: 'Usuarios vinculados',
PHASE_OF_LIFECYCLE: 'Fase del ciclo de vida',
PHASE_1use: 'Fase de uso',
PHASE_2commissioning: 'Fase de puesta en marcha',
PHASE_3construction: 'Fase de construcción',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Dirección',
Expand Down Expand Up @@ -7701,6 +7724,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -8814,6 +8838,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'введите долготу',
INPUT_SVG: 'введите SVG',
BIND_USER: 'Связанные пользователи',
PHASE_OF_LIFECYCLE: 'Этапы жизненного цикла',
PHASE_1use: 'Этап использования',
PHASE_2commissioning: 'Этап отладки',
PHASE_3construction: 'Этап строительства',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Адрес',
Expand Down Expand Up @@ -9323,6 +9351,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -10436,6 +10465,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'يرجى إدخال خط الطول',
INPUT_SVG: 'الرجاء إدخال SVG',
BIND_USER: 'ربط المستخدم',
PHASE_OF_LIFECYCLE: 'مراحل دورة الحياة',
PHASE_1use: 'استخدام المرحلة',
PHASE_2commissioning: 'مرحلة التصحيح',
PHASE_3construction: 'مرحلة البناء',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'عنوان',
Expand Down Expand Up @@ -10945,6 +10978,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -12058,6 +12092,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Vui lòng nhập kinh độ',
INPUT_SVG: 'Vui lòng nhập SVG',
BIND_USER: 'NGƯỜI DÙNG RÀNG BUỘC',
PHASE_OF_LIFECYCLE: 'Giai đoạn vòng đời',
PHASE_1use: 'Giai đoạn sử dụng',
PHASE_2commissioning: 'Giai đoạn gỡ lỗi',
PHASE_3construction: 'Giai đoạn xây dựng',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Địa chỉ',
Expand Down Expand Up @@ -12567,6 +12605,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -13680,6 +13719,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'กรุณาใส่ลองจิจูด',
INPUT_SVG: 'กรุณาใส่ SVG',
BIND_USER: 'ผูกผู้ใช้',
PHASE_OF_LIFECYCLE: 'ระยะวงจรชีวิต',
PHASE_1use: 'ขั้นตอนการใช้งาน',
PHASE_2commissioning: 'ขั้นตอนการว่าจ้าง',
PHASE_3construction: 'ขั้นตอนการก่อสร้าง',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'ที่อยู่',
Expand Down Expand Up @@ -14189,6 +14232,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -15302,6 +15346,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Lütfen Boylamı Girin',
INPUT_SVG: 'Lütfen SVG girin',
BIND_USER: 'KULLANICIYI BAĞLA',
PHASE_OF_LIFECYCLE: 'Lifecycle Fazi',
PHASE_1use: 'Use Phase',
PHASE_2commissioning: 'Komisyon Fazi',
PHASE_3construction: 'Yapılandırma Fazi',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Adres',
Expand Down Expand Up @@ -15811,6 +15859,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -16923,6 +16972,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Sila masukkan longitud',
INPUT_SVG: 'Sila masukkan SVG',
BIND_USER: 'Pengguna Mengikat',
PHASE_OF_LIFECYCLE: 'Fasa Siklo Hidup',
PHASE_1use: 'Guna Tahap',
PHASE_2commissioning: 'Fasa Pemasangan',
PHASE_3construction: 'Fasa Pembangunan',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Alamat',
Expand Down Expand Up @@ -17432,6 +17485,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -18545,6 +18599,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: 'Silakan masukkan Garis Bujur',
INPUT_SVG: 'Silakan masukan SVG',
BIND_USER: 'Mengikat Pengguna',
PHASE_OF_LIFECYCLE: 'Tahap Sepeda Hidup',
PHASE_1use: 'Gunakan Tahap',
PHASE_2commissioning: 'Fase Komisionasi',
PHASE_3construction: 'Fase Konstruksi',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: 'Alamat',
Expand Down Expand Up @@ -19054,6 +19112,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down Expand Up @@ -20148,6 +20207,10 @@ function config($translateProvider) {
INPUT_LONGITUDE: '輸入維度',
INPUT_SVG: '輸入SVG',
BIND_USER: '綁定⽤⼾',
PHASE_OF_LIFECYCLE: '生命週期階段',
PHASE_1use: '使用階段',
PHASE_2commissioning: '調試階段',
PHASE_3construction: '施工階段',
},
PHOTOVOLTAIC_POWER_STATION: {
ADDRESS: '地址',
Expand Down Expand Up @@ -20680,6 +20743,7 @@ function config($translateProvider) {
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_NAME: 'Invalid Energy Storage Container Power Conversion System Name',
INVALID_ENERGY_STORAGE_CONTAINER_POWER_CONVERSION_SYSTEM_ID: 'Invalid Energy Storage Container Power Conversion System ID',
INVALID_ENERGY_STORAGE_POWER_STATION_ID: 'Invalid Energy Storage Power Station ID',
INVALID_ENERGY_STORAGE_POWER_STATION_PHASE_OF_LIFECYCLE: 'Invalid Energy Storage Power Station Phase of Lifecycle',
INVALID_EQUATION_IN_EXPRESSION: 'Invalid Equation In Expression',
INVALID_EQUIPMENT_ID: 'Invalid Equipment ID',
INVALID_EQUIPMENT_NAME: 'Invalid Equipment Name',
Expand Down
Loading

0 comments on commit 2d54f8a

Please sign in to comment.