diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue index e5fda1b2..00e12ca8 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue @@ -244,7 +244,7 @@ export default { this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}` this.imageInfo.location = imagePlaneModule.sliceLocation this.getOrientationMarker() - this.$emit('renderAnnotations', this.series) + // this.$emit('renderAnnotations', this.series) let properties = viewport.getProperties() if (this.isFusion) { properties = viewport.getProperties(this.ptVolumeId) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue index 26d1983c..a94222a9 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -709,7 +709,8 @@ export default { studyList: [], volumeData: {}, fusionSerieId: {}, - loadingText: null + loadingText: null, + resetAnnotation: false , // 是否初始化标记 (融合时使用) } }, computed: { @@ -1472,6 +1473,7 @@ export default { async customAnnotationRemovedListener(e) { const { annotation } = e.detail try{ + if ( this.resetAnnotation && this.isFusion ) return false if (!annotation) return false if (this.readingTaskState === 2) throw 'annotation Not allowed to operate' if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) { @@ -2734,6 +2736,10 @@ export default { let { ct, pt } = data this.loading = true this.loadingText = this.$t('trials:lugano:message:loadVolumes') + this.resetAnnotation = true + // console.log(cornerstoneTools.annotation.state.getAllAnnotations(),'cornerstoneTools.annotation.state') + // cornerstoneTools.annotation.state.removeAllAnnotations() + this.renderedTaskIds = [] if ( this.verifyFusionData(ct, pt) ) { this.loading = false this.loadingText = null @@ -2741,6 +2747,7 @@ export default { this.$refs[`viewport-1`][0].setSeriesInfo(pt) this.$refs[`viewport-2`][0].setSeriesInfo(pt) this.$refs[`viewport-3`][0].setSeriesInfo(pt) + this.resetAnnotation = false return true } if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid ) { @@ -2780,6 +2787,7 @@ export default { this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true}) this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, { isFusion: true, colorMap: true }) this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, { isMip: true, colorMap: true }) + this.resetAnnotation = false this.$nextTick(() => { this.$refs[`colorMap`].init() }) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index 6c773385..376b2fcd 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -1459,6 +1459,11 @@ export default { ) { dicomInfo.uploadFileSize = dicomInfo.fileSize } + if ( + Math.abs(dicomInfo.uploadFileSize - dicomInfo.fileSize) < 5000 + ) { + dicomInfo.uploadFileSize = dicomInfo.fileSize + } } ) if (!res || !res.url) {