From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 161 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 119 insertions(+), 42 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index f02d4e1..d1a3280 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -65,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"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
<div class="id_card">{{ item.platformName }}</div>
<div class="wrap">
<ChargeRate :rate="item.rate" />
@@ -129,10 +129,10 @@
</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">
@@ -162,10 +162,11 @@
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
</div>
+ <div class="modal_bg" v-if="showWorkModal" @click="showWorkModal = false"></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">
@@ -178,8 +179,10 @@
</div>
<div class="two-swiper">
<div class="swiper-wrapper">
- <div @click="platformClick(item)" class="line one-swiper-slide swiper-slide"
- v-for="item, i in dataList5" :key="i">
+ <div @click="platformClick(item)" :class="{ lined: workModalParam.platformId == item.platformId }"
+ class="line one-swiper-slide swiper-slide" v-for="item, i in dataList5" :key="i">
+ <img v-if="workModalParam.platformId == item.platformId" class="icon" src="@/assets/ani/2.png"
+ alt="">
<div>{{ item.platformName }}</div>
<div>{{ item.carNo || '-' }}</div>
<div>{{ item.workNum ? item.workNum + '涓囨敮' : '-' }}</div>
@@ -224,22 +227,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>
@@ -270,7 +275,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>
@@ -302,6 +307,7 @@
dayjs.extend(duration)
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
+import Videos from './videoUrl/Videos.vue'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -560,11 +566,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,
@@ -611,7 +616,7 @@
show: true,
position: 'outside',
formatter: (params) => {
- const index = params.dataIndex;
+ const index = params.dataIndex
return `{color${index}|${params.data.name} ${params.data.rate}%}`
// return `<div>${params.data.name}</div>`
},
@@ -746,12 +751,14 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+ console.log('dataList5', dataList5.value)
+
})
}
const data6 = ref({})
const getData6 = () => {
- cncarWorkSituation({ size: 7 }).then(res => {
+ cncarWorkSituation({ size: 30 }).then(res => {
const result = res.data
data6.value = result
})
@@ -770,9 +777,27 @@
const showWorkModal = ref(false)
const workModalParam = ref({})
+// 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' },
+
+ { 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) => {
- workModalParam.value = val
- showWorkModal.value = !showWorkModal.value
+ const index = pointList.findIndex(i => i.name == val.platformName)
+ workModalParam.value = { ...val, ...pointList[index], index: pointList }
+ showWorkModal.value = true
}
const loopFn2 = () => {
var newSwiper1 = new Swiper('.one-swiper', {
@@ -804,6 +829,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
})
}
@@ -840,6 +874,7 @@
loopFn2()
loopFn5()
loopFn7()
+ loopFn6()
}, 12000)
})
@@ -868,6 +903,8 @@
justify-content: space-evenly;
align-items: center;
height: 218px;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.echart_wrap {
position: relative;
@@ -936,6 +973,8 @@
.left_box_two {
margin-bottom: 20px;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.list {
padding: 0px 24px 0px;
@@ -994,6 +1033,9 @@
}
.left_box_three {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+
.echart_wrap {
width: 450px;
height: 212px;
@@ -1056,6 +1098,13 @@
display: flex;
justify-content: center;
align-items: center;
+ position: relative;
+
+ .point_icon {
+ position: absolute;
+ left: 850px;
+ top: 60px;
+ }
.no {
width: 28px;
@@ -1074,8 +1123,10 @@
.work_modal {
width: 314px;
height: 180px;
- position: relative;
+ position: absolute;
padding: 22px 20px;
+ left: 850px;
+ top: 60px;
.head {
display: flex;
@@ -1134,6 +1185,14 @@
}
}
+ .modal_bg{
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ /* background-color: rgba(0,0,0,.1); */
+ }
}
.center_box_two {
@@ -1141,6 +1200,7 @@
.videos {
width: 100%;
+ height: 150px;
display: flex;
margin-bottom: 15px;
@@ -1160,6 +1220,8 @@
width: 100%;
height: 210px;
overflow-y: auto;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.two-swiper {
height: 180px;
@@ -1169,15 +1231,15 @@
.line {
display: flex;
height: 30px;
+ position: relative;
+ cursor: pointer;
- &:nth-of-type(2n + 1) {
- background: rgba(12, 153, 236, 0.2);
+ .icon {
+ position: absolute;
+ left: 0px;
+ top: 0px;
}
- &:nth-of-type(2n) {
- background: rgba(1, 15, 35, 0.61);
- box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66);
- }
div {
flex: 1;
@@ -1187,6 +1249,11 @@
font-size: 14px;
color: #D2E0FF;
}
+ }
+
+ .lined {
+ background: rgba(0, 160, 255, 0.6) !important;
+ font-weight: 600 !important;
}
.header {
@@ -1204,6 +1271,11 @@
width: 450px;
.right_box_one {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+
.static_wrap {
display: flex;
padding: 20px 0 15px;
@@ -1239,14 +1311,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%;
@@ -1298,12 +1372,15 @@
.right_box_two {
padding: 20px 20px 0;
+ margin-top: 20px;
.list {
height: 220px;
overflow: hidden;
- margin-top: 15px;
scrollbar-width: none;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+ padding-top: 15px;
.item {
display: flex;
--
Gitblit v1.9.3