From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/LogisticsEfficiency.vue | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 9b631a8..5a96827 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -17,7 +17,7 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>绱鍑哄簱閲忕粺璁�</div>
+ <div>绱鍑哄簱閲忕粺璁★紙涓囧彧锛�</div>
</div>
<div class="tabs">
<div class="tab" :class="{ active: activeTab1 == 0 }" @click="tabClick1(0)">鏈湀</div>
@@ -172,7 +172,7 @@
</div>
</div>
<div class="center_box_two">
- <div class="list">
+ <div class="list" style="z-index: 10000">
<div class="item">
<img src="@/assets/images/LogisticsCenter/car_zaitu@2x.png" alt="">
<span>鍦ㄩ�旓細{{ data7.busyNum }}</span>
@@ -186,10 +186,10 @@
<span>绂荤嚎锛歿{ data7.offlineNum }}</span>
</div>
</div>
- <div class="echart_wrap">
+ <div class="echart_wrap" style="width: 100%;height: 100%">
<div ref="echartMap" class="echart_map" id="echartMap"></div>
</div>
- <div class="warnning_info">
+ <div class="warnning_info" style="z-index: 10000">
<div class="head" @click="isShowCarW = !isShowCarW">
<img src="../assets/images/FireFighting/fire_right.png" alt="">
<span>杞﹁締鎶ヨ</span>
@@ -202,7 +202,7 @@
</div>
</div>
</div>
- <div @click="openCloudAddr" class="monitoring">
+ <div @click="openCloudAddr" class="monitoring" style="z-index: 10000">
<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="">
@@ -293,7 +293,7 @@
<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 class="val">{{ item.num }}{{item.name.indexOf('鎵樼洏') === -1 ? '涓囨敮' : '涓�'}}</div>
</div>
</div>
</div>
@@ -353,7 +353,8 @@
<div class="list">
<div class="item" v-for="item in activeCar.contractList">
<div class="head">
- <div class="code">鍚堝悓鍙凤細<span v-if="item.detailList && item.detailList.length > 0">{{ item.detailList[0].contractNum }}</span></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">
@@ -462,7 +463,6 @@
],
yAxis: [
{
- type: 'value',
name: '涓囨敮',
offset: 0,
type: 'value',
@@ -633,6 +633,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 => {
@@ -730,22 +732,26 @@
},
geo: [{
map: 'js',
- roam: false, //鏄惁鍏佽缂╂斁
+ roam: true, //鏄惁鍏佽缂╂斁
zoom: 1.2, //榛樿鏄剧ず绾у埆
scaleLimit: {
min: 0,
- max: 3
+ max: 50
}, //缂╂斁绾у埆
+ label: {
+ show: true, // 濮嬬粓鏄剧ず鏂囧瓧
+ color: '#fff' // 璁剧疆鏂囧瓧棰滆壊
+ },
itemStyle: {
normal: {
- areaColor: 'transparent',
- borderColor: '#3fdaff',
- borderWidth: 2,
- shadowColor: 'rgba(63, 218, 255, 0.5)',
- shadowBlur: 30
+ areaColor: '#1d3b60',
+ borderColor: '#428598',
+ borderWidth: 1,
+ // shadowColor: 'rgba(63, 218, 255, 0.5)',
+ // shadowBlur: 30
},
emphasis: {
- areaColor: '#2B91B7',
+ areaColor: '#5bc7d5',
}
},
tooltip: {
@@ -791,12 +797,13 @@
}
},
- //鍦板浘
+ /* //鍦板浘
{
type: 'map',
mapType: 'js',
geoIndex: -1,
zoom: 1.2, //榛樿鏄剧ず绾у埆
+ // roam: true, // 寮�鍚缉鏀惧拰骞崇Щ
label: {
show: true,
color: '#ffffff',
@@ -821,7 +828,7 @@
}
},
data: data
- },
+ },*/
...serData,
]
}
@@ -830,7 +837,7 @@
myChart.on('click', function (params) {
const item = params.data
getCarsJobDetails({ carCode: item.code }).then(res => {
- // getCarsJobDetails({ id: item.id }).then(res => {
+ // getCarsJobDetails({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.code }
@@ -853,7 +860,7 @@
}
const taskClick = (item) => {
// getCarsJobDetails({ carCode: item.carCodeFront }).then(res => {
- getJobDetailsById({ id: item.id }).then(res => {
+ getJobDetailsById({ id: item.id }).then(res => {
// getCarsJobDetails({ carCode: '鐨朅E5277' }).then(res => {
showModal.value = true
activeCar.value = { ...res.data, carCode: item.carCodeFront }
@@ -957,6 +964,11 @@
carsListPost().then(res => {
const result = res.data || {}
data7.value = result
+ initMap()
+ }, () => {
+ data7.value = {
+ carsList: []
+ }
initMap()
})
carsEventListP().then(res => {
@@ -1293,7 +1305,9 @@
}
}
}
+ .center_box_three{
+ }
.center_box_two {
flex: 1;
width: 100%;
@@ -1917,6 +1931,7 @@
border-bottom: 1px solid rgba(255, 255, 255, 0.16);
margin-bottom: 10px;
padding-right: 10px;
+
.code {
font-weight: 500;
font-size: 14px;
@@ -1981,4 +1996,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3