From 55dda9ca10f83a7cf66f3578a97288aa7297a7bd Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Wed, 4 Nov 2020 09:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=81=9C=E8=BD=A6=E5=9C=BA?= =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=A5=BC=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/chatView/chatBox.vue | 14 ++++++++++++-- .../displayNew/dispatherContest/sceneList.vue | 3 +++ .../scriptPreview/scriptButtonGroup.vue | 6 ++++++ src/views/newMap/displayNew/utils.js | 4 ++-- src/views/scriptManage/tipScriptRecord.vue | 5 +++-- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index 757db63f6..7f40cb1de 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -363,6 +363,7 @@ export default { const driverList = {}; const maintainerList = {}; const parentDepartmentList = {}; + const parkingLotSignalBuilding = {}; val.forEach(item => { const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode); this.memberData[item.id]['active'] = false; @@ -399,14 +400,18 @@ export default { case 'MAINTAINER': this.memberData[item.id].label = '通号' + (item.name || ''); this.memberData[item.id].labelName = '通号' + (item.name || ''); - // this.memberData[item.id].label = item.name || ''; maintainerList[item.id] = this.memberData[item.id]; break; case 'PARENT_DEPARTMENT': this.memberData[item.id].label = '上级部门' + (item.name || ''); this.memberData[item.id].labelName = '上级部门' + (item.name || ''); parentDepartmentList[item.id] = this.memberData[item.id]; - // case '' + break; + case 'PARKING_LOT_SIGNAL_BUILDING': + this.memberData[item.id].label = '停车场信号机' + (item.name || ''); + this.memberData[item.id].labelName = '停车场信号机' + (item.name || ''); + parkingLotSignalBuilding[item.id] = this.memberData[item.id]; + break; } }); // { label: '全部集中站', value: 'allConcentrateStation', active: false, sign: 'DEVICE_STATION' }, @@ -447,6 +452,11 @@ export default { id: 'electricDispatcher', type: 'role', children: electricDispatcherList + }, { + label: '停车场信号楼', + id: 'parkingLotSignalBuilding', + type: 'role', + children: parkingLotSignalBuilding }]; this.initCommonMemberList(); this.filterNode(); diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue index 9e9e88b22..8212872df 100644 --- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue +++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue @@ -177,6 +177,9 @@ export default { member.label = '电力调度' + (member.name ? member.name : ''); break; } + case 'PARKING_LOT_SIGNAL_BUILDING': { + member.label = '停车场信号机' + (member.name ? member.name : ''); + } } // if (member.type === 'DISPATCHER') { // this.memberId = member.id; diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue index 8e0669a54..90068e9ad 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue @@ -228,6 +228,12 @@ export default { id: 'electricDispatcher', type: 'role', children: result.deviceListData[6] + }, + { + label: '停车场信号楼', + id: 'parkingLotSignalBuilding', + type: 'role', + children: result.deviceListData[7] }]; const lastMemberList = result.lastMemberList; this.$emit('setTreeData', treeData); diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js index 08fd61ee4..83a6b9966 100644 --- a/src/views/newMap/displayNew/utils.js +++ b/src/views/newMap/displayNew/utils.js @@ -15,7 +15,7 @@ export function covertMemberData (activeTrainList, resp) { lastData = JSON.parse(lastData); const lastMemberList = []; // const electricDispatcherList = []; - const deviceListData = [[], [], [], [], [], [], []]; + const deviceListData = [[], [], [], [], [], [], [], []]; const driverList = []; lastData.forEach((member, index)=>{ if (member.userId && member.userId == store.state.user.id) { @@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) { member.label = member.type + name + userName; member.normalName = member.type + name; } - const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度', '上级部门', '电力调度']; + const deviceType = ['行调', '通号', '行值', '司机', '车辆段调度', '上级部门', '电力调度', '停车场信号楼']; const deviceTypeIndex = deviceType.indexOf(member.type); if (deviceTypeIndex >= 0) { if (deviceTypeIndex == 3) { diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index c9a077c92..e7113041f 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -256,7 +256,7 @@ export default { const covertmember = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew); const newMember = covertmember[0]; this.memberList.push(newMember); - const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度', '上级部门', '电力调度']; + const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段调度', '上级部门', '电力调度', '停车场信号楼']; const index = deviceTypeList.indexOf(newMember.type); if (index >= 0) { const treeDataIn = this.treeData[index]; @@ -502,7 +502,8 @@ export default { 'MAINTAINER':'通号', 'DEPOT_DISPATCHER':'车辆段调度', 'PARENT_DEPARTMENT':'上级部门', - 'ELECTRIC_DISPATCHER':'电力调度' + 'ELECTRIC_DISPATCHER':'电力调度', + 'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼' }; newRole.type = roleTypeEnumMap[newRole.type]; this.quickChangeMember.list.push(newRole);