From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
screen/src/views/TaskEfficiency.vue | 237 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 161 insertions(+), 76 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 442c916..159aea2 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -1,9 +1,9 @@
<template>
<v-scale-screen width="1920" height="960">
<div class="main_app">
- <img src="@/assets/images/FireFighting/bg@2x.png" class="main_bg" alt="" />
+ <img src="@/assets/images/task/bg@2x.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-浣滀笟鏁堣兘缁熺</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -19,7 +19,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩鏈堝彴瀹屾垚璁㈠崟缁熻</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="car_static">
<div class="echart_wrap">
@@ -60,12 +60,12 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩鏈堝彴宸ヤ綔鏃堕暱瓒嬪娍</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<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" />
@@ -86,7 +86,7 @@
<div class="separate"></div>
<div class="tab" :class="{ active: activeTab3 == 0 }" @click="tabClick3(0)">鍏ュ簱</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="echart_wrap">
<div class="echart2" id="echart2"></div>
@@ -129,9 +129,7 @@
</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> -->
+ <img class="point_icon" src="@/assets/ani/apngb-animated.png" alt="">
<div class="work_modal" @click="showWorkModal = false" v-if="showWorkModal">
<img class="bg" src="@/assets/images/LogisticsCenter/bg_yuetai@2x.png" alt="">
<div class="head">
@@ -164,9 +162,11 @@
</div>
</div>
<div class="center_box_two">
- <!-- <div class="videos">
- <div class="video" v-for="i in 4"></div>
- </div> -->
+ <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 class="list">
<div class="line header">
<div>鏈堝彴鍚嶇О</div>
@@ -178,8 +178,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>
@@ -201,7 +203,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>浠婃棩杞﹁締浣滀笟鎯呭喌</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="static_wrap">
<div class="item">
@@ -224,22 +226,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>
@@ -249,7 +253,7 @@
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
<div>瀹炴椂鍛婅</div>
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
<div class="list three-swiper">
<div class="swiper-wrapper">
@@ -270,13 +274,16 @@
<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>
<!-- <div class="status">澶勭悊涓�</div> -->
</div>
</div>
+ </div>
+ <div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
</div>
@@ -299,6 +306,7 @@
dayjs.extend(duration)
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
+import Video from './videoUrl/Video.vue'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -543,23 +551,24 @@
}]),
new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
offset: 0,
+ color: '#4370f2'
+ }, {
+ offset: 1,
+ color: '#61d3f9'
+ }]),
+ new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+ offset: 0,
color: '#4679f6'
}, {
offset: 1,
color: '#4674f6'
}]),
- new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
- offset: 0,
- color: '#4370f2'
- }, {
- offset: 1,
- color: '#61d3f9'
- }])]
+ ]
const temp = []
- temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: '100.0' })
- temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: (data4.value.calledNum / data4.value?.signedNum * 100).toFixed(1)})
- temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: (data4.value.workedNum / data4.value?.signedNum * 100).toFixed(1) })
- temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: (data4.value.doneNum / data4.value?.signedNum * 100).toFixed(1) })
+ 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 = {
@@ -581,7 +590,10 @@
maxSize: '80%',
gap: 4,
label: {
- show: false
+ show: false,
+ formatter: '',
+ lineHeight: 0,
+ position: 'inside'
},
itemStyle: { //鍘绘帀榛樿鐧借壊杈规绾�
@@ -603,15 +615,16 @@
label: {
show: true,
position: 'outside',
- // formatter: '{a|{b}} {a|{c}%}',
- formatter: params => {
- return `{a|${params.data.name} ${params.data.rate}%}`
+ formatter: (params) => {
+ const index = params.dataIndex
+ return `{color${index}|${params.data.name} ${params.data.rate}%}`
+ // return `<div>${params.data.name}</div>`
},
rich: {
- a: {
- color: '#869CC9',
- fontSize: 13
- },
+ color0: { color: 'orange', fontSize: 14 },
+ color1: { color: '#869CC9', fontSize: 13 },
+ color2: { color: '#869CC9', fontSize: 13 },
+ color3: { color: '#869CC9', fontSize: 13 }
}
},
labelLine: {
@@ -683,7 +696,6 @@
item.rate = ((item.workTotalTime / count) * 30).toFixed(0)
return item
})
- loopFn2()
})
}
@@ -739,13 +751,12 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
- loopFn5()
})
}
const data6 = ref({})
const getData6 = () => {
- cncarWorkSituation({ size: 7 }).then(res => {
+ cncarWorkSituation({ size: 30 }).then(res => {
const result = res.data
data6.value = result
})
@@ -753,20 +764,38 @@
const data7 = ref([])
const getData7 = () => {
- cnwarningList({ size: 7 }).then(res => {
+ cnwarningList({ size: 10 }).then(res => {
const result = res.data || []
data7.value = result.map(item => {
item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.createDate).getTime()).format('HH灏忔椂mm鍒嗛挓')
return item
})
- loopFn7()
})
}
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 },
+
+ { left: 530, top: 50 },
+ { left: 550, top: 65 },
+ { left: 570, top: 75 },
+ { left: 590, top: 75 },
+ { left: 600, top: 80 },
+ { left: 850, top: 60 },
+
+])
+
const platformClick = (val) => {
workModalParam.value = val
+ console.log(val)
+
showWorkModal.value = !showWorkModal.value
}
const loopFn2 = () => {
@@ -802,6 +831,15 @@
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
+ })
+}
const autoplayFlag = (list = [], leng = 4, time = 2000) => {
if (list.length > leng) {
return { delay: time, disableOnInteraction: false }
@@ -821,9 +859,22 @@
getData6()
getData7()
- // initEchart1()
- // initEchart2()
- // initEchart3()
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData4()
+ getData5()
+ getData6()
+ getData7()
+ }, 1000 * 60)
+
+ setTimeout(() => {
+ loopFn2()
+ loopFn5()
+ loopFn7()
+ loopFn6()
+ }, 12000)
})
@@ -851,6 +902,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;
@@ -919,12 +972,14 @@
.left_box_two {
margin-bottom: 20px;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.list {
padding: 0px 24px 0px;
height: 200px;
margin-top: 20px;
- overflow: auto;
+ overflow: hidden;
.line {
display: flex;
@@ -977,6 +1032,9 @@
}
.left_box_three {
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+
.echart_wrap {
width: 450px;
height: 212px;
@@ -1039,6 +1097,12 @@
display: flex;
justify-content: center;
align-items: center;
+ position: relative;
+ .point_icon {
+ position: absolute;
+ left: 850px;
+ top: 60px;
+ }
.no {
width: 28px;
@@ -1121,6 +1185,7 @@
.center_box_two {
width: 100%;
+
.videos {
width: 100%;
@@ -1143,39 +1208,47 @@
width: 100%;
height: 210px;
overflow-y: auto;
-
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
.two-swiper {
height: 180px;
- overflow: auto;
+ overflow: hidden;
}
.line {
display: flex;
height: 30px;
+ position: relative;
+ cursor: pointer;
- &:nth-of-type(2n) {
- background: rgba(12, 153, 236, 0.2);
+ .icon {
+ position: absolute;
+ left: 0px;
+ top: 0px;
}
- &:nth-of-type(2n + 1) {
- background: rgba(1, 15, 35, 0.61);
- box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66);
- }
div {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
}
+ .lined {
+ background: rgba(0, 160, 255, 0.6) !important;
+ font-weight: 600 !important;
+ }
+
.header {
font-weight: 500;
- font-size: 13px;
+ font-size: 14px;
color: #01ABFE;
+ background: rgba(1, 15, 35, 0.61) !important;
+ box-shadow: inset 0px 0px 40px 0px rgba(23, 51, 108, 0.66) !important;
}
}
}
@@ -1185,6 +1258,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;
@@ -1197,7 +1275,7 @@
align-items: center;
.name {
- font-size: 12px;
+ font-size: 14px;
color: #D2E0FF;
}
@@ -1220,14 +1298,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%;
@@ -1279,17 +1359,22 @@
.right_box_two {
padding: 20px 20px 0;
+ margin-top: 20px;
.list {
height: 220px;
- overflow: auto;
- margin-top: 15px;
+ overflow: hidden;
scrollbar-width: none;
+ background: rgba(0, 86, 255, 0.05);
+ backdrop-filter: blur(5px);
+ padding-top: 15px;
+
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
height: 110px;
+
.icon {
width: 40px;
display: flex;
--
Gitblit v1.9.3