From 2bd06ab8118f7354e081f66033ed1252b95f7daa Mon Sep 17 00:00:00 2001 From: duanliang Date: Sat, 26 Apr 2025 16:32:45 +0800 Subject: [PATCH] 26 --- src/views/home/components/box-3.vue | 6 +++++- src/views/monitor/components/box-2.vue | 2 +- src/views/scenic/components/big-map.vue | 11 ++++++++--- src/views/scenic/components/box-1.vue | 1 + src/views/vehicles/components/big-map.vue | 11 ++++++++--- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue index 1df3e0a..2791748 100644 --- a/src/views/home/components/box-3.vue +++ b/src/views/home/components/box-3.vue @@ -368,12 +368,16 @@ } .error { color: #F15A25; + color:#DCBB48; } .success { color: #02F9FA; + + // color:#E21B1B; } .type3{ - color:#E21B1B; + color: #02F9FA; + } } } diff --git a/src/views/monitor/components/box-2.vue b/src/views/monitor/components/box-2.vue index 8631627..f0a2e4f 100644 --- a/src/views/monitor/components/box-2.vue +++ b/src/views/monitor/components/box-2.vue @@ -692,7 +692,7 @@ transform: rotate(180deg); } &__name { - padding: 0 vw(20); + padding: 0 vw(10); display: block; font-weight: 400; font-size: vw(15); diff --git a/src/views/scenic/components/big-map.vue b/src/views/scenic/components/big-map.vue index 4f433f0..fb418a5 100644 --- a/src/views/scenic/components/big-map.vue +++ b/src/views/scenic/components/big-map.vue @@ -259,12 +259,17 @@ let tabsIndex = ref(0) } if (item.status == '静止') { - if(item.type==1){ - addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + addMarker(shipIcon, [item.lng, item.lat], [36, 50]) + }else{ - addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + addMarker(carIcon, [item.lng, item.lat], [36, 50]) } + // if(item.type==1){ + // addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + // }else{ + // addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + // } } } diff --git a/src/views/scenic/components/box-1.vue b/src/views/scenic/components/box-1.vue index 3df0b24..408f1ca 100644 --- a/src/views/scenic/components/box-1.vue +++ b/src/views/scenic/components/box-1.vue @@ -11,6 +11,7 @@
{{ item.name }}
+
diff --git a/src/views/vehicles/components/big-map.vue b/src/views/vehicles/components/big-map.vue index 325bc4c..0df31a1 100644 --- a/src/views/vehicles/components/big-map.vue +++ b/src/views/vehicles/components/big-map.vue @@ -249,13 +249,18 @@ import PubSub from 'pubsub-js' } if (item.status == '静止') { - if(item.type==1){ - addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + addMarker(shipIcon, [item.lng, item.lat], [36, 50]) }else{ - addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + addMarker(carIcon, [item.lng, item.lat], [36, 50]) } + // if(item.type==1){ + // addMarker(shipStopIcon, [item.lng, item.lat], [36, 50]) + + // }else{ + // addMarker(carStopIcon, [item.lng, item.lat], [36, 50]) + // } } } marker.value.addEventListener('click', (e) => {