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