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 19:14:34 +08:00
parent 0ff44c7ef4
commit de6aefae9d
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
distnew.zip Normal file
View File

Binary file not shown.

18
src/components/VideoDialog/index.vue
View File

@@ -18,13 +18,13 @@
<div class="action-box"> <div class="action-box">
<div class="action-item"> <div class="action-item">
<div <div
v-if="isCollect == 1" v-if="colletCond == 1"
class="video-follow" class="video-follow"
@click.stop="handleCollect()" @click.stop="handleCollect()"
>取消关注 >取消关注
</div> </div>
<div <div
v-if="isCollect == 0" v-if="colletCond == 0"
class="video-unfollow" class="video-unfollow"
@click.stop="handleCollect()" @click.stop="handleCollect()"
>关注 >关注
@@ -94,7 +94,6 @@
default: 0 default: 0
} }
}) })
let colletCond = ref(0)
let modelValue = defineModel() let modelValue = defineModel()
let videoRef = ref() let videoRef = ref()
let webRtcServer = null let webRtcServer = null
@@ -104,18 +103,19 @@
() => props.isCollect, () => props.isCollect,
(val) => { (val) => {
if (val) { if (val) {
colletCond.value = val // colletCond.value = val
// setTimeout(() => { // setTimeout(() => {
// init() // init()
// }, 1000) // }, 1000)
}else{ }else{
colletCond.value = 0 // colletCond.value = 0
} }
}, },
{ {
immediate: true immediate: true
} }
) )
let colletCond = ref(props.isCollect)
let isDayCurr = ref(props.isDiy) let isDayCurr = ref(props.isDiy)
// 收藏 // 收藏
const handleCollectAdd = async (id, status, index) => { const handleCollectAdd = async (id, status, index) => {
@@ -136,12 +136,12 @@
const handleCollect = async (id, status, index) => { const handleCollect = async (id, status, index) => {
await postVideoCollectApi({ await postVideoCollectApi({
cameraIndexCode:props.cameraIndexCode, cameraIndexCode:props.cameraIndexCode,
isCollect: props.isCollect == 0 ? 1 : 0 isCollect: colletCond.value == 0 ? 1 : 0
}) })
if (props.isCollect == 0) { if (colletCond.value == 0) {
props.isCollect = 1 colletCond.value = 1
} else { } else {
props.isCollect = 0 colletCond.value = 0
modelValue.value = false modelValue.value = false
} }
pubSub.publish('videoCollect', props.cameraIndexCode) pubSub.publish('videoCollect', props.cameraIndexCode)

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

@@ -14,7 +14,7 @@
width:(100/grad)+'%' width:(100/grad)+'%'
}"> }">
<div class="video-item__inner"> <div class="video-item__inner" @click="handleCamera(element.cameraIndexCode,element)">
<div <div
v-if="element.isDiy == 1" v-if="element.isDiy == 1"
class="video-item__follow" class="video-item__follow"
@@ -74,7 +74,7 @@
</template> </template>
<script setup> <script setup>
import { getVideCollectCate,getVideCollectCateSort,getColletDiyApi } from '@/api/home' import { getVideCollectCate,getVideCollectCateSort,getColletDiyApi,getPreviewUrlApi} from '@/api/home'
import { import {
getVideoTypeApi, getVideoTypeApi,
getVideoRegionsApi, getVideoRegionsApi,

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

@@ -1066,6 +1066,7 @@
box-sizing: border-box; box-sizing: border-box;
background-image: url('@/assets/images/bg-3.png'); background-image: url('@/assets/images/bg-3.png');
background-size: 100% 100%; background-size: 100% 100%;
flex:1;
} }
.box { .box {
@extend .bg; @extend .bg;
@@ -1091,6 +1092,7 @@
.box-5 { .box-5 {
@extend .bg; @extend .bg;
height: vh(465); height: vh(465);
flex:1;
} }
.car-box { .car-box {
width: vw(316); width: vw(316);
@@ -1137,7 +1139,7 @@
align-items: center; align-items: center;
} }
.car-ship { .car-ship {
width: vw(660); width: 100%;
height: vh(250); height: vh(250);
} }
.full { .full {