添加内容

hdw

2018-12-17 2e9957c187b7735453fe8225bd095e64b072334e

添加内容

 gx_tieta/WebRoot/ckplayer/ckplayer.js

@@ -175,7 +175,7 @@
            crossdomain: '',//安全策略文件地址

            unescape: false,//默认flashplayer里需要解码

            mobileCkControls: false,//移动端h5显示控制栏

            mobileAutoFull: true,//移动端是否默认全屏播放

            mobileAutoFull: false,//移动端是否默认全屏播放

            playbackrate: 1,//默认倍速

            h5container: '',//h5环境中使用自定义容器

            debug: false,//是否开启调试模式

@@ -5982,7 +5982,7 @@
            v = '',

            o = {

                allowScriptAccess: 'always',

                allowFullScreen: true,

                allowFullScreen: false,

                quality: 'high',

                bgcolor: '#000'

            };


 gx_tieta/WebRoot/iframe/batt-info-add.html

@@ -347,6 +347,8 @@
        {{# }); }}

        </div>

    </script>

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

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

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

    <script  type="text/javascript">

        layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {

@@ -474,12 +476,54 @@
                     //console.log(_data);

                     var temp = analysisData(editInfo.addGroupNum, _data);

                     //console.log(temp);

                     checkDevId(_data.FBSDeviceId, function(devid){

                     // 添加电池信息

                     addBatt(temp);

                     }, function(pre, max) {

                         layer.msg('设备ID:'+pre+'被占用,推荐使用'+max);

                         // 更新设备id和设备ip

                         $('#devid').val(max);

                         $('#fbsip').val(getDevIp(max));

                     });

                });

                return false;

            });

            

            // 监测当前提交的设备ID是否为最大

            function checkDevId(devid, success, error) {

                var load = layer.load(1);

                // 查询后台

                $.ajax({

                    type: 'post'

                    ,async: true

                    ,url: 'BattInfAction!searchmaxdev_id'

                    ,data:null

                    ,dataType: 'json'

                    ,success:function(res) {

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

                        if(rs.data.length != 0) {

                            if(rs.data == devid) {

                                if(isFunction(success)) {

                                    success(rs.data);

                                }

                            }else {

                                if(isFunction(error)) {

                                    error(devid, rs.data);

                                }

                            }

							
                        }else {

                            layer.msg('计算设备id失败！')

                        }

                    }

                    ,complete: function() {

                        layer.close(load);

                    }

					
                });

            }

            
            
            // 关闭面板

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

                parent.$('#iframeClose').click();


 gx_tieta/WebRoot/mobil/app/css/common.css

@@ -57,6 +57,9 @@
}



/* height */

.h {

    height: 100%;

}

.h40 {

    height: 40px;

}


 gx_tieta/WebRoot/mobil/app/js/common.js

@@ -83,6 +83,99 @@
    }

};





//依赖ckplayer.js

var CkVideo = function(container, video) {

    this.urls = [];

    this.container = $(container);

    this.opts = {

    container: video, //容器的ID或className

    variable: 'player', //播放函数名称

    loop: false, //播放结束是否循环播放

    autoplay: false,//是否自动播放

    //poster: 'material/poster.jpg', //封面图片

    preview: {},

    drag: 'start', //拖动的属性

    video: [

        ['', 'video/mp4']

        ]

       };

	
    this._slide();

    this._change();

};

CkVideo.prototype = {

    init: function(data, sid) {

        this.urls = [];

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

            var _data = data[i];

            var tmp = {};

            tmp.fileName = _data.fileName;

            tmp.fileUrl = '../../../stationsrc/'+sid+'/video/'+_data.fileName;

            this.urls.push(tmp);

        }

		
        // 设置播放列表

        this._list();

    }

    ,player: function(url) {

        this.opts.video = [[url, 'video/mp4']];

        new ckplayer(this.opts); 
    }

    ,_list: function() {

        var container = this.container.find('.ck-video-list-container ul');

        container.text("");

        // 遍历urls

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

            var _url = this.urls[i];

            var _li  = $('<li></li>');

            var _a = $('<a href="javascript:;"></a>');

            if(i == 0) {

                _a.addClass('active-this');

            }

            var _icon = $('<i class="fa fa-video-camera"></i>');

            var _span = $('<span>'+_url.fileName+'</span>');

			
            _a.append(_icon);

            _a.append(_span);

            _a.data('url', _url);

            _li.append(_a);

            container.append(_li);

        }

		
        var rsUrl = this.getAcUrl();

        this.player(rsUrl);

		
    }

    ,_slide: function() {

        var _list = this.container.find('.ck-video-list');

        var _slide = this.container.find('.ck-video-slide');

        var _this = this;

        _slide.off('click.ck.slide').on('click.ck.slide', function() {

            _list.toggleClass('slide-hide');

        });

    }

    ,_change: function() {

        var container = this.container.find('.ck-video-list-container ul');

        var _this = this;

        container.off('click.ck.change').on('click.ck.change', 'li a', function() {

            container.find('li a').removeClass('active-this');

            $(this).addClass('active-this');

            var url = $(this).data('url').fileUrl;

            _this.player(url);

        });

    }

    ,getAcUrl: function() {

        var container = this.container.find('.ck-video-list-container ul');

        var acUrl = container.find('.active-this');

        var url = '';

        if(acUrl.length != 0) {

            url = acUrl.data('url').fileUrl;

        }

        return url;

    }

};



