|
@@ -1,5 +1,5 @@
|
|
<template>
|
|
<template>
|
|
- <v-scale-screen width="2200" height="1080">
|
|
|
|
|
|
+ <v-scale-screen width="2200" height="1080" ref="screen" style="position = relative">
|
|
<div class="task_screen_cotainer">
|
|
<div class="task_screen_cotainer">
|
|
<div class="task_header">「{{ currentTaskName }}」当前态势</div>
|
|
<div class="task_header">「{{ currentTaskName }}」当前态势</div>
|
|
<div class="tag" @click="jumpToHistory">
|
|
<div class="tag" @click="jumpToHistory">
|
|
@@ -201,10 +201,12 @@
|
|
></el-image>
|
|
></el-image>
|
|
</div>
|
|
</div>
|
|
<div class="video_title">{{ videoPlayerName[0] }}</div>
|
|
<div class="video_title">{{ videoPlayerName[0] }}</div>
|
|
-
|
|
|
|
|
|
+ <!-- <hkv1 v-if="HKshow" :companyVideoData="VideoData"/> -->
|
|
<!-- <div class="video_body1"><HKVideo :companyVideoData="mainVideoData" :videoType="1"></HKVideo></div> -->
|
|
<!-- <div class="video_body1"><HKVideo :companyVideoData="mainVideoData" :videoType="1"></HKVideo></div> -->
|
|
- <video id="videoPlayerTask" class="video-js" muted></video>
|
|
|
|
-
|
|
|
|
|
|
+ <!-- <video id="videoPlayerTask" class="video-js" muted></video> -->
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ <!-- <hkv1 ref="hk1" v-if="HKshow" style="position = absolute;"/> -->
|
|
<!-- <div><HKVideo :companyVideoData="mainVideoData"></HKVideo></div> -->
|
|
<!-- <div><HKVideo :companyVideoData="mainVideoData"></HKVideo></div> -->
|
|
|
|
|
|
<!-- <div class="center_no_data">
|
|
<!-- <div class="center_no_data">
|
|
@@ -240,7 +242,7 @@
|
|
</div>
|
|
</div>
|
|
<!-- <div class="video_body2"><HKVideo2 :companyVideoData="mainVideoData" :videoType="2"></HKVideo2></div> -->
|
|
<!-- <div class="video_body2"><HKVideo2 :companyVideoData="mainVideoData" :videoType="2"></HKVideo2></div> -->
|
|
<div class="task_outer_cotnainer_status">
|
|
<div class="task_outer_cotnainer_status">
|
|
- <div class="video_flex_style" style="padding-top: 12px">
|
|
|
|
|
|
+ <!-- <div class="video_flex_style" style="padding-top: 12px">
|
|
<div>
|
|
<div>
|
|
<div class="video_title">{{ videoPlayerName[1] }}</div>
|
|
<div class="video_title">{{ videoPlayerName[1] }}</div>
|
|
<video id="videoPlayer_first" class="video-js" muted></video>
|
|
<video id="videoPlayer_first" class="video-js" muted></video>
|
|
@@ -257,7 +259,8 @@
|
|
<div class="video_title">{{ videoPlayerName[4] }}</div>
|
|
<div class="video_title">{{ videoPlayerName[4] }}</div>
|
|
<video id="videoPlayer_fourth" class="video-js" muted></video>
|
|
<video id="videoPlayer_fourth" class="video-js" muted></video>
|
|
</div>
|
|
</div>
|
|
- </div>
|
|
|
|
|
|
+ </div> -->
|
|
|
|
+ <hkv v-if="HKshow" :companyVideoData="VideoData"/>
|
|
<div class="center_no_data" v-if="false">
|
|
<div class="center_no_data" v-if="false">
|
|
<el-image
|
|
<el-image
|
|
style="width: 100px; height: 100px; margin-right: 6px"
|
|
style="width: 100px; height: 100px; margin-right: 6px"
|
|
@@ -321,17 +324,22 @@ var uploadedDataURL = require('../../public/json/taiyuan.json')
|
|
import './taskScreen.css'
|
|
import './taskScreen.css'
|
|
import Videojs from "video.js"; // 引入Videojs
|
|
import Videojs from "video.js"; // 引入Videojs
|
|
import FormTaskProcessViewer from '../components/workflow/formTaskProcessViewer.vue';
|
|
import FormTaskProcessViewer from '../components/workflow/formTaskProcessViewer.vue';
|
|
|
|
+import hkv from '../components/hk/hkv.vue'
|
|
|
|
+import hkv1 from '../components/hk/hkv1.vue'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
components:{
|
|
components:{
|
|
myFlylineChartEnhanced,
|
|
myFlylineChartEnhanced,
|
|
sacleBox,
|
|
sacleBox,
|
|
myscrollBoard,
|
|
myscrollBoard,
|
|
-
|
|
|
|
- FormTaskProcessViewer
|
|
|
|
|
|
+ hkv,
|
|
|
|
+ hkv1,
|
|
|
|
+ FormTaskProcessViewer,
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+
|
|
|
|
+ HKshow: false,
|
|
systemFinshedValue:'',
|
|
systemFinshedValue:'',
|
|
unitFinshedValue:'',
|
|
unitFinshedValue:'',
|
|
wholeOutTaskId:'',
|
|
wholeOutTaskId:'',
|
|
@@ -383,11 +391,15 @@ export default {
|
|
"videoPlayer_fourth"
|
|
"videoPlayer_fourth"
|
|
],
|
|
],
|
|
mainVideoData: {},
|
|
mainVideoData: {},
|
|
- currentSubject: ''
|
|
|
|
|
|
+ currentSubject: '',
|
|
|
|
+ VideoData:[],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
methods:{
|
|
methods:{
|
|
|
|
+
|
|
jumpToHistory() {
|
|
jumpToHistory() {
|
|
|
|
+ // this.$refs.hk.$destroy();
|
|
|
|
+ // this.HKshow = false;
|
|
this.$router.push("/situationScreen")
|
|
this.$router.push("/situationScreen")
|
|
},
|
|
},
|
|
// 表格样式修改
|
|
// 表格样式修改
|
|
@@ -685,8 +697,16 @@ export default {
|
|
},
|
|
},
|
|
// 全屏事件
|
|
// 全屏事件
|
|
showFull(id){
|
|
showFull(id){
|
|
|
|
+ console.log('this.VideoData :>> ', this.VideoData);
|
|
console.log('ckx debug 监控大屏' )
|
|
console.log('ckx debug 监控大屏' )
|
|
- this.$router.push('/monitorScreen')
|
|
|
|
|
|
+ this.$router.push(
|
|
|
|
+ {
|
|
|
|
+ path: './monitorScreen',
|
|
|
|
+ query: {
|
|
|
|
+ videoData: JSON.stringify(this.VideoData)
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+ )
|
|
},
|
|
},
|
|
// 退出全屏
|
|
// 退出全屏
|
|
exitFull(){
|
|
exitFull(){
|
|
@@ -802,7 +822,22 @@ export default {
|
|
this.videoPlayerName[index++] = res.data[item].name;
|
|
this.videoPlayerName[index++] = res.data[item].name;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+ resolveUrl(url){
|
|
|
|
+ if(url ==''){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ let data = {};
|
|
|
|
+ url = url.split("/");
|
|
|
|
+ url = url[2];
|
|
|
|
+ url = url.split(":");
|
|
|
|
+ data.Username = url[0];
|
|
|
|
+ data.Port = 80;
|
|
|
|
+ url = url[1];
|
|
|
|
+ url = url.split("@");
|
|
|
|
+ data.ip = url[1];
|
|
|
|
+ data.Password = url[0];
|
|
|
|
+ return data;
|
|
|
|
+ },
|
|
async changeVideo(subjectName) {
|
|
async changeVideo(subjectName) {
|
|
if (subjectName == '')
|
|
if (subjectName == '')
|
|
return;
|
|
return;
|
|
@@ -846,26 +881,33 @@ export default {
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
|
|
|
|
- // let url = "rtsp://admin:sgw123456@192.168.0.64:554/h265/ch01/main/av_stream";
|
|
|
|
- // url = url.split("/");
|
|
|
|
- // url = url[2];
|
|
|
|
- // url = url.split(":");
|
|
|
|
- // this.mainVideoData.Username = url[0];
|
|
|
|
- // this.mainVideoData.Port = url[2];
|
|
|
|
- // url = url[1];
|
|
|
|
- // url = url.split("@");
|
|
|
|
- // this.mainVideoData.IP = url[1];
|
|
|
|
- // this.mainVideoData.Password = url[0];
|
|
|
|
- // console.log("this.mainVideoData :>> ", this.mainVideoData);
|
|
|
|
|
|
|
|
|
|
+ this.initUrl('步坦协同课目');
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+
|
|
|
|
+ console.log('this.dataSrc :>> ', this.dataSrc);
|
|
|
|
+ for(let index = 0; index < this.dataSrc.length;index++)
|
|
|
|
+ {
|
|
|
|
+ this.VideoData.push(this.resolveUrl(this.dataSrc[index]))
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ console.log('this.VideoData :>> ', this.VideoData);
|
|
|
|
+
|
|
|
|
+ }, 1000);
|
|
|
|
+
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+
|
|
|
|
+ this.HKshow = true;
|
|
|
|
+
|
|
|
|
+ }, 800);
|
|
// 获取全部单位
|
|
// 获取全部单位
|
|
this.getAllUnits();
|
|
this.getAllUnits();
|
|
// 获取全部系统
|
|
// 获取全部系统
|
|
this.getAllSystems();
|
|
this.getAllSystems();
|
|
// 建立任务的weksocket链接
|
|
// 建立任务的weksocket链接
|
|
this.initWebsoket();
|
|
this.initWebsoket();
|
|
|
|
+
|
|
|
|
|
|
- // this.initUrl()
|
|
|
|
// this.currentSubject = "步坦协同课目";
|
|
// this.currentSubject = "步坦协同课目";
|
|
//
|
|
//
|
|
// // // 过14秒调用
|
|
// // // 过14秒调用
|
|
@@ -877,6 +919,8 @@ export default {
|
|
// }, 5000);
|
|
// }, 5000);
|
|
},
|
|
},
|
|
beforeDestroy() {
|
|
beforeDestroy() {
|
|
|
|
+ this.HKshow = false;
|
|
|
|
+
|
|
if (this.playerList.length) {
|
|
if (this.playerList.length) {
|
|
this.playerList.forEach((item) => {
|
|
this.playerList.forEach((item) => {
|
|
item.dispose();
|
|
item.dispose();
|