Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

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

2019-01-09 0cd906c45db3badb02753a1988904ca7876b6d1a

 gx_tieta/WebRoot/bat-set-test.jsp

@@ -120,8 +120,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>

@@ -818,6 +818,8 @@
                 batchSetBattParams(rsData, keyIds);

              });

              

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

              var addBattStr = '';

              // 批量设置放电参数

              function batchSetBattParams(params, keys) {

                 // 判断data的值是否为空

@@ -833,7 +835,7 @@
                       type: 'post'

                       ,async: true

                       ,url: 'Fbs9100_battparamAction_action_updatePro'

                       ,data: 'json='+JSON.stringify(params)

                       ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr

                       ,dataType: 'json'

                       ,success: function(res) {

                          var rs = JSON.parse(res.result);

@@ -906,12 +908,22 @@
                       var rs = JSON.parse(res.result);

                       //console.log(rs);

                       var data = [];

                       addBattStr = '';      // 初始化字符串 
                       if(rs.code == 1) {

                          data = rs.data;

                          data = formatSearchData(data);

                       }else {

                          layer.msg('没有可设置的电池组!');

                       }

                       // 如果有添加的数据

                       if(data.length !=0) {

                          if(addBattStr.length == 0) {   // 字符串长度为0

                             addBattStr += getFilterStr(temp);

                          }else {

                             addBattStr += ','+getFilterStr(temp);	
                          }

                       }

        					
                       tOptions.data = data;

                       //console.log(data);

                         // 生成表格数据

@@ -1072,6 +1084,15 @@
               }

               return rs;

            }

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

            function getFilterStr(data) {

               var rsString = '';

               rsString += data.StationName;

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

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

               return rsString;

            }

           });

        </script>

    </body>