From 9ddc2aee31b9afc21659b378932a0f46f43071c2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.24>
Date: 星期日, 30 九月 2018 11:50:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/dataManage.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/dataManage.jsp b/gx_tieta/WebRoot/dataManage.jsp
index 708cdd1..f0f53ae 100644
--- a/gx_tieta/WebRoot/dataManage.jsp
+++ b/gx_tieta/WebRoot/dataManage.jsp
@@ -351,7 +351,7 @@
var binfs=new Array();
$('.tbl-body table tbody tr').each(function(i){
if($(this).hasClass('b8cfe5')){
- binfs.push(Alltestdata[i].binf);
+ binfs.push(batttestdatas[i].binf);
}
});
if(confirm("纭鍒犻櫎杩�"+binfs.length+"鏉℃祴璇曟暟鎹悧锛�")){
@@ -440,7 +440,7 @@
});
});
-
+ var batttestdatas; //褰撳墠琛ㄦ牸涓殑鏁版嵁鏁扮粍(鍏朵腑鐨剆tationid鏍囪瘑浜嗗綋鍓嶆暟鎹槸灞炰簬鍐呴樆鏁版嵁杩樻槸鍏呮斁鐢垫暟鎹�)
var formjson;
//鏍规嵁绛涢�夋潯浠舵煡璇�
function searchDisCharage(){
@@ -451,6 +451,7 @@
formjson = temp;
}
Alltestdata=new Array();
+ batttestdatas = new Array();
// 娓呴櫎琛ㄦ牸鍐呭
$('.tbl-body table').remove();
//鍒涘缓绛夊緟妗�
@@ -470,6 +471,7 @@
var alllist=list[i];
var tmp = $.extend(true, {}, alllist.data);
Alltestdata.push(tmp);
+ batttestdatas.push(alllist.data);
Page = alllist.data.page;
tbArrTd.push(alllist.data.binf.StationName); //鏈烘埧鍚嶇О
tbArrTd.push(alllist.data.binf.BattGroupName); //鐢垫睜缁勫悕绉�
--
Gitblit v1.9.1