diff --git a/src/views/newMap/jointTrainingNew/addMember.vue b/src/views/newMap/jointTrainingNew/addMember.vue
new file mode 100644
index 000000000..03b2b3eb5
--- /dev/null
+++ b/src/views/newMap/jointTrainingNew/addMember.vue
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index eb630eeee..aecdad799 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -7,6 +7,7 @@
+
-
+
+
@@ -51,7 +53,6 @@
import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
import MenuDemonJoint from './menuDemon';
import MenuDemonSchema from './menuSchema';
-import MembersManage from './membersManage';
import JsQuestion from './jsQuestion';
import JoinFaultChoose from '@/views/newMap/displayNew/demon/faultChoose';
import JoinRunPlanLoad from '@/views/newMap/displayNew/demon/runPlanLoad';
@@ -75,6 +76,8 @@ import { timeFormat } from '@/utils/date';
import { Message } from 'element-ui';
import Vue from 'vue';
import localStore from 'storejs';
+import MembersManage from './membersManage';
+import AddMember from './addMember';
export default {
name: 'JointTrainingDraft',
@@ -91,7 +94,8 @@ export default {
Jl3dMaintainer,
IbpPlate,
JsQuestion,
- MembersManage
+ MembersManage,
+ AddMember
},
data() {
return {
@@ -369,29 +373,23 @@ export default {
} else {
this.$store.dispatch('training/over');
}
- // if (this.isDemon) {
- // this.$refs.menuDemon.initPlannedDriving(resp.data.planRunning);
- // } else if (this.isScript) {
- // this.$refs.menuScript.initPlannedDriving(resp.data.planRunning);
- // }
} else if (resp && resp.code == 200 && resp.data && resp.data.dataError) {
this.dataError = true;
this.$messageBox('此地图数据正在维护中,无法运行!');
}
},
async getUserRole() {
- // const res = await getUserRolesNew(this.group);
- // const data = res.data || {};
- // this.userRole = data.userRole;
- // this.deviceCode = data.deviceCode;
- // this.ibpPart = data.ibpPart;
- // if (this.userRole === 'IBP') {
- // this.showIbp(this.deviceCode);
- // } else {
- // this.hideIbp();
- // }
- // return res;
- return '';
+ const res = await getUserRolesNew(this.group);
+ const data = res.data || {};
+ this.userRole = data.userRole;
+ this.deviceCode = data.deviceCode;
+ this.ibpPart = data.ibpPart;
+ if (this.userRole === 'IBP') {
+ this.showIbp(this.deviceCode);
+ } else {
+ this.hideIbp();
+ }
+ return res;
},
// 仿真系统
async initLoadDemonData() {
@@ -427,7 +425,6 @@ export default {
} else {
resp = await this.getUserRole();
}
- // console.log('/////////////' + resp.data.userRole);
if (resp && resp.code == 200) {
// Admin 管理员 Instructor 教员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘
this.userRole = resp.data.userRole;
@@ -623,17 +620,20 @@ export default {
this.$jlmap.on('pan');
this.$jlmap.setRevoverBigScreen();
},
- showMembers() {
-
+ handlerMemberManage() {
+ this.$refs.membersManage.doShow();
+ },
+ addSimulationMember() {
+ this.$refs.addMember.doShow();
}
}
};
diff --git a/src/views/newMap/jointTrainingNew/membersManage.vue b/src/views/newMap/jointTrainingNew/membersManage.vue
index 1e1cf3048..d99b7e139 100644
--- a/src/views/newMap/jointTrainingNew/membersManage.vue
+++ b/src/views/newMap/jointTrainingNew/membersManage.vue
@@ -7,24 +7,31 @@
:before-close="doClose"
:z-index="2000"
:modal="false"
+ fullscreen
:close-on-click-modal="false"
+ center
>
-
-
- {{ $t('trainRoom.comprehensiveDrillRoom') }}
-
-
- {{ $t('trainRoom.comprehensiveTrainingManager') + room.creator.nickName }}
-
-
-
+
+
+
+
+ 添加仿真成员
+
+
{{ node.label }}
-
-
+
+
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 498bc7942..0efd84b89 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -3,7 +3,7 @@
- 成员管理
+ 成员管理
{{ $t('joinTraining.connectRealDevices') }}
{{ $t('joinTraining.driverPerspective') }}
cctv
@@ -11,6 +11,7 @@
{{ $t('joinTraining.drivingByPlan') }}
{{ $t('joinTraining.initialize') }}
+
{{ '剩余时间:'+countdownTime }}
@@ -18,7 +19,7 @@
提交
返回
-
{{ $t('global.back') }}
+
{{ $t('global.back') }}
@@ -111,9 +112,6 @@ export default {
},
project() {
return getSessionStorage('project');
- },
- projectDevice() {
- return this.$route.query.projectDevice;
}
},
watch: {
@@ -363,102 +361,102 @@ export default {
this.$message.error('提交试卷失败!');
});
},
- membersManage() {
- this.$emit('showMembers');
+ memberManage() {
+ this.$emit('handlerMemberManage');
}
}
};