ming před 3 roky
rodič
revize
85b7f68f5b

+ 10 - 64
src/views/siteManage/camera/checkVideo.vue

@@ -6,7 +6,7 @@
     @close="closeDialog(0)"
     @open="open"
   >
-    <div>{{ deviceCode }}</div>
+    <!-- <div>{{ deviceCode }}</div> -->
     <!-- <div style="background: #000">
       <video
         id="myVideo"
@@ -24,34 +24,23 @@
       controls
       preload="auto"
       style="width: 100%; height: 400px"
-       poster
-        loop="loop"
-        autoplay="autoplay"
+      poster
+      loop="loop"
+      autoplay="autoplay"
     >
       <!-- <source
-        src="http://devimages.apple.com/iphone/samples/bipbop/bipbopall.m3u8"
-        type="application/x-mpegURL"
-      /> -->
-
-      <source
         src="http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8"
         type="application/x-mpegURL"
-      />
-
-
-      <!-- <source
-        src='http://47.103.74.123/hls/C59360332.m3u8'
-        type="application/x-mpegURL"
       /> -->
+
+      <source :src="videoUrl" type="application/x-mpegURL" />
     </video>
   </el-dialog>
 </template>
 
 <script>
-// import { useStore } from 'vuex'
 import { defineComponent, ref, watchEffect } from 'vue'
-// import * as api from '@/api/siteManage/watchDog.js'
-// import { ElMessage } from 'element-plus'
+
 
 import videojs from 'video.js'
 import 'videojs-contrib-hls'
@@ -67,19 +56,12 @@ export default defineComponent({
   },
   setup(props, context) {
     context
-    // const store = useStore()
     const dialogVisible = ref(false)
-    const formInfo = ref(null)
 
-    const form = ref([])
-
-    const siteList = ref([])
     const videoUrl = ref('')
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
-      form.value = props.itemInfo.value
-
       window.setTimeout(function () {
         videojs(
           'my-video',
@@ -93,7 +75,7 @@ export default defineComponent({
           function () {
             // alert(1);
             console.log(this)
-            
+
             this.play()
           }
         )
@@ -101,33 +83,10 @@ export default defineComponent({
 
       // videoUrl.value = 'http://47.103.74.123/hls/'+props.deviceCode+'.m3u8';
       videoUrl.value =
-        'http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8'
-
-      // alert(props.deviceCode)
+        'http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
     }
 
-    const options = [
-      {
-        value: '选项1',
-        label: '站点一',
-      },
-      {
-        value: '选项2',
-        label: '站点二',
-      },
-      {
-        value: '选项3',
-        label: '站点三',
-      },
-      {
-        value: '选项4',
-        label: '站点四',
-      },
-      {
-        value: '选项5',
-        label: '站点五',
-      },
-    ]
+    const options = []
 
     // 关闭弹框
     const closeDialog = () => {
@@ -140,23 +99,10 @@ export default defineComponent({
       dialogVisible.value = props.flag
     })
 
-    const roleValid = (rule, value, callback) => {
-      rule
-      if (value.length === 0) {
-        callback(new Error('角色不能为空'))
-      } else {
-        callback()
-      }
-    }
-
     return {
       closeDialog,
       dialogVisible,
       options,
-      roleValid,
-      formInfo,
-      siteList,
-      form,
       open,
       videoUrl,
     }

+ 4 - 56
src/views/siteManage/camera/index.vue

@@ -189,8 +189,7 @@ import {
   ref,
   reactive,
   onMounted,
-  watch,
-  onUnmounted,
+  watch
 } from 'vue'
 import DialogComponent from './dialogComponent'
 import checkVideo from './checkVideo'
@@ -299,24 +298,6 @@ export default defineComponent({
       showDialog.value = true
     }
 
-    // 查看视频
-    // const open_video = (params) => {
-    //   params
-    //   tableItem.value = {
-    //     id: '',
-    //     stationName: '',
-    //     watchName: '',
-    //     watchCode: '',
-    //     siteList: [],
-    //     done: '',
-    //     guaZai: '',
-    //     checked: true,
-    //     resource: '',
-    //   }
-    //   dialogTitle.value = '查看视频'
-    //   showDialog2.value = true
-    // }
-
     // 关闭操作
     const closeDialog = () => {
     showDialog.value = false
@@ -430,20 +411,7 @@ export default defineComponent({
                 console.log(reCount.value)
                 if (onLineVideoList.value[n].ONAIR) {
                   if (++count.value > 2) {
-                    // var mask = document.getElementById('videomask');
-                    // if (mask != undefined) {
-                    // 	removeDIV('videomask');
-                    // }
                     loadingStatus.value = false
-
-                    alert('可以打开视频详情并传参')
-                    // uni.navigateTo({
-                    // 	url: '/pages/videoDetail/videoDetail?deviceType=2&companyCode=' +
-                    // 		this.companyCode + '&deviceCode=' +
-                    // 		onLineVideoList.value[n].DEVICE +
-                    // 		'',
-                    // });
-
                     tableItem.value = {
                       id: '',
                       stationName: '',
@@ -462,20 +430,10 @@ export default defineComponent({
                   }
                 } else {
                   if (reCount.value > 20) {
-                    // var mask = document.getElementById('videomask');
-                    // if (mask != undefined) {
-                    // 	removeDIV('videomask');
-                    // }
+                 
                     loadingStatus.value = false
                     alert('远程摄像头链接超时,请稍后再试')
-                    // ElMessage({
-                    //   duration: 5000,
-                    //   showClose: true,
-                    //   message: '远程摄像头链接超时,请稍后再试.',
-                    //   type: 'warning',
-                    // })
-
-                    // $("#myPopup").popup("open");
+               
                     break
                   }
                   store.state.siteCameraTimer = setTimeout(chk_video, 5000)
@@ -520,7 +478,6 @@ export default defineComponent({
           console.log(openId.value)
           console.log(onLineVideoList.value[n].ONAIR)
           if (onLineVideoList.value[n].ONAIR) {
-            alert('打开详情页并传参')
             tableItem.value = {
               id: '',
               stationName: '',
@@ -569,12 +526,6 @@ export default defineComponent({
       // end
     }
 
-    // window.setInterval(() => {
-    //   setTimeout(() => {
-    //     chk_video()
-    //   }, 0)
-    // }, 100000)
-
     //监听变化
     watch(
       () => props.siteId,
@@ -610,10 +561,7 @@ export default defineComponent({
     )
 
     onMounted(() => {})
-    onUnmounted(() => {
-      // alert('摧毁')
-      // clearTimeOut(timer.value)
-    })
+
 
     return {
       deviceData,