From 9426ece04f2ef568421d7250b344f6ad1154c838 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 24 May 2023 18:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=A7=92=E8=89=B2=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/scripts/ConstConfig.js | 46 ++-- src/store/modules/training.js | 9 +- .../newMap/display/memberManage/addMember.vue | 35 +-- .../display/memberManage/membersManage.vue | 99 ++++++++- .../newMap/display/newChat/chatDialog.vue | 208 +----------------- 5 files changed, 144 insertions(+), 253 deletions(-) diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index bc06d3ec2..a542d38bc 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -77,29 +77,29 @@ export default { { label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' } ], roleTypeList: [ - {label: '行调', value: 'DISPATCHER'}, - {label: 'NCC调度', value: 'NCC_DISPATCHER'}, - {label: '信息调度', value: 'OCC_DISPATCHER'}, - {label: '行值', value: 'STATION_SUPERVISOR'}, - {label: '司机', value: 'DRIVER'}, - {label: '通号', value: 'MAINTAINER'}, - {label: '车辆段/停车场调度', value: 'DEPOT_DISPATCHER'}, - {label: '车辆段/停车场信号楼', value: 'SIGNAL_BUILDING'}, - {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'}, - {label: '车务段段长', value: 'TRAIN_MASTER'}, - {label: '工电调度', value: 'ELECTRIC_DISPATCHER'}, - { label: '电力工务', value: 'STATION_ELECTRIC_WORKER'}, - {label: '上级部分', value: 'PARENT_DEPARTMENT'}, - {label: '派班员', value: 'SCHEDULING'}, - {label: '设备管理员', value: 'DEVICE_MANAGER'}, - {label: '值班主任', value: 'SHIFT_MANAGER'}, - {label: '环控调度', value: 'ENVIRONMENT_DISPATCHER'} + {label: 'NCC调度', value: 'NCC_DISPATCHER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '信息调度', value: 'OCC_DISPATCHER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '行调', value: 'DISPATCHER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '行值', value: 'STATION_SUPERVISOR', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '司机', value: 'DRIVER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '通号', value: 'MAINTAINER', simTypeList: ['METRO', 'RAILWAY', 'EMERGENCY']}, + {label: '车辆段/停车场调度', value: 'DEPOT_DISPATCHER', simTypeList: ['METRO']}, + {label: '车辆段/停车场信号楼', value: 'SIGNAL_BUILDING', simTypeList: ['METRO']}, + {label: '车站助理', value: 'STATION_ASSISTANT', simTypeList: ['RAILWAY']}, + {label: '车站站长', value: 'STATION_MASTER', simTypeList: ['RAILWAY']}, + {label: '车站信号员', value: 'STATION_SIGNALER', simTypeList: ['RAILWAY']}, + {label: '车站客运员', value: 'STATION_PASSENGER', simTypeList: ['RAILWAY']}, + {label: '车站扳道员', value: 'STATION_SWITCH_MAN', simTypeList: ['RAILWAY']}, + {label: '车站引导员', value: 'STATION_FACILITATOR', simTypeList: ['RAILWAY']}, + {label: '车站工务工', value: 'STATION_WORKER', simTypeList: ['RAILWAY']}, + {label: '车务段段长', value: 'TRAIN_MASTER', simTypeList: ['METRO']}, + {label: '工电调度', value: 'ELECTRIC_DISPATCHER', simTypeList: ['METRO']}, + {label: '电力工务', value: 'STATION_ELECTRIC_WORKER', 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']} ], releaseReview: [ { enlabel: 'Unpublished', label: '未发布', value: '0' }, diff --git a/src/store/modules/training.js b/src/store/modules/training.js index 5dd473e3c..c7a8e5b84 100644 --- a/src/store/modules/training.js +++ b/src/store/modules/training.js @@ -49,7 +49,8 @@ const training = { domConfig: {}, // 线路功能前端配置项 simulationUserType: '', // 仿真用户角色 simulationCreator: false, - chatBoxMin: true // 聊天框最小化 + chatBoxMin: true, // 聊天框最小化 + memberTreeData: [] // 仿真成员树数据 }, getters: { @@ -324,6 +325,9 @@ const training = { }, setChatBoxMin: (state, chatBoxMin) => { state.chatBoxMin = chatBoxMin; + }, + setMemberTreeData: (state, memberTreeData) => { + state.memberTreeData = memberTreeData; } }, @@ -660,6 +664,9 @@ const training = { }, setChatBoxMin: ({ commit }, chatBoxMin) => { commit('setChatBoxMin', chatBoxMin); + }, + setMemberTreeData: ({ commit }, memberTreeData) => { + commit('setMemberTreeData', memberTreeData); } } }; diff --git a/src/views/newMap/display/memberManage/addMember.vue b/src/views/newMap/display/memberManage/addMember.vue index e7a035953..fea6ae68a 100644 --- a/src/views/newMap/display/memberManage/addMember.vue +++ b/src/views/newMap/display/memberManage/addMember.vue @@ -43,6 +43,7 @@