From 6bd673610b45c8b7af056d296dde17585c886586 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 17:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsEfficiency.vue | 387 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 339 insertions(+), 48 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index ea14ba6..6441406 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -131,7 +131,9 @@
</div>
</div>
</div>
- <div class="center_box_two"></div>
+ <div class="center_box_two">
+ <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ </div>
</div>
<div class="right_box">
<div class="right_box_one">
@@ -244,8 +246,9 @@
import VScaleScreen from 'v-scale-screen'
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
-
import * as echarts from 'echarts'
+import ahJSON from '@/assets/anhui.json'
+
const colors = ['#FEAF01', '#01ABFE', '#51F9E4']
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
const date = ref(dayjs().format('YYYY.MM.DD'))
@@ -262,59 +265,161 @@
const initEnergy = () => {
var myChart = echarts.init(document.querySelector('.energyRef'))
// 缁樺埗鍥捐〃
- const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
myChart.setOption({
+ legend: {
+ itemGap: 12,
+ // icon: 'circle',
+ right: '12px',
+ top: '0',
+ data: ['鎬诲簱瀛�', '褰撳墠搴撳瓨', '搴撳瓨鍒╃敤鐜�'],
+ itemWidth: 20,
+ itemHeight: 10,
+ textStyle: {
+ color: '#fff',
+ borderColor: '#fff'
+ },
+ },
grid: {
- top: '20%',
- left: '2%',
- right: '2%',
- bottom: '4%',
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ top: '16%',
containLabel: true
},
tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'line'
- },
+ trigger: 'axis'
},
- xAxis: {
+ xAxis: [{
+ nameGap: 5,
type: 'category',
- data: [1, 2, 3, 4, 4, 5]
- },
- yAxis: {
- type: 'value',
- name: 'kw路h',
- nameTextStyle: {
- padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
- },
- splitLine: {
+ axisLine: {
show: true,
lineStyle: {
- //杩欓噷杈撳叆绾挎潯鐨勬牱寮�
- color: 'rgba(255,255,255,0.14)',
- }
+ color: '#999'
+ },
+ },
+ axisLabel: {
+ color: '#869CC9'
+ // fontSize: 24,
+ },
+ axisTick: {
+ show: false,
+ },
+ data: ['7.1', '7.1', '7.1', '7.1', '7.1'],
+ }],
+ yAxis: [
+ {
+ nameTextStyle: {
+ color: '#869CC9',
+ },
+ offset: 0,
+ name: '涓囨敮',
+ type: 'value',
+ axisLabel: {
+ show: true,
+ color: "#869CC9",
+ },
+ axisLine: {
+ show: true,
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ width: 1,
+ color: "rgba(49,105,129,0.4)",
+ type: 'dashed'
+ }
+ },
+ },
+ {
+ type: 'value',
+ name: '%',
+ min: 0,
+ max: 100,
+ // interval: 5,
+ axisLabel: {
+ formatter: '{value}%'
+ },
+ splitLine: false
}
- },
+ ],
series: [
{
- data: [1, 2, 3, 4, 5],
+ name: '璁″垝瀹屾垚鏁伴噺',
type: 'bar',
barWidth: 10,
+ barGap: '60%',
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
itemStyle: {
- normal: {
- color: new echarts.graphic.LinearGradient(
- 0, 0, 0, 1,
- [
- { offset: 0, color: arr[1] },
- { offset: 1, color: '#080807' }
- ]
- ),
- barBorderRadius: [10, 10, 0, 0]
- }
- }
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#5bc7d5'
+ },
+ {
+ offset: 1,
+ color: '#1a3f55'
+ }
+ ], false),
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ },
+ barBorderRadius: [3, 3, 0, 0],
+ },
+ data: [900, 438, 485, 631, 689]
+ },
+ {
+ name: '浠诲姟瀹屾垚閲�',
+ type: 'bar',
+ barWidth: 10,
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: '#edaf3d'
+ },
+ {
+ offset: 1,
+ color: '#323522'
+ }
+ ], false),
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ },
+ barBorderRadius: [3, 3, 0, 0],
+ },
+ data: [438, 485, 631, 689, 900]
+ },
+ {
+ name: '璁″垝浠诲姟鏁�',
+ type: 'line',
+ smooth: false,
+ showAllSymbol: true,
+ symbol: 'none',
+ lineStyle: {
+ color: "#1a43bc"
+ },
+ label: {
+ show: false,
+ position: 'top',
+ color: '#fff',
+ },
+ data: [485, 631, 389, 224, 287]
}
]
})
+
window.addEventListener('resize', function () {//鎵ц
myChart.resize()
})
@@ -352,9 +457,179 @@
})
}
+const echartMap = ref()
+const initMap = () => {
+ var myChart = echarts.init(echartMap.value)
+ echarts.registerMap('js', ahJSON)
+ var center = {
+ '鍚堣偉甯�': [117.25, 31.83],
+ '婊佸窞甯�': [118.32, 32.3],
+ '鑺滄箹甯�': [118.43, 31.35],
+ '闃滈槼甯�': [115.38, 32.89],
+ '铓屽煚甯�': [117.39, 32.92],
+ '娣崡甯�': [116.99, 32.63],
+ '椹瀺灞卞競': [118.5, 31.71],
+ '瀹夊簡甯�': [117.05, 30.52],
+ '榛勫北甯�': [118.33, 29.71],
+ '閾滈櫟甯�': [117.81, 30.94],
+ '瀹垮窞甯�': [116.98, 33.64],
+ '娣寳甯�': [116.8, 33.9],
+ '鍏畨甯�': [116.51, 31.75],
+ '姹犲窞甯�': [117.49, 30.66],
+ '瀹ｅ煄甯�': [118.76, 30.94],
+ '浜冲窞甯�': [115.78, 33.84],
+ }
+ var data = [
+ { name: "鍚堣偉甯�", value: 3 },
+ { name: "婊佸窞甯�", value: 0 },
+ { name: "鑺滄箹甯�", value: 1 },
+ { 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: 1 },
+ { name: "瀹ｅ煄甯�", value: 0 },
+ { name: "浜冲窞甯�", value: 0 },
+ ]
+ const option = {
+ title: {
+ top: 20,
+ text: '',
+ subtext: '',
+ x: 'center',
+ textStyle: {
+ color: '#ffffff'
+ }
+ },
+
+ tooltip: {
+ trigger: 'item',
+ formatter: function (params) {
+ if (typeof (params.value)[2] == "undefined") {
+ return params.name + ' : ' + params.value
+ } else {
+ return params.name + ' : ' + params.value[2]
+ }
+ }
+ },
+ visualMap: {
+ show: false,
+ max: 100,
+ seriesIndex: [3],
+ inRange: {
+ color: ['#A5DCF4', '#006edd']
+ }
+ },
+ geo: [{
+ map: 'js',
+ roam: false, //鏄惁鍏佽缂╂斁
+ zoom: 1.1, //榛樿鏄剧ず绾у埆
+ scaleLimit: {
+ min: 0,
+ max: 3
+ }, //缂╂斁绾у埆
+ itemStyle: {
+ normal: {
+ areaColor: 'transparent',
+ borderColor: '#3fdaff',
+ borderWidth: 2,
+ shadowColor: 'rgba(63, 218, 255, 0.5)',
+ shadowBlur: 30
+ },
+ emphasis: {
+ areaColor: '#2B91B7',
+ }
+ },
+ tooltip: {
+ show: false
+ }
+ }],
+ series: [
+ {
+ type: 'effectScatter',
+ coordinateSystem: 'geo',
+ z: 5,
+ data,
+ symbolSize: 14,
+ label: {
+ normal: {
+ show: true,
+ formatter: function (params) {
+ return '{fline|鍦扮偣锛�' + params.data.city + '}\n{tline|' + (params.data.info || '鍙戠敓xx闆嗕欢') + '}'
+ },
+ position: 'top',
+ backgroundColor: 'rgba(233,63,66,.9)',
+ padding: [0, 0],
+ borderRadius: 3,
+ lineHeight: 32,
+ color: '#ffffff',
+ rich: {
+ fline: {
+ padding: [0, 10, 10, 10],
+ color: '#ffffff'
+ },
+ tline: {
+ padding: [10, 10, 0, 10],
+ color: '#ffffff'
+ }
+ }
+ },
+ emphasis: {
+ show: true
+ }
+ },
+ itemStyle: {
+ color: '#e93f42',
+ }
+ },
+
+ //鍦板浘
+ {
+ type: 'map',
+ mapType: 'js',
+ geoIndex: -1,
+ zoom: 1.1, //榛樿鏄剧ず绾у埆
+ label: {
+ show: true,
+ color: '#ffffff',
+ emphasis: {
+ color: 'white',
+ show: false
+ }
+ },
+ itemStyle: {
+ normal: {
+ borderColor: '#2980b9',
+ borderWidth: 1,
+ areaColor: '#1d3b60'
+ },
+ emphasis: {
+ areaColor: '#FA8C16',
+ borderWidth: 0,
+ color: 'green'
+ }
+ },
+ data: data
+ }
+ ]
+ }
+
+ myChart.setOption(option)
+ window.addEventListener('resize', function () {//鎵ц
+ myChart.resize()
+ })
+}
+
onMounted(() => {
initEnergy()
initEchart1()
+ initMap()
})
@@ -536,8 +811,12 @@
.center_box {
flex: 1;
padding: 16px 60px;
+ display: flex;
+ flex-direction: column;
.center_box_one {
+ height: 190px;
+
.tabs {
display: flex;
align-items: center;
@@ -623,8 +902,14 @@
}
.center_box_two {
+ flex: 1;
width: 100%;
- border: 1px solid;
+
+ .echart_map {
+ width: 100%;
+ height: 100%;
+ border: 1px solid;
+ }
}
}
@@ -772,27 +1057,33 @@
font-size: 14px;
color: #D2E0FF;
margin-bottom: 11px;
+
.num {
font-weight: 500;
font-size: 16px;
color: #FFFFFF;
}
}
- .list{
+
+ .list {
margin-top: 22px;
- .item{
+
+ .item {
width: 100%;
height: 36px;
display: flex;
align-items: center;
- &:nth-of-type(2n+1){
- background: rgba(0,152,255,0.13);
+
+ &:nth-of-type(2n+1) {
+ background: rgba(0, 152, 255, 0.13);
}
- .la{
+
+ .la {
flex: 5;
padding-left: 20px;
}
- .val{
+
+ .val {
flex: 2;
}
}
@@ -836,15 +1127,14 @@
align-items: center;
.time {
- width: 180px;
+ width: 130px;
display: flex;
justify-content: flex-end;
- padding-bottom: 10px;
- font-size: 36px;
+ font-size: 30px;
}
.week {
- margin-left: 36px;
+ margin-left: 20px;
}
}
@@ -916,6 +1206,7 @@
position: relative;
z-index: -2;
font-size: 14px;
+
.main_bg {
position: absolute;
left: 0;
--
Gitblit v1.9.3