From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
screen/src/views/LogisticsEfficiency.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 2a13ff0..e4bfd5b 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="">
@@ -352,7 +353,8 @@
<div class="list">
<div class="item" v-for="item in activeCar.contractList">
<div class="head">
- <div class="code">鍚堝悓鍙凤細{{ item.ioCode }}</div>
+ <div class="code">鍚堝悓鍙凤細<span v-if="item.detailList && item.detailList.length > 0">{{
+ item.detailList[0].contractNum }}</span></div>
<div class="addr">鏀惰揣鍦帮細{{ item.address }}</div>
</div>
<div class="line" v-for="i in item.detailList">
@@ -390,6 +392,7 @@
wltransportMeasure,
carsListPost,
getCarsJobDetails,
+ getJobDetailsById,
carsEventListP
} from '@/api'
import 'swiper/css/swiper.min.css'
@@ -631,6 +634,8 @@
const echartMap = ref()
const initMap = () => {
+ console.log('----')
+
var myChart = echarts.init(echartMap.value)
echarts.registerMap('js', ahJSON)
const scatterData = data7.value.carsList.map(item => {
@@ -828,6 +833,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 +855,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 }
@@ -953,6 +960,11 @@
carsListPost().then(res => {
const result = res.data || {}
data7.value = result
+ initMap()
+ }, () => {
+ data7.value = {
+ carsList: []
+ }
initMap()
})
carsEventListP().then(res => {
@@ -1912,6 +1924,7 @@
line-height: 36px;
border-bottom: 1px solid rgba(255, 255, 255, 0.16);
margin-bottom: 10px;
+ padding-right: 10px;
.code {
font-weight: 500;
--
Gitblit v1.9.3