//格式化时间

Date.prototype.format =function(format)

{


 gx_tieta/WebRoot/mobil/iframe/seenhomeinfo.html

@@ -9,6 +9,7 @@
    <link rel="stylesheet" href="../src/css/layui.css">

    <link rel="stylesheet" href="../app/css/common.css">

    <link rel="stylesheet" href="../app/css/map.css">

    <link rel="stylesheet" href="../app/css/module.css">

    <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">

    <style>

        body.homeinfo-tab .layui-tab {

@@ -23,9 +24,16 @@
        body.homeinfo-tab .layui-tab-content .layui-tab-item.layui-show {

            height: 100%;

        }

        #imgCarousel .carousel-item div {

            text-align: center;

        }

        #imgCarousel img {

            width: 100%;

            height: auto;

        } 
    </style>

</head>

<body class="full-height homeinfo-tab">

<body class="full-height homeinfo-tab" style="overflow:hidden;">

    <div class="rel-full">

        <div class="page-header bg-gay3">

            <div class="layui-row h40">

@@ -43,14 +51,30 @@
                        <div class="layui-tab layui-tab-card" lay-filter="homeInfoTab" id="homeInfoTab" style="height: 100%;"></div>

                    </div>

                </div>

                <div class="abs" id="video">

                <div class="abs h" id="video">

                    <div class="rel-full">

                        视频信息

                        <div class="ck-video-container h" id="ckVideo">

                            <div class="ck-video" id="myVideo"></div>

                            <div class="ck-video-list slide-hide">

                                <div class="ck-video-list-rel">

                                    <div class="ck-video-list-container">

                                        <ul>

                                            <li><a href="javascript:;" class="active-this"><i class="fa fa-video-camera"></i><span>视频1.mp4</span></a></li>

                                            <li><a href="javascript:;"><i class="fa fa-video-camera"></i><span>视频2.mp4</span></a></li>

                                        </ul>

                                    </div>

                                    <div class="ck-video-bg"></div>

                                    <div class="ck-video-slide"><i class="fa fa-angle-right"></i></div>

                                </div>

                            </div>

                        </div>

                    </div>

                </div>

                <div class="abs" id="imgs">

                    <div class="rel-full">

                        图片信息

                        <div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">

                              <div carousel-item="" class="carousel-item" id="carouselItems"></div>

                        </div>

                    </div>

                </div>

            </div>

