From 81ba74daf8b7e7563bfadf4712c6a90d30434370 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十一月 2024 11:51:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsEfficiency.vue | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index 1d043b5..1861f8d 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -91,7 +91,7 @@
</div>
<div class="one-swiper list_temp">
<div class="swiper-wrapper">
- <div class="line swiper-slide one-swiper-slide" v-for="item in dataList3">
+ <div class="line swiper-slide one-swiper-slide" @click="showModal = true" v-for="item in dataList3">
<span class="item flag"><span :class="{ flag_bg: item.type == 1 || item.type == 3 }">{{ item.type
== 1
|| item.type == 3 ? '鍑�' : '鍏�' }}</span></span>
@@ -99,7 +99,8 @@
<span class="item id_card">{{ item.carCodeFront }}</span>
<span class="item status">{{ statusMap[item.status].label }}</span>
<span class="item addr">{{ item.repertotyAddress }}</span>
- <span class="item time" v-if="item.confirmTaskDate">{{ item.confirmTaskDate.slice(5, 16) }}</span>
+ <span class="item time">{{ item.confirmTaskDate ? item.confirmTaskDate.slice(5, 16) : '-'
+ }}</span>
</div>
</div>
</div>
@@ -147,7 +148,24 @@
</div>
</div>
<div class="center_box_two">
- <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ <div class="list">
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_zaitu@2x.png" alt="">
+ <span>鍦ㄩ�旓細{{ 8 }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_kongxian@2x.png" alt="">
+ <span>绌洪棽锛歿{ 8 }}</span>
+ </div>
+ <div class="item">
+ <img src="@/assets/images/LogisticsCenter/car_lixian@2x.png" alt="">
+ <span>绂荤嚎锛歿{ 8 }}</span>
+ </div>
+ </div>
+ <div class="echart_wrap">
+ <div ref="echartMap" class="echart_map" id="echartMap"></div>
+ </div>
+
</div>
</div>
<div class="right_box">
@@ -296,6 +314,7 @@
</div>
</div>
</div>
+ <div class="modal_mask" v-if="showModal" @click="showModal = false"></div>
</div>
</v-scale-screen>
</template>
@@ -543,7 +562,7 @@
color: ['#1984ff', '#184b8d'],
img: icKongxian,
data: [
- { name: '鑵惧啿甯�', value: [117.25, 31.49] },
+ { name: '', value: [117.25, 31.49] },
],
},
{
@@ -552,7 +571,7 @@
color: ['#f16c08', '#7f3710'],
img: icLixian,
data: [
- { name: '鑵惧啿甯�', value: [118.5, 31.08] },
+ { name: '', value: [118.5, 31.08] },
],
}
]
@@ -588,7 +607,7 @@
},
}
},
- symbolSize: [24, 30],
+ symbolSize: [32, 40],
hoverAnimation: true,
zlevel: 99,
@@ -619,12 +638,12 @@
{ name: "婊佸窞甯�", value: 0 },
{ name: "鑺滄箹甯�", value: 1 },
{ name: "闃滈槼甯�", value: 0 },
- { name: "铓屽煚甯�", value: 0 },
+ { name: "铓屽煚甯�", value: 4 },
{ name: "娣崡甯�", value: 0 },
- { name: "椹瀺灞卞競", value: 0 },
- { name: "瀹夊簡甯�", value: 0 },
+ { name: "椹瀺灞卞競", value: 6 },
+ { name: "瀹夊簡甯�", value: 2 },
{ name: "榛勫北甯�", value: 0 },
- { name: "閾滈櫟甯�", value: 0 },
+ { name: "閾滈櫟甯�", value: 40 },
{ name: "瀹垮窞甯�", value: 0 },
{ name: "娣寳甯�", value: 0 },
{ name: "鍏畨甯�", value: 0 },
@@ -663,7 +682,7 @@
geo: [{
map: 'js',
roam: false, //鏄惁鍏佽缂╂斁
- zoom: 1.1, //榛樿鏄剧ず绾у埆
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
scaleLimit: {
min: 0,
max: 3
@@ -728,7 +747,7 @@
type: 'map',
mapType: 'js',
geoIndex: -1,
- zoom: 1.1, //榛樿鏄剧ず绾у埆
+ zoom: 1.2, //榛樿鏄剧ず绾у埆
label: {
show: true,
color: '#ffffff',
@@ -1060,7 +1079,8 @@
}
.time {
- flex: 8;
+ flex: 6;
+ margin-left: 6px;
}
}
}
@@ -1166,10 +1186,37 @@
.center_box_two {
flex: 1;
width: 100%;
+ position: relative;
- .echart_map {
+ .list {
+ position: absolute;
+ top: 10px;
+ left: 20px;
+
+ .item {
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ font-size: 20px;
+ margin-bottom: 18px;
+
+ img {
+ width: 36px;
+ height: 36px;
+ margin-right: 15px;
+ }
+ }
+ }
+
+ .echart_wrap {
width: 100%;
height: 100%;
+
+ .echart_map {
+ width: 100%;
+ height: 100%;
+ /* transform: rotate(60deg); */
+ }
}
}
}
@@ -1328,7 +1375,7 @@
.list {
margin-top: 22px;
height: 240px;
- overflow: auto;
+ overflow: hidden;
scrollbar-width: none;
.item {
@@ -1494,7 +1541,7 @@
top: 20%;
left: 50%;
transform: translate(-50%, 0);
- z-index: 99;
+ z-index: 999;
padding: 24px;
.title_head {
@@ -1678,6 +1725,17 @@
}
}
+.modal_mask {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ z-index: 99;
+ background-color: rgba(0, 0, 0, 0.1);
+ /* background-color: red; */
+}
+
.bg {
position: absolute;
left: 0;
--
Gitblit v1.9.3