From cb221a76856b945b4501b6628cebe1815303f2f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 22 十月 2025 08:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 314 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 244 insertions(+), 70 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 159aea2..e270f2a 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" />
@@ -94,12 +94,17 @@
</div>
</div>
<div class="center_box">
+
+ <div class="left_box_top_znz">
+ <img src="@/assets/images/ic_compass@2x.png" alt="" />
+ </div>
+
<div class="center_box_one">
<div class="static_wrap">
<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,8 +134,11 @@
</div>
</div>
<div class="center_box_bg">
- <img class="point_icon" src="@/assets/ani/apngb-animated.png" alt="">
- <div class="work_modal" @click="showWorkModal = false" v-if="showWorkModal">
+ <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">
<img class="bg" src="@/assets/images/LogisticsCenter/bg_yuetai@2x.png" alt="">
<div class="head">
<div class="left">
@@ -147,7 +155,7 @@
<div class="line">
<div class="dian"></div>
<div class="la">浣滀笟绫诲瀷锛�</div>
- <div class="val">{{ workModalParam.workType == 0 ? '鍗歌揣' : '瑁呰揣' }}</div>
+ <div class="val">{{ workModalParam.workType == 0 ? '鍗歌揣' : workModalParam.workType == 1 ? '瑁呰揣' : ''}}</div>
</div>
<div class="line">
<div class="dian"></div>
@@ -159,14 +167,34 @@
<div class="la">棰勮瀹屾垚锛�</div>
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
+ <div class="priview" @click="videoPri">鏌ョ湅瀹炴椂鐢婚潰</div>
+ </div>
+ <div class="modal_bg" v-if="showWorkModal" @click="closeModal"></div>
+ <div v-show="showJk" class="camera_wrap">
+ <img class="bg" src="@/assets/images/task/jiankong_bg2@2x.png" alt="">
+ <div class="head">
+ <div class="left">
+ <img class="icon" src="@/assets/images/task/ic_yuetai@2x.png" alt="">
+ <div class="name">{{ workModalParam.platformName }}</div>
+ <span v-if="workModalParam.carNo">{{ workModalParam.carNo }} | {{ workModalParam.workType == 0 ? '鍗歌揣'
+ : workModalParam.workType == 1 ? '瑁呰揣' : '' }}</span>
+ </div>
+ <div class="right">
+ <span>{{ workModalParam.statusTemp }} <span v-if="workModalParam.status == 0"> | 棰勮瀹屾垚鏃堕棿锛歿{
+ workModalParam.finishTimeStr }}</span></span>
+ <img @click="closeVideo" class="icon" src="@/assets/images/task/ic_close@2x.png" alt="">
+ </div>
+ </div>
+ <div class="content">
+ <Video v-if="showJk && videoParam && videoParam.deviceId" :href="videoParam.videoPluginUrl"
+ :indexCode="videoParam.deviceId" />
+ </div>
</div>
</div>
<div class="center_box_two">
- <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 v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
+ <Videos :href="data4.videoPluginUrl" :indexCodes="data4.videoIndexCodes" />
+ </div> -->
<div class="list">
<div class="line header">
<div>鏈堝彴鍚嶇О</div>
@@ -283,7 +311,7 @@
</div>
</div>
<div v-if="data7.length == 0" class="empty_wrap" style="margin-top: 50px;">
- <img src="@/assets/images/default_empty.png" alt="">
+ <img src="@/assets/images/default_nowarning.png" alt="">
</div>
</div>
</div>
@@ -295,7 +323,7 @@
</template>
<script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, nextTick } from 'vue'
import VScaleScreen from 'v-scale-screen'
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
@@ -306,6 +334,7 @@
dayjs.extend(duration)
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
+import Videos from './videoUrl/Videos.vue'
import Video from './videoUrl/Video.vue'
import {
cnplatformGroupFinish,
@@ -341,6 +370,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
@@ -363,9 +404,9 @@
const option = {
grid: {
top: '32%',
- left: '0%',
+ left: '6%',
right: '7%',
- bottom: '0%',
+ bottom: '10%',
containLabel: true,
},
legend: {
@@ -417,8 +458,11 @@
name: '涓囨敮',
type: 'value',
axisLabel: {
- show: true,
- color: "#9eaaba",
+ color: '#869CC9'
+ },
+ nameTextStyle: {
+ color: '#869CC9',
+ padding: [0, 0, 0, 12] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
axisLine: {
show: true,
@@ -459,47 +503,36 @@
series: [
{
name: '鍒嗘椂浣滀笟閲�',
- type: 'line',
- smooth: true,
- showAllSymbol: true,
- symbol: 'circle',
- symbolSize: 0,
- lineStyle: {
- color: '#2355f5',
- borderColor: '#2355f5'
- },
+ type: 'bar',
+ barWidth: 10,
label: {
show: false,
position: 'top',
color: '#fff',
},
itemStyle: {
- color: "#2355f5",
- lineStyle: {
- width: 0,
- type: 'solid'
- }
- },
- areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: '#2355f5'
+ color: 'rgba(0, 208, 221, 1)'
},
{
offset: 1,
- color: 'rgba(14, 31, 65,0.1)'
+ color: 'rgba(0, 194, 255, 0.20)'
}
], false),
- shadowColor: 'rgba(124,248,255, 0)',
- shadowBlur: 20
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ },
+ barBorderRadius: [30, 30, 0, 0],
},
data: dataList3.value.map(i => i.workNum || 0)
},
{
name: '绱浣滀笟閲�',
type: 'bar',
- barWidth: 6,
+ barWidth: 10,
label: {
show: false,
position: 'top',
@@ -509,11 +542,11 @@
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
- color: '#63d6fa'
+ color: 'rgba(0, 86, 255, 1)'
},
{
offset: 1,
- color: '#32718d'
+ color: 'rgba(0, 86, 255, 0.20)'
}
], false),
lineStyle: {
@@ -565,12 +598,17 @@
}]),
]
const temp = []
- 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)
+ // 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 })
+ temp.push({ name: '绛惧埌鏁�', value: data4.value?.signedNum || 0, rate: data4.value?.signedNum || 0 })
+ temp.push({ name: '宸插彨鍙�', value: data4.value?.calledNum || 0, rate: data4.value?.calledNum || 0 })
+ temp.push({ name: '宸蹭綔涓�', value: data4.value?.workedNum || 0, rate: data4.value?.workedNum || 0 })
+ temp.push({ name: '宸插畬鎴�', value: data4.value?.doneNum || 0, rate: data4.value?.doneNum || 0 })
+
+ console.log('temp', temp)
const option = {
color: colors,
tooltip: {
@@ -617,7 +655,7 @@
position: 'outside',
formatter: (params) => {
const index = params.dataIndex
- return `{color${index}|${params.data.name} ${params.data.rate}%}`
+ return `{color${index}|${params.data.name} ${params.data.rate}}`
// return `<div>${params.data.name}</div>`
},
rich: {
@@ -688,12 +726,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
})
})
@@ -738,7 +776,7 @@
cnplatformWorkData().then(res => {
const result = res.data || []
dataList5.value = result.map(i => {
- i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : '浣滀笟瓒呮椂'
+ i.statusTemp = i.status == 0 ? '浣滀笟涓�' : i.status == 1 ? '绌洪棽涓�' : i.status == 2 ? '浣滀笟瓒呮椂' : '鍙彿涓�'
if (i.workTime) {
// i.workTime = dayjs.duration(i.workTime * 1000).format('HH灏忔椂mm鍒�')
i.workTime = (i.workTime / 60).toFixed(0)
@@ -751,6 +789,7 @@
i.finishTime = dayjs(i.finishTime).format('HH:mm')
return i
})
+
})
}
@@ -774,29 +813,52 @@
}
const showWorkModal = ref(false)
+const showJk = ref(false)
const workModalParam = ref({})
+const videoParam = 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 },
+const pointList = [
+ { left: 230, top: 190, left2: 290, top2: 190, name: '鍑哄簱鏈堝彴3' },
+ { left: 265, top: 180, left2: 325, top2: 190, name: '鍑哄簱鏈堝彴2' },
+ { left: 300, top: 170, left2: 360, top2: 190, name: '鍑哄簱鏈堝彴1' },
+ { left: 335, top: 160, left2: 390, top2: 190, name: '鏁存墭鐩樺嚭搴�2' },
+ { left: 370, top: 150, left2: 430, top2: 190, name: '鏁存墭鐩樺嚭搴�1' },
- { left: 530, top: 50 },
- { left: 550, top: 65 },
- { left: 570, top: 75 },
- { left: 590, top: 75 },
- { left: 600, top: 80 },
- { left: 850, top: 60 },
+ { left: 530, top: 50, left2: 590, top2: 190, name: '鍏ュ簱鏈堝彴2' },
+ { left: 550, top: 65, left2: 610, top2: 190, name: '鍏ュ簱鏈堝彴1' },
+ { left: 570, top: 75, left2: 630, top2: 190, name: '鍏ュ簱鏈堝彴3' },
+ { left: 590, top: 75, left2: 650, top2: 190, name: '1095鏁存墭鐩樺叆搴�' },
+ { left: 600, top: 80, left2: 660, top2: 190, name: '1099鏁存墭鐩樺叆搴�' },
+ { left: 850, top: 60, left2: 520, top2: 190, name: '甯傚叕鍙告湀鍙�' },
+ { left: 540, top: 136, left2: 600, top2: 136, name: '鑰佸簱鍏ュ簱' },
+ { left: 560, top: 132, left2: 620, top2: 132, name: '鑰佸簱鍑哄簱' },
-])
+]
+const videoPri = () => {
+ showJk.value = true
+ nextTick(() => {
+ videoParam.value = { ...workModalParam.value }
+ // console.log('workModalParam', videoParam.value)
+ })
+}
+const closeVideo = () => {
+ workModalParam.value = {}
+ videoParam.value = {}
+ showJk.value = false
+}
const platformClick = (val) => {
- workModalParam.value = val
- console.log(val)
-
- showWorkModal.value = !showWorkModal.value
+ 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', {
@@ -998,6 +1060,10 @@
margin-right: 10px;
}
+ .top3 {
+ box-shadow: inset 0px 0px 3px 0px #FEAF01;
+ }
+
.one-swiper-slide {
height: 40px !important;
}
@@ -1015,11 +1081,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 {
@@ -1053,6 +1122,19 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ position: relative;
+
+ .left_box_top_znz {
+ width: 68px;
+ height: 68px;
+ position: absolute;
+ right: 30px;
+ top: 150px;
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
.center_box_one {
.static_wrap {
@@ -1098,6 +1180,76 @@
justify-content: center;
align-items: center;
position: relative;
+
+ .camera_wrap {
+ position: absolute;
+ top: 0;
+ left: 50%;
+ transform: translate(-50%, 0);
+ width: 672px;
+ height: 568px;
+ z-index: 999;
+ font-size: 14px;
+ color: #D2E0FF;
+ display: flex;
+ flex-direction: column;
+
+ .content {
+ flex: 1;
+ /* height: calc( 100% - 30px ); */
+ padding: 16px 20px 32px 20px;
+
+ .video {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .head {
+ height: 56px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 30px;
+
+ .right {
+ display: flex;
+ align-items: center;
+
+ .icon {
+ width: 24px;
+ margin-left: 20px;
+ cursor: pointer;
+ }
+ }
+
+ .left {
+ display: flex;
+ align-items: center;
+
+ .name {
+ font-weight: bold;
+ font-size: 16px;
+ color: #01D9FE;
+ margin-right: 20px;
+ }
+
+ .icon {
+ width: 16px;
+ margin-right: 8px;
+ }
+ }
+ }
+
+ .bg {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ }
+ }
+
.point_icon {
position: absolute;
left: 850px;
@@ -1121,8 +1273,20 @@
.work_modal {
width: 314px;
height: 180px;
- position: relative;
+ position: absolute;
padding: 22px 20px;
+ left: 850px;
+ top: 60px;
+ z-index: 99999999;
+
+ .priview {
+ position: absolute;
+ bottom: 24px;
+ right: 40px;
+ font-size: 12px;
+ color: #01D9FE;
+ cursor: pointer;
+ }
.head {
display: flex;
@@ -1181,14 +1345,23 @@
}
}
+
+ .modal_bg {
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ /* background-color: rgba(0,0,0,.1); */
+ }
}
.center_box_two {
width: 100%;
-
.videos {
width: 100%;
+ height: 150px;
display: flex;
margin-bottom: 15px;
@@ -1209,7 +1382,8 @@
height: 210px;
overflow-y: auto;
background: rgba(0, 86, 255, 0.05);
- backdrop-filter: blur(5px);
+ backdrop-filter: blur(5px);
+
.two-swiper {
height: 180px;
overflow: hidden;
@@ -1623,4 +1797,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3