Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
commit
139e4ab5e2
|
@ -961,6 +961,11 @@ export default {
|
||||||
this.petctWindow.close()
|
this.petctWindow.close()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
window.addEventListener('beforeunload', () => {
|
||||||
|
if (this.petctWindow) {
|
||||||
|
this.petctWindow.close()
|
||||||
|
}
|
||||||
|
})
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
DicomEvent.$off('updateImage')
|
DicomEvent.$off('updateImage')
|
||||||
|
@ -976,6 +981,7 @@ export default {
|
||||||
if (this.petctWindow) {
|
if (this.petctWindow) {
|
||||||
this.petctWindow.close()
|
this.petctWindow.close()
|
||||||
}
|
}
|
||||||
|
window.removeEventListener('beforeunload')
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getWwcTpl() {
|
getWwcTpl() {
|
||||||
|
|
|
@ -690,7 +690,7 @@ export default {
|
||||||
await store.dispatch('reading/setCurrentReadingTaskState', 2)
|
await store.dispatch('reading/setCurrentReadingTaskState', 2)
|
||||||
var isAutoTask = await this.getAutoTaskVal()
|
var isAutoTask = await this.getAutoTaskVal()
|
||||||
if (isAutoTask) {
|
if (isAutoTask) {
|
||||||
DicomEvent.$emit('reload')
|
// DicomEvent.$emit('reload')
|
||||||
// DicomEvent.$emit('getNextTask')
|
// DicomEvent.$emit('getNextTask')
|
||||||
window.location.reload()
|
window.location.reload()
|
||||||
} else {
|
} else {
|
||||||
|
@ -709,7 +709,7 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
window.opener.postMessage('refreshTaskList', window.location)
|
window.opener.postMessage('refreshTaskList', window.location)
|
||||||
DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 })
|
// DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 })
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
Loading…
Reference in New Issue