From d95b36a88357d018f76d926e9074c521eb8335a7 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/screen/components/screen-map/index.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/screen/components/screen-map/index.vue b/src/views/screen/components/screen-map/index.vue
index d949913..ea2a99f 100644
--- a/src/views/screen/components/screen-map/index.vue
+++ b/src/views/screen/components/screen-map/index.vue
@@ -1,8 +1,7 @@
<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>
</div>
@@ -12,7 +11,7 @@
<script>
import * as echarts from 'echarts';
import 'echarts-gl';
-import mapData from '@/assets/map/zigong1.json';
+import mapData from '@/assets/map/zigong2.json';
import WrapperTitle from '../wrapper-title/index';
import ScreenData from '../screen-data/index';
@@ -101,7 +100,7 @@
zoomSensitivity: 1,
rotateSensitivity: 0,
},
-
+
// 鏁版嵁
data: mapData.features.map((item) => {
return {
@@ -257,4 +256,4 @@
top: 0;
left: 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0