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

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
sunzhenyu 2020-07-08 14:07:32 +08:00
commit 0f39cbd2e2
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/login/index.vue
View File

@ -423,7 +423,9 @@ export default {
this.$router.push({ path: `/jlmap3d/passengerflow`, query:{ this.$router.push({ path: `/jlmap3d/passengerflow`, query:{
mapid:resp.data.map.id, mapid:resp.data.map.id,
group:res.data.group, group:res.data.group,
project: getSessionStorage('project') project: getSessionStorage('project'),
projectDevice: this.$route.query.projectDevice,
type: this.$route.query.type
} }); } });
} else { } else {
this.$router.push({ path: `/jointTrainingNew`, query: query }); this.$router.push({ path: `/jointTrainingNew`, query: query });

8
src/views/newMap/jointTrainingNew/index.vue
View File

@ -403,7 +403,7 @@ export default {
async getUserRole() { async getUserRole() {
const res = await getSimulationUserInfo(this.group); const res = await getSimulationUserInfo(this.group);
const data = res.data || {}; const data = res.data || {};
this.userRole = data.role || 'AUDIENCE'; this.userRole = data.type || 'AUDIENCE';
this.deviceCode = data.deviceCode; this.deviceCode = data.deviceCode;
this.isAdmin = data.admin; this.isAdmin = data.admin;
@ -427,7 +427,7 @@ export default {
let resp = {data: {}}; let resp = {data: {}};
if (this.project == 'jsxt' ) { if (this.project == 'jsxt' ) {
resp = await getRaceUserById(this.$route.query.raceId); resp = await getRaceUserById(this.$route.query.raceId);
resp.data.userRole = resp.data.role; resp.data.userRole = resp.data.type;
const paperResp = await getTestPaperDatail(this.$route.query.raceId); const paperResp = await getTestPaperDatail(this.$route.query.raceId);
if (paperResp.data && paperResp.data.practicalQuestions) { if (paperResp.data && paperResp.data.practicalQuestions) {
this.questionList = []; this.questionList = [];
@ -453,7 +453,7 @@ export default {
resp = await this.getUserRole(); resp = await this.getUserRole();
} }
if (resp && resp.code == 200) { if (resp && resp.code == 200) {
this.userRole = resp.data.role || 'AUDIENCE'; this.userRole = resp.data.type || 'AUDIENCE';
this.setSimulationPrdType(); this.setSimulationPrdType();
} }
await this.getTrainDetail(); await this.getTrainDetail();
@ -658,7 +658,7 @@ export default {
this.$messageBox('您已经被请离房间！'); this.$messageBox('您已经被请离房间！');
this.$refs.demonMenu.back(); this.$refs.demonMenu.back();
} else if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) { } else if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) {
this.userRole = item.role || 'AUDIENCE'; this.userRole = item.type || 'AUDIENCE';
this.setSimulationPrdType(); this.setSimulationPrdType();
} }
}); });

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

@ -9,8 +9,8 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form ref="form" :model="formModel" label-width="120px" :rules="rules"> <el-form ref="form" :model="formModel" label-width="120px" :rules="rules">
<el-form-item label="添加仿真成员:" prop="role"> <el-form-item label="添加仿真成员:" prop="type">
<el-select v-model="formModel.role" placeholder="请选择" size="small"> <el-select v-model="formModel.type" placeholder="请选择" size="small">
<el-option <el-option
v-for="item in typeList" v-for="item in typeList"
:key="item.value" :key="item.value"
@ -35,10 +35,10 @@ export default {
return { return {
dialogVisible: false, dialogVisible: false,
formModel: { formModel: {
role: '' type: ''
}, },
rules: { rules: {
role: [ type: [
{ required: true, message: '请选择显示位置', trigger: 'change' } { required: true, message: '请选择显示位置', trigger: 'change' }
] ]
}, },
@ -71,7 +71,7 @@ export default {
handleClose() { handleClose() {
this.dialogVisible = false; this.dialogVisible = false;
this.formModel = { this.formModel = {
role: '' type: ''
}; };
this.$refs.form.resetFields(); this.$refs.form.resetFields();
} }

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

@ -32,7 +32,7 @@
> >
<span :id="data.id" slot-scope="{ node, data }" class="custom-tree-node"> <span :id="data.id" slot-scope="{ node, data }" class="custom-tree-node">
<span>{{ data.label }}</span> <span>{{ data.label }}</span>
<span v-if="data.role"> <span v-if="data.type">
<el-select :key="data.id" v-model="data.userId" placeholder="请选择" clearable size="mini" @change="nodeMemberChange($event, data)"> <el-select :key="data.id" v-model="data.userId" placeholder="请选择" clearable size="mini" @change="nodeMemberChange($event, data)">
<el-option <el-option
v-for="item in simulationUserList" v-for="item in simulationUserList"
@ -104,15 +104,15 @@ export default {
memberData: {}, memberData: {},
treeData: [{ treeData: [{
label: '行调', label: '行调',
type: 'role', // type: 'role',
children: [] children: []
}, { }, {
label: '车站值班员', label: '车站值班员',
type: 'role', // type: 'role',
children: [] children: []
}, { }, {
label: '司机', label: '司机',
type: 'role', // type: 'role',
children: [] children: []
}, { }, {
label: '通号', label: '通号',
@ -163,7 +163,7 @@ export default {
const maintainerList = []; const maintainerList = [];
val.forEach(item => { val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
switch (item.role) { switch (item.type) {
case 'DISPATCHER': case 'DISPATCHER':
this.memberData[item.id].label = '行调' + (dispatcherList.length + 1); this.memberData[item.id].label = '行调' + (dispatcherList.length + 1);
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);
@ -274,7 +274,7 @@ export default {
flag = this.memberData[data.id].nickName.indexOf(value) !== -1; flag = this.memberData[data.id].nickName.indexOf(value) !== -1;
} }
let driverNoShow = true; let driverNoShow = true;
if (data.role && data.role === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) { if (data.role && data.type === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
driverNoShow = false; driverNoShow = false;
} }
return (data.label.indexOf(value) !== -1 || flag) && driverNoShow; return (data.label.indexOf(value) !== -1 || flag) && driverNoShow;

2
src/views/newMap/jointTrainingNew/newChatView/chatBox.vue
View File

@ -218,7 +218,7 @@ export default {
const maintainerList = []; const maintainerList = [];
val.forEach(item => { val.forEach(item => {
const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
switch (item.role) { switch (item.type) {
case 'DISPATCHER': case 'DISPATCHER':
this.memberData[item.id].label = '行调' + (dispatcherList.length + 1); this.memberData[item.id].label = '行调' + (dispatcherList.length + 1);
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);