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

81041

2018-11-28 651c30db295e199e08105dab74b3a7a5e503e74b

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

 gx_tieta/WebRoot/batt-station-update1.jsp

@@ -134,6 +134,11 @@
                <a class="layui-btn layui-btn-xs" lay-event="update">升级</a>

            {{# } }}

        </script>

        <script type="text/html" id="upProgress">

            <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="upload{{d.fbsid}}" style="margin-top:6px">

                  <div class="layui-progress-bar" lay-percent="0%"></div>

            </div>

        </script>

        <script type="text/javascript" src="js/jquery-1.8.3.js"></script>

        <script type="text/javascript" src="js/echarts.js"></script>

        <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>

@@ -145,6 +150,7 @@
                var table = layui.table;        // 获取表格模块

                var form = layui.form;            // 获取表单模块

                var layer = layui.layer;        // 获取弹出框模块

                var element = layui.element;    // 获取元素操作模块

                

                var isNewLoad = true;

                var pre_province = getQueryString('province');

@@ -377,6 +383,7 @@
                        ,{field:'fbsname', title:'设备名称', align:'center'}

                        ,{field:'updatestatus', title:'升级状态', align:'center'}

                        ,{field:'status', title:'读写状态', align:'center'}

                        ,{field:'progress', title:'上传进度', align: 'center', templet:'#upProgress'}

                        ,{field:'datapackage', title:'当前数据包', align:'center'}

                        ,{fixed: 'right', title:'操作', align:'center', toolbar: '#barDemo', width:100}

                    ]]

@@ -506,6 +513,7 @@
                                    

                                    // 生成表格数据

                                    table.render(tOptions);

                                    renderTblPorgess(allData);

                                }else {

                                    layer.msg('没有要添加的内容！');

                                }

@@ -620,14 +628,13 @@
                                for(var i=0; i<rs.data.length; i++) {

                                    var _data = rs.data[i];

                                    var num = -1;

                                    // 遍历现有的tblData

                                    // 遍历现有的tblData/根据表格的设别id对获取到值进行排序以便对应表格内容

                                    for(var k=0; k<tblData.length;k++) {

                                        var _tblData = tblData[k];

                                        if(_tblData.fbsid == _data.dev_id) {

                                            num = k;

                                            break;

                                        }

				        				
                                    }

                                    

                                    if(num == -1) {

@@ -652,7 +659,7 @@
                                    tmp.datapackage[num] = dfuData;

                                }

                                var pageTbl = $('#pageTbl');

				        		
                                //console.log(tmp);

                                // 更新表格内容

                                Object.keys(tmp).forEach(function(key) {

                                    updateLayuiTblCol(pageTbl, key, tmp[key]);

@@ -876,6 +883,18 @@
                    });

                }

                

				
                // 渲染进度条

                function renderTblPorgess(tblData) {

                    // 遍历tblData根据fbsid渲染进度条

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

                        var fbsid = tblData[i].fbsid;

						
                        // 渲染进度条

                        element.render('progress', 'upload'+fbsid);

                    }

					
                }

            });

        </script>

    </body>


 gx_tieta/WebRoot/control.jsp

@@ -252,7 +252,12 @@
                                <br>

                                <a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                                    <span class="whyc-btn-icon fa fa-stop-circle"></span>

                                    <span class="whyc-btn-txt" id="stopTestBtn">停止测试</span>

                                    <span class="whyc-btn-txt">停止测试</span>

                                </a>

                                <br>

                                <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                                    <span class="whyc-btn-icon fa fa-battery-full"></span>

                                    <span class="whyc-btn-txt">电池参数</span>

                                </a>

                                <br>

                                <a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

@@ -1064,6 +1069,76 @@
            <input type="button" name="" id="sysSet_en" class="status-change-set " value="设置" >

        </div>

    </div>

    <!-- 电池参数 -->

    <div class="popup" id="battInfo_popup">

        <div class="popup-title"><span>电池参数设置</span> <a href="javascript:;" class="close">X</a></div>

        <div class="popup-content">

            <div class="popup-tbl">

                <table>

                    <tbody>

                        <tr>

                            <th>机房ID</th>

                            <th>机房名称</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_home_id"  readonly="readonly" value=""></td>

                            <td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>

                        </tr>

                        <tr>

                            <th>电池标称容量(AH)</th>

                            <th>电池标称内阻(uΩ)</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_nom_cap" value=""></td>

                            <td><input type="text" id="battInfo_nom_res" value=""></td>

                        </tr>

                        <tr>

                            <th>电池组数</th>

                            <th>每组电池单体数量</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_batt_num" value=""></td>

                            <td><input type="text" id="battInfo_batt_mon_num" value=""></td>

                        </tr>

                        <tr>

                            <th>单体标称电压（V）</th>

                            <th>电池组端标称电压（V）</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_batt_nom_vol" value=""></td>

                            <td><input type="text" id="battInfo_group_nom_vol" value=""></td>

                        </tr>

                        <tr>

                            <th>电池标称温度（℃）</th>

                            <th>电池浮充电压阀值（V）</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>

                            <td><input type="text" id="battInfo_batt_float_vol" value=""></td>

                        </tr>

                        <tr>

                            <th>电池浮充电流阀值（A）</th>

                            <th>在线电压低阀值（V）</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_batt_float_curr" value=""></td>

                            <td><input type="text" id="battInfo_online_low_vol" value=""></td>

                        </tr>

                        <tr>

                            <th>电池组连接类型</th>

                        </tr>

                        <tr>

                            <td><input type="text" id="battInfo_batt_link_type" value=""></td>

                        </tr>

                    </tbody>

                </table>

            </div>

        </div>

        <div class="popup-footer">

            <input type="button" name="" id="battInfo_read" value="读取" >							
            <input type="button" name="" id="battInfo_en" class="status-change-set " value="设置" >

        </div>

    </div>

    

    <!-- 单体曲线 -->

    <div class="popup w960 mr480x" id="monLineGraphPopup">

