xsh пре 3 година
родитељ
комит
0e36543b9a

+ 22 - 27
public/static/dahua/index.html

@@ -6,36 +6,31 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
     <link rel="stylesheet" href="./static/WSPlayer/player.css">
-    <script src="./static/WSPlayer/PlayerControl.js"></script>
-    <link rel="stylesheet" href="./static/zTreeStyle/zTreeStyle.css">
-    <!-- <script src="./static/WSPlayer/PlayerControl.js"></script> -->
     <script src="./static/jquery-3.6.0.min.js"></script>
-    <script src="./static/jquery.ztree.all.js"></script>
-    <script src="./static/datepicker.js"></script>
+    <script src="./static/WSPlayer/PlayerControl.js"></script>
 </head>
 <body style="margin: 0; width: 100%; height: 100%">
     <div id="ws-record-player" style="width: 100%; height: 600px;"></div>
-    <script type="module">
-        import WsPlayer from './js/WsPlayer/WsPlayer.js';
-        var recordPlayer = new WsPlayer({
-            el: 'ws-record-player', // 必传
-            type: 'record', // real | record
-            serverIp: '36.26.62.70',
-            num: 1,
-            showControl: true,
-        })
-        let url = location.href;
-        console.log(url)
-        let rtsps = url.split('?')[1];
-        let token = url.split('?')[2];
-        let rtsp = rtsps + '?' + token;
-        console.log(rtsp)
-        recordPlayer.playRecord({
-            rtspURL: rtsp, // String | Array[String] 可以传入多个rtsp地址,将会按照顺序在播放器中播放,最多播放四个
-            decodeMode: 'canvas', // 解码方式, video|canvas 可以不传,自动识别,h264使用video播放,265使用canvas播放
-            // wsURL: '' // 选择传递,默认播放器是连接服务器对应的websocket,但是也可以指定连接websocket地址
-        })
-        console.log(recordPlayer);
-    </script>
 </body>
+<script type="module">
+  import WSPlayer from "./src/WSPlayer/WSPlayer.js";
+  var recordPlayer = new WSPlayer({
+    el: 'ws-record-player', // 必传
+    type: 'record', // real | record
+    serverIp: '36.26.62.70',
+    num: 1,
+    showControl: true,
+  })
+  let url = location.href;
+  console.log(url)
+  let rtsps = url.split('?')[1];
+  let token = url.split('?')[2];
+  let rtsp = rtsps + '?' + token;
+  console.log(rtsp)
+  recordPlayer.playRecord({
+    rtspURL: rtsp, // String | Array[String] 可以传入多个rtsp地址,将会按照顺序在播放器中播放,最多播放四个
+    decodeMode: 'canvas', // 解码方式, video|canvas 可以不传,自动识别,h264使用video播放,265使用canvas播放
+    // wsURL: '' // 选择传递,默认播放器是连接服务器对应的websocket,但是也可以指定连接websocket地址
+  })
+</script>
 </html>

public/static/dahua/js/WSPlayer/CONSTANT.js → public/static/dahua/src/WSPlayer/CONSTANT.js


public/static/dahua/js/WSPlayer/PlayerItem.js → public/static/dahua/src/WSPlayer/PlayerItem.js


public/static/dahua/js/WSPlayer/RealPlayer.js → public/static/dahua/src/WSPlayer/RealPlayer.js


public/static/dahua/js/WSPlayer/RecordPlayer.js → public/static/dahua/src/WSPlayer/RecordPlayer.js


public/static/dahua/js/WSPlayer/WSPlayer.js → public/static/dahua/src/WSPlayer/WSPlayer.js


public/static/dahua/js/WSPlayer/spin.js → public/static/dahua/src/WSPlayer/spin.js


+ 1 - 1
src/store/index.js

@@ -10,7 +10,7 @@ export default new Vuex.Store({
     mode: true,
     // 按钮权限
     buttons: [],
-    ip: 'http://192.168.1.165:8010',
+    ip: 'http://115.238.57.190:8100',
     // 所选择的farmId
     farmId: '',
     farmList: [],

+ 1 - 1
src/utils/http.js

@@ -15,7 +15,7 @@ let removePending = (ever) => {
 // 创建axios实例
 var instance = axios.create({
   timeout: 1000 * 12,
-  baseURL: 'http://192.168.1.165:8010'
+  baseURL: 'http://115.238.57.190:8100'
 })
 
 // 请求拦截器

+ 2 - 2
src/views/Video/VideoAdmin.vue

@@ -72,7 +72,7 @@
         :visible.sync="isVideo"
         width="50%">
       <div style="width: 100%; height: 560px; text-align: center;">
-        <iframe v-if="isVideo" :src="'static/index.html?'+'1'+','+ cameraOne +','+ cameraTwo + ',' +'100%' + ',' + '0'" style="width: 100%; height: 530px;" frameborder="0"  allowfullscreen="true"></iframe>
+        <iframe v-if="isVideo" :src="'static/jinm/index.html?'+'1'+','+ cameraOne +','+ cameraTwo + ',' +'100%' + ',' + '0'" style="width: 100%; height: 530px;" frameborder="0"  allowfullscreen="true"></iframe>
         <div>
           <el-button :disabled="last === null" size="small" @click="getNext(last)">上一个</el-button>
           <el-button :disabled="next === null" size="small" @click="getNext(next)">下一个</el-button>
@@ -507,4 +507,4 @@ export default {
     box-sizing: border-box;
     padding: 20px;
   }
-</style>
+</style>