From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/LogisticsCenter.vue | 139 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 116 insertions(+), 23 deletions(-)
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index f7135b5..195f64b 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -30,11 +30,8 @@
<img src="@/assets/images/ic_question@2x.png" style="margin-left: 6px;" class="icon" alt="">
<div class="hover_wrap">
<div class="triangle"></div>
- <div class="title">鍑哄簱鑳藉姏缁熻璇存槑锛�</div>
- <div>褰撳墠璁㈠崟閲忥細鎴嚦鏄ㄦ棩鏈畬鎴愯鍗�+褰撴棩涓嬭揪鐨勮鍗曟暟閲忥紱</div>
- <div>褰撴棩浠诲姟閲忥細鎴嚦鏄ㄦ棩宸查厤杞芥湭鍑哄簱+褰撴棩宸查厤杞芥湭鍑哄簱鏁伴噺+鏃犻渶閰嶈浇鐨勪换鍔★紱</div>
- <div>浠婃棩鍑哄簱閲忥細褰撴棩鎸夊疄闄呭嚭搴撻噺锛堜互鐢靛瓙閿佷笂閿佷负鍑嗭級</div>
- <div>鍓╀綑浠诲姟閲忥細褰撴棩浠诲姟閲�-浠婃棩鍑哄簱閲�</div>
+ <div class="title">绱鍑哄簱閲忕粺璁¤鏄庯細</div>
+ <div>绱鍑哄簱閲忥細鎵�鏈夌墿娴佸嚭搴撲綔涓氭暟鎹紙鍖呭惈鑱旇惀鍔犲伐锛堝洖杩愩�佽惤鍦伴攢鍞級銆佸墠缃簱绉诲簱(鎴愰兘/涓存矀)绛夋墍鏈夊嚭搴撲綔涓氭暟鎹級</div>
</div>
</div>
</div>
@@ -48,11 +45,22 @@
</div>
<div class="content_wrap">
<div class="num_wrap">
- <div class="num_list" v-if="StockOutData.currentNum || StockOutData.currentNum == 0">
- <div class="num" v-for="i in StockOutData.currentNum + ''">
- {{ i }}
- <img class="bg" src="@/assets/images/LogisticsCenter/bg_number@2x.png" alt="">
+
+ <div class="question1">
+ <div class="hover_con">
+ <div class="num_list" v-if="StockOutData.currentNum || StockOutData.currentNum == 0">
+ <div class="num" v-for="i in StockOutData.currentNum + ''">
+ {{ i }}
+ <img class="bg" src="@/assets/images/LogisticsCenter/bg_number@2x.png" alt="">
+ </div>
+ </div>
+ <div class="hover_wrap">
+ <div class="triangle"></div>
+ <div class="title">璋冩嫧鍑哄簱閲忥細{{ StockOutData.currentProvinceNum || 0 }}绠�</div>
+ <div class="title">鍏朵粬鍑哄簱閲忥細{{ StockOutData.currentOtherNum || 0 }}绠�</div>
+ </div>
</div>
+
</div>
<div class="content">
<div class="unit_wrap">
@@ -125,7 +133,7 @@
<span class="item">{{ item.contractNumber }}</span>
<span class="item status">{{ item.statusDesc }}</span>
<span class="item">{{ item.receiveEnterprise }}</span>
- <span class="item">{{ item.transportDate || '-' }}</span>
+ <span class="item">{{ item.createDate || '-' }}</span>
</div>
</div>
</div>
@@ -172,7 +180,7 @@
<div class="name">褰撳墠璁㈠崟閲�</div>
<div class="num"><span class="blue"
v-if="cneterData.currentOrderNum || cneterData.currentOrderNum == 0">{{
- cneterData.currentOrderNum.toFixed(0) }}</span>绠�</div>
+ cneterData.currentOrderNum }}</span>绠�</div>
</div>
</div>
<div class="item">
@@ -180,7 +188,7 @@
<div class="content">
<div class="name">褰撳墠浠诲姟閲�</div>
<div class="num"><span v-if="cneterData.currentPlanNum || cneterData.currentPlanNum == 0">{{
- cneterData.currentPlanNum.toFixed(0) }}</span>绠�</div>
+ cneterData.currentPlanNum }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.currentPlanCarNum }}</div>
</div>
</div>
@@ -190,7 +198,7 @@
<div class="name">浠婃棩鍑哄簱閲�</div>
<div class="num"><span v-if="cneterData.crrentOutNum || cneterData.crrentOutNum == 0"
class="finish">{{
- cneterData.crrentOutNum.toFixed(0) }}</span>绠�</div>
+ cneterData.crrentOutNum }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.crrentOutCarNum }}</div>
</div>
</div>
@@ -200,7 +208,7 @@
<div class="name">鍓╀綑浠诲姟閲�</div>
<div class="num"><span v-if="cneterData.crrentRestNum || cneterData.crrentRestNum == 0"
class="today">{{
- cneterData.crrentRestNum.toFixed(0) }}</span>绠�</div>
+ cneterData.crrentRestNum }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.crrentRestCarNum }}</div>
</div>
</div>
@@ -342,7 +350,7 @@
鍏ㄧ渷锛�
<span>{{ data7.currentNum }}</span>
<span class="unit">杈� | </span>
- <span v-if="data7.totalNum">{{ ((data7.currentNum / data7.totalNum) * 100).toFixed(1) }}%</span>
+ <span v-if="data7.totalNum">{{ (data7.useRate * 100).toFixed(1) }}%</span>
</div>
</div>
<div class="echart5_wrap">
@@ -355,10 +363,14 @@
<div class="modal_wrap" v-if="showModal">
<div class="title_head">
<div class="left">
- <img src="@/assets/images/energy_ef/chuku_ic_car@2x.png" alt="">
+ <img src="@/assets/images/LogisticsCenter/ic_hetong.png" alt="">
<span>鍚堝悓鍙凤細{{ modalInfo.contractNumber }}</span>
</div>
<div class="tit_status">{{ modalInfo.orderStatusDesc }}</div>
+ </div>
+ <div v-if="modalInfo.overStock && modalInfo.overStock == 1" class="stock">
+ <img src="@/assets/images/LogisticsCenter/ic_tips@2x.png" alt="">
+ <span>鍥犲簱瀛樹笉瓒筹紝璁㈠崟鏆傛椂鏃犳硶閰嶈浇</span>
</div>
<div class="info">
<div class="item">
@@ -1062,8 +1074,8 @@
isLoadingTask.value = false
let temp = res.data.rows || []
transportTask.value = temp.map(item => {
- if (item.transportDate) {
- item.transportDate = item.transportDate.slice(5, 16)
+ if (item.createDate) {
+ item.createDate = item.createDate.slice(5, 16)
}
return item
})
@@ -1103,6 +1115,15 @@
label: {
show: false,
position: 'center'
+ },
+ emphasis: {
+ // 璁剧疆鎮诞鏃舵牱寮忎负绌�
+ scale: false, // 鍏抽棴鏀惧ぇ鏁堟灉
+ itemStyle: {
+ shadowBlur: 0, // 闃村奖妯＄硦搴︿负 0
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0)',
+ },
},
color: colors,
labelLine: {
@@ -1742,7 +1763,7 @@
},
barBorderRadius: [30, 30, 0, 0],
},
- data: data7.value.detailList.map(i => i.totalNum)
+ data: data7.value.detailList.map(i => (i.totalNum - i.zaituNum))
},
{
name: '褰撴棩鎻愭姤杩愬姏',
@@ -1850,7 +1871,7 @@
initialSlide: 0,
direction: 'vertical', //绔栫洿鏂瑰悜
slidesPerView: 5,
- autoplay: autoplayFlag(transportTask.value, 5, 4000),
+ autoplay: autoplayFlag(transportTask.value, 5, 6000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -2459,7 +2480,7 @@
z-index: 999;
top: -5px;
width: 407px;
- height: 134px;
+ height: 148px;
background: rgba(0, 30, 63, 0.6);
border: 1px solid #003F82;
backdrop-filter: blur(3px);
@@ -2469,6 +2490,10 @@
line-height: 19px;
font-weight: 400;
border-radius: 6px;
+
+ div {
+ margin-bottom: 3px;
+ }
.triangle {
width: 12px;
@@ -2488,6 +2513,64 @@
font-size: 14px;
color: #e2ebfd;
}
+ }
+ }
+}
+
+.question1 {
+ display: flex;
+ align-items: center;
+
+ .hover_con {
+ position: relative;
+
+ &:hover {
+ .hover_wrap {
+ display: block;
+ }
+ }
+ }
+
+
+ .hover_wrap {
+ display: none;
+
+ position: absolute;
+ left: 108%;
+ z-index: 999;
+ top: -5px;
+ width: 212px;
+ height: 62px;
+ background: rgba(0, 30, 63, 0.6);
+ border: 1px solid #003F82;
+ backdrop-filter: blur(3px);
+ padding: 10px;
+ font-size: 15px;
+ color: #e2ebfd;
+ line-height: 19px;
+ font-weight: 400;
+ border-radius: 6px;
+
+ div {
+ margin-bottom: 3px;
+ }
+
+ .triangle {
+ width: 12px;
+ height: 12px;
+ position: absolute;
+ top: 10px;
+ left: -6px;
+ transform: rotate(45deg);
+ border-left: 1px solid #003F82;
+ border-bottom: 1px solid #003F82;
+ background: rgba(0, 30, 63, 0.6);
+ /* backdrop-filter: blur(3px); */
+ }
+
+ .title {
+ font-weight: 600;
+ color: #e2ebfd;
}
}
}
@@ -2622,12 +2705,21 @@
top: -32px !important;
}
}
-
+ .stock{
+ display: flex;
+ align-items: center;
+ color: #dd5d2a;
+ margin-bottom: 8px;
+ img{
+ margin-right: 6px;
+ width: 14px;
+ }
+ }
.title_head {
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 20px;
+ margin-bottom: 8px;
.left {
display: flex;
@@ -2838,6 +2930,7 @@
.hover_wrap {
left: 175px;
+ height: 80px;
}
.icon {
--
Gitblit v1.9.3