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/map3.vue | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/views/screen/components/map3.vue b/src/views/screen/components/map3.vue
index 7dc001e..58e7adc 100644
--- a/src/views/screen/components/map3.vue
+++ b/src/views/screen/components/map3.vue
@@ -26,7 +26,7 @@
dotData: [
{
name: '鑷祦浜曞尯',
- value: [104.641171408, 29.120000, 300],
+ value: [104.621171408, 29.150000, 300],
platformOnline: true
},
{
@@ -36,27 +36,27 @@
},
{
name: '澶у畨鍖�',
- value: [104.90805, 29.235946, 300],
+ value: [104.93805, 29.175946, 300],
platformOnline: true
},
{
name: '娌挎哗鍖�',
- value: [104.75804, 29.100594, 300],
+ value: [104.78804, 29.100594, 300],
platformOnline: true
},
{
name: '璐′簳鍖�',
- value: [104.559106, 29.161427, 300],
+ value: [104.46106, 29.101427, 300],
platformOnline: true
},
{
name: '鑽ｅ幙',
- value: [104.3234, 29.2838, 300],
+ value: [104.2634, 29.2838, 300],
platformOnline: true
},
{
name: '瀵岄『鍘�',
- value: [104.950000, 29.04, 300],
+ value: [105.000000, 28.93, 300],
platformOnline: true
}
],
@@ -64,37 +64,37 @@
{
name: '鑷祦浜曞尯',
number: '0',
- value: [104.490471408, 28.860000, 300]
+ value: [104.841471408, 29.860000, 300]
},
{
name: '楂樻柊鍖�',
number: '0',
- value: [104.86, 29.405, 300]
+ value: [104.867237686031, 29.39548885792289, 300]
},
{
name: '澶у畨鍖�',
number: '0',
- value: [105.236, 29.30548885792289, 300]
+ value: [105.17337686031, 29.57948885792289, 300]
},
{
name: '娌挎哗鍖�',
number: '0',
- value: [104.760237686031, 28.7800000, 300]
+ value: [105.36237686031, 30.30048885792289, 300]
},
{
name: '璐′簳鍖�',
number: '0',
- value: [104.322237686031, 29.00048885792289, 300]
+ value: [104.51037686031, 29.42048885792289, 300]
},
{
name: '鑽ｅ幙',
number: '0',
- value: [104.466237686031, 29.44048885792289, 300]
+ value: [104.25437686031, 29.64048885792289, 300]
},
{
name: '瀵岄『鍘�',
number: '0',
- value: [105.18, 29.000000, 300]
+ value: [105.208, 29.185, 300]
}
],
}
@@ -159,7 +159,7 @@
type: 'map',
map: name,
left: '-5%',
- top: '10%',
+ top: '20%',
// boxWidth: 100,
regionHeight: 0.8,
zlevel: 10,
@@ -215,7 +215,7 @@
rotateSensitivity: 0, // 鏃嬭浆
minBeta: -13,
maxBeta: -13,
- distance: 130,
+ distance: 120,
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
@@ -255,7 +255,7 @@
// boxWidth: 100,
regionHeight: 0.8,
left: '-5%',
- top: '10%',
+ top: '20%',
zlevel: 5,
// tooltip: {
@@ -290,7 +290,7 @@
rotateSensitivity: 0, // 鏃嬭浆
minBeta: -13,
maxBeta: -13,
- distance: 130,
+ distance: 120,
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
@@ -325,57 +325,57 @@
polyline: true,
lineStyle: {
color: '#a4ddee',
- width: 1,
- opacity: 1
+ width: 2,
+ opacity: 1,
},
data: [
// 鑷祦浜曠嚎
{
coords: [
- [104.641171408, 29.120000, 300],
- [104.525471408, 28.860000, 430]
+ [104.621171408, 29.150000, 300],
+ [104.841471408, 29.860000, 335]
]
},
// 楂樻柊鍖虹嚎
{
coords: [
[104.780000, 29.19, 300],
- [104.780237686031, 29.39548885792289, 430]
+ [104.867237686031, 29.39548885792289, 335]
]
},
// 澶у畨鍖虹嚎
{
coords: [
- [104.90805, 29.235946, 300],
- [105.106237686031, 29.22948885792289, 430]
+ [104.93805, 29.175946, 300],
+ [105.17337686031, 29.57948885792289, 335]
]
},
// 娌挎哗鍖虹嚎
{
coords: [
- [104.75804, 29.100594, 300],
- [104.776237686031, 28.78048885792289, 430]
+ [104.78804, 29.100594, 300],
+ [105.36237686031, 30.30048885792289, 335]
]
},
// 璐′簳鍖虹嚎
{
coords: [
- [104.559106, 29.161427, 300],
- [104.356237686031, 29.00048885792289, 430]
+ [104.46106, 29.101427, 300],
+ [104.51037686031, 29.42048885792289, 335]
]
},
// 鑽ｅ幙绾�
{
coords: [
- [104.3234, 29.2838, 300],
- [104.456237686031, 29.39048885792289, 430]
+ [104.2634, 29.2838, 300],
+ [104.25437686031, 29.64048885792289, 335]
]
},
// 瀵岄『绾�
{
coords: [
- [104.950000, 29.04, 300],
- [105.08, 28.985, 430]
+ [105.000000, 28.93, 300],
+ [105.208, 29.185, 335]
]
}
],
@@ -398,7 +398,7 @@
data: that.markData,
itemStyle: {
- opacity: 1,
+ opacity: 0.7,
borderWidth: 1,
borderColor: 'a4ddee',
},
@@ -413,11 +413,11 @@
borderColor: '#a4ddee',
borderWidth: 0.5,
borderRadius: 5,
- padding: [8, 15]
+ padding: [4, 8]
},
formatter: function (params) {
- return `{style|${params.data.name}\n寰楀垎锛�${params.data.number}}`
+ return `{style|${params.data.name} 锛�${params.data.number}}`
},
rich: {
style: {
--
Gitblit v1.8.0