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

添加 剧本角色 站长、助理、信号员、客运员、扳道员 、引导员、工务工

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-07-25 17:49:38 +08:00
parent 3787289c32
commit 5067f0132f
8 changed files with 319 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripts/ConstDic.js
View File

@ -168,7 +168,14 @@ export const SimulationType = {
STATION_SUPERVISOR: '车站值班员',
DRIVER: '司机',
MAINTAINER: '通号',
STATION_ASSISTANT: '车站助理'
STATION_ASSISTANT: '车站助理',
STATION_MASTER:'车站站长',
STATION_SIGNALER:'车站信号员',
STATION_PASSENGER:'车站客运员',
STATION_SWITCH_MAN:'车站扳道员',
STATION_FACILITATOR:'车站引导员',
STATION_WORKER:'车站工务工'
};
export const UrlConfig = {
displayNew: '/displayNew',

87
src/views/newMap/chatView/chatBox.vue
View File

@ -388,6 +388,13 @@ export default {
const maintainerList = {};
const parentDepartmentList = {};
const parkingLotSignalBuilding = {};
const stationAssistant = [];
const stationMaster = {};
const stationSignaler = {};
const stationPassenger = {};
const stationSwitchMan = {};
const stationFacilitator = {};
const stationWorker = {};
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
this.memberData[item.id]['active'] = false;
@ -436,6 +443,41 @@ export default {
this.memberData[item.id].labelName = '停车场信号楼' + (item.name || '');
parkingLotSignalBuilding[item.id] = this.memberData[item.id];
break;
case 'STATION_ASSISTANT':
this.memberData[item.id].label = '车站助理' + (item.name || '');
this.memberData[item.id].labelName = '车站助理' + (item.name || '');
stationAssistant[item.id] = this.memberData[item.id];
break;
case 'STATION_MASTER':
this.memberData[item.id].label = '车站站长' + (item.name || '');
this.memberData[item.id].labelName = '车站站长' + (item.name || '');
stationMaster[item.id] = this.memberData[item.id];
break;
case 'STATION_SIGNALER':
this.memberData[item.id].label = '车站信号员' + (item.name || '');
this.memberData[item.id].labelName = '车站信号员' + (item.name || '');
stationSignaler[item.id] = this.memberData[item.id];
break;
case 'STATION_PASSENGER':
this.memberData[item.id].label = '车站客运员' + (item.name || '');
this.memberData[item.id].labelName = '车站客运员' + (item.name || '');
stationPassenger[item.id] = this.memberData[item.id];
break;
case 'STATION_SWITCH_MAN':
this.memberData[item.id].label = '车站扳道员' + (item.name || '');
this.memberData[item.id].labelName = '车站扳道员' + (item.name || '');
stationSwitchMan[item.id] = this.memberData[item.id];
break;
case 'STATION_FACILITATOR':
this.memberData[item.id].label = '车站引导员' + (item.name || '');
this.memberData[item.id].labelName = '车站引导员' + (item.name || '');
stationFacilitator[item.id] = this.memberData[item.id];
break;
case 'STATION_WORKER':
this.memberData[item.id].label = '车站工务工' + (item.name || '');
this.memberData[item.id].labelName = '车站工务工' + (item.name || '');
stationWorker[item.id] = this.memberData[item.id];
break;
}
});
// { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' },
@ -483,7 +525,50 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: parkingLotSignalBuilding
}];
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: stationAssistant
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: stationMaster
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: stationSignaler
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: stationPassenger
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: stationSwitchMan
},
{
label: '车站引导员',
id: 'stationFacilitator',
type: 'role',
children: stationFacilitator
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: stationWorker
}
];
this.initCommonMemberList();
this.filterNode();
// this.$nextTick(() => {

61
src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
View File

@ -258,7 +258,66 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: result.deviceListData[7]
}];
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: result.deviceListData[8]
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: result.deviceListData[9]
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: result.deviceListData[10]
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: result.deviceListData[11]
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: result.deviceListData[12]
},
{
label: '车站扳道员',
id: 'stationFacilitator',
type: 'role',
children: result.deviceListData[13]
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: result.deviceListData[14]
}
];
/**
* 车站助理
*/
// STATION_ASSISTANT,
// STATION_MASTER:'车站站长',
// STATION_SIGNALER:'车站信号员',
// STATION_PASSENGER:'车站客运员',
// STATION_SWITCH_MAN:'车站扳道员',
// STATION_FACILITATOR:'车站引导员',
// STATION_WORKER:'车站工务工'
// stationMaster
// stationSignaler
// stationPassenger
// stationSwitchMan
// stationFacilitator
// stationWorker
const lastMemberList = result.lastMemberList;
this.$emit('setTreeData', treeData);
this.$emit('setMemberData', lastMemberList);

22
src/views/newMap/displayNew/utils.js
View File

