From 6fdb27916ce66c9b5492dd21724e55b2c3f1eeb2 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 13 三月 2025 17:25:15 +0800 Subject: [PATCH] ll --- screen/src/views/TaskEfficiency.vue | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue index 2069758..c5ed8a9 100644 --- a/screen/src/views/TaskEfficiency.vue +++ b/screen/src/views/TaskEfficiency.vue @@ -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 ? '鍗歌揣' + : '瑁呰揣' }}</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' @@ -813,6 +815,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' }, @@ -829,8 +832,16 @@ { left: 850, top: 60, left2: 520, top2: 190, 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 +1178,7 @@ color: #D2E0FF; display: flex; flex-direction: column; + .content { flex: 1; /* height: calc( 100% - 30px ); */ -- Gitblit v1.9.3