From 43c7cf553e5c78d81b8f23a043901926c45eb0cf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十二月 2024 18:46:00 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/LogisticsEfficiency.vue | 163 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 58 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index ea7a49a..8fcfb75 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -47,7 +47,7 @@
data1.monthLastOutTotal) / data1.monthLastOutTotal) * 100).toFixed(1)) }}%</span>
<span v-else-if="activeTab1 == 1 && data1.yearLastOutTotal">{{ Math.abs((((data1.yearOutTotal -
data1.yearLastOutTotal) / data1.yearLastOutTotal) * 100).toFixed(1)) }}%</span>
- <span v-else>-</span>
+ <span v-else style="margin-left: 10px;">-</span>
</div>
</div>
<div class="train_wrap">
@@ -101,7 +101,7 @@
</div>
<div class="one-swiper list_temp">
<div class="swiper-wrapper">
- <div class="line swiper-slide one-swiper-slide" @click="showModal = true" v-for="item in dataList3">
+ <div @click="taskClick(item)" class="line swiper-slide one-swiper-slide" v-for="item in dataList3">
<span class="item flag"><span :class="{ flag_bg: item.type == 1 || item.type == 3 }">{{ item.type
== 1
|| item.type == 3 ? '鍑�' : '鍏�' }}</span></span>
@@ -137,22 +137,35 @@
<img src="@/assets/images/energy_ef/ic_renwuzongliang@2x.png" alt="">
<div class="content">
<div class="name">褰撳墠浠诲姟閲�</div>
- <div class="num"><span>{{ data4.planTaskNum }}</span>涓囨敮</div>
+ <div class="num"><span>{{ activeTab4 == 0 ? data1.currentOutNum : data1.currentInNum }}</span>涓囨敮</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_wanchengrenwu@2x.png" alt="">
<div class="content">
<div class="name">褰撴棩瀹屾垚浠诲姟鎬婚噺</div>
- <div class="num"><span class="today">{{ data4.finishTaskNum }}</span>涓囨敮</div>
+ <div class="num">
+ <span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{
+ activeTab4 ==
+ 0 ? data1.currentOutDoneNum :
+ data1.currentInDoneNum
+ }}</span>
+ <span v-else>0</span>
+ 涓囨敮
+ </div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_bili@2x.png" alt="">
<div class="content">
<div class="name">宸插畬鎴愭瘮渚�</div>
- <div class="num" v-if="data4.finishTaskNum && data4.planTaskNum"><span class="finish">{{ ((
- data4.finishTaskNum / data4.planTaskNum) * 100).toFixed(1) }}%</span>涓囨敮</div>
+ <div class="num">
+ <span v-if="activeTab4 == 0 && data1.currentOutNum" class="finish">{{ ((data1.currentOutDoneNum /
+ data1.currentOutNum) * 100).toFixed(1) }}</span>
+ <span v-if="activeTab4 == 1 && data1.currentInNum" class="finish">{{ ((data1.currentInDoneNum /
+ data1.currentInNum) * 100).toFixed(1) }}</span>
+ %
+ </div>
</div>
</div>
</div>
@@ -181,7 +194,7 @@
<span>杞﹁締鎶ヨ</span>
</div>
<div v-if="isShowCarW" class="war_list">
- <div class="line" v-for="item in data7.eventList">
+ <div class="line" v-for="item in eventList">
<div class="id_card">{{ item.carCode }}</div>
<div class="title">{{ item.title }}</div>
<div v-if="item.time">{{ item.time.slice(11) }}</div>
@@ -270,7 +283,8 @@
</div>
<div class="list two-swiper">
<div class="swiper-wrapper">
- <div class="item two-swiper-slide swiper-slide" v-for="item in data6.stockList">
+ <div :class="{ orange: item.num < 200 }" class="item two-swiper-slide swiper-slide"
+ v-for="item in data6.stockList">
<div class="la">{{ item.name }}</div>
<div class="val">{{ item.num }}涓囨敮</div>
</div>
@@ -313,7 +327,7 @@
<div class="icon_wrap">
<img v-if="i != 0" class="dian" src="@/assets/images/ic_dangqian@2x.png" alt="">
<img v-else src="@/assets/images/ic_jindu@2x.png" class="dian_ac" alt="">
- <div class="line"></div>
+ <div v-if="i != activeCar.logList.length - 1" class="line"></div>
</div>
<div class="content">
<div class="status" :class="{ ac: i == 0 }">{{ statusMapD[item.objType] }}</div>
@@ -369,7 +383,8 @@
wltotalInList,
wltransportMeasure,
carsListPost,
- getCarsJobDetails
+ getCarsJobDetails,
+ carsEventListP
} from '@/api'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
@@ -427,7 +442,9 @@
},
axisLabel: {
color: '#869CC9'
- // fontSize: 24,
+ },
+ nameTextStyle: {
+ color: '#869CC9' // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
axisTick: {
show: false,
@@ -438,31 +455,7 @@
yAxis: [
{
type: 'value',
- name: '涓�',
- min: 0,
- axisLabel: {
- show: true,
- color: "#869CC9",
- },
- splitLine: {
- show: true,
- lineStyle: {
- width: 1,
- color: "rgba(49,105,129,0.4)",
- type: 'dashed'
- }
- },
- // interval: 5,
- axisLabel: {
- formatter: '{value}'
- }
- },
- {
- type: 'value',
name: '涓囨敮',
- nameTextStyle: {
- color: '#869CC9',
- },
offset: 0,
type: 'value',
axisLine: {
@@ -477,8 +470,32 @@
}
},
axisLabel: {
- formatter: '{value}'
- }
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, 12] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+ },
+ },
+ {
+ type: 'value',
+ name: '涓�',
+ min: 0,
+ axisLabel: {
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, -18] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
+ },
+ splitLine: {
+ show: false,
+ lineStyle: {
+ width: 1,
+ color: "rgba(49,105,129,0.4)",
+ type: 'dashed'
+ }
+ },
},
],
series: [
@@ -492,7 +509,7 @@
position: 'top',
color: '#fff',
},
- yAxisIndex: 1,
+ yAxisIndex: 0,
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
@@ -516,7 +533,7 @@
name: '浠诲姟瀹屾垚閲�',
type: 'bar',
barWidth: 10,
- yAxisIndex: 1,
+ yAxisIndex: 0,
label: {
show: false,
position: 'top',
@@ -546,7 +563,7 @@
type: 'line',
smooth: false,
showAllSymbol: true,
- yAxisIndex: 0,
+ yAxisIndex: 1,
symbol: 'none',
lineStyle: {
color: "#1a43bc"
@@ -576,7 +593,19 @@
show: false,
position: 'center'
},
- padAngle: 5,
+ tooltip: {
+ trigger: 'none'
+ },
+ emphasis: {
+ // 璁剧疆鎮诞鏃舵牱寮忎负绌�
+ scale: false, // 鍏抽棴鏀惧ぇ鏁堟灉
+ itemStyle: {
+ shadowBlur: 0, // 闃村奖妯＄硦搴︿负 0
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0)',
+ },
+ },
+ padAngle: 3,
itemStyle: {
borderRadius: 10
},
@@ -813,6 +842,13 @@
showModal.value = false
activeCar.value = {}
}
+const taskClick = (item) => {
+ getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
+ // getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
+ showModal.value = true
+ activeCar.value = { ...res.data, carCode: item.carCodeFront }
+ })
+}
const data1 = ref({})
@@ -870,17 +906,9 @@
dataList3.value = result
})
}
-const data4 = ref({})
const activeTab4 = ref(0)
const tabClick4 = (val) => {
activeTab4.value = val
- getData4()
-}
-const getData4 = () => {
- wljobData({ queryType: activeTab4.value }).then(res => {
- const result = res.data
- data4.value = result
- })
}
const dataList5 = ref([])
const data5 = ref(0)
@@ -910,11 +938,15 @@
const isShowCarW = ref(false)
const data7 = ref({})
+const eventList = ref([])
const getData7 = () => {
carsListPost().then(res => {
const result = res.data || {}
data7.value = result
initMap()
+ })
+ carsEventListP().then(res => {
+ eventList.value = res.data || []
})
}
@@ -947,10 +979,18 @@
getData1()
getData2()
getData3()
- getData4()
getData5()
getData6()
getData7()
+
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData5()
+ getData6()
+ getData7()
+ }, 1000 * 60 * 10)
setTimeout(() => {
loopFn1()
@@ -994,15 +1034,15 @@
.num {
margin-right: 10px;
font-weight: bold;
- font-size: 46px;
- height: 44px;
- line-height: 52px;
+ font-size: 44px;
+ height: 48px;
+ line-height: 50px;
font-weight: bold;
color: #00F2F3;
letter-spacing: 3px;
background-image: -webkit-linear-gradient(top,
- #01D9FE 0%,
- #0177FE 60%,
+ #1cdafb 0%,
+ #0177FE 70%,
#0177FE 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
@@ -1092,6 +1132,7 @@
align-items: center;
padding: 0 10px;
font-size: 12px;
+ cursor: pointer;
&:nth-of-type(2n) {
background: rgba(27, 64, 97, 0.52);
@@ -1281,13 +1322,13 @@
bottom: 0;
border-top: 1px solid #5ecbce;
border-bottom: 1px solid #5ecbce;
+ background: rgba(0, 30, 63, 0.4);
+ /* backdrop-filter: blur(5px); */
.head {
display: flex;
width: 280px;
height: 57px;
- background: rgba(0, 30, 63, 0.4);
- backdrop-filter: blur(5px);
display: flex;
align-items: center;
padding-left: 10px;
@@ -1304,7 +1345,8 @@
.war_list {
max-height: 300px;
overflow: auto;
-
+ padding-left: 10px;
+ padding-bottom: 12px;
.line {
font-size: 13px;
color: #D2E0FF;
@@ -1491,6 +1533,7 @@
height: 36px !important;
display: flex;
align-items: center;
+ font-size: 14px;
&:nth-of-type(2n+1) {
background: rgba(0, 152, 255, 0.13);
@@ -1505,6 +1548,10 @@
flex: 2;
}
}
+
+ .orange {
+ color: #FF5728;
+ }
}
}
}
--
Gitblit v1.9.3