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

Merge branch 'test'

Browse Source 
# Conflicts:
#	src/views/newMap/display/terminals/index.vue
This commit is contained in:
joylink_zhangsai 2023-09-27 18:11:19 +08:00
commit 910082305d
7 changed files with 70 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scripts/ConstConfig.js
View File

@ -74,7 +74,8 @@ export default {
{ label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator' },
{ label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker' },
{ label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager' },
{ label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' }
{ label: '值班站长', value: 'STATION_HEAD', enLabel: 'Station_Head' },
{ label: '站务员', value: 'STATION_ATTENDANT', enLabel: 'Station_Attendant' }
],
roleTypeList: [
{label: 'NCC调度', value: 'NCC_DISPATCHER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']},
@ -95,11 +96,13 @@ export default {
{label: '车务段段长', value: 'TRAIN_MASTER', simTypeList: ['METRO']},
{label: '工电调度', value: 'ELECTRIC_DISPATCHER', simTypeList: ['METRO']},
{label: '电力工务', value: 'STATION_ELECTRIC_WORKER', simTypeList: ['METRO', 'RAILWAY']}, // 大铁：车站电务
{label: '上级部分', value: 'PARENT_DEPARTMENT', simTypeList: ['METRO']},
{label: '上级部门', value: 'PARENT_DEPARTMENT', simTypeList: ['METRO']},
{label: '派班员', value: 'SCHEDULING', simTypeList: ['METRO']},
{label: '设备管理员', value: 'DEVICE_MANAGER', simTypeList: ['RAILWAY']},
{label: '值班主任', value: 'SHIFT_MANAGER', simTypeList: ['METRO']},
{label: '环控调度', value: 'ENVIRONMENT_DISPATCHER', simTypeList: ['METRO']}
{label: '环控调度', value: 'ENVIRONMENT_DISPATCHER', simTypeList: ['METRO']},
{label: '值班站长', value: 'STATION_HEAD', simTypeList: ['METRO']},
{label: '站务员', value: 'STATION_ATTENDANT', simTypeList: ['METRO']}
],
releaseReview: [
{ enlabel: 'Unpublished', label: '未发布', value: '0' },

4
src/utils/baseUrl.js
View File

@ -23,13 +23,13 @@ export function handlerUrl() {
let OSS_URL;
if (process.env.NODE_ENV === 'development') {
// 开发分支
BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'http://192.168.3.233/rtss-server';
// BASE_API = 'https://joylink.club/jlcloud';
// BASE_API = 'https://test.joylink.club/jlcloud';
// BASE_API = 'http://114.116.51.125/jlcloud';
// BASE_API = 'http://192.168.3.47:9000'; // 周寅
// BASE_API = 'http://192.168.3.94:9000'; // 旭强
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
// BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';

5
src/utils/simulation.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,8 @@ export function covertMemberData (activeTrainList, resp) {
member.label = member.type + name + userName;
member.normalName = member.type + name;
}
const deviceType = ['行调', '通号', '行值', '司机', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长', '电力工务'];
const deviceType = ['行调', '通号', '行值', '司机', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长',
'车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长', '电力工务', '值班站长', '站务员'];
/**
* 车站助理

30
src/views/newMap/display/memberManage/membersManage.vue
View File

@ -106,6 +106,9 @@ export default {
}, {
labelName: '车站值班员',
children: []
}, {
labelName: '值班站长',
children: []
}, {
labelName: '司机',
children: []
@ -149,6 +152,10 @@ export default {
{
labelName: '设备管理员',
children: []
},
{
labelName: '站务员',
children: []
}
]
};
@ -207,6 +214,8 @@ export default {
const environmentDispatherList = [];
const parentDepartmentList = [];
const schedulingList = [];
const stationHeadList = [];
const stationAttendantList = [];
const ss = this.simType == 'RAILWAY' ? '车站值班员' : '行值';
const sew = this.simType == 'RAILWAY' ? '车站电务' : '电力工务';
val.forEach(item => {
@ -256,6 +265,14 @@ export default {
this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
stationAssistantList.push(this.memberData[item.id]);
break;
case 'STATION_HEAD':
this.memberData[item.id].labelName = '值班站长' + device.name + (item.name ? `-${item.name }` : '');
stationHeadList.push(this.memberData[item.id]);
break;
case 'STATION_ATTENDANT':
this.memberData[item.id].labelName = '站务员' + device.name + (item.name ? `-${item.name }` : '');
stationAttendantList.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]);
@ -308,6 +325,7 @@ export default {
this.memberData[item.id].labelName = sew + '-' + device.name + (item.name ? `-${item.name }` : '');
stationElectricWorkerList.push(this.memberData[item.id]);
break;
}
});
this.treeData = [{
@ -372,6 +390,18 @@ export default {
memberType: 'STATION_MASTER',
children: stationMasterList
},
{
labelName: '值班站长',
id: 'stationHead',
memberType: 'STATION_HEAD',
children: stationHeadList
},
{
labelName: '站务员',
id: 'stationAttendant',
memberType: 'STATION_ATTENDANT',
children: stationAttendantList
},
{
labelName: '车站信号员',
id: 'stationSignaler',

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

@ -166,7 +166,7 @@ export default {
this.$store.dispatch('training/setMapDefaultState');
this.isFirst = false;
}
if (this.$store.state.training.domConfig.trainingDesign) {
if (this.$store.state.training.domConfig.trainingDesign && this.$store.state.training.myMemberId) {
getUnreceivedMessages(this.$route.query.group, this.$store.state.training.myMemberId);
}
},

2
src/views/newMap/display/terminals/terminalMenu.vue
View File

@ -178,7 +178,7 @@ export default {
},
initPictureShow() {
const localWorkRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER'];
'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'STATION_HEAD'];
if (localWorkRoleList.includes(this.roles)) {
const terminal = this.findTerminalFromMap('localWork');
this.changePictureShow(terminal);

28
src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
View File

@ -244,6 +244,16 @@
<el-input-number v-model="batchForm.STATION_ELECTRIC_WORKER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
</el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12">
<el-form-item label="值班站长" prop="STATION_HEAD">
<el-input-number v-model="batchForm.STATION_HEAD" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
</el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12">
<el-form-item label="站务员" prop="STATION_ATTENDANT">
<el-input-number v-model="batchForm.STATION_ATTENDANT" size="small" :min="0" :step="1" :precision="0" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="NCC调度：" prop="NCC_DISPATCHER">
<el-input-number v-model="batchForm.NCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
@ -495,6 +505,8 @@ export default {
SHIFT_MANAGER: 0,
ENVIRONMENT_DISPATCHER: 0,
STATION_ELECTRIC_WORKER:0,
STATION_HEAD: 0,
STATION_ATTENDANT: 0,
systemType: 'METRO'
},
generationForm: {
@ -505,7 +517,7 @@ export default {
},
disStationList: [],
stationShow: ['STATION_SUPERVISOR', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'STATION_WORKER', 'STATION_ELECTRIC_WORKER'],
'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'STATION_WORKER', 'STATION_ELECTRIC_WORKER', 'STATION_HEAD', 'STATION_ATTENDANT'],
conversationForm: {
systemType: 'METRO',
id: '',
@ -1143,6 +1155,20 @@ export default {
deviceCode: station.code
};
memberMap[this.generationForm.systemType].push(memberStationElectricWorker);
const memberStationHead = {
id: this.getMemberId(this.generationForm.systemType),
name: '',
type: 'STATION_HEAD',
deviceCode: station.code
};
memberMap[this.generationForm.systemType].push(memberStationHead);
const memberStationAttendant = {
id: this.getMemberId(this.generationForm.systemType),
name: '',
type: 'STATION_ATTENDANT',
deviceCode: station.code
};
memberMap[this.generationForm.systemType].push(memberStationAttendant);
}
});
const memberTrainMaster = {