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

81041

2018-11-29 a6f784d801885a6a2c785206d12085c19be3f9e3

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

 gx_tieta/WebRoot/batt-state-statistical.jsp

@@ -343,10 +343,8 @@
                    tmp.push(_data.station_event_type_templow);    // 温度下限

                    tmp.push(_data.station_event_type_dampup);        // 湿度上限

                    tmp.push(_data.station_event_type_damplow);        // 湿度下限

					
                    rs.push(tmp);

                }

				
                return rs;

            }

            


 gx_tieta/WebRoot/batt-station-update1.jsp

@@ -380,10 +380,11 @@
                        ,{field:'stationid', title:'机房ID', align:'center'}

                        ,{field:'stationname', title:'机房名称', align:'center', width: 400}

                        ,{field:'fbsid', title:'设备ID', align:'center'}

                        ,{field:'fbsname', title:'设备名称', align:'center'}

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

                        ,{field: 'version', title: '版本号', align: 'center'}

                        ,{field:'filename', title:'升级文件名', align:'center'}

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

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

                        ,{field:'progress', title:'读/写进度', align: 'center', templet:'#upProgress'}

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

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

                    ]]

@@ -495,17 +496,19 @@
                                var formaterData = formaterAddData(rs.data, allData);        //解析数据

                                if(formaterData.length) {

                                    // 遍历formaterData

                                    //console.log(formaterData);

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

                                        var _formaterData = formaterData[i];

                                        var tmp = {};

                                        tmp.stationid = _formaterData.StationId;        // 机房id

                                        tmp.stationname = _formaterData.StationName;    // 机房名称

                                        tmp.fbsid = _formaterData.FBSDeviceId;            // 设备id

                                        tmp.fbsname = _formaterData.FBSDeviceName;        // 设备名称

                                        tmp.filename = getFnameByVer(_formaterData.StationIp);        // 升级文件名称

                                        tmp.updatestatusnum = 0;                        // 0 等待升级

                                        tmp.updatestatus = '等待升级';                        // 升级状态

                                        tmp.status = '写';                                // 读写状态

                                        tmp.datapackage = 1;                            // 当前数据包

                                        tmp.version = _formaterData.StationIp;            // 版本号

                                        tmp.isNewAdd = true;

                                        //console.log(tmp);

                                        allData.push(tmp);

@@ -622,12 +625,16 @@
                                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++) {

                                    var _data = rs.data[i];

                                    var num = -1;

                                    // 计算进度

                                    var currentPer = getStrPercent(_data.dfu_data_blocknum, _data.dfu_data_blocklen, _data.dfu_file_len, _data.dfu_wr_stat); 
                                    updateTblPorgress(_data.dev_id, currentPer);

                                    //console.log(currentPer);

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

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

                                        var _tblData = tblData[k];

@@ -710,12 +717,12 @@
                            if(rs.code == 1) {

                                var data = rs.data;

                                var updateData = checkUpdating(data, all);

                                var errorUpdate = checkErrorUpdate(data, all);

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

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

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

                                console.log(updateData);

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

                                if(updateData.length == 0) {

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

                                    if(temp.length == 1) {

                                        layer.msg('当前设备无法升级！');

                                    }else {

@@ -735,18 +742,24 @@
                                    content: 'iframe/batt-station-update.html',

                                    btn: ['确认升级', '取消'],

                                    yes: function(index, layero) {

                                        var updateData = $('#updateIframeData').data('update');    // 获取可升级设备的信息

                                        var goodUpdateData = $('#updateIframeData').data('update');    // 获取可升级设备的信息

                                        // 根据可升级设备的信息构造查询条件

                                        var updateList = [];

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

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

                                            var _data  = goodUpdateData[i];

                                            //var filename = getFnameByVer(_data.version);

                                            var _tmp = {

                                                dev_id: updateData[i].fbsid

                                                dev_id: _data.fbsid

                                                ,dfu_file: _data.filename

                                            };

											
                                            console.log(_data);

                                            // 添加到设备升级列表中

                                            if(_data.filename && _data.filename.length != 0) {

                                            updateList.push(_tmp);

                                        }

                                        

                                        }

                                        //console.log(updateList);

                                        // 关闭弹出面板

                                        layer.close(index);

                                        

@@ -771,34 +784,12 @@
                

                }

                

                // 从返回的可升级的设备中剔除正在升级的设备

                // 格式话升级的设备

                function checkUpdating(rsData, all) {

                    var rs = [];

                    // 遍历all

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

                        var _all = all[i];

                        var isError = true;

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

                            var _rsData = rsData[k];

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

                            if(_all.updatestatusnum == 1) {

                                isError = false;

                            }

                        }

						
                        // 根据isError判读是否是不可添加的机房

                        if(isError) {

                            rs.push(_all);

                        }

                    }

					
                    return rs;

                }

				
                // 获取无法升级的设备

                function checkErrorUpdate(rsData, all) {

                    var rs = [];

                    var rs = {

                        good: []

                        ,bad: []

                    };

                    // 遍历all

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

                        var _all = all[i];

@@ -816,7 +807,9 @@
                        

                        // 根据isError判读是否是不可添加的机房

                        if(isError) {

                            rs.push(_all);

                            rs.bad.push(_all);

                        }else {

                            rs.good.push(_all);

                        }

                    }

                    

@@ -868,6 +861,8 @@
                                    tmp.fbsid = _data.dev_id;                    // 设备id

                                    tmp.fbsname = _data.fBSDeviceName;            // 设备名称

                                    tmp.updatestatusnum = 1;                    // 0 等待升级 1正在升级

                                    tmp.version = _data.note;                    // 版本号

                                    tmp.filename = _data.dfu_file;                // 升级文件名称

                                    tmp.updatestatus = '升级中';                    // 升级状态

                                    tmp.status = _data.dfu_wr_stat == 1?'写':_data.dfu_wr_stat == 2?'读':_data.dfu_wr_stat == 3?'完成':'';                            // 读写状态

                                    tmp.datapackage = _data.dfu_data_blocknum;                        // 当前数据包

@@ -878,11 +873,11 @@
                                

                                // 更新表格

                                table.render(tOptions);

                                renderTblPorgess(allData);

                            }

                        }

                    });

                }

				
                

                // 渲染进度条

                function renderTblPorgess(tblData) {

@@ -895,6 +890,54 @@
                    }

                    

                }

				
                // 更新进度条

                function updateTblPorgress(fbsid, percent) {

					
                    // 更新进度条

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

                }

				
                // 计算进度

                function getStrPercent(current, blocklen, all, status) {

                    var rs = '0%';

                    if(all != 0) {

                        var num = Math.ceil(current*blocklen*100/all);

                        if(num>=100) {

                            num = status == 1?'写完成':'升级完成';

							
                        }

						
                        rs = num+'%';

                    }

					
                    return rs;

                }

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

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

                function getFnameByVer(version) {

                    var fileList = [

                        {

                            filename: 'avr_dfu.uc3'

                            ,pattern: /^.*\.24\.[0-9]*$/

                        }

                        ,{

                            filename: 'E51_DFU.SM5'

                            ,pattern: /^.*\.53\.[0-9]*$/

                        }

                    ];

					
                    // 遍历并获取filename

                    var filename = undefined;

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

                        var _fileList = fileList[i];

                        if(_fileList.pattern.test(version)) {

                            filename = _fileList.filename;

                        }

                    }

					
                    return filename;

                }

            });

        </script>

    </body>


 gx_tieta/WebRoot/mobil/batt-infor-conf-temp.html