@@ -1260,6 +1335,7 @@
        var equip4016_popup = new Popup($('#equip4016'));

        var sysSet_popup = new Popup($('#sysSet_popup'));

        var localNav = new Popup($('#localNav'));

        var battInfo_popup = new Popup($('#battInfo_popup'));

        // 充放电弹出框设置

        $(function() {

            // 初始化LD9充放电弹出框

@@ -1291,6 +1367,12 @@
            $('#sysSet_popup').find('.close').bind('click', function() {

                sysSet_popup.hidePopup();    // 隐藏sysSet_popup弹出框和遮罩层

            });

			
            // 设置电池参数

            $('#battInfo_popup').find('.close').bind('click', function() {

                battInfo_popup.hidePopup();    // 隐藏battInfo_popup弹出框和遮罩层

            });

			
            

            // bts面板充电电流编辑

            $('#ChargeCurrSetLabel .fa-edit').click(function() {

@@ -1364,6 +1446,7 @@
                equip4016_popup.hidePopup();    // 隐藏4016弹出框和遮罩层

                localNav.hidePopup();

                sysSet_popup.hidePopup();    // 隐藏sysSet_popup弹出框和遮罩层

                battInfo_popup.hidePopup();    // 隐藏battInfo_popup弹出框和遮罩层

            });

        });

        //初始化柱状图

@@ -4983,17 +5066,19 @@
            

            // 点击设备进程按钮

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

                console.log(threadInfoSearch);

                // console.log(threadInfoSearch);

                var batt = getBatt();

                //console.log(batt);

                threadInfoSearch.dev_id = batt.FBSDeviceId;

                SendDeviceThreadInfo(threadInfoSearch,function(data){

                    searchDeviceThreadInfo({dev_id:910000001});

                    searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id});

                });

            });

			
			
			
            

            //给GPRS发送指定的命令，获取AT返回值

            var threadInfoLoad;

            function SendDeviceThreadInfo(param,callback){

                threadInfoLoad = layer.load(1);

                $.ajax({     

                    type:"post",                                 

                    url: "Bts_gprs_stateAction_action_update_bts_task_inf",                        

@@ -5028,8 +5113,9 @@
                    dataType:'json',

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

                    success: function(data){ 

                        layer.close(threadInfoLoad); 
                        var model = eval('('+data.result+')');

                        console.info(model);

                        if(model.code == 1) {

                        var btsTaskInf = model.data[0].bts_task_inf;

                        layer.open({

                            title: '设备进程',

@@ -5037,6 +5123,10 @@
                            height: 450,

                            content: '<pre>'+btsTaskInf+'</pre>'

                        });

                        }else {

                            layer.msg('查询失败');

                        }

						
                        

                        if(callback && typeof callback == 'function'){

                            callback(model);

@@ -5054,6 +5144,11 @@
                });

            }

            

			
            // 电池参数

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

                battInfo_popup.showPopup();    // 显示battInfo_popup弹出框和遮罩层

            });

        });

        

        // 机历卡模块


 gx_tieta/WebRoot/index.jsp

@@ -3886,6 +3886,7 @@
        // 点击机房类型复选框

        $('#homeType input[type=checkbox]').click(function() {

            var homeType = getHomeType();

            getInstallNum();

            updateStation(true);

        });

        

@@ -3981,13 +3982,38 @@
                success: function(result) {

                    // 格式化数据

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

                    var txt = rs.newsum+'/'+rs.sum;

                    //console.log(rs);

                    if(rs.code == 1) {

                        var txt = getInstallNumByType(rs.data,getHomeType());

                    

                    // 更新文本值

                    $('#installnum').text(txt);

                }

					
                }

            });

        };

        }

		
        // 更具选择机房的类型返回文本

        function getInstallNumByType(data,type) {

            var rs = '未知/未知';

            switch(type) {

                case 0:

                    rs = '0/0';

                break;

                case 2:

                    rs = data[0]+'/'+data[1];

                break;

                case 12:

                    rs = data[2]+'/'+data[3];

                break;

                case 14:

                    rs = data[4]+'/'+data[5];

                break;

            }

			
            return rs;

        }

    });

    

    // 0=全部不选 14=全部选中 2=选中2V 12=选中12V