|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <v-scale-screen width="2200" height="1080" ref="screen" style="position = relative">
|
|
|
+ <v-scale-screen width="2200" height="1080">
|
|
|
<div class="task_screen_cotainer">
|
|
|
<div class="task_header">「{{ currentTaskName }}」当前态势</div>
|
|
|
<div class="tag" @click="jumpToHistory">
|
|
@@ -204,8 +204,8 @@
|
|
|
<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> -->
|
|
|
|
|
@@ -259,7 +259,7 @@
|
|
|
<div class="video_title">{{ videoPlayerName[4] }}</div>
|
|
|
<video id="videoPlayer_fourth" class="video-js" muted></video>
|
|
|
</div>
|
|
|
- </div> -->
|
|
|
+ </div> -->
|
|
|
<hkv v-if="HKshow" :companyVideoData="VideoData" ref="hkv" @init="HK1Init"/>
|
|
|
<div class="center_no_data" v-if="false">
|
|
|
<el-image
|
|
@@ -357,7 +357,7 @@ export default {
|
|
|
websocketBpmn: null, //建立的连接
|
|
|
updatekey:'1',
|
|
|
scrollTableConfig:{
|
|
|
- header: ['指令科目名称', '指令内容', '指令时间','分类', '系统'],
|
|
|
+ header: ['课目名称', '指令内容', '指令时间','分类', '系统'],
|
|
|
waitTime:1500,
|
|
|
data: [],
|
|
|
columnWidth: [80],
|
|
@@ -405,7 +405,7 @@ export default {
|
|
|
// this.HKshow = false;
|
|
|
|
|
|
this.$router.push("/situationScreen")
|
|
|
-
|
|
|
+
|
|
|
|
|
|
},
|
|
|
// 表格样式修改
|
|
@@ -499,7 +499,7 @@ export default {
|
|
|
} else {
|
|
|
this.$message.error(errorMessage);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
// 切换任务
|
|
|
async changeTask() {
|
|
@@ -555,7 +555,7 @@ export default {
|
|
|
// 获取任务的指令
|
|
|
async getinstructList (taskId) {
|
|
|
let params={}
|
|
|
- const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, 'get', params, false)
|
|
|
+ const res = await request(`/dt_screen/rest/v2/order/list/${taskId}`, 'get', params, false)
|
|
|
const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
console.log('获取任务的指令', data);
|
|
@@ -574,7 +574,10 @@ export default {
|
|
|
// 切换单位再结合任务id 获取课目课目列表
|
|
|
async getUnitSubjectList(taskId,unitId){
|
|
|
let params={}
|
|
|
- const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, 'get', params, false)
|
|
|
+ params["taskId"] = taskId
|
|
|
+ params["unitId"] = unitId
|
|
|
+ // const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, 'get', params, false)
|
|
|
+ const res = await request(`/dt_screen/rest/v2/subject/listByCondition`, 'post', params, false)
|
|
|
const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
this.subjectDatas=data
|
|
@@ -585,7 +588,10 @@ export default {
|
|
|
// 切换系统再结合任务id 获取课目课目列表
|
|
|
async getSystemSubjectList(taskId,systemId){
|
|
|
let params={}
|
|
|
- const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`, 'get', params, false)
|
|
|
+ params["taskId"] = taskId
|
|
|
+ params["systemId"] = systemId
|
|
|
+ // const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`, 'get', params, false)
|
|
|
+ const res = await request(`/dt_screen/rest/v2/subject/listByCondition`, 'post', params, false)
|
|
|
const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
this.subjectDatas=data
|