@@ -253,12 +253,16 @@
        <div data-role="footer" data-position="fixed" data-theme="a">    

            <div data-role="navbar">

                <ul>

                  <li><a href="" target="_top" data-role="button" data-icon="check" data-transition="slide">确定</a></li>

                  <li><a href="" target="_top" data-role="button" data-icon="delete" data-transition="slide">取消</a></li>

                  <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">确定</a></li>

                  <li><a href="" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">取消</a></li>

                </ul>

            </div>        

        </div>   

		    
        <div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">

        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>

        <a href="" id="sure" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >提交</a>

        <a href="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-delete" >放弃</a>

    </div>        
    </div>

</body>



@@ -278,6 +282,9 @@
 <script type="text/javascript">  

   $(function(){

    $(".unable").prop("readonly","readonly").attr("unselectable","on").addClass("uncheck");

    $("#sure").click(function(){

     window.location.href="index.html";

    });

   });

   </script>

</html> 

 gx_tieta/WebRoot/mobil/batt-state-statistical.html

@@ -202,7 +202,7 @@
            //console.info(data);

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

                data=data.data;

                //console.info(data);					
                console.info(data);					
                arr=new Array();

                index=0;

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


 gx_tieta/WebRoot/mobil/ele-param.html

@@ -85,8 +85,8 @@
        }

        .operat-but{

            margin: 0;

            padding-top: 0.7em;

            padding-bottom: 0.7em;

            padding-top: 0.1em;

            padding-bottom: 0.1em;

        } 

    </style>

    <link rel="stylesheet" href="css/fgpanel.css">

@@ -152,9 +152,9 @@
        </div>   

        <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">

        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>

      <a href="batt-infor-conf-temp.html" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-edit" >修改</a>

      <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-edit" >修改</a>

      

    <a href="batt-infor-delete.html" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">删除</a>

    <a href="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">删除</a>

    </div>    

    </div>

</body>

@@ -173,13 +173,15 @@
    var arr=new Array();        //当前表格td数据

    var tblCon = $('.tbl-container');

    var Page = {

        pageSize:10,                 //每页的行数

        pageSize:20,                 //每页的行数

        pageCurr:1,                  //当前页码数

        pageAll:0,

    };



    $('document').ready(function(){panel.show();});    

  
    $("#edit").click(function(){

        window.location.href="batt-infor-conf-temp.html";   
    });

    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','配置操作'];

    dataArr = [];

    var startTime = "1980-01-01";

