From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.23> Date: 星期一, 12 十一月 2018 10:12:26 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/global_zh_CN.properties | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index c380041..0958021 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -1009,6 +1009,7 @@ #################### endure.jsp ############################ Battery_life=\u7535\u6c60\u7ec4\u7eed\u822a\u80fd\u529b Batt_life_history_query=\u7535\u6c60\u7eed\u822a\u80fd\u529b\u5386\u53f2\u67e5\u8be2 +Station_life_query = \u673a\u623f\u7eed\u822a\u80fd\u529b\u67e5\u8be2 real_time = \u5b9e\u65f6 Endurance = \u7eed\u822a Cruising_ability=\u7eed\u822a\u80fd\u529b @@ -1080,3 +1081,24 @@ ################## btsStatus.jsp #################################### 61850_workposition = 61850\u5de5\u4f5c\u72b6\u6001 + +################## ele-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406 #################################### +Batt_pack_management = \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406 + + +################## set-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55 ################################# +Batt_makegrouprecord = \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55 + +################## batt-state-mange.jsp \u673a\u623f\u72b6\u6001\u67e5\u8be2 ########################### +Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2 + +################## batt-state-statistical.jsp \u673a\u623f\u72b6\u6001\u7edf\u8ba1 ############################# +Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2 + + +################## batt-fault-manage.jsp ############################## +Problem_feedback = \u95ee\u9898\u53cd\u9988 +Station_problem_record = \u673a\u623f\u95ee\u9898\u8bb0\u5f55 + +################## batt-traffic-statistics1.jsp ############################## +Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2 \ No newline at end of file -- Gitblit v1.9.1