From 63f68bf25b920d5711032a6e675769855ed3582b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:16 +0800
Subject: [PATCH] ll
---
screen/src/views/TaskEfficiency.vue | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 159aea2..d1a3280 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -129,8 +129,10 @@
</div>
</div>
<div class="center_box_bg">
- <img class="point_icon" src="@/assets/ani/apngb-animated.png" alt="">
- <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">
@@ -160,13 +162,12 @@
<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 v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
- <div class="video" v-for="indexCode in data4.videoIndexCodes">
- <Video v-if="indexCode" :href="data4.videoPluginUrl" :indexCode="indexCode" />
- </div>
- </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">
<div>鏈堝彴鍚嶇О</div>
@@ -306,7 +307,7 @@
dayjs.extend(duration)
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
-import Video from './videoUrl/Video.vue'
+import Videos from './videoUrl/Videos.vue'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -569,7 +570,6 @@
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,
@@ -751,6 +751,8 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+ console.log('dataList5', dataList5.value)
+
})
}
@@ -776,27 +778,26 @@
const showWorkModal = ref(false)
const workModalParam = ref({})
// point_icon
-const pointList = ref([
- { left: 230, top: 190 },
- { left: 265, top: 180 },
- { left: 300, top: 170 },
- { left: 335, top: 160 },
- { left: 370, top: 150 },
+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 },
- { left: 550, top: 65 },
- { left: 570, top: 75 },
- { left: 590, top: 75 },
- { left: 600, top: 80 },
- { left: 850, top: 60 },
+ { 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
- console.log(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', {
@@ -1098,6 +1099,7 @@
justify-content: center;
align-items: center;
position: relative;
+
.point_icon {
position: absolute;
left: 850px;
@@ -1121,8 +1123,10 @@
.work_modal {
width: 314px;
height: 180px;
- position: relative;
+ position: absolute;
padding: 22px 20px;
+ left: 850px;
+ top: 60px;
.head {
display: flex;
@@ -1181,14 +1185,22 @@
}
}
+ .modal_bg{
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
+ /* background-color: rgba(0,0,0,.1); */
+ }
}
.center_box_two {
width: 100%;
-
.videos {
width: 100%;
+ height: 150px;
display: flex;
margin-bottom: 15px;
@@ -1209,7 +1221,8 @@
height: 210px;
overflow-y: auto;
background: rgba(0, 86, 255, 0.05);
- backdrop-filter: blur(5px);
+ backdrop-filter: blur(5px);
+
.two-swiper {
height: 180px;
overflow: hidden;
--
Gitblit v1.9.3