@@ -199,44 +201,78 @@
        function searchBattLife(){

            var temp = createSearchParam();

            var json = JSON.stringify(temp);

            console.info(json);

            arrTd = new Array();

            var load;

            /*if() {

                load = layer.load(1);

            }*/

             $.ajax({

                type:"post",

                url:"",

                url:"BattInfAction!searchInform",

                async:true,

                datatype:'json',

                datatype:'text',

                data:"json="+json,

                success:function(data){

                    //console.info(data);

                    //var data = JSON.parse(data.result);					
                    var data = JSON.parse(data.result);					
                    //layer.close(load);

                    console.info(data);

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

                        data=data.data;

                        var index = 0;

                        var ArryTb= new Array();

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

                            arrTd[index++]=data[i].deviceId;

                            arrTd[index++]=data[i].stationName;

                            arrTd[index++]=data[i].real_cap;

                            arrTd.push(data[i].StationId);                //机房编号

                            arrTd.push(data[i].StationName1);                // 省

                            arrTd.push(data[i].StationName2);                // 市

                            arrTd.push(data[i].StationName5);                // 区/县

                            arrTd.push(data[i].StationName3);                //机房名称

                            arrTd.push(data[i].StationName4);                //设备名称

                            arrTd.push(data[i].StationIp);                //机房ip

                            arrTd.push(data[i].FBSDeviceId);                //FBS设备ID

                            arrTd.push(data[i].FbsDeviceIp);                //FBS设备IP

                            arrTd.push(data[i].FbsDeviceIp_YM);            //子网掩码

                            arrTd.push(data[i].FbsDeviceIp_WG);            //网关

                            arrTd.push(data[i].FBSDeviceName);            //FBS设备名称

                            arrTd.push(data[i].GroupIndexInFBSDevice);    //FBS设备索引

                            arrTd.push(data[i].BattGroupId);                //电池组ID

                            arrTd.push(data[i].BattGroupNum);                //机房内电池组编号

                            arrTd.push(data[i].BattGroupName);            //电池组名称

                            arrTd.push(data[i].FloatVolLevel);            //浮充电压阀值

                            arrTd.push(data[i].OfflineVolLevel);            //离线电压阀值

                            arrTd.push(data[i].BattFloatCurrent);            //浮充阀值

                            arrTd.push(data[i].MonCount);                    //单体数量

                            arrTd.push(data[i].MonCapStd);                //标称容量

                            arrTd.push(data[i].MonVolStd);                //标称单体电压

                            arrTd.push(data[i].MonResStd);                //标称单体内阻

                            arrTd.push(data[i].MonSerStd);                //标称单体电导

                            arrTd.push(data[i].MonVolLowToAvg);            //单体电压次低偏移量

                        

                            //arrTd[index++]=data[i].is_out_stand;

                            arrTd.push(data[i].Load_curr);                //负载电流

                            arrTd.push(data[i].DisCurrMax);                //最大核容电流

                            arrTd.push(data[i].station_phone);            //基站手机号码

							
							
                            arrTd.push(data[i].BattProducer);                //电池品牌

                            arrTd.push(data[i].BattModel);                //电池型号

                            arrTd.push(data[i].BattProductDate.substr(0,10));            //电池生产日期

                            arrTd.push(data[i].BattInUseDate.substr(0,10));            //投入使用日期

                            arrTd.push(data[i].install_user);                    // 设备安装人员

                            /* arrTd.push("");

                            arrTd.push("");

                            arrTd.push(model.data[i].StationId_ex);            //投入使用日期 */

                            arrTd.push('<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >修改或删除</a>');

                            Page.pageAll = data[i].num;

                        } 

                        Page.pageAll = data[data.length-1].page.pageAll;

					
                    }else{

                        Page.pageAll = 0;

                    }

                    setPage();

                    //console.info(Page.pageAll);	
                    createTbl(tblCon, arrTh, arrTd);            

                }    

            });     

            /* 模拟数据做好就删！！！！！！！！ */

            

            for(i=0;i<340;i++){

            /*for(i=0;i<340;i++){

             if(i%34==33){

             //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

            arrTd[i]='<a href="#myPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >修改或删除</a>';

@@ -448,11 +484,12 @@
        function createSearchParam(){

            var temp = {                            

                page:Page,

                stationName1:$('#mainteArea').val(),

                stationName2:$('#city').val(),

                stationName5: $('#country').val(),

                stationName:$('#homeName').val(),

				
                binf:{

                    StationName1:$('#mainteArea').val(),

                    StationName2:$('#city').val(),

                    StationName5: $('#country').val(),

                    StationName:$('#homeName').val(),

                },

            };

            console.info(temp);

            return temp;