设备升级添加文件名称验证

hdw

2018-12-03 78a6a3d7f0719985953ffdcc4bc3c11243250aa6

 gx_tieta/WebRoot/batt-station-update1.jsp

@@ -152,6 +152,15 @@
              var layer = layui.layer;      // 获取弹出框模块

              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;">'+

                              '<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>'+

                           '</div></div>';

        		
            var isNewLoad = true;

            var pre_province = getQueryString('province');

            // 查询省下拉框

@@ -414,8 +423,23 @@
                  updateList.push(data[i].fbsid);

               }

               

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

               layer.open({

                  type: 1

                  ,title: '升级文件名'

                  ,content: cFilenameContent

                  ,fixed: true

                  ,resize: false

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

                  ,yes: function(index) {

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

                     // 校验要更新的设备

                     checkStationState(updateList, data, filename);

                     layer.close(index);

                  }

               });

               // 校验要更新的设备

               checkStationState(updateList, data);

               // checkStationState(updateList, data);

            });

            

            // 点击表格的toolbar

@@ -439,7 +463,7 @@
               var allData = [data];

               

               // 校验要更新的设备

               checkStationState(updateList, allData);

               checkStationState(updateList, allData, data.filename);

            }

            

            // 点击添加生成表格

@@ -625,7 +649,7 @@
                          status: [],

                          datapackage: []

                       };

                       console.log(rs);

                       //console.log(rs);

                       if(rs.code == 1 && rs.data.length>0){

                          var tblData = tOptions.data;

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

@@ -704,7 +728,7 @@
            

            

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

            function checkStationState(temp, all){

            function checkStationState(temp, all, filename){

               $.ajax({    

                    type: "post",             

                    url: "Fbs9100s_dfu_stateAction_action_judgeStation",            

@@ -716,11 +740,11 @@
                       //console.log(rs);

                       if(rs.code == 1) {

                          var data = rs.data;

                          var updateData = checkUpdating(data, all);

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

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

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

                          

                          console.log(updateData);

                          //console.log(updateData);

                          // 判断是否有升级的设备

                          if(updateData.good.length == 0) {

                             if(temp.length == 1) {

@@ -736,7 +760,7 @@
                        layer.open({

                           type: 2,

                           title: '更新设备',

                           area: ['700px', '524px'],

                           area: ['960px', '524px'],

                           fixed: false, //不固定

                           maxmin: true,

                           content: 'iframe/batt-station-update.html',

@@ -760,9 +784,10 @@
                                 

                              }

                              //console.log(updateList);

                              //return;

                              // 关闭弹出面板

                              layer.close(index);

										
                              // console.log(updateList);

                              // 升级设备

                              updateBTSDevice(updateList);

                              //console.log(updateList);

@@ -785,7 +810,7 @@
            }

            

            // 格式话升级的设备

            function checkUpdating(rsData, all) {

            function checkUpdating(rsData, all, filename) {

               var rs = {

                  good: []

                  ,bad: []

@@ -799,7 +824,7 @@
                     

                     // 判断当前设备是否正在升级

                     if(_all.updatestatusnum != 1) {

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

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

                           isError = false;   

                        }

                     }