From 3029752b97bbbcc906c4b0cc4734a1f99df59152 Mon Sep 17 00:00:00 2001
From: duanliang <duanliang>
Date: Wed, 2 Apr 2025 20:40:37 +0800
Subject: [PATCH] 4.2

---
 src/assets/images/n-icon.png             | Bin 0 -> 4426 bytes
 src/views/hotel/components/video-box.vue |  16 ++++++++++++
 src/views/scenic/components/box-2.vue    |   7 ++---
 src/views/traffic/components/box-2.vue   |  31 +++++++++++++++++++++++
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/images/n-icon.png

diff --git a/src/assets/images/n-icon.png b/src/assets/images/n-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..78f05abe702deecb2f9bcf8f0033133c468e4a73
GIT binary patch
literal 4426
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
Qj{pDw07*qoM6N<$f?sN}YybcN

literal 0
HcmV?d00001

diff --git a/src/views/hotel/components/video-box.vue b/src/views/hotel/components/video-box.vue
index 80f1577..68a5eab 100644
--- a/src/views/hotel/components/video-box.vue
+++ b/src/views/hotel/components/video-box.vue
@@ -3,6 +3,7 @@
 	  <div v-if="videoLog == 1" class="video-wrapper">
 	    <div class="video-list">
 	      <div
+		  v-if="videoList?.length"
 	        class="video-item"
 	        v-for="(item, index) in videoList"
 	        :key="index"
@@ -36,6 +37,10 @@
 	          </p>
 	        </div>
 	      </div>
+		  <div class="empty-box" v-else> 
+		  未接入
+		  <!-- <el-empty :image="emptyIco" description="暂无数据" /> -->
+		  </div>
 	    </div>
 	    <div class="pagination">
 	      <el-pagination
@@ -133,6 +138,7 @@
 	} from '@/api/monitor'
 	import pubSub from 'pubsub-js'
 	import Hls from 'hls.js'
+	import emptyIco from '@/assets/images/n-icon.png'
 	const Z00M_IN = 'ZOOM_IN' // 焦距变大
 	const Z00M_OUT = 'ZOOM_OUT' // 焦距变小
 	const UP = 'UP' // 上转
@@ -312,6 +318,16 @@
 </script>
 <style></style>
 <style scoped lang="scss">
+	.empty-box{
+		display:flex;
+		align-items: center;
+		font-size:vw(40);
+		height:vh(750);
+		justify-content: center;
+		text-align:center;
+		width:100%;
+		color:#fff;
+	}
 	.action {
 	  &-box {
 	    margin-top: vh(16);
diff --git a/src/views/scenic/components/box-2.vue b/src/views/scenic/components/box-2.vue
index ee9cd5e..453fc7d 100644
--- a/src/views/scenic/components/box-2.vue
+++ b/src/views/scenic/components/box-2.vue
@@ -323,10 +323,10 @@
   import BigMap from './big-map'
   import traMap from './tra-map'
   import TrafficFlow from './traffic-flow'
-
+  import { useRouter } from 'vue-router'
   import { useMap } from '@/hooks/map'
   import { useScenicStore } from '@/stores/scenic'
-
+  const router = useRouter()
   const scenicStore = useScenicStore()
   const { initMap, addMarker, marker } = useMap()
 
@@ -339,7 +339,8 @@
   let latitude = ref('')
   let longitude = ref('')
   const hanldeLookMap = ()=>{
-	  traMapShow.value = true
+	  router.replace('/traffic')
+	  // traMapShow.value = true
   }
   const garageList = computed(() => {
     return scenicStore.stopCarData.headList
diff --git a/src/views/traffic/components/box-2.vue b/src/views/traffic/components/box-2.vue
index f7f4799..2e36e92 100644
--- a/src/views/traffic/components/box-2.vue
+++ b/src/views/traffic/components/box-2.vue
@@ -130,12 +130,43 @@
 			nextTick(()=>{
 				val[0].forEach((item,index)=>{
 					addMarker(mapIcon,[item.longitude,item.latitude],[40, 60])
+				
 					marker.value.addEventListener('click', (e) => {
 						console.log(item,'111111111111')
 						cameraIndexCode.value = item.cameraIndexCode
 						isCollect.value = item.isCollect
 						getPreviewUrl(item.cameraIndexCode)
 					})
+					var opts = {
+					    position: new BMapGL.Point(item.longitude, item.latitude), // 指定文本标注所在的地理位置
+					    offset: new BMapGL.Size(-100, 30) // 设置文本偏移量
+					};
+					// 创建文本标注对象
+					var label = new BMapGL.Label(item.cameraName, opts);
+					// 自定义文本标注样式
+					label.setStyle({
+						display:'block',
+					    color: '#0b61b4',
+					    borderRadius: '0',
+					    borderColor: 'none',
+					    padding: '10px',
+					    border:0,
+						fontWeight:'bold',
+					    fontFamily: '微软雅黑'
+					});
+					marker.value.addEventListener('mouseover', (e) => {
+						label.setStyle({
+						    display:'block'
+						});
+						map.value.addOverlay(label);
+					})
+					marker.value.addEventListener('mouseout', (e) => {
+						console.log('11111')
+						label.setStyle({
+						    display:'none'
+						});
+						
+					})
 				})
 				
 			})