From 924b9c89663a786d6253680abf191f9870f2359f Mon Sep 17 00:00:00 2001
From: duanliang <540489889@qq.com>
Date: Fri, 30 May 2025 23:54:56 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CircleProgress/index.vue    |  4 ++--
 src/views/collect/components/video-box.vue | 19 ++++++++++++-------
 src/views/monitor/components/box-2.vue     |  4 ++--
 src/views/scenic/components/box-2.vue      |  3 ++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/CircleProgress/index.vue b/src/components/CircleProgress/index.vue
index 578a99a..07c53f6 100644
--- a/src/components/CircleProgress/index.vue
+++ b/src/components/CircleProgress/index.vue
@@ -57,7 +57,7 @@
         top: '34%',
         textStyle: {
           color: '#00D0FF',
-          fontSize: fitChartSize(12)
+          fontSize: fitChartSize(24)
         }
       },
       {
@@ -66,7 +66,7 @@
         top: '56%',
         textStyle: {
           color: '#fff',
-          fontSize: fitChartSize(12)
+          fontSize: fitChartSize(24)
         }
       }
     ],
diff --git a/src/views/collect/components/video-box.vue b/src/views/collect/components/video-box.vue
index da8298e..8123ea0 100644
--- a/src/views/collect/components/video-box.vue
+++ b/src/views/collect/components/video-box.vue
@@ -14,7 +14,7 @@
 							width:(100/grad)+'%'
 						}">
 							
-							<div class="video-item__inner" @click="handleCamera(element.cameraIndexCode,element,index)">
+							<div class="video-item__inner" @click.stop="handleCamera(element.cameraIndexCode,element,index)">
 								<div
 									v-if="element.isDiy == 1"
 									class="video-item__follow"
@@ -131,13 +131,15 @@
 	const isDiyChange = (val)=>{
 		console.log(val,11222)
 		isDiy.value = val
-		
-		videoList.value[diyIndex.value].videos.forEach(async (it, i) => {
+		if(!val){
+			videoList.value[diyIndex.value].videos = videoList.value[diyIndex.value].videos.filter(item => item.cameraIndexCode !== cameraIndexCode.value); 
+		}
+		// videoList.value[diyIndex.value].videos.forEach(async (it, i) => {
 			
-			if(it.cameraIndexCode == cameraIndexCode.value){
-				it.isDiy = val
-			}
-		})
+		// 	if(it.cameraIndexCode == cameraIndexCode.value){
+		// 		it.isDiy = val
+		// 	}
+		// })
 	}
 	const onStart = (res)=>{
 		
@@ -185,7 +187,10 @@
 		
 	  } else {
 		  
+		videoList.value[index].videos = videoList.value[index].videos.filter(item => item.cameraIndexCode !== id);  
+		console.log('取消收藏',)
 	    element.isDiy = 0
+		show.value = false
 	  }
 	  // pubSub.publish('videoCollect', id)
 	}
diff --git a/src/views/monitor/components/box-2.vue b/src/views/monitor/components/box-2.vue
index 89ad5e9..b541a47 100644
--- a/src/views/monitor/components/box-2.vue
+++ b/src/views/monitor/components/box-2.vue
@@ -412,9 +412,9 @@
   const handleCollectAdd = async (id, status, index) => {
     await getColletDiyApi({
       cameraIndexCode:id,
-      isDiy: status == 0 ? 1 : 0
+      isDiy: thisVideo.value.isDiy == 0 ? 1 : 0
     })
-	if(status==1){
+	if(thisVideo.value.isDiy==1){
 		thisVideo.value.isDiy=0
 		// videoList.value.forEach((item,index)=>{
 		// 	if(item.cameraIndexCode==thisVideo.value.cameraIndexCode){
diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue
index 095f3e1..0f4eed2 100644
--- a/src/views/scenic/components/box-2.vue
+++ b/src/views/scenic/components/box-2.vue
@@ -1139,7 +1139,8 @@
       align-items: center;
     }
     .car-ship {
-      width: 100%;
+      // width: vw(660);
+	  width: 100%;
       height: vh(250);
     }
     .full {