From 8f38cbf36743746bde6997cef3998eadc6e95e10 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 07 一月 2025 18:16:00 +0800
Subject: [PATCH] 核算重构
---
src/views/screen/components/map3.vue | 121 ++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 47 deletions(-)
diff --git a/src/views/screen/components/map3.vue b/src/views/screen/components/map3.vue
index e9614f8..80bb35c 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,65 +36,79 @@
},
{
name: '澶у畨鍖�',
- value: [104.90805, 29.235946, 300],
+ value: [104.95805, 29.155946, 300],
platformOnline: true
},
{
name: '娌挎哗鍖�',
- value: [104.75804, 29.100594, 300],
+ value: [104.80504, 29.050594, 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
}
],
markData: [
{
name: '鑷祦浜曞尯',
- number: '0',
- value: [104.551471408, 28.860000, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [104.911471408, 30.100000, 300]
},
{
name: '楂樻柊鍖�',
- number: '0',
- value: [104.863237686031, 29.39548885792289, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [104.867237686031, 29.39548885792289, 300]
},
{
name: '澶у畨鍖�',
- number: '0',
- value: [105.20537686031, 29.82948885792289, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [105.12337686031, 29.38948885792289, 300]
},
{
name: '娌挎哗鍖�',
- number: '0',
- value: [104.760237686031, 28.7800000, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [105.40537686031, 30.20048885792289, 300]
},
{
name: '璐′簳鍖�',
- number: '0',
- value: [104.590237686031, 29.30048885792289, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [104.51037686031, 29.42048885792289, 300]
},
{
name: '鑽ｅ幙',
- number: '0',
- value: [104.337937686031, 29.64048885792289, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [104.25437686031, 29.64048885792289, 300]
},
{
name: '瀵岄『鍘�',
- number: '0',
- value: [105.165, 29.385, 300]
+ video: '0',
+ car: '0',
+ face: '0',
+ value: [105.208, 29.185, 300]
}
],
}
@@ -108,6 +122,12 @@
})
},
methods: {
+ setFontSize(res){
+ const clientWidth = window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;
+ if (!clientWidth) return;
+ let fontSize = clientWidth / 1920;
+ return res*fontSize;
+ },
initializeMap() {
this.updateMapData()
this.getChinData('鑷础甯�', chinaJson)
@@ -116,7 +136,9 @@
if (this.geoCoordinates) {
this.markData.forEach(item => {
if (this.geoCoordinates[item.name]) {
- item.number = this.geoCoordinates[item.name].score || '0'
+ item.video = this.geoCoordinates[item.name].video || '0.0'
+ item.car = this.geoCoordinates[item.name].car || '0.0'
+ item.face = this.geoCoordinates[item.name].face || '0.0'
}
})
}
@@ -159,7 +181,9 @@
type: 'map',
map: name,
left: '-5%',
- top: '10%',
+ top: '20%',
+ width: '100%', // 鏄庣‘鎸囧畾瀹藉害
+ height: '100%', // 鏄庣‘鎸囧畾楂樺害
// boxWidth: 100,
regionHeight: 0.8,
zlevel: 10,
@@ -215,7 +239,7 @@
rotateSensitivity: 0, // 鏃嬭浆
minBeta: -13,
maxBeta: -13,
- distance: 130,
+ distance: 120,
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
@@ -255,7 +279,9 @@
// boxWidth: 100,
regionHeight: 0.8,
left: '-5%',
- top: '10%',
+ top: '20%',
+ width: '100%', // 鏄庣‘鎸囧畾瀹藉害
+ height: '100%', // 鏄庣‘鎸囧畾楂樺害
zlevel: 5,
// tooltip: {
@@ -290,7 +316,7 @@
rotateSensitivity: 0, // 鏃嬭浆
minBeta: -13,
maxBeta: -13,
- distance: 130,
+ distance: 120,
zoomSensitivity: 0, // 缂╂斁
panSensitivity: 0, // 骞崇Щ
center: [0, 0, 0],
@@ -325,57 +351,57 @@
polyline: true,
lineStyle: {
color: '#a4ddee',
- width: 1,
- opacity: 1
+ width: 2,
+ opacity: 1,
},
data: [
// 鑷祦浜曠嚎
{
coords: [
- [104.641171408, 29.120000, 300],
- [104.551471408, 28.860000, 430]
+ [104.621171408, 29.150000, 300],
+ [104.941471408, 30.190000, 335]
]
},
// 楂樻柊鍖虹嚎
{
coords: [
[104.780000, 29.19, 300],
- [104.863237686031, 29.39548885792289, 430]
+ [104.880237686031, 29.42548885792289, 335]
]
},
// 澶у畨鍖虹嚎
{
coords: [
- [104.90805, 29.235946, 300],
- [105.20537686031, 29.82948885792289, 430]
+ [104.95805, 29.155946, 300],
+ [105.12137686031, 29.41948885792289, 335]
]
},
// 娌挎哗鍖虹嚎
{
coords: [
- [104.75804, 29.100594, 300],
- [104.776237686031, 28.78048885792289, 430]
+ [104.80504, 29.050594, 300],
+ [105.47237686031, 30.30048885792289, 335]
]
},
// 璐′簳鍖虹嚎
{
coords: [
- [104.559106, 29.161427, 300],
- [104.59237686031, 29.30048885792289, 430]
+ [104.46106, 29.101427, 300],
+ [104.51837686031, 29.45048885792289, 335]
]
},
// 鑽ｅ幙绾�
{
coords: [
- [104.3234, 29.2838, 300],
- [104.346037686031, 29.64048885792289, 430]
+ [104.2634, 29.2838, 300],
+ [104.25437686031, 29.67048885792289, 335]
]
},
// 瀵岄『绾�
{
coords: [
- [104.950000, 29.04, 300],
- [105.163, 29.385, 430]
+ [105.000000, 28.93, 300],
+ [105.218, 29.195, 335]
]
}
],
@@ -398,7 +424,7 @@
data: that.markData,
itemStyle: {
- opacity: 1,
+ opacity: 0.7,
borderWidth: 1,
borderColor: 'a4ddee',
},
@@ -408,21 +434,22 @@
position: 'top',
textStyle: {
color: '#c6f4ff',
- fontSize: '16px',
+ fontSize: this.setFontSize(16),
backgroundColor: 'rgba(25,56,97,1)',
borderColor: '#a4ddee',
borderWidth: 0.5,
borderRadius: 5,
- padding: [8, 15]
+ padding: [4, 8]
},
formatter: function (params) {
- return `{style|${params.data.name} 寰楀垎锛�${params.data.number}}`
+ // return `{style|${params.data.name} 锛�${params.data.number}}`
+ return `{style|${params.data.name} \n 瑙嗛锛�${params.data.video} \n 杞﹁締锛�${params.data.car} \n 浜鸿劯锛�${params.data.face}}`
},
rich: {
style: {
- fontSize: 16,
- lineHeight: 22
+ fontSize: this.setFontSize(14),
+ lineHeight: this.setFontSize(20),
// 鍏朵粬闇�瑕佺殑鏍峰紡
}
},
@@ -463,6 +490,6 @@
.map-main-container {
width: 100%;
- height: 100%;
+ height: 37vw; // 鍥哄畾楂樺害
}
</style>
--
Gitblit v1.8.0