Преглед на файлове

pc视频bug修复,点击搜索清空2值

ming преди 3 години
родител
ревизия
c886a96c14
променени са 2 файла, в които са добавени 29 реда и са изтрити 36 реда
  1. 18 24
      src/views/deviceManage/powerEquip/videoEquip/checkVideo.vue
  2. 11 12
      src/views/deviceManage/powerEquip/videoEquip/index.vue

+ 18 - 24
src/views/deviceManage/powerEquip/videoEquip/checkVideo.vue

@@ -1,20 +1,13 @@
 <template>
-
-    <el-dialog
-      :title="dialogTitle"
-      v-model="dialogVisible"
-      width="600px"
-  
-      @close="closeDialog(0)"
-       @open="open"
-    >
-    <div
-      v-html="randerHtml"
-      style="width: 100%;  background: #000"
-    ></div>
-     
-    </el-dialog>
-
+  <el-dialog
+    :title="dialogTitle"
+    v-model="dialogVisible"
+    width="600px"
+    @close="closeDialog(0)"
+    @open="open"
+  >
+    <div v-html="randerHtml" style="width: 100%; background: #000"></div>
+  </el-dialog>
 </template>
 
 <script>
@@ -43,15 +36,13 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
-     
-
       // videoUrl.value = 'http://47.103.74.123/hls/'+props.deviceCode+'.m3u8';
-      videoUrl.value = 'https://iot.usky.cn/hls/'+props.deviceCode+'.m3u8';
+      videoUrl.value = 'https://iot.usky.cn/hls/' + props.deviceCode + '.m3u8'
+      console.log(videoUrl.value)
       //  alert(videoUrl.value)
       // videoUrl.value ='http://cctvalih5ca.v.myalicdn.com/live/cctv1_2/index.m3u8'
 
       window.setTimeout(getVideo, 100)
-
     }
     function getVideo() {
       randerHtml.value =
@@ -74,7 +65,7 @@ export default defineComponent({
       }
 
       window.setTimeout(function () {
-        player.value = videojs('my-video', options,)
+        player.value = videojs('my-video', options)
       }, 100)
     }
 
@@ -82,6 +73,7 @@ export default defineComponent({
     const closeDialog = () => {
       if (player.value) {
         player.value.dispose()
+        //  player.value.distory()
         randerHtml.value = ''
       }
 
@@ -117,12 +109,14 @@ export default defineComponent({
 
 // label样式
 .el-form-item__label {
-    width: 150px
+  width: 150px;
 }
 .el-form-item__content {
-    margin-left: 150px
+  margin-left: 150px;
 }
 </style>
 <style >
-* { touch-action: pan-y; }
+* {
+  touch-action: pan-y;
+}
 </style>

+ 11 - 12
src/views/deviceManage/powerEquip/videoEquip/index.vue

@@ -57,11 +57,9 @@
         stripe
         :header-cell-style="headClass"
         :height="Height"
-
-         v-loading="loadingStatus"
-      element-loading-text="摄像头打开中...."
-      element-loading-background="rgba(255, 255, 255, 0.6)"
-      
+        v-loading="loadingStatus"
+        element-loading-text="摄像头打开中...."
+        element-loading-background="rgba(255, 255, 255, 0.6)"
       >
         <el-table-column
           prop="stationStatus"
@@ -128,10 +126,10 @@
         ></el-table-column>
         <el-table-column label="视频画面" align="center" width="150">
           <template #default="scope" style="text-align: center">
-           <a v-if="scope.row.ALIVEVALUE == 3" @click="open_video(scope.row)">
-            查看
-          </a>
-          <span v-else style="color: #aaa">--</span>
+            <a v-if="scope.row.ALIVEVALUE == 3" @click="open_video(scope.row)">
+              查看
+            </a>
+            <span v-else style="color: #aaa">--</span>
           </template>
         </el-table-column>
       </el-table>
@@ -163,7 +161,7 @@
 </template>
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, onMounted,watch } from 'vue'
+import { defineComponent, ref, onMounted, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import * as api from '@/api/deviceManage/videoEquip.js'
 import checkVideo from './checkVideo'
@@ -222,10 +220,11 @@ export default defineComponent({
       showDialog.value = false
       // videoMonitoringDeviceList()
     }
-    function searchData(){
+    function searchData() {
+      reCount.value = 0
+      openId.value = ''
       videoMonitoringDeviceList()
       chk_video()
-
     }
 
     //视频列表