From b76fd2fa93c2036d66e5142654cf66cf1e371531 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 四月 2024 17:12:34 +0800
Subject: [PATCH] 改为连表查询

---
 src/views/screen/components/screen-map/index.vue |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index e1b84bc..df27196 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>
@@ -11,8 +12,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 +47,7 @@
     viewControl: {
       beta: -30,
       alpha: 50,
-      distance: 105,
+      distance: 78,
       maxBeta: 180,
       panSensitivity: 0,
       zoomSensitivity: 1,
@@ -93,7 +95,7 @@
       viewControl: {
         beta: -30,
         alpha: 50,
-        distance: 105,
+        distance: 78,
         maxBeta: 180,
         panSensitivity: 0,
         zoomSensitivity: 1,
@@ -161,7 +163,8 @@
     }
   },
   components: {
-    WrapperTitle
+    WrapperTitle,
+    ScreenData
   },
   methods: {
     filterData(name) {
@@ -236,8 +239,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 +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