diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue index 602ac1f2..41c39b9c 100644 --- a/src/components/Dicom/DicomViewer.vue +++ b/src/components/Dicom/DicomViewer.vue @@ -26,6 +26,8 @@ $t('DicomViewer:anonymous:Exit') }}
{{ $t('DicomViewer:anonymous:Recovery') }}
+
{{ + $t('DicomViewer:anonymous:RecoveryAll') }}
3x2 -
{{ $t('DicomViewer:anonymous:PixelAnonymity') +
{{ + $t('DicomViewer:anonymous:PixelAnonymity') }}
@@ -501,8 +504,6 @@ export default { methods: { comparison(f) { - this.isComparison = f - this.$emit("update:Comparison", f) const elements = document.querySelectorAll('.dicom-item') const scope = this Array.from(elements).forEach((element, index) => { @@ -511,12 +512,14 @@ export default { } }) scope.activeTool = null - if (this.isComparison) { + if (f) { this.$refs[`dicomCanvas0`].getNote_RectangleRoi().then(obj => { let { image } = obj let instanceInfo = this.series.instanceInfoList.find(item => item.ImageId === image.imageId) if (!instanceInfo.IsMasked) return this.$confirm(this.$t("DicomViewer:anonymous:notMasked")) this.changeLayout('1x2') + this.isComparison = f + this.$emit("update:Comparison", f) let serie = {} Object.keys(this.series).forEach(key => { if (key !== 'instanceInfoList' && key !== 'imageIds') { @@ -552,10 +555,11 @@ export default { this.$refs[`dicomCanvas1`].loadImageStack(dicomCanvas1_info) }) } else { + this.isComparison = f + this.$emit("update:Comparison", f) this.changeLayout('1x1') this.$refs[`dicomCanvas0`].loadImageStack(this.series) } - }, recovery(isAll = false) { if (this.isComparison) return false @@ -1170,7 +1174,7 @@ export default { z-index: 9999; .btn { - width: 15%; + width: 12%; text-align: center; height: 40px; line-height: 30px; diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index b97c49e3..9104e453 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -12,33 +12,16 @@ - + - + - +