From c80a7698101d3a27f5e40fe83ba1302758c55dd5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 16:37:30 +0800
Subject: [PATCH] ll
---
screen/src/assets/images/task/jiankong_bg2@2x.png | 0
screen/src/assets/images/task/ic_yuetai@2x.png | 0
admin/src/views/platform/queueUp.vue | 34 +++++++---
h5/utils/config.js | 4
admin/src/views/platform/index.vue | 2
screen/src/assets/images/task/ic_close@2x.png | 0
screen/src/views/TaskEfficiency.vue | 106 ++++++++++++++++++++++++++++++++++
7 files changed, 130 insertions(+), 16 deletions(-)
diff --git a/admin/src/views/platform/index.vue b/admin/src/views/platform/index.vue
index 9cf9a0b..ba7ef07 100644
--- a/admin/src/views/platform/index.vue
+++ b/admin/src/views/platform/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="main_app" style="overflow: auto;height: calc(100% - 100px);">
+ <div class="main_app" style="overflow-y: auto;height: calc(100% - 100px);">
<div class="mb20 main_header">
<div class="platgroup_tabs">
<div class="tab" :class="{ active: activeGroup.id === item.id }" @click="platgroupClick(item)"
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 64659a1..2a367f4 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -1,7 +1,7 @@
<template>
<div class="main_app">
- <div class="mb20 main_header">
- <div class="platgroup_tabs">
+ <div class="main_header">
+ <div class="platgroup_tabs pt20">
<div class="tab" :class="{ active: activeGroup.id === item.id }" @click="platgroupClick(item)"
v-for="(item, i) in PlatGroupList" :key="i">
{{ item.name }}
@@ -11,9 +11,11 @@
<div class="df_sb">
<QueryForm v-model="filters" :query-form-config="queryQueueUpConfig" @handleQuery="getList(1)" @clear="clear">
</QueryForm>
- <el-button @click="openSign" type="primary" style="align-self: flex-start;">杞﹁締绛惧埌</el-button>
+ <div>
+ <el-button @click="openSign" type="primary" style="align-self: flex-start;">杞﹁締绛惧埌</el-button>
+ </div>
</div>
- <div class="main_content">
+ <div class="common-header">
<div class="static_wrap">
<span>绛夊緟锛�<span class="num">{{ staticParam.waitNum }}</span></span>
<span class="mr30">{{ }}</span>
@@ -255,14 +257,24 @@
<style lang="scss" scoped>
@import "@/assets/style/variables.scss";
-.main_content {
- background-color: #fff;
- position: relative;
- z-index: 999;
- top: -10;
- margin: -20px;
+.main_app {
padding: 0 20px;
+ .doumee-filter {
+ padding-top: 20px;
+ border: 0;
+ }
+}
+
+.common-header {
+ background-color: #fff;
+ /* position: relative; */
+ /* z-index: 999; */
+ /* top: -10; */
+ /* margin: -20px; */
+ padding: 0 20px;
+
+ /* border: 1px solid red; */
.static_wrap {
height: 50px;
line-height: 50px;
@@ -271,7 +283,7 @@
padding: 0 20px;
background: #F4FAFB;
border-radius: 2px 2px 0px 0px;
- margin-bottom: 36px;
+ /* margin-bottom: 36px; */
.num {
color: #111111;
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 05ff784..08884a3 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'zhyq_interface/'
+export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
diff --git a/screen/src/assets/images/task/ic_close@2x.png b/screen/src/assets/images/task/ic_close@2x.png
new file mode 100644
index 0000000..8d62e3d
--- /dev/null
+++ b/screen/src/assets/images/task/ic_close@2x.png
Binary files differ
diff --git a/screen/src/assets/images/task/ic_yuetai@2x.png b/screen/src/assets/images/task/ic_yuetai@2x.png
new file mode 100644
index 0000000..035aa04
--- /dev/null
+++ b/screen/src/assets/images/task/ic_yuetai@2x.png
Binary files differ
diff --git a/screen/src/assets/images/task/jiankong_bg2@2x.png b/screen/src/assets/images/task/jiankong_bg2@2x.png
new file mode 100644
index 0000000..7be37ca
--- /dev/null
+++ b/screen/src/assets/images/task/jiankong_bg2@2x.png
Binary files differ
diff --git a/screen/src/views/TaskEfficiency.vue b/screen/src/views/TaskEfficiency.vue
index f71d802..2069758 100644
--- a/screen/src/views/TaskEfficiency.vue
+++ b/screen/src/views/TaskEfficiency.vue
@@ -162,8 +162,27 @@
<div class="la">棰勮瀹屾垚锛�</div>
<div class="val">{{ workModalParam.finishTimeStr }}</div>
</div>
+ <div class="priview" @click="showJk = true">鏌ョ湅瀹炴椂鐢婚潰</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 ? '鍗歌揣' : '瑁呰揣' }}</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 && workModalParam && workModalParam.deviceId" :href="workModalParam.videoPluginUrl"
+ :indexCode="workModalParam.deviceId" />
+ </div>
+ </div>
</div>
<div class="center_box_two">
<!-- <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
@@ -309,6 +328,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,
@@ -791,6 +811,7 @@
}
const showWorkModal = ref(false)
+const showJk = ref(false)
const workModalParam = ref({})
// point_icon
const pointList = [
@@ -808,6 +829,10 @@
{ left: 850, top: 60, left2: 520, top2: 190, name: '甯傚叕鍙告湀鍙�' },
]
+const closeVideo = () => {
+ workModalParam.value = {}
+ showJk.value = false
+}
const platformClick = (val) => {
const index = pointList.findIndex(i => i.name == val.platformName)
@@ -1130,6 +1155,74 @@
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 +1251,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 +1323,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