From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/cameraVideo/components/VideoItem.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/pages/cameraVideo/components/VideoItem.vue b/src/pages/cameraVideo/components/VideoItem.vue
index 416188f..f374d94 100644
--- a/src/pages/cameraVideo/components/VideoItem.vue
+++ b/src/pages/cameraVideo/components/VideoItem.vue
@@ -28,22 +28,27 @@
<p class="p3" @mousedown="ptCtrl('down')" @mouseup="ptStop"></p>
<p class="p4" @mousedown="ptCtrl('left')" @mouseup="ptStop"></p>
</div>
- <camera-player
+
+ <!-- <camera-player
:cameraName="videoItem.name"
:cameraID="videoItem.id"
:rtspUrl="videoItem.rtsp"
:isRunning="videoItem.isRunning"
:isGb="videoItem.cameraType === 1"
+ :showArea="showArea"
v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && TreeDataPool.treeActiveName==='camera'"
- ></camera-player>
+ ></camera-player> -->
- <video
- v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && TreeDataPool.treeActiveName==='dataStack'"
- :src="videoItem.rtsp"
- autoplay="autoplay"
- poster="/images/cameraVideo/video-poster.png"
- controls
- >鎮ㄧ殑娴忚鍣ㄤ笉鏀寔 video 鏍囩銆�</video>
+ <wasm-player
+ :cameraName="videoItem.name"
+ :cameraID="videoItem.id"
+ :rtspUrl="videoItem.rtsp"
+ :isRunning="videoItem.isRunning"
+ :isGb="videoItem.cameraType === 1"
+ :showArea="showArea"
+ v-if="videoItem !== '' && videoItem !== undefined && videoItem !== null && TreeDataPool.treeActiveName==='camera'"
+ ></wasm-player>
+
</div>
</div>
</template>
@@ -52,10 +57,12 @@
import { ptzControl } from "@/api/camera"
import CameraPlayer from "@/components/player";
+import WasmPlayer from "@/components/wasmPlayer";
export default {
components: {
- CameraPlayer
+ // CameraPlayer,
+ WasmPlayer
},
props: {
videoGuid: {
@@ -66,7 +73,8 @@
videoItem: {
type: [Object, String],
default: null
- }
+ },
+ showArea: Boolean,
},
data() {
return {
--
Gitblit v1.8.0