From 35276d8317e8d53039cfaa373dfc9e8b425dfca1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 一月 2025 18:06:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsEfficiency.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 2a13ff0..0af62b6 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -31,7 +31,8 @@
<div class="num" v-if="data1.monthOutTotal || data1.yearOutTotal">{{ activeTab1 == 0 ?
data1.monthOutTotal.toLocaleString() : data1.yearOutTotal.toLocaleString() }}</div>
<div class="unit_wrap">
- <span style="color: #869CC9;">{{ activeTab1 == 0 ? '鍚屾瘮' : '鐜瘮' }}</span>
+ <!-- <span style="color: #869CC9;">{{ activeTab1 == 0 ? '鍚屾瘮' : '鐜瘮' }}</span> -->
+ <span style="color: #869CC9;">鐜瘮</span>
<template v-if="activeTab1 == 0 && data1.monthLastOutTotal">
<img v-if="data1.monthOutTotal > data1.monthLastOutTotal" src="@/assets/images/ic_up.png"
class="icon" alt="">
@@ -390,6 +391,7 @@
wltransportMeasure,
carsListPost,
getCarsJobDetails,
+ getJobDetailsById,
carsEventListP
} from '@/api'
import 'swiper/css/swiper.min.css'
@@ -828,6 +830,7 @@
myChart.on('click', function (params) {
const item = params.data
getCarsJobDetails({ carCode: item.code }).then(res => {
+ // getCarsJobDetails({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.code }
@@ -849,7 +852,8 @@
activeCar.value = {}
}
const taskClick = (item) => {
- getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
+ // getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
+ getJobDetailsById({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.carCodeFront }
@@ -1912,7 +1916,7 @@
line-height: 36px;
border-bottom: 1px solid rgba(255, 255, 255, 0.16);
margin-bottom: 10px;
-
+ padding-right: 10px;
.code {
font-weight: 500;
font-size: 14px;
--
Gitblit v1.9.3