From b4828d7800516141d6bdb419111a5f4e0e7ac554 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期三, 09 一月 2019 11:56:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bat-set-test.jsp | 4 ++--
gx_tieta/WebRoot/js/buildNav.js | 1 +
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class | 0
gx_tieta/src/global_zh_CN.properties | 5 ++++-
gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 5 ++++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class | 0
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java | 1 +
7 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class
index f1562a6..ba62eaa 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class
index 7c5a11b..909edd0 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 49e5d5f..8734d71 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1118,4 +1118,7 @@
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
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index 6d414fa..4f0944c 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -15,7 +15,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title>鐢垫睜鍙傛暟璁剧疆</title>
+ <title><s:text name="Batch_batt_param_set"/></title> <!-- 鎵归噺鐢垫睜鍙傛暟璁剧疆 -->
<link rel="stylesheet" type="text/css" href="pages/css/base.css">
<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -59,7 +59,7 @@
<div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
<!-- 鏉′欢绛涢�� -->
<div class="layui-page-filter">
- <div class="page-filter-header layui-page-filter-fweight">鐢垫睜鍙傛暟璁剧疆</div>
+ <div class="page-filter-header layui-page-filter-fweight"><s:text name="Batch_batt_param_set"/></div>
<div class="page-filter-content">
<table>
<tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
diff --git a/gx_tieta/WebRoot/js/buildNav.js b/gx_tieta/WebRoot/js/buildNav.js
index aa37cb8..1e23f7c 100644
--- a/gx_tieta/WebRoot/js/buildNav.js
+++ b/gx_tieta/WebRoot/js/buildNav.js
@@ -63,6 +63,7 @@
{permit_item_name:'batt_discharge_model_permit',num:71}, //鐢垫睜缁勯厤缁勭鐞�
{permit_item_name:'install_look_permit',num:82}, //鍩虹珯瀹夎瀹℃壒
{permit_item_name:'batt_discharge_model_permit',num:83}, //BTS璁惧鍗囩骇
+ {permit_item_name:'batt_discharge_model_permit',num:84}, //鎵归噺鐢垫睜缁勫弬鏁拌缃�
{permit_item_name:'batt_alm_param_query_permit',num:31}, // 鐢垫睜鍛婅鍙傛暟璁剧疆
{permit_item_name:'batt_alm_param_query_permit',num:66} // 璁惧鍛婅鍙傛暟璁剧疆
diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index 4367b80..94d7d86 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -88,6 +88,7 @@
{"batt_discharge_model_permit","71"}, //鐢垫睜缁勯厤缁勭鐞�
{"install_look_permit","82"}, //鍩虹珯瀹夎瀹℃壒
{"batt_discharge_model_permit","83"}, //BTS璁惧鍗囩骇
+ {"batt_discharge_model_permit","84"}, //鎵归噺鐢垫睜缁勫弬鏁拌缃�
{"batt_alm_param_query_permit","31"}, //鍛婅鍙傛暟璁剧疆
{"batt_alm_param_query_permit","66"}, //璁惧鍛婅鍙傛暟璁剧疆
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 49e5d5f..8734d71 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1118,4 +1118,7 @@
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
\ No newline at end of file
--
Gitblit v1.9.1