From 423155b8134694c2f2e68f6d3f5239ba0541b0cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 31 十二月 2024 18:10:35 +0800
Subject: [PATCH] ll
---
screen/src/views/LogisticsCenter.vue | 123 ++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 51 deletions(-)
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 1359e22..9f37ba8 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -465,7 +465,7 @@
time.value = dayjs().format('HH:mm:ss')
}, 1000)
-//
+//
const mapList = ref([])
const mapEchart = ref()
const initMap = () => {
@@ -481,51 +481,60 @@
{ value: [103.9526, 30.7617, 1901], itemStyle: { color: '#fff' }, name: '鍥涘窛', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
]
const mapData = [
- { name: '鍖椾含甯�', value: 0 },
- { name: '澶╂触甯�', value: 0 },
- { name: '涓婃捣甯�', value: 0 },
- { name: '閲嶅簡甯�', value: 0 },
- { name: '娌冲寳鐪�', value: 0 },
- { name: '娌冲崡鐪�', value: 0 },
- { name: '浜戝崡鐪�', value: 0 },
- { name: '杈藉畞鐪�', value: 0 },
- { name: '榛戦緳姹熺渷', value: 0 },
- { name: '婀栧崡鐪�', value: 0 },
- { name: '瀹夊窘鐪�', value: 0 },
- { name: '灞变笢鐪�', value: 0 },
- { name: '鏂扮枂缁村惥灏旇嚜娌诲尯', value: 0 },
- { name: '姹熻嫃鐪�', value: 0 },
- { name: '娴欐睙鐪�', value: 0 },
- { name: '姹熻タ鐪�', value: 0 },
- { name: '婀栧寳鐪�', value: 0 },
- { name: '骞胯タ澹棌鑷不鍖�', value: 0 },
- { name: '鐢樿們鐪�', value: 0 },
- { name: '灞辫タ鐪�', value: 0 },
- { name: '鍐呰挋鍙よ嚜娌诲尯', value: 0 },
- { name: '闄曡タ鐪�', value: 0 },
- { name: '鍚夋灄鐪�', value: 0 },
- { name: '绂忓缓鐪�', value: 0 },
- { name: '璐靛窞鐪�', value: 0 },
- { name: '骞夸笢鐪�', value: 0 },
- { name: '闈掓捣鐪�', value: 0 },
- { name: '瑗胯棌鑷不鍖�', value: 0 },
- { name: '瀹佸鍥炴棌鑷不鍖�', value: 0 },
- { name: '鍥涘窛鐪�', value: 0 },
- { name: '瀹佸鐪�', value: 0 },
- { name: '娴峰崡鐪�', value: 0 },
- { name: '鍙版咕鐪�', value: 0 },
- { name: '棣欐腐鐗瑰埆琛屾斂鍖�', value: 0 },
- { name: '婢抽棬鐗瑰埆琛屾斂鍖�', value: 0 },
- { name: '鍗楁捣璇稿矝', value: 0 },
+ { name: '鍖椾含甯�',code:'110000', value: 0 },
+ { name: '澶╂触甯�',code:'120000', value: 0 },
+ { name: '涓婃捣甯�', code:'310000',value: 0 },
+ { name: '閲嶅簡甯�', code:'500000',value: 0 },
+ { name: '娌冲寳鐪�',code:'130000', value: 0 },
+ { name: '娌冲崡鐪�',code:'410000', value: 0 },
+ { name: '浜戝崡鐪�',code:'530000', value: 0 },
+ { name: '杈藉畞鐪�',code:'210000', value: 0 },
+ { name: '榛戦緳姹熺渷', code:'230000',value: 0 },
+ { name: '婀栧崡鐪�',code:'430000', value: 0 },
+ { name: '瀹夊窘鐪�', code:'340000',value: 0 },
+ { name: '灞变笢鐪�',code:'370000', value: 0 },
+ { name: '鏂扮枂缁村惥灏旇嚜娌诲尯', code:'650000',value: 0 },
+ { name: '姹熻嫃鐪�',code:'320000', value: 0 },
+ { name: '娴欐睙鐪�', code:'330000', value: 0 },
+ { name: '姹熻タ鐪�', code:'360000', value: 0 },
+ { name: '婀栧寳鐪�', code:'420000', value: 0 },
+ { name: '骞胯タ澹棌鑷不鍖�',code:'450000', value: 0 },
+ { name: '鐢樿們鐪�', code:'620000', value: 0 },
+ { name: '灞辫タ鐪�', code:'140000', value: 0 },
+ { name: '鍐呰挋鍙よ嚜娌诲尯', code:'150000', value: 0 },
+ { name: '闄曡タ鐪�', code:'610000', value: 0 },
+ { name: '鍚夋灄鐪�',code:'220000', value: 0 },
+ { name: '绂忓缓鐪�', code:'350000', value: 0 },
+ { name: '璐靛窞鐪�', code:'520000', value: 0 },
+ { name: '骞夸笢鐪�', code:'440000', value: 0 },
+ { name: '闈掓捣鐪�', code:'630000', value: 0 },
+ { name: '瑗胯棌鑷不鍖�',code:'540000', value: 0 },
+ { name: '瀹佸鍥炴棌鑷不鍖�',code:'640000', value: 0 },
+ { name: '鍥涘窛鐪�',code:'510000', value: 0 },
+ { name: '瀹佸鐪�', code:'640000',value: 0 },
+ { name: '娴峰崡鐪�', code:'460000',value: 0 },
+ { name: '鍙版咕鐪�', code:'710000',value: 0 },
+ { name: '棣欐腐鐗瑰埆琛屾斂鍖�', code:'810000',value: 0 },
+ { name: '婢抽棬鐗瑰埆琛屾斂鍖�', code:'820003',value: 0 },
+ { name: '鍗楁捣璇稿矝', code:'',value: 0 },
]
+ let totalNum = 0
+ mapList.value.forEach(i => {
+ totalNum += i.yearNum
+ })
mapData.forEach(item => {
item.monthNum = 0
item.yearNum = 0
mapList.value.forEach(ite => {
- if (item.name == ite.name) {
- item.value = ite.yearNum
+ if (item.code == ite.code) {
+ item.value = 0
item.monthNum = ite.monthNum
item.yearNum = ite.yearNum
+ if(totalNum > 0){
+ item.rate = ((ite.yearNum / totalNum) * 100).toFixed(2)
+ item.value = (ite.yearNum / totalNum).toFixed(4)
+
+ }
}
})
})
@@ -535,10 +544,14 @@
visualMap: {
type: 'piecewise',
pieces: [
- { min: 100000, max: 99999999999, label: '鍑哄簱閲�10w浠ヤ笂', color: '#be6f2b' },
- { min: 50000, max: 100000, label: '鍑哄簱閲�5-10w', color: '#c39332' },
- { min: 20000, max: 50000, label: '鍑哄簱閲�2-5w', color: '#5ecbaf' },
- { min: -1, max: 20000, label: '鍑哄簱閲�2w浠ヤ笅', color: '#3561a4' },
+ { min: 0.05, max: 99999999999, label: '璋冩嫧閲忓崰姣�5%浠ヤ笂', color: '#be6f2b' },
+ { min: 0.02, max: 0.05, label: '璋冩嫧閲忓崰姣�2%~5%', color: '#c39332' },
+ { min: 0.01, max: 0.02, label: '璋冩嫧閲忓崰姣�1%~2%', color: '#5ecbaf' },
+ { min: -1, max: 0.01, label: '璋冩嫧閲忓崰姣�1%浠ヤ笅', color: '#3561a4' },
+ // { min: 100000, max: 99999999999, label: '鍑哄簱閲�10w浠ヤ笂', color: '#be6f2b' },
+ // { min: 50000, max: 100000, label: '鍑哄簱閲�5-10w', color: '#c39332' },
+ // { min: 20000, max: 50000, label: '鍑哄簱閲�2-5w', color: '#5ecbaf' },
+ // { min: -1, max: 20000, label: '鍑哄簱閲�2w浠ヤ笅', color: '#3561a4' },
],
itemWidth: 22,
itemHeight: 22,
@@ -639,20 +652,27 @@
return `<div class="map-tip-box">
<div class="item-state-con title">
<div class="icon"></div>
- <span>${params.data.name}</span>
+ <span>${params.data.name}</span>
</div>
<div class="item-state-con">
<span class="dot bj"></span>
<span class="item-state-num">
- <span class="text">鏈湀鍑哄簱閲忥細</span>
+ <span class="text">鏈湀璋冩嫧閲忥細</span>
<span class="num">${params.data.monthNum}涓囨敮</span>
</span>
</div>
- <div class="item-state-con">
+ <div class="item-state-con">
<span class="dot yj"></span>
<span class="item-state-num">
- <span class="text">鏈勾鍑哄簱閲忥細</span>
+ <span class="text">鏈勾璋冩嫧閲忥細</span>
<span class="num">${params.data.yearNum}涓囨敮</span>
+ </span>
+ </div>
+ <div class="item-state-con">
+ <span class="dot yj"></span>
+ <span class="item-state-num">
+ <span class="text">璋冩嫧閲忓崰姣旓細</span>
+ <span class="num">${params.data.rate || 0}%</span>
</span>
</div>
</div>`
@@ -682,6 +702,7 @@
mapList.value = temp.map(item => {
item.value = item.monthNum
item.name = item.provinceName
+ item.code=item.provinceCode
return item
})
initMap()
@@ -1153,7 +1174,7 @@
// icon: 'circle',
right: '12%',
top: '0%',
- data: ['鎬诲簱瀛�', '褰撳墠搴撳瓨', '搴撳瓨鍒╃敤鐜�'],
+ data: ['鎬诲簱瀹�', '褰撳墠搴撳瓨', '搴撳瓨鍒╃敤鐜�'],
itemWidth: 20,
itemHeight: 10,
textStyle: {
@@ -1174,7 +1195,7 @@
// 閬嶅巻鎮诞鏃剁殑鎵�鏈夌偣锛屽畾鍒跺寲鏄剧ず鍐呭
let result = `<div style="width: 160px">${params[0].name}</div>`
params.forEach((item) => {
- if (item.seriesName === '鎬诲簱瀛�') {
+ if (item.seriesName === '鎬诲簱瀹�') {
result += `
<div style="display: flex;align-items: center;justify-content: space-between;margin-top: 2px;">
<div style="display: flex;align-items: center;"><div style="width: 10px;height: 10px; border-radius: 50%;background-color: #5e9bca;margin-right: 4px;"></div><div>${item.seriesName}</div></div>
@@ -1255,7 +1276,7 @@
],
series: [
{
- name: '鎬诲簱瀛�',
+ name: '鎬诲簱瀹�',
type: 'bar',
barWidth: 10,
barGap: '60%',
@@ -2854,4 +2875,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3