|
@@ -201,7 +201,7 @@
|
|
|
></el-image>
|
|
|
</div>
|
|
|
<div class="video_title">{{ videoPlayerName[0] }}</div>
|
|
|
- <!-- <hkv1 v-if="HKshow" :companyVideoData="VideoData"/> -->
|
|
|
+ <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> -->
|
|
|
|
|
@@ -260,7 +260,7 @@
|
|
|
<video id="videoPlayer_fourth" class="video-js" muted></video>
|
|
|
</div>
|
|
|
</div> -->
|
|
|
- <hkv v-if="HKshow" :companyVideoData="VideoData"/>
|
|
|
+ <hkv v-if="HKshow" :companyVideoData="VideoData" ref="hkv" @init="HK1Init"/>
|
|
|
<div class="center_no_data" v-if="false">
|
|
|
<el-image
|
|
|
style="width: 100px; height: 100px; margin-right: 6px"
|
|
@@ -340,6 +340,7 @@ export default {
|
|
|
return {
|
|
|
|
|
|
HKshow: false,
|
|
|
+ HK1show: false,
|
|
|
systemFinshedValue:'',
|
|
|
unitFinshedValue:'',
|
|
|
wholeOutTaskId:'',
|
|
@@ -396,11 +397,16 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
methods:{
|
|
|
-
|
|
|
+ HK1Init(){
|
|
|
+ this.HK1show = true;
|
|
|
+ },
|
|
|
jumpToHistory() {
|
|
|
// this.$refs.hk.$destroy();
|
|
|
// this.HKshow = false;
|
|
|
+
|
|
|
this.$router.push("/situationScreen")
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
// 表格样式修改
|
|
|
changeHeaderCellStyle(row,column, rowIndex, columnIndex){
|
|
@@ -464,6 +470,8 @@ export default {
|
|
|
if (success) {
|
|
|
console.log("获取任务列表", data);
|
|
|
this.taskList = data;
|
|
|
+ this.wholeOutTaskId = data[0].taskId;
|
|
|
+ this.processInstanceId = this.wholeOutTaskId;
|
|
|
this.taskOPtion = data.map((item) => {
|
|
|
return {
|
|
|
label: item.taskName,
|
|
@@ -471,8 +479,7 @@ export default {
|
|
|
};
|
|
|
});
|
|
|
|
|
|
- this.wholeOutTaskId = data[0].taskId;
|
|
|
- this.processInstanceId = this.wholeOutTaskId;
|
|
|
+
|
|
|
let param = {taskId: this.processInstanceId};
|
|
|
const res1 = await request("/dt_screen/rest/v2/task/getDefId/", "post", param, false);
|
|
|
this.processDefinitionId = res1.data;
|
|
@@ -492,6 +499,7 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error(errorMessage);
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
// 切换任务
|
|
|
async changeTask() {
|
|
@@ -805,22 +813,32 @@ export default {
|
|
|
async initUrl(subjectName) {
|
|
|
if (subjectName == '')
|
|
|
return;
|
|
|
- // if(this.playerList.length){
|
|
|
- // this.playerList.forEach((item)=>{
|
|
|
- // item.dispose()
|
|
|
- // })
|
|
|
- // }
|
|
|
+
|
|
|
let params = {
|
|
|
- subjectName: subjectName
|
|
|
+ subjectName: subjectName,
|
|
|
+ taskId: this.wholeOutTaskId
|
|
|
};
|
|
|
- const res = await request("/dt_screen/video/videos/getUnitUrl", "post", params, false);
|
|
|
+ this.currentSubject = subjectName;
|
|
|
+ const res = await request("/dt_screen/rest/v2/video/videos/getSubjectUrls", "post", params, false);
|
|
|
let index = 0;
|
|
|
this.dataSrc = ["", "", "", "", ""];
|
|
|
this.videoPlayerName = ["监控名称", "监控名称", "监控名称", "监控名称", "监控名称"];
|
|
|
- for (let item in res.data) {
|
|
|
- this.dataSrc[index] = res.data[item].url;
|
|
|
- this.videoPlayerName[index++] = res.data[item].name;
|
|
|
+ for (let item in res.data.data) {
|
|
|
+ this.dataSrc[index] = res.data.data[item].url;
|
|
|
+ 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(() => {
|
|
|
+ this.HKshow = true;
|
|
|
+
|
|
|
+ }, 800);
|
|
|
},
|
|
|
resolveUrl(url){
|
|
|
if(url ==''){
|
|
@@ -841,72 +859,44 @@ export default {
|
|
|
async changeVideo(subjectName) {
|
|
|
if (subjectName == '')
|
|
|
return;
|
|
|
- // if(this.playerList.length){
|
|
|
- // this.playerList.forEach((item)=>{
|
|
|
- // item.dispose()
|
|
|
- // })
|
|
|
- // }
|
|
|
if(subjectName != this.currentSubject) {
|
|
|
this.currentSubject = subjectName;
|
|
|
- let params = {};
|
|
|
- const res = await request("/dt_screen/video/videos/videoClose", "get", params, false);
|
|
|
- const { errorCode, errorMessage, success,data } = res.data;
|
|
|
- if (success) {
|
|
|
- setTimeout(() => {
|
|
|
- let index = 0;
|
|
|
- this.playerList.forEach((item) => {
|
|
|
- item.src([{ type: "application/x-mpegURL", src: this.dataSrc[index++] }]);
|
|
|
- item.load();
|
|
|
- item.play();
|
|
|
- });
|
|
|
- }, 5000);
|
|
|
- }
|
|
|
-
|
|
|
- // const res = request("/dt_screen/video/videos/videoClose", "get", params, false);
|
|
|
-
|
|
|
- // setTimeout(() => {
|
|
|
- // this.initUrl(subjectName);
|
|
|
- // }, 1000);
|
|
|
- // setTimeout(() => {
|
|
|
- // let index = 0;
|
|
|
- // this.playerList.forEach((item) => {
|
|
|
- // item.src([{ type: "application/x-mpegURL", src: this.dataSrc[index++] }]);
|
|
|
- // item.load();
|
|
|
- // item.play();
|
|
|
- // });
|
|
|
- // }, 5000);
|
|
|
+ this.$refs.hkv.stopAll();
|
|
|
+ this.VideoData = [];
|
|
|
+ this.initUrl(subjectName);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
|
|
|
|
|
|
- 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.getAllSystems();
|
|
|
// 建立任务的weksocket链接
|
|
|
this.initWebsoket();
|
|
|
-
|
|
|
+ // setTimeout(() => {
|
|
|
+ // this.initUrl('步坦协同课目');
|
|
|
+ // }, 1000);
|
|
|
+ // 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.currentSubject = "步坦协同课目";
|
|
|
//
|