批量添加测试添加操作记录

hdw

2019-01-09 c6571f135b5edb236db9a5a7658de742d4faf9a7

批量添加测试添加操作记录

 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>


 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>

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

                // 点击添加电池组

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

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

                    var structData = structAddData();

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

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

                

                

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

                var addBattStr = '';

                // 查询正在放电的设备

                function searchChargeDev(callback, cParam, isCallback) {

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

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

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

                        tOptions.data = [];

                        // 清空字符串

                        addBattStr = '';

                        // 查询正在放电的内容

                        $.ajax({

                            type: 'post'

@@ -667,6 +671,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 +803,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);

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

                        return;

                    }

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

                    // 显示面板

                    layer.open({

                        type: 2

@@ -1217,7 +1230,16 @@
                    }

                    

                    return rs;

                }				
                }

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

                function getFilterStr(data) {

                    var rsString = '';

                    rsString += data.StationName;

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

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

                    return rsString;

                }		
                

            });

        </script>


 gx_tieta/WebRoot/iframe/setcurr.html

@@ -51,8 +51,8 @@
            var table = layui.table;

            

            var setCurr = parent.$('#setCurrIframe').data('setCurr');

            
            console.log(setCurr);

            var addBattStr = parent.$('#setCurrIframe').data('addBattStr');

            console.log(addBattStr);

            // 表格模块

            var tOptions = {

                elem: '#pageTbl'

@@ -133,7 +133,7 @@
                    type: 'post'

                    ,async: true

                    ,url: 'Fbs9100_setparamAction_action_updatePro_dis'

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

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

                    ,dataType: 'json'

                    ,success: function(res) {

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