From 0cd906c45db3badb02753a1988904ca7876b6d1a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 16:03:56 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bat-set-test.jsp | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index b541d2c..4f0944c 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -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>
--
Gitblit v1.9.1