lixuefeng/fengjie-datascreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 修改

Browse Source
This commit is contained in:
duanliang
2025-05-30 23:54:56 +08:00
parent 2134b44689
commit 924b9c8966
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/CircleProgress/index.vue
View File

@@ -57,7 +57,7 @@
top: '34%', top: '34%',
textStyle: { textStyle: {
color: '#00D0FF', color: '#00D0FF',
fontSize: fitChartSize(12) fontSize: fitChartSize(24)
} }
}, },
{ {
@@ -66,7 +66,7 @@
top: '56%', top: '56%',
textStyle: { textStyle: {
color: '#fff', color: '#fff',
fontSize: fitChartSize(12) fontSize: fitChartSize(24)
} }
} }
], ],

19
src/views/collect/components/video-box.vue
View File

@@ -14,7 +14,7 @@
width:(100/grad)+'%' 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 <div
v-if="element.isDiy == 1" v-if="element.isDiy == 1"
class="video-item__follow" class="video-item__follow"
@@ -131,13 +131,15 @@
const isDiyChange = (val)=>{ const isDiyChange = (val)=>{
console.log(val,11222) console.log(val,11222)
isDiy.value = val isDiy.value = val
if(!val){
videoList.value[diyIndex.value].videos.forEach(async (it, i) => { 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){ // if(it.cameraIndexCode == cameraIndexCode.value){
it.isDiy = val // it.isDiy = val
} // }
}) // })
} }
const onStart = (res)=>{ const onStart = (res)=>{
@@ -185,7 +187,10 @@
} else { } else {
videoList.value[index].videos = videoList.value[index].videos.filter(item => item.cameraIndexCode !== id);
console.log('取消收藏',)
element.isDiy = 0 element.isDiy = 0
show.value = false
} }
// pubSub.publish('videoCollect', id) // pubSub.publish('videoCollect', id)
} }

4
src/views/monitor/components/box-2.vue
View File

@@ -412,9 +412,9 @@
const handleCollectAdd = async (id, status, index) => { const handleCollectAdd = async (id, status, index) => {
await getColletDiyApi({ await getColletDiyApi({
cameraIndexCode:id, 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 thisVideo.value.isDiy=0
// videoList.value.forEach((item,index)=>{ // videoList.value.forEach((item,index)=>{
// if(item.cameraIndexCode==thisVideo.value.cameraIndexCode){ // if(item.cameraIndexCode==thisVideo.value.cameraIndexCode){

3
src/views/scenic/components/box-2.vue
View File

@@ -1139,7 +1139,8 @@
align-items: center; align-items: center;
} }
.car-ship { .car-ship {
width: 100%; // width: vw(660);
width: 100%;
height: vh(250); height: vh(250);
} }
.full { .full {