From e7d40e5061afb87166c0929050ea721cc2956b76 Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期一, 28 七月 2025 17:05:00 +0800
Subject: [PATCH] Merge commit '84f19ab0d37599400959e85e63cfda5df4869bc8' into develop
---
src/pages/cameraVideo/components/VideoPhoto.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/pages/cameraVideo/components/VideoPhoto.vue b/src/pages/cameraVideo/components/VideoPhoto.vue
index 1eb764e..f55ad23 100644
--- a/src/pages/cameraVideo/components/VideoPhoto.vue
+++ b/src/pages/cameraVideo/components/VideoPhoto.vue
@@ -2,7 +2,7 @@
<div style="height: 100%;" class="swiper-box">
<div class="swiper-box-top">
<h2 style="float:left; font-size:15px">瀹炴椂鎶撴媿</h2>
- <audio ref="alarmAudio" src="/libs/14184.wav" style="display:none"></audio>
+ <!-- <audio ref="alarmAudio" src="/libs/14184.wav" style="display:none"></audio> 棰勮澹伴煶 -->
<span
style="float:left;font-family:PingFangSC-Regular;font-size:13px;color:#999999;"
> 锛堝叡{{VideoCaptrue.cards.length}}寮狅級</span>
@@ -96,13 +96,13 @@
},
methods: {
showCapture(nodes) {
- // if (nodes.length < 1) {
- // this.taskUid = 0;
- // this.VideoCaptrue.cards = [];
- // return;
- // }
- // this.VideoCaptrue.cameras = nodes;
- // this.VideoCaptrue.initCards();
+ if (nodes.length < 1) {
+ this.taskUid = 0;
+ this.VideoCaptrue.cards = [];
+ return;
+ }
+ this.VideoCaptrue.cameras = nodes;
+ this.VideoCaptrue.initCards();
},
toAdd(item) {
this.$emit("addToBase", item);
--
Gitblit v1.8.0