From 43564a53cbe38623a27db4a7e5642bafcded6d57 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 13 十一月 2024 19:04:21 +0800
Subject: [PATCH] ll
---
screen/src/views/TaskEfficiency.vue | 408 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 324 insertions(+), 84 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 27e6ece..442c916 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -62,14 +62,16 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="line" v-for="item, i in dataList2" :key="i">
- <div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
- <div class="id_card">{{ item.platformName }}</div>
- <div class="wrap">
- <ChargeRate :rate="item.rate" />
+ <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="id_card">{{ item.platformName }}</div>
+ <div class="wrap">
+ <ChargeRate :rate="item.rate" />
+ </div>
+ <div class="num">{{ item.workTotalTimeT }}</div>
</div>
- <div class="num">{{ item.workTotalTimeT }}</div>
</div>
</div>
</div>
@@ -96,40 +98,75 @@
<div class="static_wrap">
<div class="item">
<div class="name">鏈堝彴鏁伴噺</div>
- <div v-if="data4.platformTotal" class="nums">
- <div class="num" v-for="n, i in data4.platformTotal + ''" :key="i">{{ n }}</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>
</div>
<div class="item">
<div class="name">绌洪棽鏈堝彴</div>
- <div v-if="data4.freePlatform" class="nums">
- <div class="num" v-for="n, i in data4.freePlatform + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.freePlatform || data4.freePlatform == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.freePlatform)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">棰勭害杞﹁締</div>
- <div v-if="data4.reservationCar" class="nums">
- <div class="num" v-for="n, i in data4.reservationCar + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.reservationCar || data4.reservationCar == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.reservationCar)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">浣滀笟杞﹁締</div>
- <div v-if="data4.workingCar" class="nums">
- <div class="num" v-for="n, i in data4.workingCar + ''" :key="i">{{ n }}</div>
+ <div v-if="data4.workingCar || data4.workingCar == 0" class="nums">
+ <div class="num" v-for="n, i in formatNum3(data4.workingCar)" :key="i">{{ n }}</div>
</div>
</div>
<div class="item">
<div class="name">鎺掗槦杞﹁締</div>
- <div class="nums" v-if="data4.lineUpCar">
- <div class="num" v-for="n, i in data4.lineUpCar + ''" :key="i">{{ n }}</div>
+ <div class="nums" v-if="data4.lineUpCar || data4.lineUpCar == 0">
+ <div class="num" v-for="n, i in formatNum3(data4.lineUpCar)" :key="i">{{ n }}</div>
</div>
</div>
</div>
</div>
- <div class="center_box_two">
- <div class="videos">
- <div class="video" v-for="i in 4"></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> -->
+ <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">
+ <div class="left">
+ <img src="@/assets/images/LogisticsCenter/ic_yuetai@2x.png" alt="">
+ <span>{{ workModalParam.platformName }}</span>
+ </div>
+ <div class="right">{{ workModalParam.statusTemp }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟杞﹁締锛�</div>
+ <div class="val">{{ workModalParam.carNo }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟绫诲瀷锛�</div>
+ <div class="val">{{ workModalParam.workType == 0 ? '鍗歌揣' : '瑁呰揣' }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">浣滀笟鏃堕暱锛�</div>
+ <div class="val">{{ workModalParam.workTime }}</div>
+ </div>
+ <div class="line">
+ <div class="dian"></div>
+ <div class="la">棰勮瀹屾垚锛�</div>
+ <div class="val">{{ workModalParam.finishTimeStr }}</div>
+ </div>
</div>
+ </div>
+ <div class="center_box_two">
+ <!-- <div class="videos">
+ <div class="video" v-for="i in 4"></div>
+ </div> -->
<div class="list">
<div class="line header">
<div>鏈堝彴鍚嶇О</div>
@@ -139,15 +176,20 @@
<div>棰勮瀹屾垚鏃堕棿</div>
<div>鏈堝彴鐘舵��</div>
</div>
- <div class="line" v-for="item, i in dataList5" :key="i">
- <div>{{ item.platformName }}</div>
- <div>{{ item.carNo || '-' }}</div>
- <div>{{ item.workNum }}{{ item.workNum ? '涓囨敮' : '-' }}</div>
- <div>{{ item.workTime || '-' }}</div>
- <div>{{ item.finishTime || '-' }}</div>
- <div :style="{
- color: item.status == 1 ? '#869CC9' : item.status == 2 ? '#FE5501' : '#D2E0FF'
- }">{{ item.statusTemp }}</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>{{ item.platformName }}</div>
+ <div>{{ item.carNo || '-' }}</div>
+ <div>{{ item.workNum ? item.workNum + '涓囨敮' : '-' }}</div>
+ <div>{{ item.workTime || '-' }}</div>
+ <div>{{ item.finishTimeStr || '-' }}</div>
+ <div :style="{
+ color: item.status == 1 ? '#869CC9' : item.status == 2 ? '#FE5501' : '#D2E0FF'
+ }">{{ item.statusTemp }}</div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -164,33 +206,39 @@
<div class="static_wrap">
<div class="item">
<div class="name">绛惧埌鏁�</div>
- <div class="num">{{ data6.inNum || 0 }}</div>
+ <div class="num">{{ data4?.signedNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸插彨鍙�</div>
- <div class="num">{{ data6.callNum || 0 }}</div>
+ <div class="num">{{ data4?.calledNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸蹭綔涓�</div>
- <div class="num">{{ data6.workingNum || 0 }}</div>
+ <div class="num">{{ data4?.workedNum || 0 }}</div>
</div>
<div class="item">
<div class="name">宸插畬鎴�</div>
- <div class="num">{{ data6.finishNum || 0 }}</div>
+ <div class="num">{{ data4?.doneNum || 0 }}</div>
</div>
</div>
<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="line" v-for="item, i in data6?.platformLogList">
<div class="time_wrap">
- <div class="time" v-if="item.createDate">{{ item.createDate.slice(11, 16) }}</div>
- <div class="sp"></div>
- <div class="dian"></div>
+ <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 }}</div>
- <div class="status">寮�濮嬩綔涓�</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>
@@ -203,29 +251,31 @@
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="item" v-for="i in 5">
- <div class="icon">
- <div class="circle"></div>
- <div class="line"></div>
- </div>
- <div class="content">
- <div class="header">
- <div class="time">time</div>
- <span class="status">涓�</span>
+ <div class="list three-swiper">
+ <div class="swiper-wrapper">
+ <div class="item three-swiper-slide swiper-slide" v-for="item, i in data7">
+ <div class="icon">
+ <div class="circle"></div>
+ <div class="line"></div>
</div>
- <div class="main">
- <div class="left">
- <div class="title">
- <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
- <span>鍛婅锛氬紑杞﹀惛鐑�</span>
- </div>
- <div class="wrap">
- <span style="margin-right: 30px;">鐘舵�侊細寰呭鐞�</span>
- <span>宸插彂鐢燂細1鍒嗛挓</span>
- </div>
+ <div class="content">
+ <div class="header">
+ <div class="time">{{ item.createDate }}</div>
+ <!-- <span class="status">浣�</span> -->
</div>
- <div class="status">澶勭悊涓�</div>
+ <div class="main">
+ <div class="left">
+ <div class="title">
+ <img class="xf" src="@/assets/images/FireFighting/ic_gaojing_red@2x.png" alt="">
+ <span>鍛婅锛歿{ item.eventContent }}</span>
+ </div>
+ <div class="wrap">
+ <!-- <span style="margin-right: 30px;">鐘舵�侊細寰呭鐞�</span> -->
+ <span>宸插彂鐢燂細{{ item.haveTime }}</span>
+ </div>
+ </div>
+ <!-- <div class="status">澶勭悊涓�</div> -->
+ </div>
</div>
</div>
</div>
@@ -243,7 +293,12 @@
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
import ChargeRate from '@/components/ChargeRate.vue'
+import { statusMap } from '@/utils/config'
import * as echarts from 'echarts'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration)
+import 'swiper/css/swiper.min.css'
+import Swiper from 'swiper'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -251,6 +306,7 @@
cncenterData,
cncarWorkSituation,
cnworkEfficiency,
+ cnwarningList
} from '@/api'
@@ -277,7 +333,7 @@
show: false,
position: 'center'
},
- padAngle: 5,
+ padAngle: 2,
itemStyle: {
borderRadius: 10
},
@@ -430,7 +486,7 @@
shadowColor: 'rgba(124,248,255, 0)',
shadowBlur: 20
},
- data: dataList3.value.map(i => i.workNum)
+ data: dataList3.value.map(i => i.workNum || 0)
},
{
name: '绱浣滀笟閲�',
@@ -500,12 +556,12 @@
color: '#61d3f9'
}])]
const temp = []
- temp.push({ name: '棰勭害鏁�', value: data6.value.reservationNum || 0 })
- temp.push({ name: '宸茶繘鍦�', value: data6.value.inNum || 0 })
- temp.push({ name: '宸蹭綔涓�', value: data6.value.workingNum || 0 })
- temp.push({ name: '宸茬鍦�', value: data6.value.leaveNum || 0 })
- console.log('temp', 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) })
+ console.log('temp', temp)
+
const option = {
color: colors,
tooltip: {
@@ -547,7 +603,10 @@
label: {
show: true,
position: 'outside',
- formatter: '{a|{b}} {a|{c}%}',
+ // formatter: '{a|{b}} {a|{c}%}',
+ formatter: params => {
+ return `{a|${params.data.name} ${params.data.rate}%}`
+ },
rich: {
a: {
color: '#869CC9',
@@ -609,17 +668,22 @@
const getData2 = () => {
cnplatformDuration().then(res => {
const result = res.data || []
+ let count = 1
+ if (result.length > 0) {
+ count = result[0].workTotalTime
+ }
dataList2.value = result.map(item => {
if (item.workTotalTime) {
if (item.workTotalTime > 60) {
item.workTotalTimeT = (item.workTotalTime / 60).toFixed(0) + '灏忔椂' + item.workTotalTime % 60 + '鍒嗛挓'
} else {
- item.workTotalTimeT = item.workTotalTime
+ item.workTotalTimeT = item.workTotalTime + '鍒嗛挓'
}
}
- item.rate = ((item.workTotalTime / item.openTotalTime) * 30).toFixed(0)
+ item.rate = ((item.workTotalTime / count) * 30).toFixed(0)
return item
})
+ loopFn2()
})
}
@@ -639,10 +703,24 @@
const data4 = ref({})
const getData4 = () => {
cncenterData().then(res => {
- const result = res.data
+ const result = res.data || []
data4.value = result
+ initEchart3()
})
}
+const formatNum3 = (num) => {
+ if (num || num == 0) {
+ num = num + ''
+ if (num.length == 1) {
+ return '00' + num
+ } else if (num.length == 2) {
+ return '0' + num
+ } else {
+ return num
+ }
+ }
+}
+
const dataList5 = ref([])
const getData5 = () => {
cnplatformWorkData().then(res => {
@@ -650,25 +728,86 @@
dataList5.value = result.map(i => {
i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : '浣滀笟瓒呮椂'
if (i.workTime) {
- if (item.workTime > 60) {
- item.workTime = (item.workTime / 60).toFixed(0) + 'h' + item.workTime % 60 + 'm'
+ // i.workTime = dayjs.duration(i.workTime * 1000).format('HH灏忔椂mm鍒�')
+ i.workTime = (i.workTime / 60).toFixed(0)
+ if (i.workTime > 60) {
+ i.workTime = (i.workTime / 60).toFixed(0) + 'h' + i.workTime % 60 + 'm'
} else {
- item.workTime = item.workTime
+ i.workTime = i.workTime + 'm'
}
}
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+ loopFn5()
})
}
const data6 = ref({})
const getData6 = () => {
- cncarWorkSituation().then(res => {
+ cncarWorkSituation({ size: 7 }).then(res => {
const result = res.data
data6.value = result
- initEchart3()
})
+}
+
+const data7 = ref([])
+const getData7 = () => {
+ cnwarningList({ size: 7 }).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({})
+const platformClick = (val) => {
+ workModalParam.value = val
+ showWorkModal.value = !showWorkModal.value
+}
+const loopFn2 = () => {
+ var newSwiper1 = new Swiper('.one-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 5,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 5, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn5 = () => {
+ var newSwiper1 = new Swiper('.two-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 6,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 6, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const loopFn7 = () => {
+ var newSwiper1 = new Swiper('.three-swiper', {
+ initialSlide: 0,
+ // loop: true, // 寰幆妯″紡閫夐」
+ direction: 'vertical', //绔栫洿鏂瑰悜
+ slidesPerView: 2,
+ // autoplay: { delay: 500, disableOnInteraction: false },
+ autoplay: autoplayFlag(dataList2.value, 2, 4000),
+ observer: true, //淇敼swiper鑷繁鎴栧瓙鍏冪礌鏃讹紝鑷姩鍒濆鍖杝wiper
+ })
+}
+const autoplayFlag = (list = [], leng = 4, time = 2000) => {
+ if (list.length > leng) {
+ return { delay: time, disableOnInteraction: false }
+ } else {
+ return false
+ }
}
@@ -680,6 +819,7 @@
getData4()
getData5()
getData6()
+ getData7()
// initEchart1()
// initEchart2()
@@ -781,14 +921,15 @@
margin-bottom: 20px;
.list {
- padding: 20px 24px 4px;
- height: 227px;
+ padding: 0px 24px 0px;
+ height: 200px;
+ margin-top: 20px;
+ overflow: auto;
.line {
display: flex;
align-items: center;
- margin-bottom: 20px;
- height: 20px;
+ height: 40px;
.top {
font-weight: 500;
@@ -800,6 +941,10 @@
color: #DBEAEA;
box-shadow: inset 0px 0px 3px 0px #01D9FE;
margin-right: 10px;
+ }
+
+ .one-swiper-slide {
+ height: 40px !important;
}
.id_card {
@@ -888,6 +1033,92 @@
}
}
+ .center_box_bg {
+ width: 100%;
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .no {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+ border: 1px solid #0193FE;
+ box-shadow: 1px 1px 6px #466d89;
+ font-size: 12px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #123062;
+ cursor: pointer;
+ }
+
+ .work_modal {
+ width: 314px;
+ height: 180px;
+ position: relative;
+ padding: 22px 20px;
+
+ .head {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 12px;
+
+ .left {
+ display: flex;
+ align-items: center;
+ font-weight: bold;
+ font-size: 15px;
+ color: #FFFFFF;
+
+ img {
+ width: 17px;
+ margin-right: 10px;
+ }
+ }
+
+ .right {
+ font-weight: 500;
+ font-size: 13px;
+ color: #01D9FE;
+ }
+ }
+
+ .line {
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ margin-bottom: 8px;
+
+ &:nth-last-child(1) {
+ margin-bottom: 0;
+ }
+
+ .dian {
+ width: 4px;
+ height: 4px;
+ border-radius: 50%;
+ background-color: #fff;
+ margin-right: 7px;
+ }
+
+ .la {
+ color: #D2E0FF;
+ }
+ }
+
+ .bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ }
+
+ }
+ }
+
.center_box_two {
width: 100%;
@@ -911,6 +1142,12 @@
.list {
width: 100%;
height: 210px;
+ overflow-y: auto;
+
+ .two-swiper {
+ height: 180px;
+ overflow: auto;
+ }
.line {
display: flex;
@@ -1044,16 +1281,15 @@
padding: 20px 20px 0;
.list {
- height: 248px;
+ height: 220px;
overflow: auto;
margin-top: 15px;
scrollbar-width: none;
-
.item {
display: flex;
font-size: 13px;
color: #D2E0FF;
-
+ height: 110px;
.icon {
width: 40px;
display: flex;
@@ -1158,6 +1394,10 @@
}
}
}
+
+ .swiper-wrapper {
+ display: block !important;
+ }
}
.main_header {
--
Gitblit v1.9.3