From d7eeea3efe4ca9039b3769ebcc5eb568a4e05fc1 Mon Sep 17 00:00:00 2001 From: duanliang Date: Tue, 15 Apr 2025 17:48:25 +0800 Subject: [PATCH] 4.15 --- src/components/HlsPlayer/index.vue | 3 ++- src/layout/components/CoreVideo/index.vue | 6 +++--- src/utils/config.js | 2 +- src/views/home/components/box-1.vue | 7 ++++--- src/views/scenic/components/box-1.vue | 18 +++++++++++++++++ src/views/vehicles/components/big-map.vue | 24 ++++++++++++++++++----- 6 files changed, 47 insertions(+), 13 deletions(-) diff --git a/src/components/HlsPlayer/index.vue b/src/components/HlsPlayer/index.vue index 938b6b8..db680d0 100644 --- a/src/components/HlsPlayer/index.vue +++ b/src/components/HlsPlayer/index.vue @@ -8,7 +8,7 @@ :controls="false" disablePictureInPicture > - @@ -75,6 +75,7 @@ immediate: true }, url(newUrl) { + console.log(newUrl,'77777777777777777777777777777777') if (newUrl && this.isActive) { this.initializePlayer() } diff --git a/src/layout/components/CoreVideo/index.vue b/src/layout/components/CoreVideo/index.vue index ee24a71..dfed669 100644 --- a/src/layout/components/CoreVideo/index.vue +++ b/src/layout/components/CoreVideo/index.vue @@ -12,7 +12,7 @@ >
取消关注
-
-
+
{{ item.name }}：
@@ -170,7 +170,8 @@ return homeStore.scenicQueueData.dataList.map((item) => item.name) }) onMounted(()=>{ - countList.value = homeStore.scenicData.data; + // countList.value = homeStore.scenicData.data; + // console.log(homeStore.scenicData.data,'homeStore.scenicData.data') }) diff --git a/src/views/scenic/components/box-1.vue b/src/views/scenic/components/box-1.vue index 34964bd..c682ceb 100644 --- a/src/views/scenic/components/box-1.vue +++ b/src/views/scenic/components/box-1.vue @@ -20,6 +20,7 @@
+ @@ -125,6 +126,9 @@ const handleMore = () => { router.push('/workOrder') } + const hanldeToDetails = ()=>{ + router.push('/traffic') + } let src = ref('') let cameraIndexCode = ref('') let videoShow = ref(false) @@ -235,6 +239,20 @@ height: vh(600); overflow-x: auto; overflow-y: hidden; + position:relative; + .look-btn{ + position: absolute; + right: vw(20); + top: 50%; + transform: translateY(-50%); + padding: vw(12); + display: flex; + align-items: center; + background: #0a4190; + border-radius: vw(4); + font-size: vw(14); + color: #fff; + } .scenic-box { width: 100%; height: 100%; diff --git a/src/views/vehicles/components/big-map.vue b/src/views/vehicles/components/big-map.vue index ec5b1d7..1f84aac 100644 --- a/src/views/vehicles/components/big-map.vue +++ b/src/views/vehicles/components/big-map.vue @@ -209,13 +209,27 @@ import PubSub from 'pubsub-js' console.log(item,'item') if (item.lng && item.lat) { if (item.status == '行驶') { - addMarker(shipIcon, [item.lng, item.lat], [36, 50]) + if(item.type==0){ + addMarker(carIcon, [item.lng, item.lat], [36, 50]) + }else{ + addMarker(shipIcon, [item.lng, item.lat], [36, 50]) + } } if (item.status == '离线') { - addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50]) + if(item.type==0){ + addMarker(carOfflineIcon, [item.lng, item.lat], [36, 50]) + }else{ + addMarker(shipOfflineIcon, [item.lng, item.lat], [36, 50]) + } + } if (item.status == '静止') { - addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + + if(item.type==0){ + addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + }else{ + addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + } } marker.value.addEventListener('click', (e) => { e.sim = e.target.sim @@ -497,7 +511,7 @@ import PubSub from 'pubsub-js' display: none; } .dialog { - width: vw(3140); + width: vw(3170); padding: vw(8); background-image: url('@/assets/images/dialog-bg.png') !important; background-size: 100% 100%; @@ -505,7 +519,7 @@ import PubSub from 'pubsub-js' height:vh(930); margin-top:vh(130); :deep(.el-dialog) { - width: vw(3140); + width: vw(3170); padding: vw(8); background-image: url('@/assets/images/dialog-bg.png') !important; background-size: 100% 100%;