liuyg
2021-06-11 518af6f3d0ee7164f24c901c60165b17a4325ce4
视频加载  样式调整
6 files modified
107 ■■■■ changed files
libs/flv/flvjs/flv.js 30 ●●●● patch | view | raw | blame | history
widgets/searchL/Widget.js 40 ●●●●● patch | view | raw | blame | history
widgets/searchL/css/style.css 5 ●●●● patch | view | raw | blame | history
widgets/searchTabaPopup/Widget.html 6 ●●●● patch | view | raw | blame | history
widgets/searchTabaPopup/Widget.js 9 ●●●●● patch | view | raw | blame | history
widgets/searchTabaPopup/css/style.css 17 ●●●●● patch | view | raw | blame | history
libs/flv/flvjs/flv.js
@@ -1,4 +1,6 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.flvjs = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
(function (f) { if (typeof exports === "object" && typeof module !== "undefined") { module.exports = f() } else if (typeof define === "function" && define.amd) { define([], f) } else { var g; if (typeof window !== "undefined") { g = window } else if (typeof global !== "undefined") { g = global } else if (typeof self !== "undefined") { g = self } else { g = this } g.flvjs = f() } })(function () {
    var define, module, exports; return (function e(t, n, r) { function s(o, u) { if (!n[o]) { if (!t[o]) { var a = typeof require == "function" && require; if (!u && a) return a(o, !0); if (i) return i(o, !0); var f = new Error("Cannot find module '" + o + "'"); throw f.code = "MODULE_NOT_FOUND", f } var l = n[o] = { exports: {} }; t[o][0].call(l.exports, function (e) { var n = t[o][1][e]; return s(n ? n : e) }, l, l.exports, e, t, n, r) } return n[o].exports } var i = typeof require == "function" && require; for (var o = 0; o < r.length; o++)s(r[o]); return s })({
        1: [function (_dereq_, module, exports) {
(function (process,global){
/*!
 * @overview es6-promise - a tiny implementation of Promises/A+.
@@ -12,7 +14,8 @@
    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
    typeof define === 'function' && define.amd ? define(factory) :
    (global.ES6Promise = factory());
}(this, (function () { 'use strict';
                }(this, (function () {
                    'use strict';
function objectOrFunction(x) {
  var type = typeof x;
@@ -1248,9 +1251,17 @@
        throw er; // Unhandled 'error' event
      } else {
        // At least give some kind of context to the user
                            //手动添加try
                            try {
        var err = new Error('Uncaught, unspecified "error" event. (' + er + ')');
        err.context = er;
        throw err;
                            }
                            catch (err) {
                                // console.log('1259报错')
                            }
      }
    }
  }
@@ -11586,13 +11597,21 @@
                return;
            }
                        //手动添加try
                        try {
            if (console.error) {
                console.error(str);
                                // console.error(str);//报错
            } else if (console.warn) {
                console.warn(str);
            } else {
                console.log(str);
            }
                        }
                        catch (err) {
                            console.log('1259报错')
                        }
        }
    }, {
        key: 'i',
@@ -11672,7 +11691,7 @@
                return;
            }
            console.log(str);
                        // console.log(str);
        }
    }]);
@@ -12050,7 +12069,8 @@
exports.default = decodeUTF8;
},{}]},{},[21])(21)
        }, {}]
    }, {}, [21])(21)
});
//# sourceMappingURL=flv.js.map
widgets/searchL/Widget.js
@@ -311,29 +311,19 @@
                            var data = obj.data //获得当前行数据
                                , layEvent = obj.event; //获得 lay-event 对应的值
                            if (layEvent === 'detail') {
                                //   layer.msg('查看操作');
                                // var dom = $('#poput-m-t-video'),
                                //     str = `
                                //     <div class="header">${obj.data.name}--实时视频</div>
                                //     <video id="video1" class="video-js vjs-default-skin" width="100%" height="100%"
                                //         data-setup='{"controls" : true, "autoplay" : true, "preload" : "auto"}'>
                                //         <source src="http://171.34.197.243:701/rtp/34020000001110000100_34020000001320000004.flv" type="video/x-flv">
                                //     </video>`;
                                // dom.empty();
                                // dom.append(str);
                                var dom = $('#twovideo'),
                                    //     <div class="header" style="z-index: 14">${obj.data.name}--实时视频</div>
                                    //    <video id="poput-m-t-video-video" ></video>
                                var dom = $('.header'),
                                    str = `${obj.data.name}--实时视频`;
                                dom.empty();
                                dom.append(str);
                                if (obj.data.flv) {
                                    var dom = $('#poput-m-t-video'),
                                    // <div id="poput-m-t-video-login"><i class="layui-icon">&#xe63e;</i></div>
                                    str = `
                                <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
                                    <div class="header">${obj.data.name}--实时视频</div>
                                    <div id="poput-m-t-video">
                                        <video id="poput-m-t-video-video" ></video>
                                </div>
                                `;
                                dom.empty();
                                dom.append(str);
                                // console.log(obj.data.name);
                                // console.log(obj.data.flv);
@@ -347,6 +337,20 @@
                                    flvPlayer.load();
                                    flvPlayer.play();
                                }
                                    window.$myVideoFlvplayer = flvPlayer;
                                    // var time = setTimeout(() => {
                                    // }, 2000);
                                } else {
                                    var dom = $('#poput-m-t-video'),
                                        str = `
                                            <div id="poput-m-t-video-none" >·暂无视频</div>
                                    `;
                                    dom.empty();
                                    dom.append(str);
                                }
                                $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
                                $('.jimu-widget-searchTabaPopup').find('.p-main').eq(0).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
widgets/searchL/css/style.css
@@ -57,6 +57,9 @@
  align-items: center;
  justify-content: center;
}
.jimu-widget-searchL .searchLMain .layui-tab-content{
  padding: 0 !important;
}
.jimu-widget-searchL #inputTwo #local_data2 {
  position: relative;
@@ -113,7 +116,7 @@
  right: 5px;
  top: 70px;
  width: 462px;
  min-height: 554px;
  min-height: 540px;
  height: auto;
  padding-bottom: 20px;
  border-radius: 5px 5px 5px 5px;
widgets/searchTabaPopup/Widget.html
@@ -1,11 +1,11 @@
<div>
    <div class="popup">
        <div class="p-main two" id="twovideo">
            <!-- <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
             <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
            <div class="header">江豚湾--实时视频</div>
            <div id="poput-m-t-video">
                <video id="poput-m-t-video-video" ></video>
            </div> -->
                <!-- <video id="poput-m-t-video-video" ></video> -->
            </div>
        </div>
        <div class="p-main three">
            <div class="cloce"><i class="layui-icon">&#x1006;</i></div>
widgets/searchTabaPopup/Widget.js
@@ -31,6 +31,15 @@
                // 暴露在外的接
                var that = this;
                $('.cloce').click(() => {
                    if (window.$myVideoFlvplayer) {
                        var flvPlayer = window.$myVideoFlvplayer;
                        flvPlayer.pause();
                        flvPlayer.unload();
                        flvPlayer.detachMediaElement();
                        flvPlayer.destroy();
                        flvPlayer = null;
                        window.$myVideoFlvplayer = false
                    }
                    $('.jimu-widget-searchTabaPopup').css({ 'display': 'none' });
                    that.myChart.clear();
                    that.myChart1.clear();
widgets/searchTabaPopup/css/style.css
@@ -98,8 +98,25 @@
#poput-m-t-video-video{
  width: 100%;
  height: 560px;
  object-fit: fill;
  /* border: 1px springgreen solid; */
}
#poput-m-t-video-login{
  width: 100%;
  height: 560px;
  display: flex;
  align-items: center;
  justify-content: center;
}
#poput-m-t-video-none{
  font-size: 24px;
  width: 100%;
  height: 560px;
  display: flex;
  align-items: center;
  justify-content: center;
}
.jimu-widget-searchTabaPopup .layui-this {