未审批可更改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 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>

@@ -537,13 +537,12 @@
                  ,{field:'StationName', title:'机房名称', align:'center', width: 470}

                  ,{field:'BattGroupId', title:'电池组ID', align:'center', width: 160}

                  ,{field:'BattGroupName', title:'电池组名称', align:'center', width: 160}

                  ,{field:'devStatus', title:'设备状态', templet: '#devStatus', align:'center', width: 600}

                  ,{field:'devStatus', title:'设备状态', templet: '#devStatus', align:'center', width: 700}

                  ,{field:'testTime', title:'已测时长', templet: '#testTime', align:'center', width: 140}

                  ,{field:'signalNum', title:'通信计数', templet: '#signalNum', align:'center', width: 140}

                  ,{field:'StationName9', title:'设备版本号', align:'center', width: 160}

                  ,{field:'MonCount', title:'单体数量', align:'center', width: 100}

                  ,{field:'Load_curr', title:'负载电流', align:'center', width: 100}

                  ,{field:'MonCapStd', title:'标称容量', align:'center', width: 100}

                  ,{field:'MonVolStd', title:'标称单体电压', align:'center', width: 140}

                  ,{field:'doThings', fixed: 'right', title: '设置状态', toolbar: '#setStatus', align: 'center', width: 160}

                ]]

               ,data:[]

@@ -565,6 +564,7 @@
              

              // 点击添加电池组

              $('#setCurrIframe').data('setCurr', []);

        		
              $('#batchAdd').click(function() {

                 var structData = structAddData();

               // 判断是否选择要添加的内容

@@ -578,7 +578,8 @@
              });

              

              

        		
              // 设置添加操作的字符串

              var addBattStr = '';

              // 查询正在放电的设备

              function searchChargeDev(callback, cParam, isCallback) {

                 var rq = structAddData();      // 获取查询条件

@@ -589,6 +590,8 @@
                    devType = preDevType;

                    // 设备类型的条件改变清空表格

                    tOptions.data = [];

                    // 清空字符串

                    addBattStr = '';

                    // 查询正在放电的内容

                    $.ajax({

                       type: 'post'

@@ -667,6 +670,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 +802,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);

@@ -813,9 +825,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) {

@@ -840,7 +854,7 @@
               

               // 构造批量设置放电参数的方法

               function getSetCurrParam(data, ratio) {

                  //console.log(data);

                  // console.log(data);

                  var rs = [];

                  for(var i=0; i<data.length; i++) {

                     var _data = data[i];

@@ -982,7 +996,7 @@
                  layer.msg('暂无无法启动,请先设置放电参数!');

                  return;

               }

					
               $('#setCurrIframe').data('addBattStr', addBattStr);

               // 显示面板

               layer.open({

                  type: 2

@@ -1059,12 +1073,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;

                     }

                  }

                  

@@ -1164,12 +1180,14 @@
                           if(_data.dev_workstate ==0 && _data.dev_res_test_state != 0) {

                              index = 3;

                           }

                           var monCap = _data.dev_captest_cap==0?_data.dev_captest_cap:_data.dev_captest_cap.toFixed(1);

                           // 设置设备状态字符串

                           str = "状态:"   + workStates[index]+

                                ",告警:"+alarmStates[_data.dev_alarmstate]+

                                ",组端电压(V):"+_data.dev_captest_groupvol+

                                ",在线电压(V):"+_data.dev_captest_onlinevol+

                                ",电流(A):"+_data.dev_captest_curr+

                                ",容量(AH):"+_data.dev_captest_cap;

                                ",容量(AH):"+monCap;

                           // 设置设备内阻测试的字符串

                           if(index == 3){

                               str = "状态:"+workStates[index]+

@@ -1213,7 +1231,16 @@
               }

               

               return rs;

            }				
            }

				
            // 获取筛选条件的字符串

            function getFilterStr(data) {

               var rsString = '';

               rsString += data.StationName;

               rsString += '-'+data.MonVolStd+'V设备';

               rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');

               return rsString;

            }		
            

           });

        </script>