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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index d1a3280..f71d802 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" />
@@ -99,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">
@@ -129,7 +129,8 @@
</div>
</div>
<div class="center_box_bg">
- <img v-if="showWorkModal" class="point_icon" :style="{ left: workModalParam.left + 'px', top: workModalParam.top + 'px' }"
+ <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">
@@ -162,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 +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
@@ -364,9 +377,9 @@
const option = {
grid: {
top: '32%',
- left: '0%',
+ left: '6%',
right: '7%',
- bottom: '0%',
+ bottom: '10%',
containLabel: true,
},
legend: {
@@ -418,8 +431,11 @@
name: '涓囨敮',
type: 'value',
axisLabel: {
- show: true,
- color: "#9eaaba",
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, 12] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
axisLine: {
show: true,
@@ -688,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
})
})
@@ -751,7 +767,6 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
- console.log('dataList5', dataList5.value)
})
}
@@ -797,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', {
@@ -999,6 +1022,10 @@
margin-right: 10px;
}
+ .top3 {
+ box-shadow: inset 0px 0px 3px 0px #FEAF01;
+ }
+
.one-swiper-slide {
height: 40px !important;
}
@@ -1016,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 {
@@ -1127,6 +1157,7 @@
padding: 22px 20px;
left: 850px;
top: 60px;
+ z-index: 99999999;
.head {
display: flex;
@@ -1185,7 +1216,8 @@
}
}
- .modal_bg{
+
+ .modal_bg {
position: fixed;
left: 0;
top: 0;
@@ -1636,4 +1668,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3