From c3aaf28f7316cce12eec007a9f85a96cbcddeec2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:20 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/TaskEfficiency.vue | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index 2069758..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,7 +162,7 @@
<div class="la">棰勮瀹屾垚锛�</div>
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
- <div class="priview" @click="showJk = true">鏌ョ湅瀹炴椂鐢婚潰</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">
@@ -171,16 +171,18 @@
<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 ? '鍗歌揣' : '瑁呰揣' }}</span>
+ <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>
+ <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 && workModalParam && workModalParam.deviceId" :href="workModalParam.videoPluginUrl"
- :indexCode="workModalParam.deviceId" />
+ <Video v-if="showJk && videoParam && videoParam.deviceId" :href="videoParam.videoPluginUrl"
+ :indexCode="videoParam.deviceId" />
</div>
</div>
</div>
@@ -316,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'
@@ -496,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',
@@ -546,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: {
@@ -813,6 +804,7 @@
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' },
@@ -827,10 +819,20 @@
{ 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
}
@@ -1167,6 +1169,7 @@
color: #D2E0FF;
display: flex;
flex-direction: column;
+
.content {
flex: 1;
/* height: calc( 100% - 30px ); */
--
Gitblit v1.9.3