添加角色OCC_DISPATCHER信息调度

src/scripts/ConstConfig.js

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

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

@@ -80,8 +80,9 @@ export default {
                 'DEVICE_MANAGER'
             ],
             typeList: [
-                {label: '行调', value: 'DISPATCHER'},
                 {label: 'NCC调度', value: 'NCC_DISPATCHER'},
+                {label: '信息调度', value: 'OCC_DISPATCHER'},
+                {label: '行调', value: 'DISPATCHER'},
                 {label: '通号', value: 'MAINTAINER'},
                 {label: '车站值班员', value: 'STATION_SUPERVISOR'},
                 {label: '车站助理', value: 'STATION_ASSISTANT'},

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

@@ -96,6 +96,9 @@ export default {
             treeData: [{
                 labelName: 'NCC调度',
                 children: []
+            }, {
+                labelName: '信息调度',
+                children: []
             }, {
                 labelName: '行调',
                 children: []
@@ -178,6 +181,7 @@ export default {
                 this.memberData = this.$store.state.training.memberData;
                 const dispatcherList = [];
                 const nccDispatcherList = [];
+                const occDispatcherList = [];
                 const electricDispatcherList = [];
                 const depotDispatcherList = [];
                 const stationSupervisorList = [];
@@ -201,6 +205,10 @@ export default {
                         this.memberData[item.id].labelName = 'NCC调度' + (item.name || '');
                         nccDispatcherList.push(this.memberData[item.id]);
                         break;
+                    case 'OCC_DISPATCHER':
+                        this.memberData[item.id].labelName = '信息调度' + (item.name || '');
+                        occDispatcherList.push(this.memberData[item.id]);
+                        break;
                     case 'DISPATCHER':
                         this.memberData[item.id].labelName = '行调' + (item.name || '');
                         dispatcherList.push(this.memberData[item.id]);
@@ -280,6 +288,10 @@ export default {
                     labelName: 'NCC调度',
                     id: 'nccDispatcher',
                     children: nccDispatcherList
+                }, {
+                    labelName: '信息调度',
+                    id: 'occDispatcher',
+                    children: occDispatcherList
                 }, {
                     labelName: '行调',
                     id: 'dispatcher',

src/views/newMap/display/newChat/chatDialog.vue

@@ -402,6 +402,7 @@ export default {
             if (val && val.length) {
                 const dispatcherList = [];
                 const nccDispatcherList = [];
+                const occDispatcherList = [];
                 const electricDispatcherList = [];
                 const depotDispatcherList = [];
                 const stationSupervisorList = [];
@@ -425,6 +426,10 @@ export default {
                         this.memberData[item.id].labelName = 'NCC调度' + (item.name || '');
                         nccDispatcherList.push(this.memberData[item.id]);
                         break;
+                    case 'OCC_DISPATCHER':
+                        this.memberData[item.id].labelName = '信息调度' + (item.name || '');
+                        occDispatcherList.push(this.memberData[item.id]);
+                        break;
                     case 'DISPATCHER':
                         this.memberData[item.id].labelName = '行调' + (item.name || '');
                         dispatcherList.push(this.memberData[item.id]);
@@ -502,6 +507,10 @@ export default {
                     labelName: 'NCC调度',
                     id: 'nccDispatcher',
                     children: nccDispatcherList
+                }, {
+                    labelName: '信息调度',
+                    id: 'occDispatcher',
+                    children: occDispatcherList
                 }, {
                     labelName: '行调',
                     id: 'dispatcher',

src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue

@@ -249,6 +249,11 @@
                 <el-input-number v-model="batchForm.NCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="信息调度：" prop="OCC_DISPATCHER">
+                <el-input-number v-model="batchForm.OCC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-form-item>
@@ -471,6 +476,7 @@ export default {
             batchForm: {
                 DISPATCHER: 0,
                 NCC_DISPATCHER: 0,
+                OCC_DISPATCHER: 0,
                 STATION_SUPERVISOR: 0,
                 DRIVER: 0,
                 MAINTAINER: 0,
@@ -592,7 +598,8 @@ export default {
                 name += findType.label;
             }
             name += '-';
-            if (obj.type == 'NCC_DISPATCHER') {
+            const typeList = ['NCC_DISPATCHER', 'OCC_DISPATCHER'];
+            if (typeList.includes(obj.type)) {
                 if (obj.name) {
                     name += obj.name;
                 }
@@ -718,6 +725,17 @@ export default {
                     memberMap[this.batchForm.systemType].push(member);
                 }
             }
+            if (this.batchForm.OCC_DISPATCHER) {
+                for (let i = 0; i < this.batchForm.OCC_DISPATCHER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'OCC_DISPATCHER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
             this.stationList.forEach(station => {
                 if (!station.depot) {
                     if (this.batchForm.STATION_SUPERVISOR) {
@@ -917,6 +935,7 @@ export default {
             this.batchForm = {
                 DISPATCHER: 0,
                 NCC_DISPATCHER: 0,
+                OCC_DISPATCHER: 0,
                 STATION_SUPERVISOR: 0,
                 DRIVER: 0,
                 MAINTAINER: 0,
@@ -979,6 +998,13 @@ export default {
                 deviceCode: ''
             };
             memberMap[this.generationForm.systemType].push(memberNccDispatcher);
+            const memberOccDispatcher = {
+                id: this.getMemberId(this.generationForm.systemType),
+                name: '',
+                type: 'OCC_DISPATCHER',
+                deviceCode: ''
+            };
+            memberMap[this.generationForm.systemType].push(memberOccDispatcher);
             this.stationList.forEach(station => {
                 if (!station.depot) {
                     const member = {