Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-08 de072c451bdf8b49efea074e86d129e043e9df6b

 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;

                     }

                  }