From 8dc5f14cb31b82de76e7d5be262d1a9c5e6e994e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-map/index.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index e1b84bc..5576e0c 100644
--- a/src/views/screen/components/screen-map/index.vue
+++ b/src/views/screen/components/screen-map/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="map-container">
- <wrapper-title :title="'鍖哄煙鍦板浘'"></wrapper-title>
+ <!-- <wrapper-title :title="'鍖哄煙鍦板浘'"></wrapper-title> -->
<div class="map-content">
<div ref="map" class="map-style"></div>
</div>
@@ -11,8 +11,9 @@
<script>
import * as echarts from 'echarts';
import 'echarts-gl';
-import mapData from '@/assets/map/zigong.json';
+import mapData from '@/assets/map/zigong2.json';
import WrapperTitle from '../wrapper-title/index';
+import ScreenData from '../screen-data/index';
echarts.registerMap('zigong', mapData);
let mapChart = null;
@@ -45,7 +46,7 @@
viewControl: {
beta: -30,
alpha: 50,
- distance: 105,
+ distance: 78,
maxBeta: 180,
panSensitivity: 0,
zoomSensitivity: 1,
@@ -93,7 +94,7 @@
viewControl: {
beta: -30,
alpha: 50,
- distance: 105,
+ distance: 78,
maxBeta: 180,
panSensitivity: 0,
zoomSensitivity: 1,
@@ -161,7 +162,8 @@
}
},
components: {
- WrapperTitle
+ WrapperTitle,
+ ScreenData
},
methods: {
filterData(name) {
@@ -236,8 +238,9 @@
.map-content {
flex: 1;
- background: rgba(67, 102, 155, 0.3);
- border: 1px solid rgba(47, 91, 157, 0.8);
+ position: relative;
+ // background: rgba(67, 102, 155, 0.3);
+ // border: 1px solid rgba(47, 91, 157, 0.8);
}
.map-style {
@@ -245,4 +248,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