添加版本验证

hdw

2018-12-04 fb5d6874fb74ba9983fd68108c57eef44071041c

添加版本验证

 gx_tieta/WebRoot/batt-station-update1.jsp

@@ -153,12 +153,19 @@
                var element = layui.element;    // 获取元素操作模块

                

                // 设置检测文件名弹出框的content

                var cFilenameContent = '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">'+

                var cFilenameContent = '<div style="width:300px; height: 80px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">'+

                                        '<span>选择文件名：</span>'+

                                        '<select id="equipeTypeSel" style="width: 200px;height: 26px; border: 1px solid #ccc">'+

                                            '<option value="avr_dfu.uc3">avr_dfu.uc3</option>'+

                                            '<option value="E51_DFU.SM5">E51_DFU.SM5</option>'+

                                        '</select>'+

                                        '</select><br><br>'+

                                        '<span>输入版本号：</span>'+

                                        '<input type="text" id="newestVer" style="width: 200px;height: 24px; border: 1px solid #ccc">'+

                                    '</div></div>';

									
                var cVerContent = '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">'+

                                        '<span>输入版本号：</span>'+

                                        '<input type="text" id="newestVer" style="width: 200px;height: 24px; border: 1px solid #ccc">'+

                                    '</div></div>';

                

                var isNewLoad = true;

@@ -426,15 +433,17 @@
                    // 打开面板设置升级设别的类型

                    layer.open({

                        type: 1

                        ,title: '升级文件名'

                        ,title: '升级文件名/版本号'

                        ,content: cFilenameContent

                        ,fixed: true

                        ,resize: false

                        ,btn:['设置', '取消']

                        ,yes: function(index) {

                            var filename = $('#equipeTypeSel').val();

                            var newestVer = $('#newestVer').val();

							
                            // 校验要更新的设备

                            checkStationState(updateList, data, filename);

                            checkStationState(updateList, data, filename, newestVer);

                            layer.close(index);

                        }

                    });

@@ -462,8 +471,24 @@
                    var updateList = [data.fbsid];

                    var allData = [data];

                    

                    // 校验要更新的设备

                    checkStationState(updateList, allData, data.filename);

                    // 打开面板设置升级设别的类型

                    layer.open({

                        type: 1

                        ,title: '升级文件名/版本号'

                        ,content: cFilenameContent

                        ,fixed: true

                        ,resize: false

                        ,btn:['设置', '取消']

                        ,yes: function(index) {

                            var newestVer = $('#newestVer').val();

							
                            // 校验要更新的设备

                            checkStationState(updateList, allData, data.filename, newestVer);

                            layer.close(index);

                        }

                    });

					
					
                }

                

                // 点击添加生成表格

@@ -728,7 +753,7 @@
                

                

                // 验证设备是否允许设备进行远程升级

                function checkStationState(temp, all, filename){

                function checkStationState(temp, all, filename, newestVer){

                    $.ajax({     

                        type: "post",                 

                        url: "Fbs9100s_dfu_stateAction_action_judgeStation",                

@@ -740,7 +765,7 @@
                            //console.log(rs);

                            if(rs.code == 1) {

                                var data = rs.data;

                                var updateData = checkUpdating(data, all, filename);

                                var updateData = checkUpdating(data, all, filename, newestVer);

                                $('#updateIframeData').data('update', updateData.good);                // 可更新的设备信息

                                $('#updateIframeData').data('errorUpdate', updateData.bad);    // 无法更新的设备信息 

                                

@@ -810,7 +835,7 @@
                }

                

                // 格式话升级的设备

                function checkUpdating(rsData, all, filename) {

                function checkUpdating(rsData, all, filename, newestVer) {

                    var rs = {

                        good: []

                        ,bad: []

@@ -825,7 +850,11 @@
                            // 判断当前设备是否正在升级

                            if(_all.updatestatusnum != 1) {

                                if(_all.fbsid == _rsData.FBSDeviceId && _all.filename == filename) {

                                    isError = false;	
                                    // 检测当前版本号是否为最新

                                    var isNewstVer = checkNewestVer(newestVer, _all.version);

                                    if(!isNewstVer) {

                                        isError = false;	
                                    }

                                }

                            }

                        }

@@ -939,7 +968,7 @@
                    return rs;

                }

                //console.log(getFnameByVer('D:8,V2.53.40'));

                // 更具版本号获取文件的名称

                // 根据版本号获取文件的名称

                function getFnameByVer(version) {

                    var fileList = [

                        {

@@ -963,6 +992,20 @@
                    

                    return filename;

                }

				
                console.log(checkNewestVer('42', 'D:8,V2.53.44'));

                // 验证版本

                function checkNewestVer(ver ,version) {

                    var pattern = '^.*\\.[0-9]*\\.([0-9]*)$';

                    var reg = new RegExp(pattern);

                    reg.test(version);

                    // 判断当前版本是否为最新版本

                    var isNewest = false;

                    if(ver == RegExp.$1) {

                        isNewest = true;

                    }

                    return isNewest;

                }

            });

        </script>

    </body>


 gx_tieta/WebRoot/bts-comm-task.jsp

@@ -41,7 +41,7 @@
        <div class="layui-page-container">

            <!-- 条件筛选 -->

            <div class="layui-page-filter">

                <div class="page-filter-header layui-page-filter-fweight">机房站点升级功能</div>

                <div class="page-filter-header layui-page-filter-fweight">设备连接信息</div>

                <div class="page-filter-content">

                    <table>

                        <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">