From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index f02d4e1..4bc1764 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -2,6 +2,7 @@
<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>
@@ -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>
@@ -611,7 +614,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>`
},
@@ -772,6 +775,8 @@
const workModalParam = ref({})
const platformClick = (val) => {
workModalParam.value = val
+ console.log(val)
+
showWorkModal.value = !showWorkModal.value
}
const loopFn2 = () => {
@@ -868,6 +873,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 +943,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 +1003,9 @@
}
.left_box_three {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+
.echart_wrap {
width: 450px;
height: 212px;
@@ -1056,7 +1068,6 @@
display: flex;
justify-content: center;
align-items: center;
-
.no {
width: 28px;
height: 28px;
@@ -1138,6 +1149,8 @@
.center_box_two {
width: 100%;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.videos {
width: 100%;
@@ -1169,15 +1182,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 +1200,11 @@
font-size: 14px;
color: #D2E0FF;
}
+ }
+
+ .lined {
+ background: rgba(0,160,255,0.6) !important;
+ font-weight: 600 !important;
}
.header {
@@ -1204,6 +1222,10 @@
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;
@@ -1298,13 +1320,14 @@
.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;
font-size: 13px;
@@ -1539,6 +1562,12 @@
z-index: -2;
font-size: 14px;
+ .point_icon {
+ position: absolute;
+ left: 800px;
+ top: 420px;
+ }
+
.main_bg {
position: absolute;
left: 0;
--
Gitblit v1.9.3