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 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 8fcfb75..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="">
@@ -201,6 +202,12 @@
</div>
</div>
</div>
+ <div @click="openCloudAddr" class="monitoring">
+ <img src="@/assets/images/ic_jiankong@2x.png" class="icon" alt="">
+ <div>杞﹁締鐩戞帶骞冲彴</div>
+ <img class="top" src="@/assets/images/SecurityControl/ar_open@2x.png" alt="">
+ </div>
+
</div>
</div>
<div class="right_box">
@@ -346,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">
@@ -384,6 +392,7 @@
wltransportMeasure,
carsListPost,
getCarsJobDetails,
+ getJobDetailsById,
carsEventListP
} from '@/api'
import 'swiper/css/swiper.min.css'
@@ -625,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 => {
@@ -822,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 }
@@ -843,11 +855,16 @@
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 }
})
+}
+
+const openCloudAddr = () => {
+ window.open('https://vms.hikvisionauto.com:8040/', '_blank')
}
@@ -943,6 +960,11 @@
carsListPost().then(res => {
const result = res.data || {}
data7.value = result
+ initMap()
+ }, () => {
+ data7.value = {
+ carsList: []
+ }
initMap()
})
carsEventListP().then(res => {
@@ -1347,6 +1369,7 @@
overflow: auto;
padding-left: 10px;
padding-bottom: 12px;
+
.line {
font-size: 13px;
color: #D2E0FF;
@@ -1366,6 +1389,35 @@
flex: 4;
}
}
+ }
+ }
+
+ .monitoring {
+ position: absolute;
+ cursor: pointer;
+ bottom: 10px;
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 500;
+ font-size: 15px;
+ width: 156px;
+ height: 40px;
+ background: linear-gradient(180deg, rgba(0, 148, 235, 0.68) 0%, rgba(0, 148, 235, 0) 100%);
+ border-radius: 2px;
+ border: 1px solid;
+ border-image: linear-gradient(180deg, rgba(177, 210, 255, 0.64), rgba(0, 171, 255, 0.7)) 1 1;
+
+ .icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 10px;
+ }
+
+ .top {
+ width: 7px;
+ margin-left: 6px;
}
}
}
@@ -1872,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