From 2c2d704ee75db7f023b0f46c1eca381409ed8e3a Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 13 Aug 2020 09:07:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=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/demon/runPlanView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue index b8c0f5965..fcf66a3e9 100644 --- a/src/views/newMap/displayNew/demon/runPlanView.vue +++ b/src/views/newMap/displayNew/demon/runPlanView.vue @@ -239,6 +239,7 @@ export default { async loadChartPage() { try { this.seriesMap = {}; + this.staticSeries = []; const stations = this.$store.state.runPlan.stations; const planData = this.$store.state.runPlan.planData; this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(stations); @@ -413,7 +414,6 @@ export default { for (var time = 0 + this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) { list.push(time); } - const startValue = 3600 * 6; const offsetTime = 3600 * 1; From 066340930fb7dcb42e96c15b70d598b50e465da1 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 13 Aug 2020 09:22:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=80=E5=87=BAiscs=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=99=E6=B8=85=E7=90=86=E4=BB=BF=E7=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iscs/iscsSystem/groupNav.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue index 422ef959b..f5d84b980 100644 --- a/src/views/iscs/iscsSystem/groupNav.vue +++ b/src/views/iscs/iscsSystem/groupNav.vue @@ -35,6 +35,7 @@ import merge from 'webpack-merge'; import { getToken } from '@/utils/auth'; import { getSessionStorage } from '@/utils/auth'; import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp'; +import { clearSimulation } from '@/api/simulation'; export default { data() { return { @@ -268,7 +269,8 @@ export default { ] } ], - stationList: [] + stationList: [], + firstBack: false }; }, computed: { @@ -283,12 +285,12 @@ export default { '$store.state.socket.simulationRoleList':function(val) { (val || []).forEach(item => { if (item.messageType === 'KICK_OUT' && item.userId == this.$store.state.user.id) { - this.back(); + !this.firstBack && this.back(); } }); }, '$store.state.socket.simulationOver':function(val) { - this.back(); + !this.firstBack && this.back(); } }, async created () { @@ -388,12 +390,17 @@ export default { this.$router.push({ path: `/displayIscs/system/config/${this.type}`, query: query }); }, back() { + this.firstBack = true; if (this.projectDevice) { this.$store.dispatch('LogOut').then(() => { location.reload(); }); } else { - this.$router.push({ path: `/trainingPlatform` }); + clearSimulation(this.$route.query.group).then(resp => { + this.$router.push({ path: `/trainingPlatform` }); + }).catch(()=> { + this.$message.error('清除仿真失败！'); + }); } }, changeCurrentSystem() { From a97c1fcb742129c423df7db1dac0c3cd9aa5a777 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Thu, 13 Aug 2020 09:40:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?iscs=E5=B7=A5=E4=BD=9C=E7=AB=99=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iscs/iscsDesign/demonList.vue | 6 +++--- src/views/iscs/iscsSystem/groupNav.vue | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/views/iscs/iscsDesign/demonList.vue b/src/views/iscs/iscsDesign/demonList.vue index ce8dc46ba..5af612c99 100644 --- a/src/views/iscs/iscsDesign/demonList.vue +++ b/src/views/iscs/iscsDesign/demonList.vue @@ -4,7 +4,7 @@ iscs系统列表
- +
@@ -45,7 +45,7 @@ export default { editModel: {}, lineCode: '', mapList: [], - testList: [] + mapStationList: [] }; }, computed: { @@ -81,7 +81,7 @@ export default { filterText(val) { this.$refs.tree.filter(val); }, - testList(val) { + mapStationList(val) { console.log(val); } }, diff --git a/src/views/iscs/iscsSystem/groupNav.vue b/src/views/iscs/iscsSystem/groupNav.vue index f5d84b980..902c152aa 100644 --- a/src/views/iscs/iscsSystem/groupNav.vue +++ b/src/views/iscs/iscsSystem/groupNav.vue @@ -313,7 +313,6 @@ export default { } }, mounted() { - window.onbeforeunload = this.clearSubscribe; this.subscribe(); this.navList.forEach((nav, navIndex)=>{ if (nav.children && nav.children.length > 0) { @@ -331,9 +330,6 @@ export default { this.currentSystem = 'center'; } }, - beforeDestroy() { - this.clearSubscribe(); - }, methods: { show(item) { let flag = false; @@ -391,6 +387,7 @@ export default { }, back() { this.firstBack = true; + this.clearSubscribe(); if (this.projectDevice) { this.$store.dispatch('LogOut').then(() => { location.reload(); From 60b07ef1320a15fd75640e44c03b3f9a8f38f3f0 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 13 Aug 2020 10:46:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=89=A7=E6=9C=AC=E7=BC=96=E5=88=B6?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=9D=83=E8=BD=AC=E7=A7=BB=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/passiveDialog/control.vue | 22 -------- src/store/modules/scriptRecord.js | 9 +-- src/views/scriptManage/getAction.vue | 5 -- src/views/scriptManage/tipScriptRecord.vue | 55 ------------------- 4 files changed, 1 insertion(+), 90 deletions(-) diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue index d06fc9488..f2e968f37 100644 --- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue +++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue @@ -302,17 +302,6 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - const controlTransfer = this.$store.state.scriptRecord.controlTransfer; - if (controlTransfer.stations) { - replyVOList.forEach(replyVO=>{ - controlTransfer.stations.splice(controlTransfer.stations.indexOf(replyVO.stationCode), 1); - }); - } - if (controlTransfer.stations.length > 0) { - this.$store.dispatch('scriptRecord/updateControlTransfer', controlTransfer); - } else { - this.$store.dispatch('scriptRecord/updateControlTransfer', {}); - } this.doClose(); } }).catch(() => { @@ -342,17 +331,6 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - const controlTransfer = this.$store.state.scriptRecord.controlTransfer; - if (controlTransfer.stations) { - replyVOList.forEach(replyVO=>{ - controlTransfer.stations.splice(controlTransfer.stations.indexOf(replyVO.stationCode), 1); - }); - } - if (controlTransfer.stations.length > 0) { - this.$store.dispatch('scriptRecord/updateControlTransfer', controlTransfer); - } else { - this.$store.dispatch('scriptRecord/updateControlTransfer', {}); - } this.doClose(); } }).catch(() => { diff --git a/src/store/modules/scriptRecord.js b/src/store/modules/scriptRecord.js index 5b3e82c38..eed8e295b 100644 --- a/src/store/modules/scriptRecord.js +++ b/src/store/modules/scriptRecord.js @@ -13,8 +13,7 @@ const scriptRecord = { updateRoleStatus:0, // 剧本更新角色标志 updateRoleId:'', // 剧本更新角色id updateCoversitionStatus:0, // 剧本仿真更新会话信息 - userRole:null, // 剧本更新的角色 - controlTransfer:{} // 剧本控制权转移 + userRole:null // 剧本更新的角色 }, getters: { mapLocation: (state)=>{ @@ -73,9 +72,6 @@ const scriptRecord = { }, updateCoversitionInfo:(state) => { state.updateCoversitionStatus += 1; - }, - updateControlTransfer:(state, controlTransfer) => { - state.controlTransfer = controlTransfer; } }, actions: { @@ -105,9 +101,6 @@ const scriptRecord = { }, updateCoversitionInfo:({ commit }) => { commit('updateCoversitionInfo'); - }, - updateControlTransfer:({ commit }, controlTransfer) => { - commit('updateControlTransfer', controlTransfer); } } }; diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue index a8480c246..35c978461 100644 --- a/src/views/scriptManage/getAction.vue +++ b/src/views/scriptManage/getAction.vue @@ -150,11 +150,6 @@ export default { if (operateType == 'CM') { operateType = 'ControlConvertMenu'; } - if (commandName == 'CM_Apply_For_Station_Control') { - this.$store.dispatch('scriptRecord/updateControlTransfer', {type:'CM_Apply_For_Station_Control', stations:element.operationParamMap.stationCodes, roleId:this.$store.state.scriptRecord.updateRoleId}); - } else if (commandName == 'CM_Apply_For_Center_Control') { - this.$store.dispatch('scriptRecord/updateControlTransfer', {type:'CM_Apply_For_Center_Control', stations:element.operationParamMap.stationCodes, roleId:this.$store.state.scriptRecord.updateRoleId}); - } const operateName = Object.values(CMD[operateType]).find(res=>{ return res.value == commandName; }); const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机'}; const operateTypeName = deviceTypeList[operateType]; diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue index db5e286a1..0c32d5d53 100644 --- a/src/views/scriptManage/tipScriptRecord.vue +++ b/src/views/scriptManage/tipScriptRecord.vue @@ -69,8 +69,6 @@ export default { mapLocation:null, allMemberList:[], memberList:[], - inter:null, - times:60, size: { width: 300, height: 300 @@ -161,40 +159,13 @@ export default { switchMode(role) { changeScriptRole(this.group, role).then(res=>{ let prdType = ''; - const controlTransferList = []; const memberInfo = this.memberList.find(member=>{ return member.id == role; }); if (memberInfo) { if (memberInfo.type == '行值') { - const controlTransfer = this.$store.state.scriptRecord.controlTransfer; - if (controlTransfer.type == 'CM_Apply_For_Center_Control' && controlTransfer.stations.includes(memberInfo.deviceCode) ) { - const stations = controlTransfer.stations; - stations.forEach(station=>{ - controlTransferList.push({code:station, deviceType:'STATION', - controlMode:'Local', tbStrategyId:1, applicantIdOfControlTransfer:controlTransfer.roleId, apply2TheControlMode:'Center', validDurationOfControlTransferApplication:60 }); - }); - this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); - this.$store.dispatch('training/setRoleDeviceCode', memberInfo.deviceCode); - } prdType = '01'; } else if (memberInfo.type == '行调') { - const controlTransfer = this.$store.state.scriptRecord.controlTransfer; - if (controlTransfer.type == 'CM_Apply_For_Station_Control') { - const stations = controlTransfer.stations; - // if (stations.indexOf(memberInfo.deviceCode)) { - // // {"type":"Simulation_DeviceStatus","body":[{"code":"Station18000", - // // "deviceType":,"controlMode":"Center","tbStrategyId":1,"applicantIdOfControlTransfer":"3", - // // "apply2TheControlMode":"Local","validDurationOfControlTransferApplication":53}]} - // const controlTransferList = [{code:'', applicantIdOfControlTransfer:'' }]; - // this.store.dispatch('map/setControlTransfer', controlTransferList); - // } - stations.forEach(station=>{ - controlTransferList.push({code:station, deviceType:'STATION', - controlMode:'Center', tbStrategyId:1, applicantIdOfControlTransfer:controlTransfer.roleId, apply2TheControlMode:'Local', validDurationOfControlTransferApplication:60 }); - }); - this.$store.dispatch('training/setRoles', 'DISPATCHER'); - } prdType = '02'; } else if (memberInfo.type == '司机') { prdType = '04'; @@ -212,32 +183,6 @@ export default { ); this.oldMemberId = role; this.$store.dispatch('training/setPrdType', prdType); - if (controlTransferList.length > 0) { - this.$store.dispatch('map/setControlTransfer', controlTransferList); - // this.inter = setInterval(()=>{ - // if (this.times > 0) { - // const controlTransfers = []; - // controlTransferList.forEach(controlTransfer=>{ - // controlTransfer.validDurationOfControlTransferApplication = this.times; - // controlTransfers.push(controlTransfer); - // }); - // this.$store.dispatch('map/setControlTransfer', controlTransfers); - // this.times--; - // } else { - // clearInterval(this.inter); - // const controlTransfers = []; - // controlTransferList.forEach(controlTransfer=>{ - // controlTransfer.controlMode = controlTransfer.apply2TheControlMode; - // controlTransfer.applicantIdOfControlTransfer = null; - // controlTransfer.apply2TheControlMode = null; - // controlTransfer.validDurationOfControlTransferApplication = null; - // controlTransfers.push(controlTransfer); - // }); - // this.$store.dispatch('map/setControlTransfer', controlTransfers); - // this.$store.dispatch('scriptRecord/updateControlTransfer', {}); - // } - // }, 1000); - } ConstConfig.ConstSelect.roleTypeNew.forEach(each=>{ if (each.label == memberInfo.type) { this.$store.dispatch('scriptRecord/updateRole', each.value + ':' + role);