From 9ae3baca4c8730fcc5f7c8daf3b6368cec554ae6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 十二月 2024 18:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 7923c46..3189033 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 + 1 }}</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" />
@@ -163,7 +163,7 @@
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
</div>
- <div class="modal_bg" v-if="showWorkModal" @click="showWorkModal = false"></div>
+ <div class="modal_bg" v-if="showWorkModal" @click="closeModal"></div>
</div>
<div class="center_box_two">
<div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
@@ -342,6 +342,18 @@
label: {
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: {
@@ -755,7 +767,6 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
- console.log('dataList5', dataList5.value)
})
}
@@ -801,7 +812,15 @@
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', {
@@ -1002,7 +1021,9 @@
box-shadow: inset 0px 0px 3px 0px #01D9FE;
margin-right: 10px;
}
-
+ .top3{
+ box-shadow: inset 0px 0px 3px 0px #FEAF01;
+ }
.one-swiper-slide {
height: 40px !important;
}
@@ -1131,7 +1152,7 @@
padding: 22px 20px;
left: 850px;
top: 60px;
-
+ z-index: 99999999;
.head {
display: flex;
justify-content: space-between;
--
Gitblit v1.9.3