From eed5715ed72cda38a07d792b3750fdb077ff0492 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 14:30:57 +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 | 31 +++++++++++++--
gx_tieta/WebRoot/js/buildNav.js | 1
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/Filters/HotlinkFilter.class | 0
gx_tieta/WebRoot/iframe/setcurr.html | 6 +-
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/WebRoot/batch-set-curr.jsp | 36 ++++++++++++++---
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java | 1
9 files changed, 68 insertions(+), 17 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 8d3efec..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">
@@ -120,8 +120,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -818,6 +818,8 @@
batchSetBattParams(rsData, keyIds);
});
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鎵归噺璁剧疆鏀剧數鍙傛暟
function batchSetBattParams(params, keys) {
// 鍒ゆ柇data鐨勫�兼槸鍚︿负绌�
@@ -833,7 +835,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_battparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(params)
+ ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -906,12 +908,22 @@
var rs = JSON.parse(res.result);
//console.log(rs);
var data = [];
+ addBattStr = ''; // 鍒濆鍖栧瓧绗︿覆
if(rs.code == 1) {
data = rs.data;
data = formatSearchData(data);
}else {
layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
}
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
+ }
+
tOptions.data = data;
//console.log(data);
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -1072,6 +1084,15 @@
}
return rs;
}
+
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 3f3015e..582651d 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -117,8 +117,8 @@
<div class="layui-form-item">
<div class="layui-input-block">
<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
- <option value="12">1U璁惧</option>
- <option value="2">2U璁惧</option>
+ <option value="12">12V璁惧</option>
+ <option value="2">2V璁惧</option>
</select>
</div>
</div>
@@ -565,6 +565,7 @@
// 鐐瑰嚮娣诲姞鐢垫睜缁�
$('#setCurrIframe').data('setCurr', []);
+
$('#batchAdd').click(function() {
var structData = structAddData();
// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
@@ -578,7 +579,8 @@
});
-
+ // 璁剧疆娣诲姞鎿嶄綔鐨勫瓧绗︿覆
+ var addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勮澶�
function searchChargeDev(callback, cParam, isCallback) {
var rq = structAddData(); // 鑾峰彇鏌ヨ鏉′欢
@@ -589,6 +591,8 @@
devType = preDevType;
// 璁惧绫诲瀷鐨勬潯浠舵敼鍙樻竻绌鸿〃鏍�
tOptions.data = [];
+ // 娓呯┖瀛楃涓�
+ addBattStr = '';
// 鏌ヨ姝ｅ湪鏀剧數鐨勫唴瀹�
$.ajax({
type: 'post'
@@ -667,6 +671,15 @@
var data = [];
if(rs.code == 1) {
data = getFilterData(rs.data, tOptions.data);
+ }
+
+ // 濡傛灉鏈夋坊鍔犵殑鏁版嵁
+ if(data.length !=0) {
+ if(addBattStr.length == 0) { // 瀛楃涓查暱搴︿负0
+ addBattStr += getFilterStr(temp);
+ }else {
+ addBattStr += ','+getFilterStr(temp);
+ }
}
// 灏嗘暟鎹坊鍔犲埌琛ㄦ牸涓�
for(var i=0; i<data.length; i++) {
@@ -790,14 +803,14 @@
// 璇锋眰璁剧疆鍙傛暟
function ajaxSetParam(param) {
- console.log(param);
+ //console.log(param);
var load = layer.load(1);
// 璇锋眰鍚庡彴
$.ajax({
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr // 娣诲姞鎿嶄綔璁板綍
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
@@ -984,7 +997,7 @@
layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
return;
}
-
+ $('#setCurrIframe').data('addBattStr', addBattStr);
// 鏄剧ず闈㈡澘
layer.open({
type: 2
@@ -1217,7 +1230,16 @@
}
return rs;
- }
+ }
+
+ // 鑾峰彇绛涢�夋潯浠剁殑瀛楃涓�
+ function getFilterStr(data) {
+ var rsString = '';
+ rsString += data.StationName;
+ rsString += '-'+data.MonVolStd+'V璁惧';
+ rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'鐢垫睜缁�1': '鐢垫睜缁�2');
+ return rsString;
+ }
});
</script>
diff --git a/gx_tieta/WebRoot/iframe/setcurr.html b/gx_tieta/WebRoot/iframe/setcurr.html
index 29513e9..951acf5 100644
--- a/gx_tieta/WebRoot/iframe/setcurr.html
+++ b/gx_tieta/WebRoot/iframe/setcurr.html
@@ -51,8 +51,8 @@
var table = layui.table;
var setCurr = parent.$('#setCurrIframe').data('setCurr');
-
- console.log(setCurr);
+ var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
+ console.log(addBattStr);
// 琛ㄦ牸妯″潡
var tOptions = {
elem: '#pageTbl'
@@ -133,7 +133,7 @@
type: 'post'
,async: true
,url: 'Fbs9100_setparamAction_action_updatePro_dis'
- ,data: 'json='+JSON.stringify(param)
+ ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
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