From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/TaskEfficiency.vue | 159 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 132 insertions(+), 27 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index f71d802..e78f9de 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -150,7 +150,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>
@@ -162,8 +162,29 @@
<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">
@@ -297,7 +318,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'
@@ -309,6 +330,7 @@
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
import Videos from './videoUrl/Videos.vue'
+import Video from './videoUrl/Video.vue'
import {
cnplatformGroupFinish,
cnplatformDuration,
@@ -476,47 +498,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',
@@ -526,11 +537,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: {
@@ -791,7 +802,9 @@
}
const showWorkModal = ref(false)
+const showJk = ref(false)
const workModalParam = ref({})
+const videoParam = ref({})
// point_icon
const pointList = [
{ left: 230, top: 190, left2: 290, top2: 190, name: '鍑哄簱鏈堝彴3' },
@@ -806,8 +819,22 @@
{ 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) => {
const index = pointList.findIndex(i => i.name == val.platformName)
@@ -1130,6 +1157,75 @@
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;
@@ -1158,6 +1254,15 @@
left: 850px;
top: 60px;
z-index: 99999999;
+
+ .priview {
+ position: absolute;
+ bottom: 24px;
+ right: 40px;
+ font-size: 12px;
+ color: #01D9FE;
+ cursor: pointer;
+ }
.head {
display: flex;
@@ -1221,8 +1326,8 @@
position: fixed;
left: 0;
top: 0;
- width: 100vw;
- height: 100vh;
+ width: 100%;
+ height: 100%;
/* background-color: rgba(0,0,0,.1); */
}
}
--
Gitblit v1.9.3