diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 6a2a2060..e155569b 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -961,6 +961,11 @@ export default { this.petctWindow.close() } }) + window.addEventListener('beforeunload', () => { + if (this.petctWindow) { + this.petctWindow.close() + } + }) }, beforeDestroy() { DicomEvent.$off('updateImage') @@ -976,6 +981,7 @@ export default { if (this.petctWindow) { this.petctWindow.close() } + window.removeEventListener('beforeunload') }, methods: { getWwcTpl() { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index c78e306a..2e9560ba 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -690,7 +690,7 @@ export default { await store.dispatch('reading/setCurrentReadingTaskState', 2) var isAutoTask = await this.getAutoTaskVal() if (isAutoTask) { - DicomEvent.$emit('reload') + // DicomEvent.$emit('reload') // DicomEvent.$emit('getNextTask') window.location.reload() } else { @@ -709,7 +709,7 @@ export default { } window.opener.postMessage('refreshTaskList', window.location) - DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 }) + // DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 }) } this.loading = false }).catch(() => {