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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-08-03 17:30:17 +08:00
commit 584fbad941
7 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/views/jlmap3d/maintainer/jl3dmaintainer.vue
View File

@ -1,13 +1,13 @@
<template>
<div class="jalmap3ddiv">
<div class="jl3dmap3dMaintainerSelect" v-show="selectShow">
<div v-show="selectShow" class="jl3dmap3dMaintainerSelect">
<div class="maintainerSelectButton" style="left:33%" @click="initNormal">通号检修模式</div>
<div class="maintainerSelectButton" style="right:33%" @click="initVR">通号检修模式(VR)</div>
</div>
<div class="display-draft">
<el-button-group>
<el-button v-if="isAdmin" @click="memberManage">成员管理</el-button>
<!-- <el-button v-if="isAdmin" @click="memberManage">成员管理</el-button> -->
<el-button type="primary" @click="back">{{ $t('global.back') }}</el-button>
</el-button-group>
@ -17,8 +17,7 @@
v-show="faultlistshow"
:devicelist="devicelist"
@selectdevice="selectdevice"
>
</Devicefault-List>
/>
<Fault-Device
v-show="deviceShow"
@ -26,7 +25,6 @@
@closedevice3dview="devicemodel"
/>
<div id="testjlmap3d" class="jlmap3ddraw">
<canvas id="canvastexture" />
</div>
@ -62,7 +60,6 @@ import FaultDevice from '@/views/jlmap3d/maintainer/component/faultdevice';
import Jlmap3dConfig from '@/views/jlmap3d/simulation/show/configmenu';
import { ProjectIcon } from '@/scripts/ProjectConfig';
import bgPsdImg from '@/assets/bg_psd.png';
// import Jlmap3dMsg from '@/views/jlmap3d/show/msg';
@ -71,7 +68,7 @@ export default {
name: 'Jl3dMaintainer',
components: {
DevicefaultList,
FaultDevice,
FaultDevice
// Jlmap3dMsg
// ShowProperty
},
@ -138,7 +135,6 @@ export default {
this.token = this.$route.query.token;
},
show: function (skinCode, group) {
if (this.jlmap3d == null) {
this.initNormal(skinCode, group);
@ -150,36 +146,36 @@ export default {
}
},
initNormal: function () {
this.selectShow = false;
this.deviceShow = false;
// this.deviceShow = true;
// this.faultlistshow = true;
const mapdata = this.$store.getters['map/map'];
const dom = document.getElementById('app');
const project = this.$route.query.project;
// console.log(project);
this.selectShow = false;
this.deviceShow = false;
// this.deviceShow = true;
// this.faultlistshow = true;
const mapdata = this.$store.getters['map/map'];
const dom = document.getElementById('app');
const project = this.$route.query.project;
// console.log(project);
if (project) {
if (project) {
this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, project);
} else {
} else {
this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, '');
}
this.jlmap3d.eventon();
this.jlmap3d = new JLmap3dMaintainer(dom, mapdata, this.mapid, this.$store, this.group, '');
}
this.jlmap3d.eventon();
},
initVR:function (skinCode, group) {
const routeData = this.$router.resolve({
path:'/jlmap3d/maintainervr',
query:{
mapid:this.mapid,
group:this.group,
token:this.token,
noPreLogout: true
}
});
window.open(routeData.href);
const routeData = this.$router.resolve({
path:'/jlmap3d/maintainervr',
query:{
mapid:this.mapid,
group:this.group,
token:this.token,
noPreLogout: true
}
});
window.open(routeData.href);
},
raystand() {
this.jlmap3d.rayswitch('stand');
@ -233,13 +229,13 @@ export default {
// console.log(divicedata);
this.$refs.faultdevice.showmodel(divicedata);
},
warningmsg(nowmsg){
this.controlmsg = nowmsg;
this.msgshow = true;
setTimeout(this.warningmsgoff,3000);
warningmsg(nowmsg) {
this.controlmsg = nowmsg;
this.msgshow = true;
setTimeout(this.warningmsgoff, 3000);
},
warningmsgoff(){
this.msgshow = false;
warningmsgoff() {
this.msgshow = false;
},
showroom() {
this.deviceShow = true;
@ -248,7 +244,7 @@ export default {
back() {
this.$emit('back');
this.isswitch = false;
},
}
}
};
</script>

2
src/views/newMap/displayNew/menuDemon.vue
View File

@ -411,7 +411,7 @@ export default {
height: 32px;
overflow: hidden;
padding-left: 44px;
z-index: 9;
z-index: 360;
.btn_hover{
position: absolute;
left: 0;

4
src/views/newMap/displayNew/menuSchema.vue
View File

@ -17,7 +17,7 @@
<el-button v-if="notScript && !runing" size="small" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
<el-button v-if="faultMode" size="small" type="danger" @click="setFault">自动故障设置</el-button>
</el-button-group>
<el-button v-if="!isScheduling" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button>
<el-button v-if="!isScheduling" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
<!-- <el-button v-if="!isLocalStation" size="small" :type="faultMode ? 'danger' : ''" @click="changeDirectiveMode()">指令模式</el-button> -->
</template>
</div>
@ -267,7 +267,7 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.schema {
z-index: 9;
z-index: 360;
display: inline;
position: absolute;
right: 5px;

12
src/views/newMap/jointTrainingNew/chatView/chatBox.vue
View File

@ -317,6 +317,7 @@ export default {
electricDispatcherList.push(this.memberData[item.id]);
break;
case 'DEPOT_DISPATCHER':
this.memberData[item.id].label = device.name;
depotDispatcherList.push(this.memberData[item.id]);
break;
case 'STATION_SUPERVISOR':
@ -353,6 +354,11 @@ export default {
id: 'maintainer',
type: 'role',
children: maintainerList
}, {
label: '车辆段',
id: 'depotDispatcher',
type: 'role',
children: depotDispatcherList
}];
this.initCommonMemberList();
}
@ -618,6 +624,7 @@ export default {
const temStationSupervisorList = [];
const temMaintainerList = [];
const temDriverList = [];
const temDepotDispatcherList = [];
this.$store.state.training.memberList.forEach(item =>{
switch (item.type) {
case 'DISPATCHER':
@ -632,9 +639,12 @@ export default {
case 'DRIVER':
temDriverList.push({memberId: item.id, connect:true });
break;
case 'DEPOT_DISPATCHER':
temDepotDispatcherList.push({memberId: item.id, connect:true });
break;
}
});
this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList];
this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList];
if (this.userRole === 'AUDIENCE' || this.commonConversation) {
this.conversitionMemberList = [];
this.messageList = [...this.commonMessageList];

3
src/views/newMap/jointTrainingNew/memberManage/membersManage.vue
View File

@ -198,6 +198,9 @@ export default {
id: 'maintainer',
children: maintainerList
}];
if (depotDispatcherList) {
this.treeData.push({label: '车辆段', id: 'depotDispatcher', children: depotDispatcherList});
}
}
},
'$store.state.map.activeTrainListChange': function () {

8
src/views/newMap/jointTrainingNew/menuDemon.vue
View File

@ -176,6 +176,12 @@ export default {
},
'$store.state.training.prdType': function(prdType) {
this.change3dname();
},
'$store.state.socket.simulationStart': async function (val) {
if (val) {
this.$store.dispatch('training/setInitTime', +new Date(val));
this.$store.dispatch('training/start');
}
}
},
async mounted() {
@ -527,7 +533,7 @@ export default {
height: 32px;
overflow: hidden;
padding-left: 44px;
z-index: 9;
z-index: 360;
.btn_hover{
position: absolute;
left: 0;

5
src/views/newMap/jointTrainingNew/menuSchema.vue
View File

@ -15,7 +15,8 @@
<el-button v-if="faultMode && !dataError" size="small" type="danger" @click="setFault">{{ $t('joinTraining.faultSetting') }}</el-button>
</template>
</el-button-group>
<el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button>
<!-- <el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? 'danger' : ''" @click="changeOperateMode()">故障模式</el-button> -->
<el-button v-if="isAdmin && !dataError && !isScreen" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
<!-- isCenter && !dataError && !isAdmin 此判断用于以后(目前 暂时不用) -->
<el-button v-if="isShowDirective" size="small" :type="directiveMode ? 'primary' : ''" @click="changeDirectiveMode()">指令模式</el-button>
</div>
@ -202,7 +203,7 @@ export default {
</script>
<style>
.schema {
z-index: 9;
z-index: 360;
display: inline;
position: absolute;
right: 5px;