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 b03f87ec..0ba5f76e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -822,9 +822,9 @@ export default { this.getWwcTpl() // cornerstone.imageCache.setMaximumSizeBytes(0) - const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB - // const maximumSizeInBytes = 1024 * 1024 * 500 - cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) + // const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB + // // const maximumSizeInBytes = 1024 * 1024 * 500 + // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes) this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') } this.CriterionType = parseInt(localStorage.getItem('CriterionType')) if (this.CriterionType === 10) { 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 ae001200..1b3ea62b 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,8 @@ export default { await store.dispatch('reading/setCurrentReadingTaskState', 2) var isAutoTask = await this.getAutoTaskVal() if (isAutoTask) { - DicomEvent.$emit('getNextTask') + // DicomEvent.$emit('getNextTask') + window.location.reload() } else { // '当前阅片任务已完成，是否进入下一个阅片任务？' this.$confirm(this.$t('trials:readingReport:message:msg4'), { @@ -698,7 +699,8 @@ export default { distinguishCancelAndClose: true }) .then(() => { - DicomEvent.$emit('getNextTask') + window.location.reload() + // DicomEvent.$emit('getNextTask') }) .catch(action => { changeURLStatic('visitTaskId', this.visitTaskId) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index f71a2aaa..60ab27b9 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -56,9 +56,9 @@ - + @@ -224,13 +224,63 @@ export default { // } // }) cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded) + // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull) + // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged) }, beforeDestroy() { cornerstone.imageCache.purgeCache() DicomEvent.$off('refreshStudyListMeasureData') }, methods: { - initStudyInfo() { + initStudyInfo(){ + const loading = this.$loading({ fullscreen: true }) + // 初始化待渲染序列 + this.getInitSeries().then((res) => { + requestPoolManager.startTaskTimer() + res.map((item) => { + this.loadInitialImage(item) + }) + console.log(res) + var i = res.findIndex(s => s.isCurrentTask) + if (i > -1) { + + var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) + if (idx > -1) { + this.measureData = this.visitTaskList[idx].MeasureData + this.studyList = this.visitTaskList[idx].StudyList + var priority = parseInt(new Date().getTime()) * 10 + res[i].imageIds.map(image=>{ + priority -- + this.imageList.push({ imageId: image, seriesId: res[i].seriesId, studyIndex: res[i].studyIndex, seriesIndex: res[i].seriesIndex, visitTaskId: res[i].visitTaskId, priority }) + }) + + + // this.studyList.map((study, studyIndex) => { + // study.SeriesList.map((series, seriesIndex) => { + // if (series.modality !== 'SR') { + // series.imageIds.map(image => { + // let priority = 0 + // if (series.seriesId === res[i].seriesId) { + // priority = parseInt(new Date().getTime()) * 10 + // } else { + // priority = --p + // } + // this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority }) + // }) + // } + // }) + // }) + this.loopLoad() + } + } + DicomEvent.$emit('loadImageStacks', res) + loading.close() + this.isRender = true + }).catch(() => { + loading.close() + }) + }, + initStudyInfo2() { console.log('initStudyInfo') const loading = this.$loading({ fullscreen: true }) // 初始化待渲染序列 @@ -625,19 +675,27 @@ export default { this.studyList.map((study, studyIndex) => { study.SeriesList.map((series, seriesIndex) => { if (!series.loadStatus && series.isDicom && series.modality !== 'SR') { - if (isCurrentTask || isBaseLineTask) { - // 当前任务/基线任务下载所有影像 - series.imageIds.map(image => { - priority = priority - 1 - this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority }) - }) - } else if (!isBaseLineTask && !isCurrentTask && study.IsCriticalSequence) { - // 非当前随访任务下载关键影像 + // if (isCurrentTask || isBaseLineTask) { + // // 当前任务/基线任务下载所有影像 + // series.imageIds.map(image => { + // priority = priority - 1 + // this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority }) + // }) + // } else if (!isBaseLineTask && !isCurrentTask && study.IsCriticalSequence) { + // // 非当前随访任务下载关键影像 + // series.imageIds.map(image => { + // priority = priority - 1 + // this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority }) + // }) + // } + // 均只下载关键序列 + if(!isCurrentTask && study.IsCriticalSequence){ series.imageIds.map(image => { priority = priority - 1 this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority }) }) } + } }) }) @@ -732,7 +790,14 @@ export default { this.studyList[studyIndex].SeriesList[seriesIndex].loadStatus = true } } - } + }, + cornerstoneimagecachechanged(e){ + const cacheInfo = cornerstone.imageCache.getCacheInfo() + console.log(cacheInfo) + }, + cornerstoneimagecachefull(e){ + console.log('超过内存了') + }, } }