|
@@ -201,26 +201,7 @@
|
|
></el-image>
|
|
></el-image>
|
|
</div>
|
|
</div>
|
|
<div class="video_title">{{ videoPlayerName[0] }}</div>
|
|
<div class="video_title">{{ videoPlayerName[0] }}</div>
|
|
- <hkv1 v-if="HK1show" :companyVideoData="VideoData" />
|
|
|
|
- <!-- <div class="video_body1"><HKVideo :companyVideoData="mainVideoData" :videoType="1"></HKVideo></div> -->
|
|
|
|
- <!-- <video id="videoPlayerTask" class="video-js" muted></video> -->
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- <!-- <hkv1 ref="hk1" v-if="HKshow" style="position = absolute;"/> -->
|
|
|
|
- <!-- <div><HKVideo :companyVideoData="mainVideoData"></HKVideo></div> -->
|
|
|
|
-
|
|
|
|
- <!-- <div class="center_no_data">
|
|
|
|
- <el-image
|
|
|
|
- style="width: 100px; height: 100px; margin-right:6px;"
|
|
|
|
- :src="require('../assets/img/build.png')"
|
|
|
|
- fit="contain"
|
|
|
|
- >
|
|
|
|
- </el-image>
|
|
|
|
- <div>
|
|
|
|
-
|
|
|
|
- </div>
|
|
|
|
- </div> -->
|
|
|
|
- <!-- </div> -->
|
|
|
|
|
|
+ <hk-camara v-if="HKCamaraShow" :companyVideoData="VideoData" @init="HKCardInit" />
|
|
</div>
|
|
</div>
|
|
<div class="commandMonitoring_task">
|
|
<div class="commandMonitoring_task">
|
|
<div class="map_more_box">
|
|
<div class="map_more_box">
|
|
@@ -242,25 +223,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>
|
|
|
|
- <div class="video_title">{{ videoPlayerName[1] }}</div>
|
|
|
|
- <video id="videoPlayer_first" class="video-js" muted></video>
|
|
|
|
- </div>
|
|
|
|
- <div>
|
|
|
|
- <div class="video_title">{{ videoPlayerName[2] }}</div>
|
|
|
|
- <video id="videoPlayer_second" class="video-js" muted></video>
|
|
|
|
- </div>
|
|
|
|
- <div>
|
|
|
|
- <div class="video_title">{{ videoPlayerName[3] }}</div>
|
|
|
|
- <video id="videoPlayer_third" class="video-js" muted></video>
|
|
|
|
- </div>
|
|
|
|
- <div>
|
|
|
|
- <div class="video_title">{{ videoPlayerName[4] }}</div>
|
|
|
|
- <video id="videoPlayer_fourth" class="video-js" muted></video>
|
|
|
|
- </div>
|
|
|
|
- </div> -->
|
|
|
|
- <hkv v-if="HKshow" :companyVideoData="VideoData" ref="hkv" @init="HK1Init"/>
|
|
|
|
|
|
+ <hkv v-if="HKCardShow" :companyVideoData="VideoData" ref="hkv"/>
|
|
<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"
|
|
@@ -325,7 +288,7 @@ 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 hkv from '../components/hk/hkv.vue'
|
|
-import hkv1 from '../components/hk/hkv1.vue'
|
|
|
|
|
|
+import hkCamara from '../components/hk/hkCamara.vue'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
components:{
|
|
components:{
|
|
@@ -333,14 +296,14 @@ export default {
|
|
sacleBox,
|
|
sacleBox,
|
|
myscrollBoard,
|
|
myscrollBoard,
|
|
hkv,
|
|
hkv,
|
|
- hkv1,
|
|
|
|
|
|
+ hkCamara,
|
|
FormTaskProcessViewer,
|
|
FormTaskProcessViewer,
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
|
|
- HKshow: false,
|
|
|
|
- HK1show: false,
|
|
|
|
|
|
+ HKCardShow: false,
|
|
|
|
+ HKCamaraShow: false,
|
|
systemFinshedValue:'',
|
|
systemFinshedValue:'',
|
|
unitFinshedValue:'',
|
|
unitFinshedValue:'',
|
|
wholeOutTaskId:'',
|
|
wholeOutTaskId:'',
|
|
@@ -357,7 +320,7 @@ export default {
|
|
websocketBpmn: null, //建立的连接
|
|
websocketBpmn: null, //建立的连接
|
|
updatekey:'1',
|
|
updatekey:'1',
|
|
scrollTableConfig:{
|
|
scrollTableConfig:{
|
|
- header: ['课目名称', '指令内容', '指令时间','分类', '系统'],
|
|
|
|
|
|
+ header: ['课目名称', '指令名称', '特情注入', '指令内容', '模训系统', '时间'],
|
|
waitTime:1500,
|
|
waitTime:1500,
|
|
data: [],
|
|
data: [],
|
|
columnWidth: [80],
|
|
columnWidth: [80],
|
|
@@ -397,9 +360,9 @@ export default {
|
|
};
|
|
};
|
|
},
|
|
},
|
|
methods:{
|
|
methods:{
|
|
- HK1Init(){
|
|
|
|
- this.HK1show = true;
|
|
|
|
- },
|
|
|
|
|
|
+ HKCardInit(){
|
|
|
|
+ this.HKCardshow = true;
|
|
|
|
+ },
|
|
jumpToHistory() {
|
|
jumpToHistory() {
|
|
// this.$refs.hk.$destroy();
|
|
// this.$refs.hk.$destroy();
|
|
// this.HKshow = false;
|
|
// this.HKshow = false;
|
|
@@ -465,12 +428,13 @@ export default {
|
|
// 获取任务列表
|
|
// 获取任务列表
|
|
async getTaskList() {
|
|
async getTaskList() {
|
|
let params = {};
|
|
let params = {};
|
|
- const res = await request("/dt_screen/rest/v2/task/listCurrentTask/", "post", params, false);
|
|
|
|
|
|
+ // const res = await request("/dt_screen/rest/v2/task/listCurrentTask/", "post", params, false);
|
|
|
|
+ const res = await request("/dt_screen/rest/v2/task/listRunningTasks/", "post", params, false);
|
|
const { errorCode, errorMessage, success, data } = res.data;
|
|
const { errorCode, errorMessage, success, data } = res.data;
|
|
if (success) {
|
|
if (success) {
|
|
console.log("获取任务列表", data);
|
|
console.log("获取任务列表", data);
|
|
this.taskList = data;
|
|
this.taskList = data;
|
|
- this.wholeOutTaskId = data[0].taskId;
|
|
|
|
|
|
+ this.wholeOutTaskId = data[0].taskId;
|
|
this.processInstanceId = this.wholeOutTaskId;
|
|
this.processInstanceId = this.wholeOutTaskId;
|
|
this.taskOPtion = data.map((item) => {
|
|
this.taskOPtion = data.map((item) => {
|
|
return {
|
|
return {
|
|
@@ -714,12 +678,12 @@ export default {
|
|
console.log('this.VideoData :>> ', this.VideoData);
|
|
console.log('this.VideoData :>> ', this.VideoData);
|
|
console.log('ckx debug 监控大屏' )
|
|
console.log('ckx debug 监控大屏' )
|
|
this.$router.push(
|
|
this.$router.push(
|
|
- {
|
|
|
|
- path: './monitorScreen',
|
|
|
|
- query: {
|
|
|
|
- videoData: JSON.stringify(this.VideoData)
|
|
|
|
- }
|
|
|
|
-}
|
|
|
|
|
|
+ {
|
|
|
|
+ path: './monitorScreen',
|
|
|
|
+ query: {
|
|
|
|
+ videoData: JSON.stringify(this.VideoData)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
)
|
|
)
|
|
},
|
|
},
|
|
// 退出全屏
|
|
// 退出全屏
|
|
@@ -833,50 +797,49 @@ export default {
|
|
this.dataSrc[index] = res.data.data[item].url;
|
|
this.dataSrc[index] = res.data.data[item].url;
|
|
this.videoPlayerName[index++] = res.data.data[item].name;
|
|
this.videoPlayerName[index++] = res.data.data[item].name;
|
|
}
|
|
}
|
|
- setTimeout(() => {
|
|
|
|
-
|
|
|
|
- for(let index = 0; index < this.dataSrc.length;index++)
|
|
|
|
- {
|
|
|
|
- this.VideoData.push(this.resolveUrl(this.dataSrc[index]))
|
|
|
|
- }
|
|
|
|
- }, 1000);
|
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
|
- setTimeout(() => {
|
|
|
|
- this.HKshow = true;
|
|
|
|
-
|
|
|
|
- }, 800);
|
|
|
|
|
|
+ for(let index = 0; index < this.dataSrc.length;index++)
|
|
|
|
+ {
|
|
|
|
+ this.VideoData.push(this.resolveUrl(this.dataSrc[index]))
|
|
|
|
+ }
|
|
|
|
+ }, 1000);
|
|
|
|
+
|
|
|
|
+ setTimeout(() => {
|
|
|
|
+ this.HKCardShow = true;
|
|
|
|
+ }, 800);
|
|
},
|
|
},
|
|
resolveUrl(url){
|
|
resolveUrl(url){
|
|
if(url ==''){
|
|
if(url ==''){
|
|
return;
|
|
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;
|
|
|
|
|
|
+ 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;
|
|
if(subjectName != this.currentSubject) {
|
|
if(subjectName != this.currentSubject) {
|
|
this.currentSubject = subjectName;
|
|
this.currentSubject = subjectName;
|
|
- this.$refs.hkv.stopAll();
|
|
|
|
- this.VideoData = [];
|
|
|
|
- this.initUrl(subjectName);
|
|
|
|
|
|
+ this.$refs.hkv.stopAll();
|
|
|
|
+ this.VideoData = [];
|
|
|
|
+ this.initUrl(subjectName);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
// 获取全部单位
|
|
// 获取全部单位
|
|
this.getAllUnits();
|
|
this.getAllUnits();
|
|
// 获取全部系统
|
|
// 获取全部系统
|
|
@@ -887,7 +850,7 @@ export default {
|
|
// this.initUrl('步坦协同课目');
|
|
// this.initUrl('步坦协同课目');
|
|
// }, 1000);
|
|
// }, 1000);
|
|
// setTimeout(() => {
|
|
// setTimeout(() => {
|
|
-
|
|
|
|
|
|
+
|
|
// console.log('this.dataSrc :>> ', this.dataSrc);
|
|
// console.log('this.dataSrc :>> ', this.dataSrc);
|
|
// for(let index = 0; index < this.dataSrc.length;index++)
|
|
// for(let index = 0; index < this.dataSrc.length;index++)
|
|
// {
|
|
// {
|
|
@@ -899,7 +862,7 @@ export default {
|
|
// }, 1000);
|
|
// }, 1000);
|
|
|
|
|
|
// setTimeout(() => {
|
|
// setTimeout(() => {
|
|
-
|
|
|
|
|
|
+
|
|
// this.HKshow = true;
|
|
// this.HKshow = true;
|
|
|
|
|
|
// }, 800);
|
|
// }, 800);
|