From 7f953d9aa0e7d4fcbe3c366c7f9f0b3f847f12bd Mon Sep 17 00:00:00 2001 From: hdw <hdw@192.168.137.1> Date: 星期六, 19 一月 2019 09:16:08 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/global_zh_CN.properties | 47 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index 1609111..128f98e 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -256,7 +256,7 @@ Installation_date=\u5b89\u88c5\u65e5\u671f Battery_installation_time=\u7535\u6c60\u5b89\u88c5\u65e5\u671f Discharge_total=\u653e\u7535\u6d4b\u8bd5\u603b\u6b21\u6570 -Discharge_test_times=\u65b0\u589e\u653e\u7535\u6d4b\u8bd5\u6b21\u6570 \t +Discharge_test_times=\u653e\u7535\u6d4b\u8bd5\u6b21\u6570 Latest_test_time=\u6700\u8fd1\u653e\u7535\u6d4b\u8bd5\u65f6\u95f4 Battery_maintenance_times=\u7535\u6c60\u5f02\u5e38\u7ef4\u62a4\u6b21\u6570 \t Latest_maintenance_time=\u6700\u8fd1\u7ef4\u62a4\u65f6\u95f4 @@ -277,7 +277,6 @@ ############# eleAssess.jsp ###################### Record_number=\u8bb0\u5f55\u7f16\u53f7 Use_fixed_year=\u4f7f\u7528\u5e74\u9650 -Discharge_test_times=\u653e\u7535\u6d4b\u8bd5\u6b21\u6570 Battery_failure_frequency=\u7535\u6c60\u6545\u969c\u6b21\u6570 Failure_frequency=\u6545\u969c\u6b21\u6570 Highest_capacity=\u5386\u53f2\u6700\u9ad8\u5bb9\u91cf @@ -430,7 +429,7 @@ Level_two_warn=\u4e8c\u7ea7\u544a\u8b66 Level_thr_warn=\u4e09\u7ea7\u544a\u8b66 Level_four_warn=\u56db\u7ea7\u544a\u8b66 -Alarm_start_time=\u544a\u8b66\u5f00\u59cb\u65f6\u95f4\u6bb5 +Alarm_start_time=\u544a\u8b66\u5f00\u59cb\u65f6\u95f4 Alarm_state_warn_light=\u544a\u8b66\u72b6\u6001\u8b66\u793a\u706f Alarm_condition_to_filter=\u544a\u8b66\u6761\u4ef6\u8fc7\u6ee4 Alarm_threshold_filter=\u544a\u8b66\u9600\u503c\u8fc7\u6ee4 @@ -442,7 +441,6 @@ Alarm_value=\u544a\u8b66\u503c Alarm_level=\u544a\u8b66\u7b49\u7ea7 Confirm_alarm_time=\u544a\u8b66\u786e\u8ba4\u65f6\u95f4 -Alarm_start_time=\u544a\u8b66\u5f00\u59cb\u65f6\u95f4 Alarm_deadline=\u544a\u8b66\u7ed3\u675f\u65f6\u95f4 ################equipHistWarn.jsp###################### @@ -496,7 +494,7 @@ Alter=\u66f4\u6539 Set_up=\u8bbe\u7f6e Start_up=\u542f\u52a8 -End=\u7ec8\u6b62 +End=\u7ed3\u675f UserID=\u7528\u6237ID #################holidayMgr.jsp############################## @@ -585,13 +583,12 @@ Inform_supervisor_make=\u901a\u77e5\u4e3b\u7ba1\u4f7f\u80fd Whether_inform_supervisor=\u662f\u5426\u901a\u77e5\u4e3b\u7ba1 supervisor_name=\u4e3b\u7ba1\u59d3\u540d -Assign_name=\u6307\u6d3e\u4eba\u59d3\u540d Remark=\u5907\u6ce8 Test_data_ID=\u6d4b\u8bd5\u6570\u636eID Task_Enabled=\u4f5c\u4e1a\u4f7f\u80fd Expiration_date=\u622a\u6b62\u65e5\u671f Have_the_test=\u662f\u5426\u5df2\u6d4b\u8bd5 -Start_date=\u8d77\u59cb\u65e5\u671f +Start_date=\u5f00\u59cb\u65e5\u671f Whether_has_completed=\u662f\u5426\u5df2\u5b8c\u6210 Job_submission_time=\u4f5c\u4e1a\u63d0\u4ea4\u65f6\u95f4 From_template=\u4ece\u6a21\u677f @@ -607,7 +604,6 @@ Job_execution_number_days=\u4f5c\u4e1a\u6267\u884c\u671f\u81ea\u589e\u5929\u6570 Task_allows_extension_number_day=\u4f5c\u4e1a\u5141\u8bb8\u5ef6\u671f\u5929\u6570 Rule_out_weekend=\u6392\u9664\u5468\u672b -Exclude_holidays=\u6392\u9664\u8282\u5047\u65e5 Saturday=\u661f\u671f\u516d Sunday=\u661f\u671f\u5929 Confirm_exclude=\u786e\u8ba4\u6392\u9664 @@ -658,7 +654,6 @@ Person_liable=\u8d23\u4efb\u4eba Creater=\u521b\u5efa\u4eba Priority=\u4f18\u5148\u7ea7 -Start_date=\u5f00\u59cb\u65e5\u671f Completion_date=\u5b8c\u6210\u65e5\u671f Latest_progress=\u6700\u65b0\u8fdb\u5c55 Spot_checks_user=\u88ab\u62bd\u67e5\u7528\u6237 @@ -724,7 +719,6 @@ Figure = \u56fe reasons=\u539f\u56e0 Start = \u5f00\u59cb -End = \u7ed3\u675f Batch = \u6279\u91cf Operation = \u64cd\u4f5c Preinstall = \u9884\u8bbe @@ -788,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 @@ -1043,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 @@ -1096,10 +1092,39 @@ ################## 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 ############################## 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 +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 + +################## bts-comm-task.jsp ################################ +Dev_connect_info_query=\u8bbe\u5907\u8fde\u63a5\u4fe1\u606f\u67e5\u8be2 + +################### 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 + +################## 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