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:
fan 2023-04-25 13:56:24 +08:00
commit 034199ec23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/ConstConfig.js
View File

@ -78,7 +78,7 @@ export default {
], ],
roleTypeList: [ roleTypeList: [
{label: '行调', value: 'DISPATCHER'}, {label: '行调', value: 'DISPATCHER'},
{label: 'NCC行调', value: 'NCC_DISPATCHER'}, {label: 'NCC调度', value: 'NCC_DISPATCHER'},
{label: '行值', value: 'STATION_SUPERVISOR'}, {label: '行值', value: 'STATION_SUPERVISOR'},
{label: '司机', value: 'DRIVER'}, {label: '司机', value: 'DRIVER'},
{label: '通号', value: 'MAINTAINER'}, {label: '通号', value: 'MAINTAINER'},

2
src/views/newMap/display/memberManage/addMember.vue
View File

@ -81,7 +81,7 @@ export default {
], ],
typeList: [ typeList: [
{label: '行调', value: 'DISPATCHER'}, {label: '行调', value: 'DISPATCHER'},
{label: 'NCC行调', value: 'NCC_DISPATCHER'}, {label: 'NCC调度', value: 'NCC_DISPATCHER'},
{label: '通号', value: 'MAINTAINER'}, {label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'}, {label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'}, {label: '车站助理', value: 'STATION_ASSISTANT'},

6
src/views/newMap/display/memberManage/membersManage.vue
View File

@ -97,7 +97,7 @@ export default {
labelName: '行调', labelName: '行调',
children: [] children: []
}, { }, {
labelName: 'NCC行调', labelName: 'NCC调度',
children: [] children: []
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
@ -202,7 +202,7 @@ export default {
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);
break; break;
case 'NCC_DISPATCHER': case 'NCC_DISPATCHER':
this.memberData[item.id].labelName = 'NCC行调' + (item.name || ''); this.memberData[item.id].labelName = 'NCC调度' + (item.name || '');
nccDispatcherList.push(this.memberData[item.id]); nccDispatcherList.push(this.memberData[item.id]);
break; break;
case 'ELECTRIC_DISPATCHER': case 'ELECTRIC_DISPATCHER':
@ -281,7 +281,7 @@ export default {
id: 'dispatcher', id: 'dispatcher',
children: dispatcherList children: dispatcherList
}, { }, {
labelName: 'NCC行调', labelName: 'NCC调度',
id: 'nccDispatcher', id: 'nccDispatcher',
children: nccDispatcherList children: nccDispatcherList
}, { }, {

6
src/views/newMap/display/newChat/editGroup.vue
View File

@ -93,7 +93,7 @@ export default {
labelName: '行调', labelName: '行调',
children: [] children: []
}, { }, {
labelName: 'NCC行调', labelName: 'NCC调度',
children: [] children: []
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
@ -239,7 +239,7 @@ export default {
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);
break; break;
case 'NCC_DISPATCHER': case 'NCC_DISPATCHER':
this.memberData[item.id].labelName = 'NCC行调' + (item.name || ''); this.memberData[item.id].labelName = 'NCC调度' + (item.name || '');
nccDispatcherList.push(this.memberData[item.id]); nccDispatcherList.push(this.memberData[item.id]);
break; break;
case 'ELECTRIC_DISPATCHER': case 'ELECTRIC_DISPATCHER':
@ -318,7 +318,7 @@ export default {
id: 'dispatcher', id: 'dispatcher',
children: dispatcherList children: dispatcherList
}, { }, {
labelName: 'NCC行调', labelName: 'NCC调度',
id: 'nccDispatcher', id: 'nccDispatcher',
children: nccDispatcherList children: nccDispatcherList
}, { }, {

2
src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
View File

@ -245,7 +245,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="NCC行调：" prop="NCC_DISPATCHER"> <el-form-item label="NCC调度：" prop="NCC_DISPATCHER">
<el-input-number v-model="batchForm.NCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.NCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>