hdw
2018-12-06 f06c97b7d66d5108571d5a093e88827c459a2a76
修改续航时间
3个文件已修改
48 ■■■■ 已修改文件
gx_tieta/WebRoot/batt-state-manage.jsp 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ele-param1.jsp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-info-add.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-manage.jsp
@@ -629,7 +629,7 @@
                    var index = 0;
                    var data = JSON.parse(data.result);
                    if(data.code==1&&data.data!=null){
                        //console.info(data.data);
                        console.info(data.data);
                        var data = data.data;
                        //console.info(data[0].dev_id);
                        for(var i=0;i<data.length;i++){
@@ -675,11 +675,11 @@
                            if(_data.station_stat_xuhang){
                                arrTd[index++] = create_fa_font('fa-television','red',{msg: '续航异常'});
                                arrTd[index++] = _data.station_xuhang_start_time;
                                arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
                                arrTd[index++] = StringtoData(_data.station_xuhang_start_time);
                            }else{
                                arrTd[index++] = create_fa_font('fa-television','green',{msg: '正常'});
                                arrTd[index++] = "-";
                                arrTd[index++] = formartTime(0);
                                arrTd[index++] = _data.station_xuhang_start_time;
                                arrTd[index++] = getXunHangTimeLong(_data.station_xuhang_end_time, _data.station_xuhang_start_time, _data.station_stat_xuhang);
                            }
                            
                            // 开门关门异常
@@ -722,14 +722,34 @@
                }
            });
        }
        // 获取续航时长
        function StringtoData(value){
        var date1= value;  //开始时间
        var date2 = new Date();    //结束时间
        var date3 = date2.getTime() - new Date(date1).getTime();   //时间差的毫秒数
        var date4 = Math.floor(date3/(1000));
        return formartTime(date4);
        }
            //格式化时间value传入为秒
            var date1= value;  //开始时间
            var date2 = new Date();    //结束时间
            var date3 = date2.getTime() - new Date(date1).getTime();   //时间差的毫秒数
            var date4 = Math.floor(date3/(1000));
            return formartTime(date4);
        }
        // 通过续航开始时间和结束时间获取续航的时长
        function getXunHangTimeLong(start, end, state) {
            var timeLong = '';
            if(start && end) {
                var _timeLong = new Date(end).getTime()-new Date(start).getTime();
                timeLong = Math.floor(_timeLong/(1000));
            }
            // 最终时间xx天xx时xx分钟
            var rsTime = '-';
            if(isNumber(timeLong)&&!state) {
                rsTime = formartTime(timeLong)
            }
            return rsTime;
        }
        //格式化时间value传入为秒
        function formartTime(value){
            value = Math.abs(parseInt(value));
            //console.info(value);
gx_tieta/WebRoot/ele-param1.jsp
@@ -496,7 +496,8 @@
                function delBattGroup(obj) {
                    //console.log(obj);
                    var data = obj.data;
                    var content = '是否确认删除<span style="font-weight: bold; color: #FF5722">'+data.StationName3+'</span>'
                    var content = '是否确认删除<span style="font-weight: bold; color: #FF5722">'+data.StationName3+
                                    '-'+data.BattGroupName+'</span>'
                    layer.confirm(content,{
                        icon: 2
                        ,title: '提示'
gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -542,8 +542,7 @@
                            }, 3000);
                        }else{
                            layer.msg('添加失败!');
                        }
                        loading.hideLoading($('#main'));
                        }
                    },
                    error:function(){
                        layer.msg('添加失败!');