From 2e48ac5cc6658121468b82f7d4a07bea2d7fbe27 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 13:30:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/chatView/chatBox.vue | 36 ++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue index 9d44fa824..57285ac56 100644 --- a/src/views/newMap/chatView/chatBox.vue +++ b/src/views/newMap/chatView/chatBox.vue @@ -1113,6 +1113,14 @@ export default { const temMaintainerList = []; const temDriverList = []; const temDepotDispatcherList = []; + const temStationAssistList = []; + const temStationMasterList = []; + const temStationSignalerList = []; + const temStationPassengerList = []; + const temStationSwitchManList = []; + const temStationFacilitatorList = []; + const temStationWorkerList = []; + const temDeviceManagerList = []; this.$store.state.training.memberList.forEach(item =>{ switch (item.type) { case 'DISPATCHER': @@ -1130,9 +1138,35 @@ export default { case 'DEPOT_DISPATCHER': temDepotDispatcherList.push({memberId: item.id, connect:true }); break; + case 'STATION_ASSISTANT': + temStationAssistList.push({memberId: item.id, connect:true }); + break; + case 'STATION_MASTER': + temStationMasterList.push({memberId: item.id, connect:true }); + break; + case 'STATION_SIGNALER': + temStationSignalerList.push({memberId: item.id, connect:true }); + break; + case 'STATION_PASSENGER': + temStationPassengerList.push({memberId: item.id, connect:true }); + break; + case 'STATION_SWITCH_MAN': + temStationSwitchManList.push({memberId: item.id, connect:true }); + break; + case 'STATION_FACILITATOR': + temStationFacilitatorList.push({memberId: item.id, connect:true }); + break; + case 'STATION_WORKER': + temStationWorkerList.push({memberId: item.id, connect:true }); + break; + case 'DEVICE_MANAGER': + temDeviceManagerList.push({memberId: item.id, connect:true }); + break; } }); - this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList]; + this.commonMemberList = [...temDispatcherList, ...temStationSupervisorList, ...temMaintainerList, ...temDriverList, ...temDepotDispatcherList, + ...temStationAssistList, ...temStationMasterList, ...temStationSignalerList, ...temStationPassengerList, ...temStationSwitchManList, + ...temStationFacilitatorList, temStationWorkerList, temDeviceManagerList]; if (this.userRole == 'AUDIENCE' || this.commonConversation) { this.conversitionMemberList = []; this.messageList = [...this.commonMessageList]; From c92d77fb6910989789701d0b338ff6609b01bcfa Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 13:55:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=BB=99=20=E4=BF=A1=E5=8F=B7=E5=91=98=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E7=8E=B0=E5=9C=B0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/displayNew/scriptDisplay/scriptRecord/index.vue | 6 ++++-- src/views/scriptManage/tipScriptRecord.vue | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue index bab4b8cf1..3e73c46c3 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue @@ -148,8 +148,10 @@ export default { return mem.userId != '' && mem.userId != undefined; }); if (member) { - const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT', 'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING']; - const prdTypeList = ['01', '02', '04', '', '05', '', '']; + const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT', + 'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', + 'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER']; + const prdTypeList = ['01', '02', '04', '', '05', '', '', '', '', '', '01', '', '', '', '', '']; const index = memberType.indexOf(member.type); let prdType; if (index >= 0) { diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index c5ec22226..0ef8c0728 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -560,7 +560,7 @@ export default { role.type = 'STATION_MASTER'; this.$store.dispatch('training/setRoles', 'STATION_MASTER'); } else if (role.type == '车站信号员') { - prdType = ''; + prdType = '01'; role.type = 'STATION_SIGNALER'; this.$store.dispatch('training/setRoles', 'STATION_SIGNALER'); } else if (role.type == '车站客运员') { From faea986734471fbd1559635e9454177369be32fd Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 15:51:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=B0=81=E9=94=81/=E8=A7=A3=E5=B0=81=20?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/menuSignal.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index 0cf472ed0..cefbe4080 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -86,9 +86,15 @@ export default { }, { label: '封锁/解封', - handler: '', - cmdType: '' + handler: this.lockOrUnlock + // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK + }, + // { + // label: '解封', + // handler: '', + // cmdType: '' + // }, { label: '总人解', handler: this.humanTrainRoute, From c26c57930b5de73af630fc54b0ebb7ca42a4a404 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 15:53:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/menuSignal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index cefbe4080..72d252e7c 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -319,13 +319,13 @@ export default { }, lockOrUnlock() { if (this.selected.lock) { - commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { this.$refs.routeControl.doShow(operate, this.selected); } }); } else { - commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { + commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { this.$refs.routeControl.doShow(operate, this.selected); } From d79e95425b2ad40707da751ff69f368b85721ab0 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 16:11:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/datie_02/menus/menuSignal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue index 72d252e7c..14bce60ac 100644 --- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue +++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue @@ -318,7 +318,7 @@ export default { }); }, lockOrUnlock() { - if (this.selected.lock) { + if (this.selected.blockade) { commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => { if (valid) { this.$refs.routeControl.doShow(operate, this.selected); From 246f204eb7b8a1e21d498421e1b34f0ccda7643b Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Tue, 26 Jul 2022 16:30:48 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/menuSchema.vue | 8 ++++++-- .../scriptDisplay/scriptRecord/index.vue | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index c51b0f211..6b99b6028 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -306,8 +306,10 @@ export default { this.$refs.registerBook.doShow(); }, checkRoleInit(data) { + const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', + 'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER']; data.forEach(item => { - if ((item.admin && item.online) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') { + if ((item.admin && item.online) && item.userId == this.userId && stationRoleList.includes(item.type)) { this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode); this.deviceCode = item.deviceCode; this.setShowStation(item.deviceCode); @@ -316,8 +318,10 @@ export default { }); }, checkRoleChange(data) { + const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', + 'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER']; data.forEach(item => { - if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') { + if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && stationRoleList.includes(item.type)) { // this.userRole = item.type || 'AUDIENCE'; this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode); this.deviceCode = item.deviceCode; diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue index 3e73c46c3..a9fb99ad7 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue @@ -222,13 +222,22 @@ export default { }, checkRoleChange(data) { + const stationRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', + 'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER']; data.forEach(item => { - if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && item.type == 'STATION_SUPERVISOR') { + if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && (stationRoleList.includes(item.type) )) { // this.userRole = item.type || 'AUDIENCE'; this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode); this.deviceCode = item.deviceCode; - this.setShowStation(item.deviceCode); - this.$store.dispatch('training/setPrdType', '01'); + + if (item.type == 'STATION_SUPERVISOR' || item.type == 'STATION_SIGNALER') { + this.setShowStation(item.deviceCode); + this.$store.dispatch('training/setPrdType', '01'); + } else { + const showStation = this.centralizedStationMap[item.deviceCode]; + this.setShowStation(''); + this.$jlmap.setCenter(showStation); + } // this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]); // this.$nextTick(() => { // if (item.deviceCode && this.$store.state.training.prdType !== '09') { this.setCenter(item.deviceCode); }