From 6817c96db53ac16f5d5eca72b73230d898f32126 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:43:32 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/screen/components/screen-map/index.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index 89992b9..d949913 100644
--- a/src/views/screen/components/screen-map/index.vue
+++ b/src/views/screen/components/screen-map/index.vue
@@ -2,6 +2,7 @@
<div class="map-container">
<wrapper-title :title="'鍖哄煙鍦板浘'"></wrapper-title>
<div class="map-content">
+
<div ref="map" class="map-style"></div>
</div>
</div>
@@ -13,6 +14,7 @@
import 'echarts-gl';
import mapData from '@/assets/map/zigong1.json';
import WrapperTitle from '../wrapper-title/index';
+import ScreenData from '../screen-data/index';
echarts.registerMap('zigong', mapData);
let mapChart = null;
@@ -161,7 +163,8 @@
}
},
components: {
- WrapperTitle
+ WrapperTitle,
+ ScreenData
},
methods: {
filterData(name) {
@@ -236,6 +239,7 @@
.map-content {
flex: 1;
+ position: relative;
// background: rgba(67, 102, 155, 0.3);
// border: 1px solid rgba(47, 91, 157, 0.8);
}
@@ -245,4 +249,12 @@
height: 100%;
}
}
+
+.data-container {
+ width: 100%;
+ display: flex;
+ position: absolute;
+ top: 0;
+ left: 0;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0