diff --git a/public/webs/css/style.css b/public/webs/css/style.css index 8af0526..ff83339 100644 --- a/public/webs/css/style.css +++ b/public/webs/css/style.css @@ -13,219 +13,16 @@ html { overflow: hidden; } body { -<<<<<<< HEAD width: 100%; height: 100%; - overflow: hidden; } .h5-left { - width: 100%; - height: 100%; + float: left; } .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.js b/public/webs/index.js index 37bd1ad..12c196c 100644 --- a/public/webs/index.js +++ b/public/webs/index.js @@ -156,22 +156,18 @@ const onPreview = (isPlayback, url, playbackIndex, isChangeStream) => { alert("通道" + (channel + 1) + "已存在！"); return; } + let ip = window.location.href.split("?")[2]; + let channel = window.location.href.split("?")[1]; onStopPreview(); -<<<<<<< HEAD - var player = null - let options = { - -======= var player = null; let options = { ->>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e - wsURL: "ws://" + "221.214.127.18" + ":" + "8200" + "/rtspoverwebsocket", + wsURL: "ws://" + ip + ":" + "8200" + "/rtspoverwebsocket", rtspURL: "rtsp://" + - "221.214.127.18" + + ip + ":" + "8200" + - "/cam/realmonitor?channel=10" + + `/cam/realmonitor?channel=${channel}` + "&subtype=0" + "&proto=Private3", username: "admin", diff --git a/src/assets/pds/中间.png b/src/assets/pds/中间.png new file mode 100644 index 0000000..6db0ca7 Binary files /dev/null and b/src/assets/pds/中间.png differ diff --git a/src/assets/pds/列表.png b/src/assets/pds/列表.png new file mode 100644 index 0000000..a29566f Binary files /dev/null and b/src/assets/pds/列表.png differ diff --git a/src/assets/pds/变损率icon.png b/src/assets/pds/变损率icon.png new file mode 100644 index 0000000..b961d72 Binary files /dev/null and b/src/assets/pds/变损率icon.png differ diff --git a/src/assets/pds/右.png b/src/assets/pds/右.png new file mode 100644 index 0000000..998bf33 Binary files /dev/null and b/src/assets/pds/右.png differ diff --git a/src/assets/pds/实时功率icon.png b/src/assets/pds/实时功率icon.png new file mode 100644 index 0000000..ce28ed6 Binary files /dev/null and b/src/assets/pds/实时功率icon.png differ diff --git a/src/assets/pds/左.png b/src/assets/pds/左.png new file mode 100644 index 0000000..9a5ef17 Binary files /dev/null and b/src/assets/pds/左.png differ diff --git a/src/assets/pds/组 23.png b/src/assets/pds/组 23.png new file mode 100644 index 0000000..94b8cd8 Binary files /dev/null and b/src/assets/pds/组 23.png differ diff --git a/src/assets/pds/设备工况icon.png b/src/assets/pds/设备工况icon.png new file mode 100644 index 0000000..a58c250 Binary files /dev/null and b/src/assets/pds/设备工况icon.png differ diff --git a/src/assets/pds/负载率icon.png b/src/assets/pds/负载率icon.png new file mode 100644 index 0000000..428d3b1 Binary files /dev/null and b/src/assets/pds/负载率icon.png differ diff --git a/src/assets/pds/遮罩.png b/src/assets/pds/遮罩.png new file mode 100644 index 0000000..2229cbb Binary files /dev/null and b/src/assets/pds/遮罩.png differ diff --git a/src/views/Zhou/ZNYWJK.vue b/src/views/Zhou/ZNYWJK.vue index 0830e3f..d4a7cdd 100644 --- a/src/views/Zhou/ZNYWJK.vue +++ b/src/views/Zhou/ZNYWJK.vue @@ -17,13 +17,12 @@
; + >

{{ dates }}

-<<<<<<< HEAD -======= - ->>>>>>> 39fec77d76384e95b93f7c97ee954bdd068ea41e