From de072c451bdf8b49efea074e86d129e043e9df6b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 08:50:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batch-set-curr.jsp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index 5e5e0ec..3f3015e 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -813,9 +813,11 @@
}
var trIndex = getSetCurrIndex(data, tOptions.data);
+ //console.log(trIndex);
// 琚缃弬鏁扮殑鏈烘埧
for(var i=0; i<trIndex.length; i++) {
var _data = data[i];
+ console.log(_data);
var _trIndex = trIndex[i];
var _temp = {'doThings':''};
if(_data.num==1) {
@@ -1059,12 +1061,14 @@
for(var i=0; i<setData.length; i++) {
var _setData = setData[i];
var setDevId = _setData.dev_id;
+ //console.log(setDevId);
// 閬嶅巻allData
for(var k=0; k<allData.length; k++) {
- var _allData = allData[i];
+ var _allData = allData[k];
var allDevId = _allData.FBSDeviceId;
if(setDevId == allDevId) {
rs.push(k);
+ break;
}
}
--
Gitblit v1.9.1