From 4d29d3ec20673c8ed5480731306fb3ce6b1dcff1 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 19 Sep 2021 15:40:24 +0800 Subject: [PATCH 1/2] updated translation of Admin UI --- admin/app/translations.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/app/translations.js b/admin/app/translations.js index f135fb85..031ee6fc 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -1328,7 +1328,7 @@ function config($translateProvider) { INPUT_SVG: '请输入SVG', DESCRIPTION: '描述', DISTRIBUTION_CIRCUIT: '配电回路', - N_S_DISTRIBUTION_CIRCUIT: '所属配电回路', + N_S_DISTRIBUTION_CIRCUIT: '附属配电回路', ADD_DISTRIBUTION_CIRCUIT: '添加配电回路', EDIT_DISTRIBUTION_CIRCUIT: '编辑配电回路', SELECT_DISTRIBUTION_CIRCUIT: '请选择配电回路', @@ -1355,14 +1355,14 @@ function config($translateProvider) { EDIT_ENERGY_FLOW_DIAGRAM: '编辑能流图', SELECT_ENERGY_FLOW_DIAGRAM: '请选择能流图', NODE: '节点', - N_S_NODE: ' 所属节点', + N_S_NODE: ' 附属节点', ADD_NODE: '添加节点', EDIT_NODE: '编辑节点', NODE_ID: '节点ID', NODE_NAME: '节点名称', INPUT_NODE_NAME: '请输入节点名称', LINK: '链接', - N_S_LINK: ' 所属链接', + N_S_LINK: ' 附属链接', LINK_ID: '链接ID', ADD_LINK: '添加链接', EDIT_LINK: '编辑链接', @@ -1389,7 +1389,7 @@ function config($translateProvider) { BIND_PARAMETER: '绑定参数', ADD_PARAMETER: '添加参数', EDIT_PARAMETER: '编辑参数', - N_S_PARAMETER: '所含参数', + N_S_PARAMETER: '附属参数', PARAMETER_ID: 'ID', PARAMETER_NAME: '名称', INPUT_PARAMETER_NAME: '请输入名称', @@ -1418,7 +1418,7 @@ function config($translateProvider) { BIND_PARAMETER: '绑定参数', ADD_PARAMETER: '添加参数', EDIT_PARAMETER: '编辑参数', - N_S_PARAMETER: '所含参数', + N_S_PARAMETER: '附属参数', PARAMETER_ID: 'ID', PARAMETER_NAME: '名称', INPUT_PARAMETER_NAME: '请输入名称', From ee228c752b6bdb7c7b9fa612675af1a12c8f1ae7 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 19 Sep 2021 15:42:23 +0800 Subject: [PATCH 2/2] updated demo script of database --- database/demo-cn/myems_system_db.sql | 2 +- database/demo-de/myems_system_db.sql | 2 +- database/demo-en/myems_system_db.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/database/demo-cn/myems_system_db.sql b/database/demo-cn/myems_system_db.sql index ea537652..0dbed1b3 100644 --- a/database/demo-cn/myems_system_db.sql +++ b/database/demo-cn/myems_system_db.sql @@ -167,7 +167,7 @@ USE `myems_system_db`; INSERT INTO `myems_system_db`.`tbl_distribution_circuits` (`id`, `name`, `uuid`, `distribution_system_id`, `distribution_room`, `switchgear`, `peak_load`, `peak_current`, `customers`, `meters`) VALUES -(1, '51W91', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, 'EW1', '51AL9', 30, 53.6, '地下室应急照明', 'ALE-1102, ALE-1082'); +(1, 'AHa01', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, '1ES', 'AHa01', 5100, 1250, '11#电源进线1WHj2', 'AHa01'); COMMIT; diff --git a/database/demo-de/myems_system_db.sql b/database/demo-de/myems_system_db.sql index cd42078e..f32c664a 100644 --- a/database/demo-de/myems_system_db.sql +++ b/database/demo-de/myems_system_db.sql @@ -167,7 +167,7 @@ USE `myems_system_db`; INSERT INTO `myems_system_db`.`tbl_distribution_circuits` (`id`, `name`, `uuid`, `distribution_system_id`, `distribution_room`, `switchgear`, `peak_load`, `peak_current`, `customers`, `meters`) VALUES -(1, '51W91', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, 'EW1', '51AL9', 30, 53.6, '地下室应急照明', 'ALE-1102, ALE-1082'); +(1, 'AHa01', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, '1ES', 'AHa01', 5100, 1250, '11#电源进线1WHj2', 'AHa01'); COMMIT; diff --git a/database/demo-en/myems_system_db.sql b/database/demo-en/myems_system_db.sql index c7c52d6c..cab33495 100644 --- a/database/demo-en/myems_system_db.sql +++ b/database/demo-en/myems_system_db.sql @@ -167,7 +167,7 @@ USE `myems_system_db`; INSERT INTO `myems_system_db`.`tbl_distribution_circuits` (`id`, `name`, `uuid`, `distribution_system_id`, `distribution_room`, `switchgear`, `peak_load`, `peak_current`, `customers`, `meters`) VALUES -(1, '51W91', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, 'EW1', '51AL9', 30, 53.6, '地下室应急照明', 'ALE-1102, ALE-1082'); +(1, 'AHa01', '52f7abe1-ba0e-47a6-a327-4faac42a1d11', 1, '1ES', 'AHa01', 5100, 1250, '11#电源进线1WHj2', 'AHa01'); COMMIT;