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/batch-set-curr.jsp | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
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>
--
Gitblit v1.9.1