diff --git a/public/index.html b/public/index.html index d0b68c2..5d967b5 100644 --- a/public/index.html +++ b/public/index.html @@ -6,11 +6,6 @@ - - - - - <%= htmlWebpackPlugin.options.title %> diff --git a/public/module/webs/index.html b/public/module/webs/index.html index 05c57a3..9662b51 100644 --- a/public/module/webs/index.html +++ b/public/module/webs/index.html @@ -18,11 +18,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/public/module/webs/index.js b/public/module/webs/index.js index b469663..f25ec9d 100644 --- a/public/module/webs/index.js +++ b/public/module/webs/index.js @@ -139,6 +139,7 @@ const setVideoDom = () => { $canvas_ivs = $("#h5_ivs_" + WndIndex); $videoLoading = $("#h5_loading_" + WndIndex); }; + /** /** * @description 预览 @@ -148,6 +149,7 @@ const setVideoDom = () => { * @param {boolean} isChangeStream 是否是切换码流导致的重新拉流 */ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { + let channel = window.location.href.split("?")[1]; if ( playerInstance[WndIndex] && onlineChannel.indexOf(channel) > -1 && @@ -157,7 +159,7 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { return; } onStopPreview(); - var player = null + var player = null; let options = { wsURL: "ws://" + "221.214.127.18" + ":" + "8200" + "/rtspoverwebsocket", rtspURL: @@ -165,7 +167,7 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { "221.214.127.18" + ":" + "8200" + - "/cam/realmonitor?channel=1" + + `/cam/realmonitor?channel=${channel}` + "&subtype=0" + "&proto=Private3", username: "admin", @@ -187,9 +189,6 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { if (!player.isPlayback) { onlineChannel.push(channel); updateChannelList(); - // if(curWndType !== 1) { - // clickNextWnd(); - // } } }); diff --git a/src/views/Zhou/ZNYWJK.vue b/src/views/Zhou/ZNYWJK.vue index 340c399..ab78338 100644 --- a/src/views/Zhou/ZNYWJK.vue +++ b/src/views/Zhou/ZNYWJK.vue @@ -16,17 +16,14 @@
- ; -
- +
{{ item.name }}
@@ -386,36 +388,40 @@ export default { ], sxtlist: [ { - src: require("../../assets/videos/G.E.M.邓紫棋 - 不想回家.mp4"), - name: "SP锅炉", + channel: "D19", + name: "3号煤磨在线监测", }, { - src: require("../../assets/videos/G.E.M.邓紫棋 - 句号.mp4"), - name: "回转窑", + channel: "D14", + name: "水泥散12#发货口", }, { - src: require("../../assets/videos/G.E.M.邓紫棋 - GLORIA.mp4"), - name: "西侧垃圾发电", + channel: "69", + name: "1#回转窑", }, { - src: require("../../assets/videos/林俊杰 - 愿与愁.mp4"), - name: "北侧垃圾发电", + channel: "70", + name: "辊压机", }, { - src: require("../../assets/videos/G.E.M.邓紫棋 - 不想回家.mp4"), - name: "SP锅炉", + channel: "71", + name: "2#窑", }, { - src: require("../../assets/videos/G.E.M.邓紫棋 - 句号.mp4"), - name: "回转窑", + channel: "33", + name: "矿区全貌", }, { - src: require("../../assets/videos/G.E.M.邓紫棋 - GLORIA.mp4"), - name: "西侧垃圾发电", + channel: "40", + name: "3#煤磨", }, { - src: require("../../assets/videos/林俊杰 - 愿与愁.mp4"), - name: "北侧垃圾发电", + channel: "63", + name: "垃圾处理北门外", + }, + { + channel: "71", + name: "2#窑", }, ], dates: new Date(), @@ -471,15 +477,16 @@ export default { this.dates = formattedTime; }, 100); var options = { - wsURL:"ws://221.214.127.18:8200/rtspoverwebsocket", - rtspURL:"rtsp://admin:pyss2017@192.168.1.212:8200/cam/realmonitor?channel=D1&subtype=0", - username:"admin", - password:"pyss2017" + wsURL: "ws://221.214.127.18:8200/rtspoverwebsocket", + rtspURL: + "rtsp://admin:pyss2017@192.168.1.212:8200/cam/realmonitor?channel=D1&subtype=0", + username: "admin", + password: "pyss2017", }; var videoplayerObj = document.getElementById("testVideo"); var canvasplayerObj = document.getElementById("testCanvas"); var player = new PlayerControl(options); - player.init(canvasplayerObj,videoplayerObj); + player.init(canvasplayerObj, videoplayerObj); }, }; @@ -716,8 +723,7 @@ export default { justify-content: space-around; flex-wrap: wrap; align-items: center; - align-content: space-around; - overflow-y: scroll; + overflow-y: auto; // 滚动条整体 整体如果不设置,只设置滑块和轨道是没有效果的 ::-webkit-scrollbar { width: 5px;