joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

cctv视图 数字沙盘 派班工作站 代码调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-12-29 16:45:39 +08:00
parent 058838c39f
commit 36dabd5735
4 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
View File

@ -570,7 +570,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
trainlisttest.list[code].position.y = 0;
// trainlisttest.list[code].progress = 0;
trainlisttest.list[code].dispose = "0";
debugger
trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
trainlisttest.list[code].nextcode = null;
trainlisttest.list[code].curve = null;

3
src/utils/stomp.js
View File

@ -65,6 +65,9 @@ export function getTopic(type, group, param) {
case 'RUNFACT':
topic = `/user/queue/simulation/${group}/runFact`;
break;
case 'JL3D':
topic = `/user/queue/simulation/${group}/jl3d`;
break;
}
return topic;

72
src/views/jlmap3d/passflow/jl3dpassflow.vue
View File

@ -105,42 +105,42 @@ export default {
document.querySelector("link[rel*='icon']").href =
loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
},
mounted() {
if (this.lineCode == '07') {
for (var i = 0; i < 4; i++) {
const videoPlay = new Video(
'myvideo' + i,
{
controls: false,
autoplay: 'muted',
loop: true,
preload: 'auto',
width: window.innerWidth / 4 + 'px',
height: window.innerHeight / 2 + 'px',
hls: {
withCredentials: true
}
},
function () {
console.log('videojs播放器初始化成功');
}
);
this.videoList.push(videoPlay);
}
}
this.init();
window.updatestationlist = this.updatestationlist;
if (this.$route.query.type == 'CCTV') {
this.isCctv = false;
}
},
created() {
if (this.loadingProjectList.includes(this.$route.query.project)) {
this.$store.dispatch('app/transitionAnimations');
}
document.querySelector("link[rel*='icon']").href =
loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
},
// mounted() {
// if (this.lineCode == '07') {
// for (var i = 0; i < 4; i++) {
// const videoPlay = new Video(
// 'myvideo' + i,
// {
// controls: false,
// autoplay: 'muted',
// loop: true,
// preload: 'auto',
// width: window.innerWidth / 4 + 'px',
// height: window.innerHeight / 2 + 'px',
// hls: {
// withCredentials: true
// }
// },
// function () {
// console.log('videojs播放器初始化成功');
// }
// );
// this.videoList.push(videoPlay);
// }
// }
// this.init();
// window.updatestationlist = this.updatestationlist;
// if (this.$route.query.type == 'CCTV') {
// this.isCctv = false;
// }
// },
// created() {
// if (this.loadingProjectList.includes(this.$route.query.project)) {
// this.$store.dispatch('app/transitionAnimations');
// }
// document.querySelector("link[rel*='icon']").href =
// loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
// },
mounted() {
if (this.lineCode == '07') {
for (var i = 0; i < 4; i++) {

8
src/views/newMap/display/terminals/index.vue
View File

@ -227,6 +227,9 @@ export default {
case 'RUNFACT':
creatSubscribe(getTopic(type, this.group), header, defaultCallback);
break;
case 'JL3D':
creatSubscribe(getTopic(type, this.group), header, defaultCallback);
break;
}
},
clearSubscribe() {
@ -235,6 +238,7 @@ export default {
clearSubscribe(getTopic('STATE', this.group));
clearSubscribe(getTopic('CTC', this.group));
clearSubscribe(getTopic('LPF', this.group));
clearSubscribe(getTopic('JL3D', this.group));
},
loadingChange() {
this.loading = true;
@ -254,6 +258,10 @@ export default {
this.$nextTick(() => { this.subscribe('YJDDZH'); });
} else if (val === 'diagramPreview') {
this.$nextTick(() => { this.subscribe('RUNFACT'); });
} else if (val === 'digitalStand' || val == 'cctvView') {
this.$nextTick(() => { this.subscribe('JL3D'); });
} else if (val === 'scheduleWork') {
this.mapViewLoaded(true);
}
this.$nextTick(() => { this.loading = false; });
},