diff --git a/src/jmapNew/theme/haerbin_01/operationConfig.js b/src/jmapNew/theme/haerbin_01/operationConfig.js index a0bb4f6fe..14bc3942b 100644 --- a/src/jmapNew/theme/haerbin_01/operationConfig.js +++ b/src/jmapNew/theme/haerbin_01/operationConfig.js @@ -1013,7 +1013,7 @@ export default { minDuration: 8, operateType: 'CM_Receive_Control', skinCode: '07', - trainingName: '接收控制({10})', + trainingName: '接收控制({1})', trainingRemark: '接收控制', trainingType: 'ControlConvertMenu', productTypes: ['02'], @@ -1028,7 +1028,7 @@ export default { minDuration: 8, operateType: 'CM_Surrender_Control', skinCode: '07', - trainingName: '交出控制({10})', + trainingName: '交出控制({1})', trainingRemark: '交出控制', trainingType: 'ControlConvertMenu', productTypes: ['02'], diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index bca9fcaec..76b6f01b7 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -377,7 +377,7 @@ export default { console.log(this.userRole, '11111111'); this.$store.dispatch('training/setPrdType', this.$route.query.prdType); this.$store.dispatch('training/setRoles', userRole); - this.$store.dispatch('scriptRecord/updateSimulationPause', false); + // this.$store.dispatch('scriptRecord/updateSimulationPause', false); }, clearAllData() { this.$refs.chatbox.clearAllData(); diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue index 3008375f6..45f900215 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue @@ -365,7 +365,6 @@ export default { scriptRePreview(this.group).then(resp=>{ getSimulationInfoNew(this.group).then(()=>{ this.isscriptRun = false; - this.$store.dispatch('scriptRecord/updateSimulationPause', false); this.$store.dispatch('scriptRecord/updateBgSet', false); // this.userRole = ''; this.$store.dispatch('training/setRoles', '');