@@ -328,16 +352,19 @@
    </script>

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

    <script src="../../src/layui.js"></script>

    <script src="../../ckplayer/ckplayer.js"></script>

    <script src="../app/js/common.js"></script>

    <script src="../../pages/js/GPS.js"></script>

    <script type="text/javascript">

        // layui模块

        layui.use(['layer', 'laytpl', 'form', 'upload', 'element'], function() {

        layui.use(['layer', 'laytpl', 'form', 'upload', 'element', 'carousel'], function() {

            var layer = layui.layer;        // 获取layer模块

            var laytpl = layui.laytpl;      // 获取laytpl模块

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

            var upload = layui.upload;      // 获取upload模块

            var element = layui.element;    // 获取element模块

            var carousel = layui.carousel;    // 获取carousel模块 
            var ckVideo = new CkVideo('#ckVideo', '#myVideo');        // 实例化CkVideo

            var footerMenu = new FooterMenu($('#pageFooter'));  // 实例化底部导航栏

            var homeInfo = parent.$('#homeInfoIframe').data('homeInfo'); // 机房信息

            var homeInfoTpl = $('#homeTab').html();        // 机房信息模板

@@ -367,7 +394,7 @@
                        if(rs.code == 1) {

                            var data = rs.data;

                            var rsData = formatHomeInfo(data);

                            console.log(rsData);

                            // console.log(rsData);

                            laytpl(homeInfoTpl).render(rsData, function(html) {

                                $('#homeInfoTab').html(html);

                                element.render('tab', 'homeInfoTab');

@@ -520,6 +547,102 @@
                // 返回结果集

                return rs;

            }

			
            // 获取视频列表

            getVideoList(homeInfo.homeId);

               function getVideoList(sid) {

                   var tmp = {

                       StationId: sid,

                       VideoOrImage: 'video'

                   };

                   var videoContainer = $('#videos .video-list-content');

                   // 请求视频播放列表

                   $.ajax({

                       type: 'post',

                       async: true,

                       url: 'MyFileAction!searchStationSource',

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

                       dataType: 'json',

                       success: function(result) {

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

                           //console.log(rs);

                           if(rs.code==1) {

                               var data = rs.data;

                               ckVideo.init(data, sid);

                           }else {

                               ckVideo.init([], sid);

                           }

           				
                       }

                   });

               }

           	
           	
               // 机房环境图片集模块

            var imgCarouselopts = {

                elem: '#imgCarousel',

                arrow: 'always',

                width: '100%',

                height: '100%',

                autoplay: false

            };

			
            //常规轮播

            var homeEnvImgs = carousel.render(imgCarouselopts);

            // 查询轮播图资源

            var imgsContainer = $('#carouselItems');

            searchCarouselImgs(homeInfo.homeId, homeEnvImgs, imgCarouselopts, imgsContainer);

            function searchCarouselImgs(sid, carousel, options, imgsContainer) {

                var tmp = {

                       StationId: sid,

                       VideoOrImage: 'image'

                   };

                   // 请求视频播放列表

                   $.ajax({

                       type: 'post',

                       async: true,

                       url: 'MyFileAction!searchStationSource',

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

                       dataType: 'json',

                       success: function(result) {

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

                           //console.log(rs);

                           var rsList = [];

                           if(rs.code==1) {

                               var data = rs.data;

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

                                   var _data = data[i];

                                   var tmp = {};

                                   tmp.fileName = _data.fileName;

                                   tmp.fileUrl = '../../../stationsrc/'+sid+'/image/'+_data.fileName;

                                   rsList.push(tmp);

                               }

                           }else {

                                   var tmp = {};

                                   tmp.fileName = 'none.jpg';

                                   tmp.fileUrl = '../../images/none.jpg';

                                   rsList.push(tmp);

                           }

                           updateCarouselImgs(homeEnvImgs, imgCarouselopts, imgsContainer, rsList);

                       }

                   });

            }

			
            // 更新图片轮播图

            function updateCarouselImgs(carousel, options, container, imgs) {

                // 清空容器

                container.text('');

                // 遍历imgs

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

                    var _imgs = imgs[i];

                    var item = $('<div><img src="'+_imgs.fileUrl+'"></div>');

                    container.append(item);

                }

				
                carousel.reload(options);

            }

			
			
        });

    </script>

</body>


 gx_tieta/WebRoot/mobil/map.html

@@ -331,7 +331,6 @@
        

        // 显示地图图标

        var allStation = [];

        searchStation();

        function searchStation(){

            var temp = createSearchParam();

            var json = JSON.stringify(temp);

@@ -647,6 +646,7 @@
                        var _point = new BMap.Point(data.map_longitude,data.map_latitude);

                        map.centerAndZoom(_point, data.map_level);    // 用城市名设置地图中心点

                    }

                    searchStation();

                   }            

            });

        }


 gx_tieta/WebRoot/progress-control.jsp

@@ -394,7 +394,8 @@
        // 判断重启的类型

        function checkRestartType(temp) {

            //var _restart = '<img src="image/restart.gif" title="重启线程" class="restart"/>';

            var _restart = '<img src="image/restart.gif" title="<s:text name='Restart'/><s:text name='Thread'/>" class="restart"/>';

            var text = "<s:text name='Restart'/><s:text name='Thread'/>";

            var _restart = '<img src="image/restart.gif" title="'+text+'" class="restart"/>';

            

            if(temp.ServerFlag == 2) {

                _restart = '';