From 98fc24ab242c28ae9d46aec6129d947743201ad0 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 21 Apr 2020 17:28:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=BC=94=E7=BB=83?= =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E6=B7=BB=E5=8A=A0=E8=81=8A=E5=A4=A9=E7=AA=97?= =?UTF-8?q?=E5=8F=A3(=E6=9C=AA=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/chat.js | 8 + src/scripts/ConstConfig.js | 2 +- src/views/newMap/jointTrainingNew/chatBox.vue | 183 ++++++++++++++++++ .../newMap/jointTrainingNew/menuDemon.vue | 149 ++++++++------ 4 files changed, 284 insertions(+), 58 deletions(-) create mode 100644 src/views/newMap/jointTrainingNew/chatBox.vue diff --git a/src/api/chat.js b/src/api/chat.js index 8a578dd05..bf653caf8 100644 --- a/src/api/chat.js +++ b/src/api/chat.js @@ -285,3 +285,11 @@ export function realDeviceIsUsed(group, projectCode) { } }); } + +// 获取仿真成员列表(新版地图) +export function getSimulationMembersNew(group) { + return request({ + url: `/simulation/${group}/members`, + method: 'get' + }); +} diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js index 7070ddc21..9cf863d59 100644 --- a/src/scripts/ConstConfig.js +++ b/src/scripts/ConstConfig.js @@ -89,7 +89,7 @@ export default { ], roleTypeNew:[ {label: '管理员', value: 'ADMIN', enLabel: 'Admin '}, - // {label: '教员', value: 'Instructor', enLabel: 'Instructor '}, + {label: '教员', value: 'Instructor', enLabel: 'Instructor '}, {label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher '}, {label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant '}, {label: '观众', value: 'AUDIENCE', enLabel: 'Audience '}, diff --git a/src/views/newMap/jointTrainingNew/chatBox.vue b/src/views/newMap/jointTrainingNew/chatBox.vue new file mode 100644 index 000000000..8aefa46c3 --- /dev/null +++ b/src/views/newMap/jointTrainingNew/chatBox.vue @@ -0,0 +1,183 @@ + + + + + 成员列表 + + {{ member.role+'-'+member.name }} + + + + + 聊天窗口 + + + + + + + + + + + 聊天窗口 + + + + + + + + diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 0ea4a114c..1c21f0724 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -1,5 +1,63 @@ + + + {{ $t('joinTraining.connectRealDevices') }} @@ -8,7 +66,7 @@ {{ $t('joinTraining.drivingByPlan') }} {{ $t('joinTraining.exitPlan') }} - {{ $t('global.back') }} + {{ $t('global.back') }} @@ -19,6 +77,9 @@