diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 2e289234d..503d1d6d2 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -78,7 +78,6 @@ export default {
],
roleTypeList: [
{label: '行调', value: 'DISPATCHER'},
- {label: 'NCC行调', value: 'NCC_DISPATCHER'},
{label: '行值', value: 'STATION_SUPERVISOR'},
{label: '司机', value: 'DRIVER'},
{label: '通号', value: 'MAINTAINER'},
diff --git a/src/views/newMap/display/memberManage/addMember.vue b/src/views/newMap/display/memberManage/addMember.vue
index fa87e0f91..988c48c35 100644
--- a/src/views/newMap/display/memberManage/addMember.vue
+++ b/src/views/newMap/display/memberManage/addMember.vue
@@ -81,7 +81,6 @@ export default {
],
typeList: [
{label: '行调', value: 'DISPATCHER'},
- {label: 'NCC行调', value: 'NCC_DISPATCHER'},
{label: '通号', value: 'MAINTAINER'},
{label: '车站值班员', value: 'STATION_SUPERVISOR'},
{label: '车站助理', value: 'STATION_ASSISTANT'},
diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue
index 09f0e9086..4d20055ca 100644
--- a/src/views/newMap/display/memberManage/membersManage.vue
+++ b/src/views/newMap/display/memberManage/membersManage.vue
@@ -96,9 +96,6 @@ export default {
treeData: [{
labelName: '行调',
children: []
- }, {
- labelName: 'NCC行调',
- children: []
}, {
labelName: '车站值班员',
children: []
@@ -177,7 +174,6 @@ export default {
if (val && val.length) {
this.memberData = this.$store.state.training.memberData;
const dispatcherList = [];
- const nccDispatcherList = [];
const electricDispatcherList = [];
const depotDispatcherList = [];
const stationSupervisorList = [];
@@ -201,10 +197,6 @@ export default {
this.memberData[item.id].labelName = '行调' + (item.name || '');
dispatcherList.push(this.memberData[item.id]);
break;
- case 'NCC_DISPATCHER':
- this.memberData[item.id].labelName = 'NCC行调' + (item.name || '');
- nccDispatcherList.push(this.memberData[item.id]);
- break;
case 'ELECTRIC_DISPATCHER':
this.memberData[item.id].labelName = '电力调度' + (item.name || '');
electricDispatcherList.push(this.memberData[item.id]);
@@ -280,10 +272,6 @@ export default {
labelName: '行调',
id: 'dispatcher',
children: dispatcherList
- }, {
- labelName: 'NCC行调',
- id: 'nccDispatcher',
- children: nccDispatcherList
}, {
labelName: '车站值班员',
id: 'stationSupervisor',
diff --git a/src/views/newMap/display/newChat/editGroup.vue b/src/views/newMap/display/newChat/editGroup.vue
index 7501c5414..72c8fcf85 100644
--- a/src/views/newMap/display/newChat/editGroup.vue
+++ b/src/views/newMap/display/newChat/editGroup.vue
@@ -92,9 +92,6 @@ export default {
treeData: [{
labelName: '行调',
children: []
- }, {
- labelName: 'NCC行调',
- children: []
}, {
labelName: '车站值班员',
children: []
@@ -224,7 +221,6 @@ export default {
if (val && val.length) {
// this.memberData = this.$store.state.training.memberData;
const dispatcherList = [];
- const nccDispatcherList = [];
const electricDispatcherList = [];
const depotDispatcherList = [];
const stationSupervisorList = [];
@@ -248,10 +244,6 @@ export default {
this.memberData[item.id].labelName = '行调' + (item.name || '');
dispatcherList.push(this.memberData[item.id]);
break;
- case 'NCC_DISPATCHER':
- this.memberData[item.id].labelName = 'NCC行调' + (item.name || '');
- nccDispatcherList.push(this.memberData[item.id]);
- break;
case 'ELECTRIC_DISPATCHER':
this.memberData[item.id].labelName = '电力调度' + (item.name || '');
electricDispatcherList.push(this.memberData[item.id]);
@@ -325,12 +317,8 @@ export default {
});
this.treeData = [{
labelName: '行调',
- id: 'dispatcher',
+ id: 'dispatcher1',
children: dispatcherList
- }, {
- labelName: 'NCC行调',
- id: 'nccDispatcher',
- children: nccDispatcherList
}, {
labelName: '车站值班员',
id: 'stationSupervisor',
diff --git a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
index 6983573ef..32bcf076b 100644
--- a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
@@ -159,6 +159,8 @@
+
+
@@ -169,95 +171,104 @@
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
- 批量创建
- 重置
-
+
+
+ 批量创建
+ 重置
+
-
+
+
@@ -440,7 +451,6 @@ export default {
},
batchForm: {
DISPATCHER: 0,
- NCC_DISPATCHER: 0,
STATION_SUPERVISOR: 0,
DRIVER: 0,
MAINTAINER: 0,
@@ -535,11 +545,7 @@ export default {
name += findType.label;
}
name += '-';
- if (obj.type == 'NCC_DISPATCHER') {
- if (obj.name) {
- name += obj.name;
- }
- } else if (obj.type == 'DISPATCHER') {
+ if (obj.type == 'DISPATCHER') {
const findDeviceCode = this.disStationList.find(item => {
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 => {
if (!station.depot) {
if (this.batchForm.STATION_SUPERVISOR) {
@@ -855,7 +850,6 @@ export default {
resetForm() {
this.batchForm = {
DISPATCHER: 0,
- NCC_DISPATCHER: 0,
STATION_SUPERVISOR: 0,
DRIVER: 0,
MAINTAINER: 0,
@@ -911,13 +905,6 @@ export default {
};
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 => {
if (!station.depot) {
const member = {