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

src/views/login/index.vue

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

src/views/newMap/jointTrainingNew/index.vue

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

src/views/newMap/jointTrainingNew/memberManage/addMember.vue

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

src/views/newMap/jointTrainingNew/memberManage/membersManage.vue

@@ -32,7 +32,7 @@
           >
             <span :id="data.id" slot-scope="{ node, data }" class="custom-tree-node">
               <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-option
                     v-for="item in simulationUserList"
@@ -104,15 +104,15 @@ export default {
             memberData: {},
             treeData: [{
                 label: '行调',
-                type: 'role',
+                // type: 'role',
                 children: []
             }, {
                 label: '车站值班员',
-                type: 'role',
+                // type: 'role',
                 children: []
             }, {
                 label: '司机',
-                type: 'role',
+                // type: 'role',
                 children: []
             }, {
                 label: '通号',
@@ -163,7 +163,7 @@ export default {
                 const maintainerList = [];
                 val.forEach(item => {
                     const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
-                    switch (item.role) {
+                    switch (item.type) {
                     case 'DISPATCHER':
                         this.memberData[item.id].label = '行调' + (dispatcherList.length + 1);
                         dispatcherList.push(this.memberData[item.id]);
@@ -274,7 +274,7 @@ export default {
                 flag = this.memberData[data.id].nickName.indexOf(value) !== -1;
             }
             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;
             }
             return (data.label.indexOf(value) !== -1 || flag) && driverNoShow;

src/views/newMap/jointTrainingNew/newChatView/chatBox.vue

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