From 864e4772eea5e0a589b6f6797d0695a3b3dd225e Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:19:31 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/global_zh_CN.properties | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index f0e0451..128f98e 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -782,6 +782,7 @@ No=\u5426 ################ power.jsp########################## +Permit = \u6743\u9650 Power_groups_list=\u6743\u9650\u7ec4\u5217\u8868 Power_groups_user_list=\u6743\u9650\u7ec4\u7528\u6237\u5217\u8868 Report_query=\u62a5\u8868\u67e5\u8be2\u6743\u9650 @@ -1037,6 +1038,7 @@ ################## equip-stats-change.jsp ################## Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2 +Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2 ################### batt-attention.jsp ####################### Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406 @@ -1109,10 +1111,20 @@ ################### ex-battinfo.jsp ################################## Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279 - +Audit = \u5ba1\u6838 +Acceptance = \u9a8c\u6536 ################## batch-set-curr.jsp ############################## Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5 ################## batt-station-update1.jsp ######################### -BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7 \ No newline at end of file +BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7 + +################## bat-set-test.jsp ############################## +Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e + +################## sys-set-test.jsp ############################## +Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e + +################## bts-comm-mon.jsp ######################### +Batt_conn_info_query = \u7535\u6c60\u7ec4\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2 \ No newline at end of file -- Gitblit v1.9.1