|
|
@@ -1,12 +1,13 @@
|
|
|
<template>
|
|
|
<v-scale-screen width="2200" height="1080">
|
|
|
- <div class="task_screen_cotainer">
|
|
|
- <div class="task_header">「{{ currentTaskName }}」任务态势大屏
|
|
|
- <el-button @click="changeVideo"></el-button>
|
|
|
+ <div class="task_screen_cotainer">
|
|
|
+ <div class="task_header">「{{ currentTaskName }}」当前态势</div>
|
|
|
+ <div class="tag" @click="jumpToHistory">
|
|
|
+ 历史态势
|
|
|
</div>
|
|
|
<div class="content_cotainer">
|
|
|
<div class="center_chart_cotainer_task" id="taskItem">
|
|
|
- <div class="task_detail_cotainer_task" style="width: 100%">
|
|
|
+ <div class="task_detail_cotainer_task" style="width:100%;">
|
|
|
<div v-if="false" class="header_line_style">
|
|
|
<div class="headerTitle"></div>
|
|
|
</div>
|
|
|
@@ -16,7 +17,7 @@
|
|
|
<el-select
|
|
|
v-model="wholeOutTaskId"
|
|
|
placeholder="「切换任务」"
|
|
|
- style="width: 270px"
|
|
|
+ style="width:270px;"
|
|
|
@change="changeTask"
|
|
|
filterable
|
|
|
>
|
|
|
@@ -25,41 +26,47 @@
|
|
|
:key="item.value"
|
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
|
- ></el-option>
|
|
|
+
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
<el-image
|
|
|
+
|
|
|
@click="showMoreInfo('more')"
|
|
|
class="showLessStyle"
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px; margin-left: 10px"
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px; margin-left: 10px;"
|
|
|
:src="require('../assets/img/small.svg')"
|
|
|
fit="contain"
|
|
|
- ></el-image>
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
<el-image
|
|
|
v-if="false"
|
|
|
@click="showMoreInfo('less')"
|
|
|
:src="require('../assets/img/iconMore.svg')"
|
|
|
fit="contain"
|
|
|
class="showLessStyle"
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px; margin-left: 10px"
|
|
|
- ></el-image>
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px; margin-left: 10px;"
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
</div>
|
|
|
<div class="task_header_top">
|
|
|
<div class="subject_task_item_task">
|
|
|
<div class="task_outer_cotnainer_status">
|
|
|
<div class="map_more_box">
|
|
|
- <div class="task_list_header" style="font-size: 16px; margin: 0 24px 8px 0; white-space: nowrap">
|
|
|
+ <div class="task_list_header" style="font-size:16px; margin: 0 24px 8px 0; white-space: nowrap; ">
|
|
|
<el-image
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px"
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px;"
|
|
|
:src="require('../assets/img/rightIcon.svg')"
|
|
|
fit="contain"
|
|
|
- ></el-image>
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
课目分布
|
|
|
</div>
|
|
|
<div class="select_lsit_box">
|
|
|
<el-select
|
|
|
v-model="systemSubjectId"
|
|
|
placeholder="切换系统名称"
|
|
|
- style="width: 55%; margin-right: 5px"
|
|
|
+ style="width:55%; margin-right:5px;"
|
|
|
@change="changeTaskAndSystem"
|
|
|
clearable
|
|
|
filterable
|
|
|
@@ -69,12 +76,14 @@
|
|
|
:key="item.value"
|
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
|
- ></el-option>
|
|
|
+
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
<el-select
|
|
|
v-model="unitSubjectValue"
|
|
|
placeholder="切换单位名称"
|
|
|
- style="width: 55%"
|
|
|
+ style="width:55%;"
|
|
|
clearable
|
|
|
@change="changeTaskAndUnit"
|
|
|
filterable
|
|
|
@@ -84,51 +93,60 @@
|
|
|
:key="item.value"
|
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
|
- ></el-option>
|
|
|
+
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="subject_list_container" id="subjectList">
|
|
|
- <template v-for="(item, index) in subjectDatas">
|
|
|
+ <template v-for="(item,index) in subjectDatas">
|
|
|
<div class="subject_list_item_new" :key="index" @click="changeVideo(item.subjectName)">
|
|
|
<div class="subject_list_header">
|
|
|
<div>
|
|
|
<div class="subject_list_name">
|
|
|
- {{ item.subjectName || "-" }}
|
|
|
+ {{ item.subjectName ||'-' }}
|
|
|
</div>
|
|
|
<div class="orgainzers">
|
|
|
- 参与人员：{{ (item.participatingPeople && item.participatingPeople.join(",")) || "-" }}
|
|
|
+ 参与人员：{{ item.participatingPeople && item.participatingPeople.join(',') || '-' }}
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-image
|
|
|
- style="width: 36px; height: 36px"
|
|
|
+ style="width: 36px; height: 36px; "
|
|
|
:src="subjectMap[item.status]"
|
|
|
fit="contain"
|
|
|
- ></el-image>
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
</div>
|
|
|
<div class="system_task_style">
|
|
|
- <div>
|
|
|
- 参加系统：{{ (item.participatingSystems && item.participatingSystems.join(",")) || "-" }}
|
|
|
- </div>
|
|
|
- <div v-if="item.status == '已完成'" class="view_table_style" @click="viewManData(item)">
|
|
|
+ <div>参加系统：{{ item.participatingSystems && item.participatingSystems.join(',') || '-'}}</div>
|
|
|
+ <div
|
|
|
+ v-if="item.status=='已完成'"
|
|
|
+ class="view_table_style"
|
|
|
+ @click="viewManData(item)">
|
|
|
表格查看
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
+
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
<div class="unit_map_box_task_new">
|
|
|
<div class="map_more_box">
|
|
|
- <div class="task_list_header" style="font-size: 16px; margin-bottom: 8px">
|
|
|
+ <div class="task_list_header" style="font-size:16px; margin-bottom:8px;">
|
|
|
<el-image
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px"
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px;"
|
|
|
:src="require('../assets/img/rightIcon.svg')"
|
|
|
fit="contain"
|
|
|
- ></el-image>
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
流程图
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
<form-task-process-viewer
|
|
|
:processInstanceId="processInstanceId"
|
|
|
@@ -136,18 +154,20 @@
|
|
|
v-if="isReady"
|
|
|
></form-task-process-viewer>
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
<div class="task_header_footer_task_new">
|
|
|
- <div class="subject_task_item_task" style="width: 28.2%">
|
|
|
+ <div class="subject_task_item_task" style="width:28.2%;">
|
|
|
<div class="task_outer_cotnainer_status">
|
|
|
<div class="task_outer_cotnainer_status">
|
|
|
<div class="map_more_box">
|
|
|
- <div class="task_list_header" style="font-size: 16px; margin-bottom: 8px">
|
|
|
+ <div class="task_list_header" style="font-size:16px; margin-bottom:8px;">
|
|
|
<el-image
|
|
|
- style="width: 30px; height: 22px; margin-right: 6px"
|
|
|
+ style="width: 30px; height: 22px; margin-right:6px;"
|
|
|
:src="require('../assets/img/rightIcon.svg')"
|
|
|
fit="contain"
|
|
|
- ></el-image>
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
指令监控
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -290,58 +310,55 @@
|
|
|
</v-scale-screen>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import * as echarts from "echarts";
|
|
|
-import myFlylineChartEnhanced from "../components/my-flyline-chart-enhanced/index";
|
|
|
-import formTaskProcessViewer from "@/components/workflow/formTaskProcessViewer";
|
|
|
-import myscrollBoard from "../components/myscroll-board/src/main";
|
|
|
-import sacleBox from "../components/sacle-box/index";
|
|
|
-import { request } from "../utils/request";
|
|
|
-var uploadedDataURL = require("../../public/json/taiyuan.json");
|
|
|
-import "./taskScreen.css";
|
|
|
+import * as echarts from 'echarts';
|
|
|
+import myFlylineChartEnhanced from '../components/my-flyline-chart-enhanced/index'
|
|
|
+import formTaskProcessViewer from '@/components/workflow/formTaskProcessViewer'
|
|
|
+import myscrollBoard from '../components/myscroll-board/src/main'
|
|
|
+import sacleBox from '../components/sacle-box/index'
|
|
|
+import { request } from '../utils/request';
|
|
|
+var uploadedDataURL = require('../../public/json/taiyuan.json')
|
|
|
+import './taskScreen.css'
|
|
|
import Videojs from "video.js"; // 引入Videojs
|
|
|
-import FormTaskProcessViewer from "../components/workflow/formTaskProcessViewer.vue";
|
|
|
-import HKVideo from "../components/HKVS/hkv.vue";
|
|
|
-import HKVideo2 from "../components/HKVS/hkv2.vue"
|
|
|
+import FormTaskProcessViewer from '../components/workflow/formTaskProcessViewer.vue';
|
|
|
|
|
|
export default {
|
|
|
- components: {
|
|
|
+ components:{
|
|
|
myFlylineChartEnhanced,
|
|
|
sacleBox,
|
|
|
myscrollBoard,
|
|
|
- HKVideo,
|
|
|
- HKVideo2,
|
|
|
+
|
|
|
FormTaskProcessViewer
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- systemFinshedValue: "",
|
|
|
- unitFinshedValue: "",
|
|
|
- wholeOutTaskId: "",
|
|
|
- systemSubjectId: "",
|
|
|
- unitSubjectValue: "",
|
|
|
- subjectItem: {},
|
|
|
+ systemFinshedValue:'',
|
|
|
+ unitFinshedValue:'',
|
|
|
+ wholeOutTaskId:'',
|
|
|
+ systemSubjectId:'',
|
|
|
+ unitSubjectValue:'',
|
|
|
+ subjectItem:{},
|
|
|
processDefinitionId: "",
|
|
|
- processInstanceId: "",
|
|
|
- moreFlag: true,
|
|
|
- dialogVisible: false,
|
|
|
- taskList: [],
|
|
|
+ processInstanceId:"",
|
|
|
+ moreFlag:true,
|
|
|
+ dialogVisible:false,
|
|
|
+ taskList:[],
|
|
|
websocket: null, //建立的连接
|
|
|
websocketOrder: null, //建立的连接
|
|
|
- updatekey: "1",
|
|
|
- scrollTableConfig: {
|
|
|
- header: ["指令名称", "指令内容", "指令时间"],
|
|
|
- waitTime: 1500,
|
|
|
+ updatekey:'1',
|
|
|
+ scrollTableConfig:{
|
|
|
+ header: ['指令名称', '指令内容', '指令时间'],
|
|
|
+ waitTime:1500,
|
|
|
data: [],
|
|
|
columnWidth: [80],
|
|
|
- oddRowBGC: "#072347",
|
|
|
- evenRowBGC: "#021736"
|
|
|
+ oddRowBGC:'#072347',
|
|
|
+ evenRowBGC:'#021736'
|
|
|
},
|
|
|
- dialogType: 1,
|
|
|
- subjectDatas: [],
|
|
|
- subjectMap: {
|
|
|
- 待执行: require("../assets/img/waite.png"),
|
|
|
- 执行中: require("../assets/img/doing.png"),
|
|
|
- 已完成: require("../assets/img/finshed.png")
|
|
|
+ dialogType:1,
|
|
|
+ subjectDatas:[],
|
|
|
+ subjectMap:{
|
|
|
+ '待执行':require('../assets/img/waite.png'),
|
|
|
+ '执行中':require('../assets/img/doing.png'),
|
|
|
+ '已完成':require('../assets/img/finshed.png') ,
|
|
|
},
|
|
|
instructList: [],
|
|
|
unitOption: [],
|
|
|
@@ -366,59 +383,62 @@ export default {
|
|
|
mainVideoData: {}
|
|
|
};
|
|
|
},
|
|
|
- methods: {
|
|
|
+ methods:{
|
|
|
+ jumpToHistory() {
|
|
|
+ this.$router.push("/situationScreen")
|
|
|
+ },
|
|
|
// 表格样式修改
|
|
|
- changeHeaderCellStyle(row, column, rowIndex, columnIndex) {
|
|
|
- if (row.columnIndex === 0) {
|
|
|
- return "background: #004279 ; color:#fff;"; // 修改的样式
|
|
|
- } else {
|
|
|
- return "background: #004279 ;color:#fff; ";
|
|
|
+ changeHeaderCellStyle(row,column, rowIndex, columnIndex){
|
|
|
+ if(row.columnIndex === 0){
|
|
|
+ return 'background: #004279 ; color:#fff;'; // 修改的样式
|
|
|
+ }else {
|
|
|
+ return 'background: #004279 ;color:#fff; ';
|
|
|
}
|
|
|
},
|
|
|
- changeCellStyle(row, column, rowIndex, columnIndex) {
|
|
|
- if (row.columnIndex === 0) {
|
|
|
- return "background: #0A427C ; color:#fff;"; // 修改的样式
|
|
|
- } else {
|
|
|
- return "background: #0A427C ; color:#fff;";
|
|
|
+ changeCellStyle(row,column, rowIndex, columnIndex){
|
|
|
+ if(row.columnIndex === 0){
|
|
|
+ return 'background: #0A427C ; color:#fff;'; // 修改的样式
|
|
|
+ }else {
|
|
|
+ return 'background: #0A427C ; color:#fff;';
|
|
|
}
|
|
|
},
|
|
|
// 获取全部系统
|
|
|
- async getAllSystems() {
|
|
|
- let params = {};
|
|
|
- const res = await request("/dt_screen/rest/v1/screen/listSystem/", "get", params, false);
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getAllSystems(){
|
|
|
+ let params={}
|
|
|
+ const res = await request('/dt_screen/rest/v1/screen/listSystem/', 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- console.log("获取全部系统", data);
|
|
|
- this.systemOption = data.map((item) => {
|
|
|
+ console.log('获取全部系统', data);
|
|
|
+ this.systemOption = data.map((item)=>{
|
|
|
return {
|
|
|
- label: item.systemName,
|
|
|
+ label:item.systemName,
|
|
|
value: item.systemId
|
|
|
- };
|
|
|
- });
|
|
|
- this.systemFinshedValue = this.systemOption[0].value;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.systemFinshedValue=this.systemOption[0].value
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 获取全部单位
|
|
|
- async getAllUnits() {
|
|
|
- let params = {};
|
|
|
- const res = await request("/dt_screen/rest/v1/screen/listUnit/", "get", params, false);
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getAllUnits (){
|
|
|
+ let params={}
|
|
|
+ const res = await request('/dt_screen/rest/v1/screen/listUnit/', 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- console.log("获取全部单位", data);
|
|
|
+ console.log('获取全部单位', data);
|
|
|
// 获取任务数据
|
|
|
- this.getTaskList();
|
|
|
- this.unitOption = data.map((item) => {
|
|
|
+ this.getTaskList()
|
|
|
+ this.unitOption = data.map((item)=>{
|
|
|
return {
|
|
|
- label: item.unitName,
|
|
|
+ label:item.unitName,
|
|
|
value: item.unitId
|
|
|
- };
|
|
|
- });
|
|
|
- this.unitFinshedValue = this.unitOption[0].value;
|
|
|
- this.unitSubGradeValue = this.unitOption[0].value;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.unitFinshedValue=this.unitOption[0].value
|
|
|
+ this.unitSubGradeValue=this.unitOption[0].value
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 获取任务列表
|
|
|
@@ -480,81 +500,78 @@ export default {
|
|
|
this.initInstructWebsoket();
|
|
|
},
|
|
|
changeTaskAndUnit() {
|
|
|
- this.systemSubjectId = "";
|
|
|
- if (this.unitSubjectValue) {
|
|
|
- this.getUnitSubjectList(this.wholeOutTaskId, this.unitSubjectValue);
|
|
|
- } else {
|
|
|
- this.getSubjectList(this.wholeOutTaskId);
|
|
|
+ this.systemSubjectId=''
|
|
|
+ if(this.unitSubjectValue){
|
|
|
+ this.getUnitSubjectList(this.wholeOutTaskId, this.unitSubjectValue)
|
|
|
+ }else {
|
|
|
+ this.getSubjectList(this.wholeOutTaskId)
|
|
|
}
|
|
|
},
|
|
|
changeTaskAndSystem() {
|
|
|
- this.unitSubjectValue = "";
|
|
|
- if (this.systemSubjectId) {
|
|
|
- this.getSystemSubjectList(this.wholeOutTaskId, this.systemSubjectId);
|
|
|
- } else {
|
|
|
- this.getSubjectList(this.wholeOutTaskId);
|
|
|
+ this.unitSubjectValue=''
|
|
|
+ if(this.systemSubjectId){
|
|
|
+ this.getSystemSubjectList(this.wholeOutTaskId, this.systemSubjectId)
|
|
|
+ }else {
|
|
|
+ this.getSubjectList(this.wholeOutTaskId)
|
|
|
}
|
|
|
},
|
|
|
// 获取任务的课目信息
|
|
|
- async getSubjectList(taskId) {
|
|
|
- let params = {};
|
|
|
- const res = await request(`/dt_screen/rest/v1/subject/list/${taskId}`, "get", params, false);
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getSubjectList(taskId){
|
|
|
+ let params={}
|
|
|
+ const res = await request(`/dt_screen/rest/v1/subject/list/${taskId}`, 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- console.log("获取任务的课目信息", data);
|
|
|
- this.subjectDatas = data;
|
|
|
+ console.log('获取任务的课目信息', data);
|
|
|
+ this.subjectDatas=data
|
|
|
+
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 获取任务的指令
|
|
|
- async getinstructList(taskId) {
|
|
|
- let params = {};
|
|
|
- const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, "get", params, false);
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getinstructList (taskId) {
|
|
|
+ let params={}
|
|
|
+ const res = await request(`/dt_screen/rest/v1/order/list/${taskId}`, 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- console.log("获取任务的指令", data);
|
|
|
- this.instructList = data;
|
|
|
- let tempData = [];
|
|
|
- data.forEach((item) => {
|
|
|
- tempData.push([item.subjectName, item.content, item.time]);
|
|
|
- });
|
|
|
- this.scrollTableConfig.data = tempData;
|
|
|
- this.updatekey = new Date().getTime();
|
|
|
+ console.log('获取任务的指令', data);
|
|
|
+ this.instructList=data
|
|
|
+ let tempData=[]
|
|
|
+ data.forEach((item)=>{
|
|
|
+ tempData.push([item.subjectName,item.content,item.time])
|
|
|
+ })
|
|
|
+ this.scrollTableConfig.data=tempData
|
|
|
+ this.updatekey=new Date().getTime()
|
|
|
+
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 切换单位再结合任务id 获取课目课目列表
|
|
|
- async getUnitSubjectList(taskId, unitId) {
|
|
|
- let params = {};
|
|
|
- const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, "get", params, false);
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getUnitSubjectList(taskId,unitId){
|
|
|
+ let params={}
|
|
|
+ const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/unit/${unitId}`, 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- this.subjectDatas = data;
|
|
|
+ this.subjectDatas=data
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 切换系统再结合任务id 获取课目课目列表
|
|
|
- async getSystemSubjectList(taskId, systemId) {
|
|
|
- let params = {};
|
|
|
- const res = await request(
|
|
|
- `/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`,
|
|
|
- "get",
|
|
|
- params,
|
|
|
- false
|
|
|
- );
|
|
|
- const { errorCode, errorMessage, success, data } = res.data;
|
|
|
+ async getSystemSubjectList(taskId,systemId){
|
|
|
+ let params={}
|
|
|
+ const res = await request(`/dt_screen/rest/v1/subject/list/task/${taskId}/system/${systemId}`, 'get', params, false)
|
|
|
+ const { errorCode, errorMessage, success,data } = res.data;
|
|
|
if (success) {
|
|
|
- this.subjectDatas = data;
|
|
|
+ this.subjectDatas=data
|
|
|
} else {
|
|
|
- this.$message.error(errorMessage);
|
|
|
+ this.$message.error(errorMessage)
|
|
|
}
|
|
|
},
|
|
|
// 建立websocket 链接 任务
|
|
|
- initWebsoket() {
|
|
|
- this.websocket = new WebSocket("ws://43.143.221.128:8084/websocket/task"); //这里将http替换成ws
|
|
|
+ initWebsoket(){
|
|
|
+ this.websocket = new WebSocket(`ws://${this.$store.state.webSocketIp}:${this.$store.state.webSocketPort}/websocket/task`);//这里将http替换成ws
|
|
|
switch (this.websocket.readyState) {
|
|
|
case 0:
|
|
|
console.log("正在连接");
|
|
|
@@ -568,28 +585,28 @@ export default {
|
|
|
case 3:
|
|
|
console.log("连接已关闭或者没有链接成功");
|
|
|
break;
|
|
|
- }
|
|
|
- this.websocket.onopen = this.websocketsend; //websoket连接成功
|
|
|
- this.websocket.onmessage = this.websocketonmessage; //websoket收到信息
|
|
|
- this.websocket.onclose = this.websocketclose; //websoket连接关闭
|
|
|
+ };
|
|
|
+ this.websocket.onopen = this.websocketsend;//websoket连接成功
|
|
|
+ this.websocket.onmessage =this. websocketonmessage;//websoket收到信息
|
|
|
+ this.websocket.onclose = this.websocketclose;//websoket连接关闭
|
|
|
},
|
|
|
- websocketsend() {
|
|
|
- console.log("ws 连接成功");
|
|
|
+ websocketsend(){
|
|
|
+ console.log('ws 连接成功');
|
|
|
},
|
|
|
- websocketonmessage(msg) {
|
|
|
+ websocketonmessage(msg){
|
|
|
// 获取全部单位
|
|
|
- this.getAllUnits();
|
|
|
+ this.getAllUnits()
|
|
|
// 获取全部系统
|
|
|
- this.getAllSystems();
|
|
|
- console.log("收到任务信息", msg);
|
|
|
+ this.getAllSystems()
|
|
|
+ console.log('收到任务信息',msg);
|
|
|
},
|
|
|
- websocketclose() {
|
|
|
- console.log("ws 连接关闭");
|
|
|
- this.initWebsoket(); //重新建立连接
|
|
|
+ websocketclose(){
|
|
|
+ console.log('ws 连接关闭');
|
|
|
+ this.initWebsoket();//重新建立连接
|
|
|
},
|
|
|
- initInstructWebsoket() {
|
|
|
+ initInstructWebsoket(){
|
|
|
// 指令的ws
|
|
|
- this.websocketOrder = new WebSocket(`ws://43.143.221.128:8084/websocket/order/${this.wholeOutTaskId}`); //这里将http替换成ws
|
|
|
+ this.websocketOrder = new WebSocket(`ws://${this.$store.state.webSocketIp}:${this.$store.state.webSocketPort}/websocket/order/${this.wholeOutTaskId}`);//这里将http替换成ws
|
|
|
switch (this.websocketOrder.readyState) {
|
|
|
case 0:
|
|
|
console.log("正在连接");
|
|
|
@@ -603,38 +620,38 @@ export default {
|
|
|
case 3:
|
|
|
console.log("连接已关闭或者没有链接成功");
|
|
|
break;
|
|
|
- }
|
|
|
- this.websocketOrder.onopen = this.orderWebsocketsend; //websoket连接成功
|
|
|
- this.websocketOrder.onmessage = this.orderWebsocketonmessage; //websoket收到信息
|
|
|
- this.websocketOrder.onclose = this.orderWebsocketclose; //websoket连接关闭
|
|
|
+ };
|
|
|
+ this.websocketOrder.onopen = this.orderWebsocketsend;//websoket连接成功
|
|
|
+ this.websocketOrder.onmessage =this. orderWebsocketonmessage;//websoket收到信息
|
|
|
+ this.websocketOrder.onclose = this.orderWebsocketclose;//websoket连接关闭
|
|
|
},
|
|
|
- orderWebsocketsend() {
|
|
|
- console.log("ws 连接成功");
|
|
|
+ orderWebsocketsend(){
|
|
|
+ console.log('ws 连接成功');
|
|
|
},
|
|
|
- orderWebsocketonmessage(msg) {
|
|
|
+ orderWebsocketonmessage(msg){
|
|
|
// 获取任务的指令信息
|
|
|
- this.getinstructList(this.wholeOutTaskId);
|
|
|
- console.log("收到指令信息", msg);
|
|
|
+ this.getinstructList(this.wholeOutTaskId)
|
|
|
+ console.log('收到指令信息',msg);
|
|
|
},
|
|
|
- orderWebsocketclose() {
|
|
|
- console.log("ws 连接关闭");
|
|
|
- this.initInstructWebsoket(); //重新建立连接
|
|
|
+ orderWebsocketclose(){
|
|
|
+ console.log('ws 连接关闭');
|
|
|
+ this.initInstructWebsoket();//重新建立连接
|
|
|
},
|
|
|
// 查看成绩表格
|
|
|
- viewManData(item) {
|
|
|
- this.dialogType = 2;
|
|
|
- this.dialogVisible = true;
|
|
|
- console.log("item", item);
|
|
|
- const { subjectScore } = item;
|
|
|
- this.gridData = subjectScore;
|
|
|
+ viewManData(item){
|
|
|
+ this.dialogType=2
|
|
|
+ this.dialogVisible=true
|
|
|
+ console.log('item',item);
|
|
|
+ const { subjectScore } = item
|
|
|
+ this.gridData=subjectScore
|
|
|
},
|
|
|
// 全屏事件
|
|
|
- showFull(id) {
|
|
|
- console.log("ckx debug 监控大屏");
|
|
|
- this.$router.push("/monitorScreen");
|
|
|
+ showFull(id){
|
|
|
+ console.log('ckx debug 监控大屏' )
|
|
|
+ this.$router.push('/monitorScreen')
|
|
|
},
|
|
|
// 退出全屏
|
|
|
- exitFull() {
|
|
|
+ exitFull(){
|
|
|
let exitFullScreen =
|
|
|
document.exitFullScreen ||
|
|
|
document.mozCancelFullScreen ||
|
|
|
@@ -643,14 +660,17 @@ export default {
|
|
|
if (exitFullScreen) {
|
|
|
exitFullScreen.call(document);
|
|
|
}
|
|
|
- this.updatekey = new Date().getTime();
|
|
|
+ this.updatekey=new Date().getTime()
|
|
|
},
|
|
|
// 展开全屏
|
|
|
- requestFullScreen(elem) {
|
|
|
- console.log("ckx debug ");
|
|
|
+ requestFullScreen(elem){
|
|
|
+ console.log('ckx debug ', )
|
|
|
// #兼容不同的浏览器
|
|
|
var requestMethod =
|
|
|
- elem.requestFullScreen || elem.webkitRequestFullScreen || elem.mozRequestFullScreen || elem.msRequestFullScreen;
|
|
|
+ elem.requestFullScreen ||
|
|
|
+ elem.webkitRequestFullScreen ||
|
|
|
+ elem.mozRequestFullScreen ||
|
|
|
+ elem.msRequestFullScreen;
|
|
|
if (requestMethod) {
|
|
|
requestMethod.call(elem);
|
|
|
} else if (typeof window.ActiveXObject !== "undefined") {
|
|
|
@@ -660,50 +680,48 @@ export default {
|
|
|
wscript.SendKeys("{F11}");
|
|
|
}
|
|
|
}
|
|
|
- let that = this;
|
|
|
- window.addEventListener("resize", function () {
|
|
|
- //执行
|
|
|
- let isFull =
|
|
|
- document.mozFullScreen ||
|
|
|
+ let that =this
|
|
|
+ window.addEventListener('resize',function () {//执行
|
|
|
+ let isFull = document.mozFullScreen ||
|
|
|
document.fullScreen ||
|
|
|
//谷歌浏览器及Webkit内核浏览器
|
|
|
document.webkitIsFullScreen ||
|
|
|
document.webkitRequestFullScreen ||
|
|
|
document.mozRequestFullScreen ||
|
|
|
- document.msFullscreenEnabled;
|
|
|
+ document.msFullscreenEnabled
|
|
|
if (isFull === undefined) {
|
|
|
- that.exitFull();
|
|
|
- } else {
|
|
|
+ that.exitFull()
|
|
|
+ }else {
|
|
|
+
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
checkFull() {
|
|
|
//判断浏览器是否处于全屏状态 （需要考虑兼容问题）
|
|
|
//火狐浏览器
|
|
|
- let isFull =
|
|
|
- document.mozFullScreen ||
|
|
|
+ let isFull = document.mozFullScreen ||
|
|
|
document.fullScreen ||
|
|
|
//谷歌浏览器及Webkit内核浏览器
|
|
|
document.webkitIsFullScreen ||
|
|
|
document.webkitRequestFullScreen ||
|
|
|
document.mozRequestFullScreen ||
|
|
|
- document.msFullscreenEnabled;
|
|
|
+ document.msFullscreenEnabled
|
|
|
if (isFull === undefined) {
|
|
|
- isFull = false;
|
|
|
+ isFull = false
|
|
|
}
|
|
|
return isFull;
|
|
|
},
|
|
|
- showMoreInfo(type) {
|
|
|
- if (type == "more") {
|
|
|
- this.$router.push("/situationScreen");
|
|
|
- } else {
|
|
|
- this.$router.push("/taskScreen");
|
|
|
+ showMoreInfo(type){
|
|
|
+ if(type=='more'){
|
|
|
+ this.$router.push('/situationScreen')
|
|
|
+ }else {
|
|
|
+ this.$router.push('/taskScreen')
|
|
|
}
|
|
|
},
|
|
|
|
|
|
// 初始化视频
|
|
|
- initVideo(nowPlayVideoUrl, id) {
|
|
|
- let that = this;
|
|
|
+ initVideo(nowPlayVideoUrl,id) {
|
|
|
+ let that =this
|
|
|
|
|
|
// 这些options属性也可直接设置在video标签上，见 muted
|
|
|
let options = {
|
|
|
@@ -718,11 +736,12 @@ export default {
|
|
|
]
|
|
|
};
|
|
|
// videojs的第一个参数表示的是，文档中video的id
|
|
|
- const myPlyer = Videojs(id, options, function onPlayerReady() {
|
|
|
+ const myPlyer= Videojs(id, options, function onPlayerReady() {
|
|
|
console.log("onPlayerReady 中的this指的是：", this); // 这里的this是指Player,是由Videojs创建出来的实例
|
|
|
console.log(myPlyer === this); // 这里返回的是true
|
|
|
});
|
|
|
- this.playerList.push(myPlyer);
|
|
|
+ this.playerList.push(myPlyer)
|
|
|
+
|
|
|
},
|
|
|
|
|
|
async initUrl(subjectName = "电子干扰课目") {
|
xyh123999