@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) {
lastData = JSON.parse(lastData);
const lastMemberList = [];
// const electricDispatcherList = [];
const deviceListData = [[], [], [], [], [], [], [], []];
const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
const driverList = [];
lastData.forEach((member, index)=>{
if (member.userId && member.userId == store.state.user.id) {
@ -37,7 +37,25 @@ export function covertMemberData (activeTrainList, resp) {
member.label = member.type + name + userName;
member.normalName = member.type + name;
}
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼'];
const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工'];
/**
* 车站助理
*/
// STATION_ASSISTANT,
// STATION_MASTER:'车站站长',
// STATION_SIGNALER:'车站信号员',
// STATION_PASSENGER:'车站客运员',
// STATION_SWITCH_MAN:'车站扳道员',
// STATION_FACILITATOR:'车站引导员',
// STATION_WORKER:'车站工务工'
// stationMaster
// stationSignaler
// stationPassenger
// stationSwitchMan
// stationFacilitator
// stationWorker
const deviceTypeIndex = deviceType.indexOf(member.type);
if (deviceTypeIndex >= 0) {
if (deviceTypeIndex == 3) {

9
src/views/newMap/jointTrainingNew/memberManage/addMember.vue
View File

@ -70,7 +70,14 @@ export default {
typeList: [
{label: '行调', value: 'DISPATCHER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'}
{label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
{label: '车站客运员', value: 'STATION_PASSENGER'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'}
]
};
},

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

@ -120,7 +120,32 @@ export default {
}, {
labelName: '车站助理',
children: []
}]
},
{
labelName: '车站站长',
children: []
},
{
labelName: '车站信号员',
children: []
},
{
labelName: '车站客运员',
children: []
},
{
labelName: '车站扳道员',
children: []
},
{
labelName: '车站引导员',
children: []
},
{
labelName: '车站工务工',
children: []
}
]
};
},
computed: {
@ -155,6 +180,12 @@ export default {
const maintainerList = [];
const ctcOperatorList = [];
const stationAssistantList = [];
const stationMasterList = [];
const stationSignalerList = [];
const stationPassengerList = [];
const stationSwitchManList = [];
const stationFacilitatorList = [];
const stationWorkerList = [];
val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
switch (item.type) {
@ -190,6 +221,31 @@ export default {
this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
stationAssistantList.push(this.memberData[item.id]);
break;
case 'STATION_MASTER':
this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : '');
stationMasterList.push(this.memberData[item.id]);
break;
case 'STATION_SIGNALER':
this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name ? `-${item.name }` : '');
stationSignalerList.push(this.memberData[item.id]);
break;
case 'STATION_PASSENGER':
this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name ? `-${item.name }` : '');
stationPassengerList.push(this.memberData[item.id]);
break;
case 'STATION_SWITCH_MAN':
this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name ? `-${item.name }` : '');
stationSwitchManList.push(this.memberData[item.id]);
break;
case 'STATION_FACILITATOR':
this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name ? `-${item.name }` : '');
stationFacilitatorList.push(this.memberData[item.id]);
break;
case 'STATION_WORKER':
this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : '');
stationWorkerList.push(this.memberData[item.id]);
break;
}
});
this.treeData = [{
@ -224,6 +280,36 @@ export default {
labelName: '车站助理',
id: 'stationAssistant',
children: stationAssistantList
},
{
labelName: '车站站长',
id: 'stationMaster',
children: stationMasterList
},
{
labelName: '车站信号员',
id: 'stationSignaler',
children: stationSignalerList
},
{
labelName: '车站客运员',
id: 'stationPassenger',
children: stationPassengerList
},
{
labelName: '车站扳道员',
id: 'stationSwitchMan',
children: stationSwitchManList
},
{
labelName: '车站引导员',
id: 'stationFacilitator',
children: stationFacilitatorList
},
{
labelName: '车站工务工',
id: 'stationWorker',
children: stationWorkerList
}
];
EventBus.$emit('trainTicketMember', [...stationSupervisorList, ...stationAssistantList]);

9
src/views/scriptManage/addScriptMember.vue
View File

@ -72,7 +72,14 @@ export default {
typeList: [
{label: '行调', value: 'DISPATCHER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'}
{label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
{label: '车站站长', value: 'STATION_MASTER'},
{label: '车站信号员', value: 'STATION_SIGNALER'},
{label: '车站客运员', value: 'STATION_PASSENGER'},
{label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
{label: '车站引导员', value: 'STATION_FACILITATOR'},
{label: '车站工务工', value: 'STATION_WORKER'}
]
};
},

42
src/views/scriptManage/tipScriptRecord.vue
View File

@ -228,6 +228,48 @@ export default {
id: 'parkingLotSignalBuilding',
type: 'role',
children: result.deviceListData[7]
},
{
label: '车站助理',
id: 'stationAssistant',
type: 'role',
children: result.deviceListData[8]
},
{
label: '车站站长',
id: 'stationMaster',
type: 'role',
children: result.deviceListData[9]
},
{
label: '车站信号员',
id: 'stationSignaler',
type: 'role',
children: result.deviceListData[10]
},
{
label: '车站客运员',
id: 'stationPassenger',
type: 'role',
children: result.deviceListData[11]
},
{
label: '车站扳道员',
id: 'stationSwitchMan',
type: 'role',
children: result.deviceListData[12]
},
{
label: '车站扳道员',
id: 'stationFacilitator',
type: 'role',
children: result.deviceListData[13]
},
{
label: '车站工务工',
id: 'stationWorker',
type: 'role',
children: result.deviceListData[14]
}
];
this.memberList = result.lastMemberList;