From 8d1f2f2e82f3f7512930c536e91ee7c92315f3d6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 三月 2025 19:55:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 186 +++++++++++++++++++++++++++++++++-------------
1 files changed, 133 insertions(+), 53 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 4bc1764..f71d802 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -2,7 +2,6 @@
<v-scale-screen width="1920" height="960">
<div class="main_app">
<img src="@/assets/images/task/bg@2x.png" class="main_bg" alt="" />
- <img class="point_icon" src="@/assets/ani/apngb-animated.png" alt="">
<div class="main_header">
<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺</div>
@@ -66,7 +65,7 @@
<div class="list one-swiper">
<div class="swiper-wrapper">
<div class="line one-swiper-slide swiper-slide" v-for="item, i in dataList2" :key="i">
- <div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
+ <div class="top" :class="{ top3: i < 3 }"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
<div class="id_card">{{ item.platformName }}</div>
<div class="wrap">
<ChargeRate :rate="item.rate" />
@@ -100,7 +99,7 @@
<div class="item">
<div class="name">鏈堝彴鏁伴噺</div>
<div v-if="data4.platformTotal || data4.platformTotal == 0" class="nums">
- <div class="num" v-for="n, i in formatNum3(data4.platformTotal) " :key="i">{{ n }}</div>
+ <div class="num" v-for="n, i in formatNum3(data4.platformTotal)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
@@ -130,10 +129,11 @@
</div>
</div>
<div class="center_box_bg">
- <!-- <div class="no no1" @click="workModalClick">1</div>
- <div class="no no2" @click="workModalClick">2</div>
- <div class="no no3" @click="workModalClick">3</div> -->
- <div class="work_modal" @click="showWorkModal = false" v-if="showWorkModal">
+ <img v-if="showWorkModal" class="point_icon"
+ :style="{ left: workModalParam.left + 'px', top: workModalParam.top + 'px' }"
+ src="@/assets/ani/apngb-animated.png" alt="">
+ <div class="work_modal" :style="{ left: workModalParam.left2 + 'px', top: workModalParam.top + 'px' }"
+ @click="showWorkModal = false" v-if="showWorkModal">
<img class="bg" src="@/assets/images/LogisticsCenter/bg_yuetai@2x.png" alt="">
<div class="head">
<div class="left">
@@ -163,10 +163,11 @@
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
</div>
+ <div class="modal_bg" v-if="showWorkModal" @click="closeModal"></div>
</div>
<div class="center_box_two">
- <!-- <div class="videos">
- <div class="video" v-for="i in 4"></div>
+ <!-- <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
+ <Videos :href="data4.videoPluginUrl" :indexCodes="data4.videoIndexCodes" />
</div> -->
<div class="list">
<div class="line header">
@@ -227,22 +228,24 @@
<div class="echart_wrap">
<div class="echart3" id="echart3"></div>
</div>
- <div class="list">
- <div class="line" v-for="item, i in data6?.platformLogList">
- <div class="time_wrap">
- <div class="time" :style="{
- backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
- }" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
- <div class="sp" :style="{
- backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
- }"></div>
- <div class="dian" :style="{
- backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
- }"></div>
+ <div class="list four-swiper">
+ <div class="swiper-wrapper">
+ <div class="line four-swiper-slide swiper-slide" v-for="item, i in data6?.platformLogList">
+ <div class="time_wrap">
+ <div class="time" :style="{
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
+ }" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
+ <div class="sp" :style="{
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
+ }"></div>
+ <div class="dian" :style="{
+ backgroundColor: item.objType == 5 ? '#4ca8f7' : item.objType == 6 ? '#f2b23e' : item.objType == 10 ? '#4673f6' : '#4aa38f'
+ }"></div>
+ </div>
+ <div class="id_card">{{ item.carCodeFront || item.param4 }}</div>
+ <div class="status">{{ statusMap[item.objType] }}</div>
+ <div class="desc">{{ item.content }}</div>
</div>
- <div class="id_card">{{ item.carCodeFront || item.param4 }}</div>
- <div class="status">{{ statusMap[item.objType] }}</div>
- <div class="desc">{{ item.content }}</div>
</div>
</div>
</div>
@@ -273,7 +276,7 @@
<span>鍛婅锛歿{ item.eventContent }}</span>
</div>
<div class="wrap">
- <!-- <span style="margin-right: 30px;">鐘舵�侊細寰呭鐞�</span> -->
+ <span style="margin-right: 50px;">{{ item.platformName }}</span>
<span>宸插彂鐢燂細{{ item.haveTime }}</span>
</div>
</div>
@@ -305,6 +308,7 @@
dayjs.extend(duration)
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
+import Videos from './videoUrl/Videos.vue'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -339,6 +343,18 @@
show: false,
position: 'center'
},
+ tooltip: {
+ trigger: 'none'
+ },
+ emphasis: {
+ // 璁剧疆鎮诞鏃舵牱寮忎负绌�
+ scale: false, // 鍏抽棴鏀惧ぇ鏁堟灉
+ itemStyle: {
+ shadowBlur: 0, // 闃村奖妯＄硦搴︿负 0
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0)',
+ },
+ },
padAngle: 2,
itemStyle: {
borderRadius: 10
@@ -361,9 +377,9 @@
const option = {
grid: {
top: '32%',
- left: '0%',
+ left: '6%',
right: '7%',
- bottom: '0%',
+ bottom: '10%',
containLabel: true,
},
legend: {
@@ -415,8 +431,11 @@
name: '涓囨敮',
type: 'value',
axisLabel: {
- show: true,
- color: "#9eaaba",
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, 12] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
axisLine: {
show: true,
@@ -563,11 +582,10 @@
}]),
]
const temp = []
- temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100.0' : 0 })
+ temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum ? '100' : 0 })
temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.signedNum ? (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.signedNum ? (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.signedNum ? (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) : 0 })
- console.log('temp', temp)
const option = {
color: colors,
@@ -686,12 +704,12 @@
dataList2.value = result.map(item => {
if (item.workTotalTime) {
if (item.workTotalTime > 60) {
- item.workTotalTimeT = (item.workTotalTime / 60).toFixed(0) + '灏忔椂' + item.workTotalTime % 60 + '鍒嗛挓'
+ item.workTotalTimeT = Math.floor(item.workTotalTime / 60) + '灏忔椂' + item.workTotalTime % 60 + '鍒嗛挓'
} else {
item.workTotalTimeT = item.workTotalTime + '鍒嗛挓'
}
}
- item.rate = ((item.workTotalTime / count) * 30).toFixed(0)
+ item.rate = Math.floor((item.workTotalTime / count) * 30)
return item
})
})
@@ -749,12 +767,13 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+
})
}
const data6 = ref({})
const getData6 = () => {
- cncarWorkSituation({ size: 7 }).then(res => {
+ cncarWorkSituation({ size: 30 }).then(res => {
const result = res.data
data6.value = result
})
@@ -773,11 +792,35 @@
const showWorkModal = ref(false)
const workModalParam = ref({})
-const platformClick = (val) => {
- workModalParam.value = val
- console.log(val)
+// point_icon
+const pointList = [
+ { left: 230, top: 190, left2: 290, top2: 190, name: '鍑哄簱鏈堝彴3' },
+ { left: 265, top: 180, left2: 325, top2: 190, name: '鍑哄簱鏈堝彴2' },
+ { left: 300, top: 170, left2: 360, top2: 190, name: '鍑哄簱鏈堝彴1' },
+ { left: 335, top: 160, left2: 390, top2: 190, name: '鏁存墭鐩樺嚭搴�2' },
+ { left: 370, top: 150, left2: 430, top2: 190, name: '鏁存墭鐩樺嚭搴�1' },
- showWorkModal.value = !showWorkModal.value
+ { left: 530, top: 50, left2: 590, top2: 190, name: '鍏ュ簱鏈堝彴2' },
+ { left: 550, top: 65, left2: 610, top2: 190, name: '鍏ュ簱鏈堝彴1' },
+ { left: 570, top: 75, left2: 630, top2: 190, name: '鍏ュ簱鏈堝彴3' },
+ { left: 590, top: 75, left2: 650, top2: 190, name: '1095鏁存墭鐩樺叆搴�' },
+ { left: 600, top: 80, left2: 660, top2: 190, name: '1099鏁存墭鐩樺叆搴�' },
+ { left: 850, top: 60, left2: 520, top2: 190, name: '甯傚叕鍙告湀鍙�' },
+
+]
+
+const platformClick = (val) => {
+ const index = pointList.findIndex(i => i.name == val.platformName)
+ workModalParam.value = { ...val, ...pointList[index], index: pointList }
+ if (workModalParam.value.workTime) {
+ workModalParam.value.workTime = workModalParam.value.workTime.replaceAll('m', '鍒嗛挓')
+ workModalParam.value.workTime = workModalParam.value.workTime.replaceAll('h', '灏忔椂')
+ }
+ showWorkModal.value = true
+}
+const closeModal = () => {
+ showWorkModal.value = false
+ workModalParam.value = {}
}
const loopFn2 = () => {
var newSwiper1 = new Swiper('.one-swiper', {
@@ -809,6 +852,15 @@
slidesPerView: 2,
// autoplay: { delay: 500, disableOnInteraction: false },
autoplay: autoplayFlag(dataList2.value, 2, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn6 = () => {
+ var newSwiper1 = new Swiper('.four-swiper', {
+ initialSlide: 0,
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 7,
+ autoplay: autoplayFlag(data6.value.platformLogList, 7, 4000),
observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
})
}
@@ -845,6 +897,7 @@
loopFn2()
loopFn5()
loopFn7()
+ loopFn6()
}, 12000)
})
@@ -969,6 +1022,10 @@
margin-right: 10px;
}
+ .top3 {
+ box-shadow: inset 0px 0px 3px 0px #FEAF01;
+ }
+
.one-swiper-slide {
height: 40px !important;
}
@@ -986,11 +1043,14 @@
.num {
font-weight: 500;
- width: 82px;
+ width: 88px;
text-align: right;
font-size: 13px;
color: #DBEAEA;
margin-left: 2px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.wrap {
@@ -1068,6 +1128,14 @@
display: flex;
justify-content: center;
align-items: center;
+ position: relative;
+
+ .point_icon {
+ position: absolute;
+ left: 850px;
+ top: 60px;
+ }
+
.no {
width: 28px;
height: 28px;
@@ -1085,8 +1153,11 @@
.work_modal {
width: 314px;
height: 180px;
- position: relative;
+ position: absolute;
padding: 22px 20px;
+ left: 850px;
+ top: 60px;
+ z-index: 99999999;
.head {
display: flex;
@@ -1145,15 +1216,23 @@
}
}
+
+ .modal_bg {
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ /* background-color: rgba(0,0,0,.1); */
+ }
}
.center_box_two {
width: 100%;
- background: rgba(0, 86, 255, 0.05);
- backdrop-filter: blur(5px);
.videos {
width: 100%;
+ height: 150px;
display: flex;
margin-bottom: 15px;
@@ -1173,6 +1252,8 @@
width: 100%;
height: 210px;
overflow-y: auto;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.two-swiper {
height: 180px;
@@ -1203,7 +1284,7 @@
}
.lined {
- background: rgba(0,160,255,0.6) !important;
+ background: rgba(0, 160, 255, 0.6) !important;
font-weight: 600 !important;
}
@@ -1226,6 +1307,7 @@
backdrop-filter: blur(5px);
background: rgba(0, 86, 255, 0.05);
backdrop-filter: blur(5px);
+
.static_wrap {
display: flex;
padding: 20px 0 15px;
@@ -1261,14 +1343,16 @@
.list {
margin: 0 20px 0;
- width: 100%;
- height: 222px;
+ width: 430px;
+ height: 231px;
+ overflow: hidden;
+ scrollbar-width: none;
.line {
display: flex;
align-items: center;
font-size: 12px;
- height: 33px;
+ height: 33px !important;
color: #D2E0FF;
width: 100%;
@@ -1321,6 +1405,7 @@
.right_box_two {
padding: 20px 20px 0;
margin-top: 20px;
+
.list {
height: 220px;
overflow: hidden;
@@ -1328,6 +1413,7 @@
background: rgba(0, 86, 255, 0.05);
backdrop-filter: blur(5px);
padding-top: 15px;
+
.item {
display: flex;
font-size: 13px;
@@ -1562,12 +1648,6 @@
z-index: -2;
font-size: 14px;
- .point_icon {
- position: absolute;
- left: 800px;
- top: 420px;
- }
-
.main_bg {
position: absolute;
left: 0;
@@ -1588,4 +1668,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3