dedsudiyu 2 hafta önce
ebeveyn
işleme
af98cc34ea

+ 9 - 3
src/components/VideoMonitor/VideoGrid.vue

@@ -10,7 +10,8 @@
     </div>
     <div class="panel-content">
       <div class="grid-container" >
-        <H5PlayerVideo v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
+        <!--<H5PlayerVideo v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>-->
+        <mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>
         <!-- <div
           v-for="(video, idx) in videoList"
           :key="video.id"
@@ -45,7 +46,7 @@
         </button>
       </div>
     </div>
-    <fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>
+    <!--<fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>-->
   </div>
 </template>
 
@@ -53,10 +54,15 @@
   import {getVideoList} from '@/api'
   import H5PlayerVideo from '@/components/H5PlayerVideo/H5PlayerVideo.vue'
   import fullH5PlayerVideo from '@/components/fullH5PlayerVideo/fullH5PlayerVideo.vue'
+  import mpegtsVideo from '@/components/mpegtsVideo/mpegtsVideo.vue'
 
   export default {
     name: 'VideoGrid',
-    components: {H5PlayerVideo, fullH5PlayerVideo},
+    components: {
+      H5PlayerVideo,
+      fullH5PlayerVideo,
+      mpegtsVideo,
+    },
     data() {
       return {
         videoQueryParams: {

+ 9 - 3
src/components/alarmWindow/AlertModal.vue

@@ -55,7 +55,8 @@
                 <i class="el-icon-video-camera"></i>
                 <span>实时监控画面</span>
               </div>
-              <H5PlayerVideo style="margin:10px 0 0 12px;" v-if="videoData" :videoProps="videoData"></H5PlayerVideo>
+              <!--<H5PlayerVideo style="margin:10px 0 0 12px;" v-if="videoData" :videoProps="videoData"></H5PlayerVideo>-->
+              <mpegts-video style="display: inline-block" :videoProps="videoData"></mpegts-video>
             </div>
           </div>
         </div>
@@ -81,7 +82,7 @@
           </div>
         </div>
       </div>
-      <fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>
+      <!--<fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>-->
     </div>
   <!--</transition>-->
 </template>
@@ -90,9 +91,14 @@
 import H5PlayerVideo from '@/components/H5PlayerVideo/H5PlayerVideo.vue'
 import fullH5PlayerVideo from '@/components/fullH5PlayerVideo/fullH5PlayerVideo.vue'
 import { getVideoList,laboratoryPlanCloseRiskPlan  } from '@/api'
+import mpegtsVideo from '@/components/mpegtsVideo/mpegtsVideo.vue'
 export default {
   name: 'AlertModal',
-  components: { H5PlayerVideo,fullH5PlayerVideo },
+  components: {
+    H5PlayerVideo,
+    fullH5PlayerVideo,
+    mpegtsVideo
+  },
   props: {
     AlertModalData: {
       type: Object,

+ 6 - 3
src/components/alarmWindow/emergency.vue

@@ -155,8 +155,9 @@
         <!--<div class="evac-floor-lbl">楼道 {{ alarmData.floor || '1' }}层</div>-->
         <!--<div class="evac-cam-slot">实时视频监控</div>-->
         <div class="video-for-box" v-if="videoType">
-          <H5PlayerVideo style="margin:10px 0 0 10px;"
-                         v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>
+          <!--<H5PlayerVideo style="margin:10px 0 0 10px;"-->
+                         <!--v-for="(item,index) in videoList" :key="index" :videoProps="item"></H5PlayerVideo>-->
+          <mpegts-video style="display: inline-block" :videoProps="item" v-for="(item,index) in videoList" :key="index"></mpegts-video>
         </div>
         <p class="null-p" v-if="!videoType">暂无数据</p>
       </div>
@@ -242,7 +243,7 @@
         </div>
       </div>
     </div>
-    <fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>
+    <!--<fullH5PlayerVideo v-if="fullVideoType" :fullVideoProps="fullVideoProps"></fullH5PlayerVideo>-->
   </div>
 </template>
 
@@ -256,11 +257,13 @@ import {
 } from '@/api/index'
 import H5PlayerVideo from '@/components/H5PlayerVideo/H5PlayerVideo.vue'
 import fullH5PlayerVideo from '@/components/fullH5PlayerVideo/fullH5PlayerVideo.vue'
+import mpegtsVideo from '@/components/mpegtsVideo/mpegtsVideo.vue'
 export default {
   name: 'Emergency',
   components: {
     H5PlayerVideo,
     fullH5PlayerVideo,
+    mpegtsVideo,
   },
   props: {
     alarmData: {