Skip to content

M
MyEMS能源管理系统

MyEMS / MyEMS能源管理系统

通知 46
Star 2
Fork 0
M
MyEMS能源管理系统

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 6539cc2b 编写于 作者: nengyuangzhang's avatar nengyuangzhang
浏览文件
操作

added bind energy storage power station to space in myems-admin

上级 5352cc58
隐藏空白更改
内联 并排
Showing with 318 addition and 1 deletion
CHANGELOG.md
浏览文件 @ 6539cc2b
......@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- added energy storage power station relation to space in myems-api
- added myems energy plan database
- added cardsummary to fdd fault in myems-web
- added bind energy storage power station to space in myems-admin
### Changed
- changed map marker in myems-web
- updated popup style of mapbox in myems-web
......
myems-admin/app/config.router.js
浏览文件 @ 6539cc2b
......@@ -832,6 +832,7 @@ app
'app/services/settings/meter/offlinemeter.service.js',
'app/services/settings/equipment/equipment.service.js',
'app/services/settings/combinedequipment/combinedequipment.service.js',
'app/services/settings/energystoragepowerstation/energystoragepowerstation.service.js',
'app/services/settings/tenant/tenant.service.js',
'app/services/settings/store/store.service.js',
'app/services/settings/shopfloor/shopfloor.service.js',
......@@ -841,6 +842,7 @@ app
'app/services/settings/space/spacemeter.service.js',
'app/services/settings/space/spaceequipment.service.js',
'app/services/settings/space/spacecombinedequipment.service.js',
'app/services/settings/space/spaceenergystoragepowerstation.service.js',
'app/services/settings/space/spacetenant.service.js',
'app/services/settings/space/spacestore.service.js',
'app/services/settings/space/spaceshopfloor.service.js',
......@@ -852,6 +854,7 @@ app
'app/controllers/settings/space/spacemeter.controller.js',
'app/controllers/settings/space/spaceequipment.controller.js',
'app/controllers/settings/space/spacecombinedequipment.controller.js',
'app/controllers/settings/space/spaceenergystoragepowerstation.controller.js',
'app/controllers/settings/space/spacetenant.controller.js',
'app/controllers/settings/space/spacestore.controller.js',
'app/controllers/settings/space/spaceshopfloor.controller.js',
......
myems-admin/app/controllers/settings/space/spaceenergystoragepowerstation.controller.js 0 → 100644
浏览文件 @ 6539cc2b
'use strict';
app.controller('SpaceEnergyStoragePowerStationController', function(
$scope,
$window,
$translate,
SpaceService,
EnergyStoragePowerStationService,
SpaceEnergyStoragePowerStationService,
toaster,SweetAlert) {
$scope.spaces = [];
$scope.currentSpaceID = 1;
$scope.energystoragepowerstations = [];
$scope.spaceenergystoragepowerstations = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceService.getAllSpaces(headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data;
} else {
$scope.spaces = [];
}
//create space tree
var treedata = {'core': {'data': [], "multiple" : false,}, "plugins" : [ "wholerow" ]};
for(var i=0; i < $scope.spaces.length; i++) {
if ($scope.spaces[i].id == 1) {
var node = {"id": $scope.spaces[i].id.toString(),
"parent": '#',
"text": $scope.spaces[i].name,
"state": { 'opened' : true, 'selected' : false },
};
} else {
var node = {"id": $scope.spaces[i].id.toString(),
"parent": $scope.spaces[i].parent_space.id.toString(),
"text": $scope.spaces[i].name,
};
};
treedata['core']['data'].push(node);
}
angular.element(spacetreewithenergystoragepowerstation).jstree(treedata);
//space tree selected changed event handler
angular.element(spacetreewithenergystoragepowerstation).on("changed.jstree", function (e, data) {
$scope.currentSpaceID = parseInt(data.selected[0]);
$scope.getEnergyStoragePowerStationsBySpaceID($scope.currentSpaceID);
});
});
};
$scope.getEnergyStoragePowerStationsBySpaceID = function(id) {
$scope.spaceenergystoragepowerstations=[];
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceEnergyStoragePowerStationService.getEnergyStoragePowerStationsBySpaceID(id, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaceenergystoragepowerstations = $scope.spaceenergystoragepowerstations.concat(response.data);
} else {
$scope.spaceenergystoragepowerstations=[];
}
});
};
$scope.getAllEnergyStoragePowerStations = function() {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EnergyStoragePowerStationService.getAllEnergyStoragePowerStations(headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.energystoragepowerstations = response.data;
} else {
$scope.energystoragepowerstations = [];
}
});
};
$scope.pairEnergyStoragePowerStation=function(dragEl,dropEl){
var energystoragepowerstationid=angular.element('#'+dragEl).scope().energystoragepowerstation.id;
var spaceid=angular.element(spacetreewithenergystoragepowerstation).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceEnergyStoragePowerStationService.addPair(spaceid,energystoragepowerstationid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
body: $translate.instant("TOASTER.BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS"),
showCloseButton: true,
});
$scope.getEnergyStoragePowerStationsBySpaceID(spaceid);
} else {
toaster.pop({
type: "error",
title: $translate.instant(response.data.title),
body: $translate.instant(response.data.description),
showCloseButton: true,
});
}
});
};
$scope.deleteEnergyStoragePowerStationPair=function(dragEl,dropEl){
if(angular.element('#'+dragEl).hasClass('source')){
return;
}
var spaceenergystoragepowerstationid = angular.element('#' + dragEl).scope().spaceenergystoragepowerstation.id;
var spaceid = angular.element(spacetreewithenergystoragepowerstation).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceEnergyStoragePowerStationService.deletePair(spaceid, spaceenergystoragepowerstationid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
body: $translate.instant("TOASTER.UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS"),
showCloseButton: true,
});
$scope.getEnergyStoragePowerStationsBySpaceID(spaceid);
} else {
toaster.pop({
type: "error",
title: $translate.instant(response.data.title),
body: $translate.instant(response.data.description),
showCloseButton: true,
});
}
});
};
$scope.getAllSpaces();
$scope.getAllEnergyStoragePowerStations();
$scope.refreshSpaceTree = function() {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceService.getAllSpaces(headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data;
} else {
$scope.spaces = [];
}
//create space tree
var treedata = {'core': {'data': [], "multiple" : false,}, "plugins" : [ "wholerow" ]};
for(var i=0; i < $scope.spaces.length; i++) {
if ($scope.spaces[i].id == 1) {
var node = {"id": $scope.spaces[i].id.toString(),
"parent": '#',
"text": $scope.spaces[i].name,
"state": { 'opened' : true, 'selected' : false },
};
} else {
var node = {"id": $scope.spaces[i].id.toString(),
"parent": $scope.spaces[i].parent_space.id.toString(),
"text": $scope.spaces[i].name,
};
};
treedata['core']['data'].push(node);
}
angular.element(spacetreewithenergystoragepowerstation).jstree(true).settings.core.data = treedata['core']['data'];
angular.element(spacetreewithenergystoragepowerstation).jstree(true).refresh();
});
};
$scope.$on('handleBroadcastSpaceChanged', function(event) {
$scope.spaceenergystoragepowerstations = [];
$scope.refreshSpaceTree();
});
});
myems-admin/app/services/settings/space/spaceenergystoragepowerstation.service.js 0 → 100644
浏览文件 @ 6539cc2b
'use strict';
app.factory('SpaceEnergyStoragePowerStationService', function($http) {
return {
addPair: function(spaceID,energystoragepowerstationID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/energystoragepowerstations',{data:{'energy_storage_power_station_id':energystoragepowerstationID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deletePair: function(spaceID, energystoragepowerstationID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/energystoragepowerstations/'+energystoragepowerstationID, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
getEnergyStoragePowerStationsBySpaceID: function(id, headers, callback) {
$http.get(getAPI()+'spaces/'+id+'/energystoragepowerstations', {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
}
};
});
myems-admin/app/translations.js
浏览文件 @ 6539cc2b
......@@ -810,6 +810,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Bind Combined Equipment',
N_S_COMBINED_EQUIPMENT: 'Bound Combined Equipments',
COMBINED_EQUIPMENT_LIST: 'Combined Equipment List',
BIND_ENERGY_STORAGE_POWER_STATION: 'Bind Energy Storage Power Station',
N_S_ENERGY_STORAGE_POWER_STATION: 'Bound Energy Storage Power Stations',
ENERGY_STORAGE_POWER_STATION_LIST: 'Energy Storage Power Station List',
BIND_STORE: 'Bind Store',
N_S_STORE: 'Bound Stores',
STORE_LIST: 'Store List',
......@@ -976,6 +979,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Unbind Equipment Success',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Bind Combined Equipment Success',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Unbind Combined Equipment Success',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Bind Energy Storage Power Station Success',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Unbind Energy Storage Power Stations Success',
BIND_TENANT_SUCCESS: 'Bind Tenant Success',
UNBIND_TENANT_SUCCESS: 'Unbind Tenant Success',
BIND_STORE_SUCCESS: 'Bind Store Success',
......@@ -2424,6 +2429,9 @@ function config($translateProvider) {
BIND_EQUIPMENT: '绑定设备',
N_S_EQUIPMENT: '绑定的设备',
EQUIPMENT_LIST: '设备列表',
BIND_ENERGY_STORAGE_POWER_STATION: '绑定储能电站',
N_S_ENERGY_STORAGE_POWER_STATION: '绑定的储能电站',
ENERGY_STORAGE_POWER_STATION_LIST: '储能电站列表',
BIND_TENANT: '绑定租户',
N_S_TENANT: '绑定的租户',
TENANT_LIST: '租户列表',
......@@ -2590,6 +2598,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: '解绑设备成功',
BIND_COMBINED_EQUIPMENT_SUCCESS: '绑定组合设备成功',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: '解绑组合设备成功',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: '绑定储能电站成功',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: '解绑储能电站成功',
BIND_TENANT_SUCCESS: '绑定租户成功',
UNBIND_TENANT_SUCCESS: '解绑租户成功',
BIND_STORE_SUCCESS: '绑定门店成功',
......@@ -4040,6 +4050,9 @@ function config($translateProvider) {
BIND_EQUIPMENT: 'Gerät binden',
N_S_EQUIPMENT: 'Gebundenes Gerät',
EQUIPMENT_LIST: 'Geräteliste',
BIND_ENERGY_STORAGE_POWER_STATION: 'Bind Energy Storage Kraftwerk',
N_S_ENERGY_STORAGE_POWER_STATION: 'Gebundene Energiespeicherkraftwerke',
ENERGY_STORAGE_POWER_STATION_LIST: 'Liste der Energiespeicherkraftwerke',
BIND_TENANT: 'Mieter binden',
N_S_TENANT: 'Gebundener Mieter',
TENANT_LIST: 'Mieterliste',
......@@ -4203,6 +4216,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Binden Sie das Gerät erfolgreich ab',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Binden Sie das kombinierte Gerät erfolgreich',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Binden Sie das kombinierte Gerät erfolgreich ab',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Bind Energy Storage Kraftwerk Erfolg',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Entbinden Sie den Erfolg von Energiespeicherkraftwerken',
BIND_TENANT_SUCCESS: 'Mieter erfolgreich binden',
UNBIND_TENANT_SUCCESS: 'Den Mieter erfolgreich binden',
BIND_STORE_SUCCESS: 'Binden Sie den Laden erfolgreich',
......@@ -5650,6 +5665,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Lier l’équipement combiné',
N_S_COMBINED_EQUIPMENT: 'Équipements combinés reliés',
COMBINED_EQUIPMENT_LIST: 'Liste d’équipement combiné',
BIND_ENERGY_STORAGE_POWER_STATION: 'Lier la centrale électrique de stockage d’énergie',
N_S_ENERGY_STORAGE_POWER_STATION: 'Centrales électriques de stockage d’énergie liée',
ENERGY_STORAGE_POWER_STATION_LIST: 'Liste des centrales électriques de stockage d\'énergie',
BIND_STORE: 'Lier le magasin',
N_S_STORE: 'Magasins reliés',
STORE_LIST: 'Liste des magasins',
......@@ -5816,6 +5834,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Délier l’équipement Succès',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Réussir à lier l’équipement combiné',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Délier le succès de l’équipement combiné',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Succès de la centrale électrique de stockage d’énergie Bind',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Délier le succès des centrales électriques de stockage d’énergie',
BIND_TENANT_SUCCESS: 'Lier la réussite des locataires',
UNBIND_TENANT_SUCCESS: 'Dissocier la réussite du locataire',
BIND_STORE_SUCCESS: 'Lier le succès du magasin',
......@@ -7263,6 +7283,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Equipos combinados Bind',
N_S_COMBINED_EQUIPMENT: 'Equipos combinados encuadernados',
COMBINED_EQUIPMENT_LIST: 'Lista de equipos combinados',
BIND_ENERGY_STORAGE_POWER_STATION: 'Central eléctrica de almacenamiento de energía Bind',
N_S_ENERGY_STORAGE_POWER_STATION: 'Centrales eléctricas de almacenamiento de energía vinculada',
ENERGY_STORAGE_POWER_STATION_LIST: 'Lista de centrales eléctricas de almacenamiento de energía',
BIND_STORE: 'Tienda de enlace',
N_S_STORE: 'Tiendas con destino',
STORE_LIST: 'Lista de tiendas',
......@@ -7429,6 +7452,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Desvincular el éxito del equipo',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Éxito de equipos combinados de Bind',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Desvincule el éxito de los equipos combinados',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Vincular el éxito de la central eléctrica de almacenamiento de energía',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Desvincular el éxito de las centrales eléctricas de almacenamiento de energía',
BIND_TENANT_SUCCESS: 'Vincular el éxito del inquilino',
UNBIND_TENANT_SUCCESS: 'Desvincular el éxito del inquilino',
BIND_STORE_SUCCESS: 'Éxito de Bind Store',
......@@ -8875,6 +8900,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Комбинированное оборудование Bind',
N_S_COMBINED_EQUIPMENT: 'Связанное комбинированное оборудование',
COMBINED_EQUIPMENT_LIST: 'Список комбинированного оборудования',
BIND_ENERGY_STORAGE_POWER_STATION: 'Электростанция хранения энергии Bind',
N_S_ENERGY_STORAGE_POWER_STATION: 'Электростанции для хранения связанной энергии',
ENERGY_STORAGE_POWER_STATION_LIST: 'Список электростанций по хранению энергии',
BIND_STORE: 'Магазин привязки',
N_S_STORE: 'Связанные магазины',
STORE_LIST: 'Список магазинов',
......@@ -9041,6 +9069,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Отмена привязки оборудования к успеху',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Успех комбинированного оборудования Bind',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Успех комбинированного оборудования Unbind',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Успех электростанции по хранению энергии Bind',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Успех электростанций по хранению энергии Unbind',
BIND_TENANT_SUCCESS: 'Привязка клиента к успеху',
UNBIND_TENANT_SUCCESS: 'Отмена привязки клиента к успеху',
BIND_STORE_SUCCESS: 'Успех привязки магазина',
......@@ -10487,6 +10517,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'ربط المعدات مجتمعة',
N_S_COMBINED_EQUIPMENT: 'المعدات المشتركة ملزمة',
COMBINED_EQUIPMENT_LIST: 'قائمة المعدات المجمعة',
BIND_ENERGY_STORAGE_POWER_STATION: 'ربط محطة توليد الطاقة لتخزين الطاقة',
N_S_ENERGY_STORAGE_POWER_STATION: 'محطات توليد الطاقة لتخزين الطاقة',
ENERGY_STORAGE_POWER_STATION_LIST: 'قائمة محطات توليد الطاقة لتخزين الطاقة',
BIND_STORE: 'ربط المتجر',
N_S_STORE: 'المتاجر الملزمة',
STORE_LIST: 'قائمة المتاجر',
......@@ -10653,6 +10686,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'فك ربط نجاح المعدات',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'ربط نجاح المعدات المشتركة',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'فك ربط نجاح المعدات المجمعة',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'ربط نجاح محطة توليد الطاقة بتخزين الطاقة',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'فك ارتباط نجاح محطات توليد الطاقة بتخزين الطاقة',
BIND_TENANT_SUCCESS: 'ربط نجاح المستأجر',
UNBIND_TENANT_SUCCESS: 'فك ربط نجاح المستأجر',
BIND_STORE_SUCCESS: 'ربط نجاح المتجر',
......@@ -12099,6 +12134,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Ràng buộc thiết bị kết hợp',
N_S_COMBINED_EQUIPMENT: 'Thiết bị kết hợp ràng buộc',
COMBINED_EQUIPMENT_LIST: 'Danh sách thiết bị kết hợp',
BIND_ENERGY_STORAGE_POWER_STATION: 'Nhà máy điện lưu trữ năng lượng Bind',
N_S_ENERGY_STORAGE_POWER_STATION: 'Nhà máy điện lưu trữ năng lượng ràng buộc',
ENERGY_STORAGE_POWER_STATION_LIST: 'Danh sách trạm điện lưu trữ năng lượng',
BIND_STORE: 'Cửa hàng ràng buộc',
N_S_STORE: 'Cửa hàng bị ràng buộc',
STORE_LIST: 'Danh sách cửa hàng',
......@@ -12265,6 +12303,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Cởi trói thiết bị thành công',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Ràng buộc thành công thiết bị kết hợp',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Unbind thiết bị kết hợp thành công',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Nhà máy điện lưu trữ năng lượng Bind thành công',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Giải phóng thành công các nhà máy điện lưu trữ năng lượng',
BIND_TENANT_SUCCESS: 'Ràng buộc thành công của người thuê nhà',
UNBIND_TENANT_SUCCESS: 'Cởi trói thành công của đối tượng thuê',
BIND_STORE_SUCCESS: 'Ràng buộc cửa hàng thành công',
......@@ -13711,6 +13751,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'ผูกอุปกรณ์รวม',
N_S_COMBINED_EQUIPMENT: 'อุปกรณ์รวมที่ถูกผูกไว้',
COMBINED_EQUIPMENT_LIST: 'รายการอุปกรณ์รวม',
BIND_ENERGY_STORAGE_POWER_STATION: 'สถานีไฟฟ้าเก็บพลังงานผูก',
N_S_ENERGY_STORAGE_POWER_STATION: 'สถานีไฟฟ้าเก็บพลังงานที่ถูกผูกไว้',
ENERGY_STORAGE_POWER_STATION_LIST: 'รายชื่อสถานีไฟฟ้าเก็บพลังงาน',
BIND_STORE: 'ร้านผูก',
N_S_STORE: 'ร้านค้าที่ถูกผูกไว้',
STORE_LIST: 'รายชื่อร้านค้า',
......@@ -13877,6 +13920,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'อุปกรณ์ยกเลิกการผูกสําเร็จ',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'ผูกความสําเร็จของอุปกรณ์รวม',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'การยกเลิกการผูกของอุปกรณ์ที่รวมกันสําเร็จ',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'ความสำเร็จของโรงไฟฟ้า Bind Energy Storage',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'เลิกผูกมัดความสำเร็จของสถานีไฟฟ้าเก็บพลังงาน',
BIND_TENANT_SUCCESS: 'ผูกความสําเร็จของผู้เช่า',
UNBIND_TENANT_SUCCESS: 'ยกเลิกการผูกความสําเร็จของผู้เช่า',
BIND_STORE_SUCCESS: 'ร้านค้าถูกผูกไว้เรียบร้อยแล้ว',
......@@ -15323,6 +15368,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Kombine Ekipmanı Bağlayın',
N_S_COMBINED_EQUIPMENT: 'Bağlı Kombine Ekipmanlar',
COMBINED_EQUIPMENT_LIST: 'Kombine Ekipman Listesi',
BIND_ENERGY_STORAGE_POWER_STATION: 'Bind Enerji Depolama Santrali',
N_S_ENERGY_STORAGE_POWER_STATION: 'Bağlı Enerji Depolama Santralleri',
ENERGY_STORAGE_POWER_STATION_LIST: 'Enerji Depolama Santrali Listesi',
BIND_STORE: 'Mağazayı Bağla',
N_S_STORE: 'Bağlı Mağazalar',
STORE_LIST: 'Mağaza Listesi',
......@@ -15489,6 +15537,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Bağımsız Ekipman Başarısı',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Kombine Ekipman Başarısını Bağlayın',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Unbind Kombine Ekipman Başarısı',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Bind Enerji Depolama Santrali Başarısı',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Enerji Depolama Güç İstasyonlarının Başarısını Çözün',
BIND_TENANT_SUCCESS: 'Kiracı Başarısını Bağlama',
UNBIND_TENANT_SUCCESS: 'Kiracı Başarısını Çöz',
BIND_STORE_SUCCESS: 'Mağaza Başarısını Bağlayın',
......@@ -16934,6 +16984,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Peralatan Gabungan Bind',
N_S_COMBINED_EQUIPMENT: 'Peralatan Gabungan terikat',
COMBINED_EQUIPMENT_LIST: 'Senarai Peralatan Gabungan',
BIND_ENERGY_STORAGE_POWER_STATION: 'Stesen Janakuasa Simpanan Tenaga Bind',
N_S_ENERGY_STORAGE_POWER_STATION: 'Stesen Janakuasa Simpanan Tenaga Terikat',
ENERGY_STORAGE_POWER_STATION_LIST: 'Senarai Stesen Janakuasa Simpanan Tenaga',
BIND_STORE: 'Kedai Bin',
N_S_STORE: 'Kedai terikat',
STORE_LIST: 'Senarai Kedai',
......@@ -17100,6 +17153,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Kejayaan Peralatan Unbind',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Kejayaan Peralatan Gabungan Bind',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Kejayaan Peralatan Gabungan Unbind',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Kejayaan Stesen Janakuasa Simpanan Tenaga Bind',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Nyahikat Kejayaan Stesen Janakuasa Penyimpanan Tenaga',
BIND_TENANT_SUCCESS: 'Kejayaan Penyewa Bind',
UNBIND_TENANT_SUCCESS: 'Kejayaan Penyewa Unbind',
BIND_STORE_SUCCESS: 'Kejayaan Kedai Bind',
......@@ -18546,6 +18601,9 @@ function config($translateProvider) {
BIND_COMBINED_EQUIPMENT: 'Mengikat Peralatan Gabungan',
N_S_COMBINED_EQUIPMENT: 'Peralatan Gabungan Terikat',
COMBINED_EQUIPMENT_LIST: 'Daftar Peralatan Gabungan',
BIND_ENERGY_STORAGE_POWER_STATION: 'Mengikat Pembangkit Listrik Penyimpanan Energi',
N_S_ENERGY_STORAGE_POWER_STATION: 'Pembangkit Listrik Penyimpanan Energi Terikat',
ENERGY_STORAGE_POWER_STATION_LIST: 'Daftar Pembangkit Listrik Penyimpanan Energi',
BIND_STORE: 'Toko Bind',
N_S_STORE: 'Toko Terikat',
STORE_LIST: 'Daftar Toko',
......@@ -18712,6 +18770,8 @@ function config($translateProvider) {
UNBIND_EQUIPMENT_SUCCESS: 'Keberhasilan Unbind Equipment',
BIND_COMBINED_EQUIPMENT_SUCCESS: 'Mengikat Keberhasilan Peralatan Gabungan',
UNBIND_COMBINED_EQUIPMENT_SUCCESS: 'Keberhasilan Peralatan Gabungan Unbind',
BIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Mengikat Keberhasilan Pembangkit Listrik Penyimpanan Energi',
UNBIND_ENERGY_STORAGE_POWER_STATION_SUCCESS: 'Keberhasilan Melepaskan Pembangkit Listrik Penyimpanan Energi',
BIND_TENANT_SUCCESS: 'Mengikat Keberhasilan Penyewa',
UNBIND_TENANT_SUCCESS: 'Sukses Putuskan Ikatan Penyewa',
BIND_STORE_SUCCESS: 'Mengikat Toko Sukses',
myems-admin/views/settings/space/space.html
浏览文件 @ 6539cc2b
......@@ -725,6 +725,65 @@
</div>
</div>
</uib-tab>
<uib-tab heading="{{'SPACE.BIND_ENERGY_STORAGE_POWER_STATION' | translate}}">
<div class="panel-body" ng-controller="SpaceEnergyStoragePowerStationController">
<div class="row">
<div class="col-lg-3">
<div class="panel panel-info">
<div class="panel-heading">
{{'SETTING.SELECT_SPACE' | translate}}
</div>
<div class="panel-body" style="overflow: auto; max-height: 700px;">
<div id="spacetreewithenergystoragepowerstation"></div>
</div>
</div>
</div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
{{'SPACE.N_S_ENERGY_STORAGE_POWER_STATION' | translate}}
</div>
<div class="panel-body maxheight"
x-hjc-drop-target="true"
x-on-drop="pairEnergyStoragePowerStation(dragEl,dropEl)"
uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
<div class="btn btn-primary btn-rounded btn-block"
title="{{spaceenergystoragepowerstation.name}}"
ng-repeat="spaceenergystoragepowerstation in spaceenergystoragepowerstations" x-hjc-draggable="true">
{{spaceenergystoragepowerstation.name}}</div>
</div>
</div>
<div class="panel panel-danger">
<div class="panel-heading">
{{'SETTING.TRASH' | translate}}
</div>
<div class="panel-body trash">
<img class="trashcan" src="img/trashcan.png" x-hjc-drop-target="true"
x-on-drop="deleteEnergyStoragePowerStationPair(dragEl,dropEl)">
</div>
</div>
</div>
<div class="col-lg-4">
<!-- according panel-->
<div class="panel panel-primary">
<div class="panel-heading"> {{'SPACE.ENERGY_STORAGE_POWER_STATION_LIST' | translate}} </div>
<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}"
slim-scroll box-height="760">
<div class="source btn btn-info btn-rounded btn-block"
ng-repeat="energystoragepowerstation in energystoragepowerstations" x-hjc-draggable="true">
{{energystoragepowerstation.name}}
</div>
</div>
</div>
</div>
</div>
</div>
</uib-tab>
</uib-tabset>
</div>
</div>
......
myems-api/core/space.py
浏览文件 @ 6539cc2b
......@@ -1100,7 +1100,7 @@ class SpaceEnergyStoragePowerStationCollection:
raise falcon.HTTPError(status=falcon.HTTP_400, title='API.ERROR',
description='API.SPACE_ENERGY_STORAGE_POWER_STATION_RELATION_EXISTS')
add_row = (" INSERT INTO tbl_spaces_equipments (space_id, energy_storage_power_station_id) "
add_row = (" INSERT INTO tbl_spaces_energy_storage_power_stations (space_id, energy_storage_power_station_id) "
" VALUES (%s, %s) ")
cursor.execute(add_row, (id_, energy_storage_power_station_id,))
cnx.commit()
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或