diff --git a/.history/public/webs/index_20231211180135.js b/.history/public/webs/index_20231211180135.js index 2312b14..237fe51 100644 --- a/.history/public/webs/index_20231211180135.js +++ b/.history/public/webs/index_20231211180135.js @@ -139,7 +139,6 @@ const setVideoDom = () => { $canvas_ivs = $("#h5_ivs_" + WndIndex); $videoLoading = $("#h5_loading_" + WndIndex); }; - /** /** * @description 预览 @@ -149,8 +148,6 @@ const setVideoDom = () => { * @param {boolean} isChangeStream 是否是切换码流导致的重新拉流 */ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { - let channel = window.location.href.split("?")[1]; - let ip = window.location.href.split("?")[2]; if ( playerInstance[WndIndex] && onlineChannel.indexOf(channel) > -1 && @@ -162,13 +159,13 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { onStopPreview(); var player = null; let options = { - wsURL: "ws://" + ip + ":" + "8200" + "/rtspoverwebsocket", + wsURL: "ws://" + "221.214.127.18" + ":" + "8200" + "/rtspoverwebsocket", rtspURL: "rtsp://" + - ip + + "221.214.127.18" + ":" + "8200" + - `/cam/realmonitor?channel=${channel}` + + "/cam/realmonitor?channel=10" + "&subtype=0" + "&proto=Private3", username: "admin", @@ -180,6 +177,7 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { playbackIndex: playbackIndex, }; player = new PlayerControl(options); + player.on("MSEResolutionChanged", function (e) { console.log(e); }); @@ -189,8 +187,12 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { if (!player.isPlayback) { onlineChannel.push(channel); updateChannelList(); + // if(curWndType !== 1) { + // clickNextWnd(); + // } } }); + player.on("GetFrameRate", function (e) { console.log("GetFrameRate: " + e); }); diff --git a/.history/public/webs/index_20231212101857.html b/.history/public/webs/index_20231212101857.html new file mode 100644 index 0000000..a455461 --- /dev/null +++ b/.history/public/webs/index_20231212101857.html @@ -0,0 +1,17 @@ + + + + + + + + + + + +
+
+
+
+ + \ No newline at end of file diff --git a/.history/src/views/Zhou/ZNYWJK_20231212101832.vue b/.history/src/views/Zhou/ZNYWJK_20231212101832.vue new file mode 100644 index 0000000..0830e3f --- /dev/null +++ b/.history/src/views/Zhou/ZNYWJK_20231212101832.vue @@ -0,0 +1,1152 @@ + +<<<<<<< HEAD +======= + +>>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e + + diff --git a/public/webs/css/style.css b/public/webs/css/style.css index 1e9ac83..8af0526 100644 --- a/public/webs/css/style.css +++ b/public/webs/css/style.css @@ -13,6 +13,7 @@ html { overflow: hidden; } body { +<<<<<<< HEAD width: 100%; height: 100%; overflow: hidden; @@ -25,8 +26,206 @@ body { .h5-play-wrap { width: auto; height: auto; +======= + padding:10px; + min-width: 1280px; + width: 100%; + height: 100%; + overflow: scroll; +} +.h5-left, +.h5-right { + float: left; + margin-right: 20px; +} +.fn-padl10 { + padding-left: 10px; +} +.fn-marl10 { + margin-left: 10px; +} +.fn-clear { + clear: both; +} +.fn-overflow { + overflow: hidden; +} +.fn-width100 { + width: 100px; +} +.fn-marl10 { + margin-left: 10px; +} +.fn-marl150 { + margin-left: 150px; +} +.fn-mart10 { + margin-top: 10px; +} +.fn-fontBlue { + color: blue; +} +.fn-fontRed { + color: red !important; +} +.fn-lightBorder { + border: 1px solid rgb(255, 204, 0) !important; +} +.fn-normalBorder { + border: 1px solid rgb(125, 125, 125) !important; +} +fieldset { + display:block; + margin-top: 10px; +} +fieldset legend{ + font-size: 14px; +} +.h5-play-wrap { + width: 500px; + height: 300px; +>>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e background-color: #000; border: 1px solid #333; position: relative; overflow: hidden; } +<<<<<<< HEAD +======= +.h5-fieldset-wrap { + width: 520px; + padding: 10px; + border: 1px solid #333; +} +.h5-form-item { + float: left; + height: auto; + overflow: hidden; + margin-bottom: 5px; +} +.h5-form-item label { + width: 80px; + display: inline-block; +} +.h5-form-item input { + width: 130px; +} +.h5-form-item select { + width: 134px; +} +.h5-form-item span { + width: 60px; +} +.h5-form-item .h5-button { + width: 80px; + height: 30px; + font-size: 12px; +} +.h5-ptz-wrap { + width: 210px; + float: left; +} +.h5-step-wrap { + margin-bottom: 10px; +} +.h5-zoomfocus-wrap { + width: 200px; + float: left; +} +.h5-preset-wrap { + float: left; + margin-top: 10px; +} +.h5-ptz-wrap .h5-button { + width: 60px; + height: 30px; + margin-bottom: 3px; +} +.h5-zoomfocus-wrap .h5-button { + width: 80px; + height: 30px; + margin-bottom: 3px; +} +.h5-preset-wrap .h5-button { + width: 60px; + height: 30px; + margin-bottom: 3px; +} +.h5-preset-wrap input { + width: 130px; +} +.h5-table { + border-collapse: collapse; + background: #ddd; + width: 600px; + float: left; + height: 300px; + display: block; + overflow-y: scroll; +} +.h5-table tbody tr:nth-child(odd) { + background-color: #fff; +} + +.h5-table tr td{ + text-align: center; + padding: 5px 0; + border: 1px solid #999; +} +.h5-table tr:hover{ + cursor: text; +} +a.i-download { + display: block; + width: 20px; + height: 20px; + margin: 0 auto; + cursor: pointer; + background: #cccccc; + border-radius: 50%; +} +a.i-download:hover { + background: #999; +} +.h5-page { + text-align: right; + margin-top: 10px; + margin-right: 18px; + display: block; + float: left; +} +.h5-ul { + float: left; + background: #ccc; + list-style: none; + max-height: 250px; + overflow-y: scroll; +} +.h5-ul li { + cursor: pointer; + height: 20px; + line-height: 20px; +} +.h5-ul li:hover { + background-color: #eee; +} +.video_loading{ + position: absolute; + top: 0; + left: 0; + color: #fff; +} +.h5-menu-list { + margin-top: 40px; + background-color: #ccc; +} +.h5-menu-list li { + height: 40px; + line-height: 40px; + font-size: 20px; + cursor: pointer; +} +.h5-menu-list li:hover { + background-color: #eee; +} +>>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e diff --git a/public/webs/index.html b/public/webs/index.html index e45b4b2..a455461 100644 --- a/public/webs/index.html +++ b/public/webs/index.html @@ -13,8 +13,5 @@
- - - - + \ No newline at end of file diff --git a/public/webs/index.js b/public/webs/index.js index adec45d..37bd1ad 100644 --- a/public/webs/index.js +++ b/public/webs/index.js @@ -157,9 +157,14 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { return; } onStopPreview(); +<<<<<<< HEAD var player = null let options = { +======= + var player = null; + let options = { +>>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e wsURL: "ws://" + "221.214.127.18" + ":" + "8200" + "/rtspoverwebsocket", rtspURL: "rtsp://" + diff --git a/src/views/Zhou/ZNYWJK.vue b/src/views/Zhou/ZNYWJK.vue index 79ea9e3..0830e3f 100644 --- a/src/views/Zhou/ZNYWJK.vue +++ b/src/views/Zhou/ZNYWJK.vue @@ -199,6 +199,10 @@ +<<<<<<< HEAD +======= + +>>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e