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

Revert "添加角色NCC行调"

Browse Source 
This reverts commit 6d848115b3.
This commit is contained in:
fan 2023-05-06 10:53:25 +08:00
parent c4028ee8c6
commit 5c72107b90
5 changed files with 40 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scripts/ConstConfig.js
View File

@ -78,7 +78,6 @@ export default {
], ],
roleTypeList: [ roleTypeList: [
{label: '行调', value: 'DISPATCHER'}, {label: '行调', value: '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'},

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

@ -81,7 +81,6 @@ export default {
], ],
typeList: [ typeList: [
{label: '行调', value: 'DISPATCHER'}, {label: '行调', value: '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'},

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

@ -96,9 +96,6 @@ export default {
treeData: [{ treeData: [{
labelName: '行调', labelName: '行调',
children: [] children: []
}, {
labelName: 'NCC行调',
children: []
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
children: [] children: []
@ -177,7 +174,6 @@ export default {
if (val && val.length) { if (val && val.length) {
this.memberData = this.$store.state.training.memberData; this.memberData = this.$store.state.training.memberData;
const dispatcherList = []; const dispatcherList = [];
const nccDispatcherList = [];
const electricDispatcherList = []; const electricDispatcherList = [];
const depotDispatcherList = []; const depotDispatcherList = [];
const stationSupervisorList = []; const stationSupervisorList = [];
@ -201,10 +197,6 @@ export default {
this.memberData[item.id].labelName = '行调' + (item.name || ''); this.memberData[item.id].labelName = '行调' + (item.name || '');
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);
break; break;
case 'NCC_DISPATCHER':
this.memberData[item.id].labelName = 'NCC行调' + (item.name || '');
nccDispatcherList.push(this.memberData[item.id]);
break;
case 'ELECTRIC_DISPATCHER': case 'ELECTRIC_DISPATCHER':
this.memberData[item.id].labelName = '电力调度' + (item.name || ''); this.memberData[item.id].labelName = '电力调度' + (item.name || '');
electricDispatcherList.push(this.memberData[item.id]); electricDispatcherList.push(this.memberData[item.id]);
@ -280,10 +272,6 @@ export default {
labelName: '行调', labelName: '行调',
id: 'dispatcher', id: 'dispatcher',
children: dispatcherList children: dispatcherList
}, {
labelName: 'NCC行调',
id: 'nccDispatcher',
children: nccDispatcherList
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
id: 'stationSupervisor', id: 'stationSupervisor',

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

@ -92,9 +92,6 @@ export default {
treeData: [{ treeData: [{
labelName: '行调', labelName: '行调',
children: [] children: []
}, {
labelName: 'NCC行调',
children: []
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
children: [] children: []
@ -224,7 +221,6 @@ export default {
if (val && val.length) { if (val && val.length) {
// this.memberData = this.$store.state.training.memberData; // this.memberData = this.$store.state.training.memberData;
const dispatcherList = []; const dispatcherList = [];
const nccDispatcherList = [];
const electricDispatcherList = []; const electricDispatcherList = [];
const depotDispatcherList = []; const depotDispatcherList = [];
const stationSupervisorList = []; const stationSupervisorList = [];
@ -248,10 +244,6 @@ export default {
this.memberData[item.id].labelName = '行调' + (item.name || ''); this.memberData[item.id].labelName = '行调' + (item.name || '');
dispatcherList.push(this.memberData[item.id]); dispatcherList.push(this.memberData[item.id]);
break; break;
case 'NCC_DISPATCHER':
this.memberData[item.id].labelName = 'NCC行调' + (item.name || '');
nccDispatcherList.push(this.memberData[item.id]);
break;
case 'ELECTRIC_DISPATCHER': case 'ELECTRIC_DISPATCHER':
this.memberData[item.id].labelName = '电力调度' + (item.name || ''); this.memberData[item.id].labelName = '电力调度' + (item.name || '');
electricDispatcherList.push(this.memberData[item.id]); electricDispatcherList.push(this.memberData[item.id]);
@ -325,12 +317,8 @@ export default {
}); });
this.treeData = [{ this.treeData = [{
labelName: '行调', labelName: '行调',
id: 'dispatcher', id: 'dispatcher1',
children: dispatcherList children: dispatcherList
}, {
labelName: 'NCC行调',
id: 'nccDispatcher',
children: nccDispatcherList
}, { }, {
labelName: '车站值班员', labelName: '车站值班员',
id: 'stationSupervisor', id: 'stationSupervisor',

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

@ -159,6 +159,8 @@
<el-input-number v-model="batchForm.MAINTAINER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.MAINTAINER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="行值：" prop="STATION_SUPERVISOR"> <el-form-item label="行值：" prop="STATION_SUPERVISOR">
<el-input-number v-model="batchForm.STATION_SUPERVISOR" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_SUPERVISOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
@ -169,95 +171,104 @@
<el-input-number v-model="batchForm.DRIVER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.DRIVER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'METRO'">
<el-col :span="12">
<el-form-item label="车辆段/停车场调度：" prop="DEPOT_DISPATCHER"> <el-form-item label="车辆段/停车场调度：" prop="DEPOT_DISPATCHER">
<el-input-number v-model="batchForm.DEPOT_DISPATCHER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.DEPOT_DISPATCHER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> <el-col :span="12">
<el-form-item label="车辆段/停车场信号楼：" prop="SIGNAL_BUILDING"> <el-form-item label="车辆段/停车场信号楼：" prop="SIGNAL_BUILDING">
<el-input-number v-model="batchForm.SIGNAL_BUILDING" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.SIGNAL_BUILDING" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'RAILWAY'">
<el-col :span="12">
<el-form-item label="车站助理：" prop="STATION_ASSISTANT"> <el-form-item label="车站助理：" prop="STATION_ASSISTANT">
<el-input-number v-model="batchForm.STATION_ASSISTANT" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_ASSISTANT" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> <el-col :span="12">
<el-form-item label="车站站长：" prop="STATION_MASTER"> <el-form-item label="车站站长：" prop="STATION_MASTER">
<el-input-number v-model="batchForm.STATION_MASTER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_MASTER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'RAILWAY'">
<el-col :span="12">
<el-form-item label="车站信号员：" prop="STATION_SIGNALER"> <el-form-item label="车站信号员：" prop="STATION_SIGNALER">
<el-input-number v-model="batchForm.STATION_SIGNALER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_SIGNALER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> <el-col :span="12">
<el-form-item label="车站客运员：" prop="STATION_PASSENGER"> <el-form-item label="车站客运员：" prop="STATION_PASSENGER">
<el-input-number v-model="batchForm.STATION_PASSENGER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_PASSENGER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'RAILWAY'">
<el-col :span="12">
<el-form-item label="车站扳道员：" prop="STATION_SWITCH_MAN"> <el-form-item label="车站扳道员：" prop="STATION_SWITCH_MAN">
<el-input-number v-model="batchForm.STATION_SWITCH_MAN" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_SWITCH_MAN" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> <el-col :span="12">
<el-form-item label="车站引导员：" prop="STATION_FACILITATOR"> <el-form-item label="车站引导员：" prop="STATION_FACILITATOR">
<el-input-number v-model="batchForm.STATION_FACILITATOR" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_FACILITATOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'RAILWAY'">
<el-col :span="12">
<el-form-item label="车站工务工：" prop="STATION_WORKER"> <el-form-item label="车站工务工：" prop="STATION_WORKER">
<el-input-number v-model="batchForm.STATION_WORKER" size="small" :min="0" :max="1" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_WORKER" size="small" :min="0" :max="1" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'RAILWAY'" :span="12"> <el-col :span="12">
<el-form-item label="设备管理员：" prop="DEVICE_MANAGER"> <el-form-item label="设备管理员：" prop="DEVICE_MANAGER">
<el-input-number v-model="batchForm.DEVICE_MANAGER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.DEVICE_MANAGER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'METRO'">
<el-col :span="12">
<el-form-item label="工电调度：" prop="ELECTRIC_DISPATCHER"> <el-form-item label="工电调度：" prop="ELECTRIC_DISPATCHER">
<el-input-number v-model="batchForm.ELECTRIC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.ELECTRIC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> <el-col :span="12">
<el-form-item label="车务段段长：" prop="TRAIN_MASTER"> <el-form-item label="车务段段长：" prop="TRAIN_MASTER">
<el-input-number v-model="batchForm.TRAIN_MASTER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.TRAIN_MASTER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> </el-row>
<el-row v-if="batchForm.systemType === 'METRO'">
<el-col :span="12">
<el-form-item label="值班主任：" prop="SHIFT_MANAGER"> <el-form-item label="值班主任：" prop="SHIFT_MANAGER">
<el-input-number v-model="batchForm.SHIFT_MANAGER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.SHIFT_MANAGER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> <el-col :span="12">
<el-form-item label="环控调度" prop="ENVIRONMENT_DISPATCHER"> <el-form-item label="环控调度" prop="ENVIRONMENT_DISPATCHER">
<el-input-number v-model="batchForm.ENVIRONMENT_DISPATCHER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.ENVIRONMENT_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="batchForm.systemType === 'METRO'" :span="12"> <el-col :span="12">
<el-form-item label="电力工务" prop="STATION_ELECTRIC_WORKER"> <el-form-item label="电力工务" prop="STATION_ELECTRIC_WORKER">
<el-input-number v-model="batchForm.STATION_ELECTRIC_WORKER" size="small" :min="0" :step="1" :precision="0" /> <el-input-number v-model="batchForm.STATION_ELECTRIC_WORKER" size="small" :min="0" :step="1" :precision="0" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- -->
<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-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item>
<el-button type="primary" @click="batchCreate">批量创建</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-row> </el-row>
<el-form-item>
<el-button type="primary" @click="batchCreate">批量创建</el-button>
<el-button @click="resetForm">重置</el-button>
</el-form-item>
</el-form> </el-form>
</div></el-tab-pane> </div>
</el-tab-pane>
<el-tab-pane class="view-control" label="一键生成" name="fourth" :lazy="lazy"> <el-tab-pane class="view-control" label="一键生成" name="fourth" :lazy="lazy">
<el-form ref="generationForm" :model="generationForm" label-width="120px" class="demo-ruleForm" size="small"> <el-form ref="generationForm" :model="generationForm" label-width="120px" class="demo-ruleForm" size="small">
<el-form-item label="系统：" prop="systemType"> <el-form-item label="系统：" prop="systemType">
@ -440,7 +451,6 @@ export default {
}, },
batchForm: { batchForm: {
DISPATCHER: 0, DISPATCHER: 0,
NCC_DISPATCHER: 0,
STATION_SUPERVISOR: 0, STATION_SUPERVISOR: 0,
DRIVER: 0, DRIVER: 0,
MAINTAINER: 0, MAINTAINER: 0,
@ -535,11 +545,7 @@ export default {
name += findType.label; name += findType.label;
} }
name += '-'; name += '-';
if (obj.type == 'NCC_DISPATCHER') { if (obj.type == 'DISPATCHER') {
if (obj.name) {
name += obj.name;
}
} else if (obj.type == 'DISPATCHER') {
const findDeviceCode = this.disStationList.find(item => { const findDeviceCode = this.disStationList.find(item => {
return item.code == obj.deviceCode; return item.code == obj.deviceCode;
}); });
@ -646,17 +652,6 @@ export default {
} }
} }
} }
if (this.batchForm.NCC_DISPATCHER) {
for (let i = 0; i < this.batchForm.NCC_DISPATCHER; i++) {
const member = {
id: this.getMemberId(this.batchForm.systemType),
name: '',
type: 'NCC_DISPATCHER',
deviceCode: ''
};
memberMap[this.batchForm.systemType].push(member);
}
}
this.stationList.forEach(station => { this.stationList.forEach(station => {
if (!station.depot) { if (!station.depot) {
if (this.batchForm.STATION_SUPERVISOR) { if (this.batchForm.STATION_SUPERVISOR) {
@ -855,7 +850,6 @@ export default {
resetForm() { resetForm() {
this.batchForm = { this.batchForm = {
DISPATCHER: 0, DISPATCHER: 0,
NCC_DISPATCHER: 0,
STATION_SUPERVISOR: 0, STATION_SUPERVISOR: 0,
DRIVER: 0, DRIVER: 0,
MAINTAINER: 0, MAINTAINER: 0,
@ -911,13 +905,6 @@ export default {
}; };
memberMap[this.generationForm.systemType].push(memberDispatcher); memberMap[this.generationForm.systemType].push(memberDispatcher);
} }
const memberNccDispatcher = {
id: this.getMemberId(this.generationForm.systemType),
name: '',
type: 'NCC_DISPATCHER',
deviceCode: ''
};
memberMap[this.generationForm.systemType].push(memberNccDispatcher);
this.stationList.forEach(station => { this.stationList.forEach(station => {
if (!station.depot) { if (!station.depot) {
const member = { const member = {