From d11cadaa677d5c117f6e17dcd4d81fc93348e14f Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.25> Date: 星期二, 13 十一月 2018 13:19:15 +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 | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index 0958021..45a1e7b 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -1089,11 +1089,14 @@ ################## 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 ########################### +################## batt-state-mange.jsp \u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2 ########################### Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2 +Station_real_status_query=\u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2 ################## batt-state-statistical.jsp \u673a\u623f\u72b6\u6001\u7edf\u8ba1 ############################# Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2 + +Station_histor_events_query = \u673a\u623f\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2 ################## batt-fault-manage.jsp ############################## @@ -1101,4 +1104,8 @@ 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 +Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2 +Device_traffic_query = \u8bbe\u5907\u6d41\u91cf\u67e5\u8be2 + + +Batt_data_analysis = \u7535\u6c60\u6570\u636e\u5206\u6790 \ No newline at end of file -- Gitblit v1.9.1