diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue index fb9da17e..bb0d943b 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue @@ -119,7 +119,7 @@ -
+
{ this.annotationModifiedListener(evt) - }, 100) + }, 0) eventTarget.addEventListener( toolsEvents.ANNOTATION_MODIFIED, (evt) => { @@ -1209,10 +1210,12 @@ export default { const measureData = Object.assign({}, annotation) const params = {} const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex) + this.loading = true await this.getScreenshots({ visitTaskId: this.taskInfo.VisitTaskId, annotation }, async (base64Str) => { + this.loading = false const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str) let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : '' if (annotation.id) params.Id = annotation.id diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue index 20ce1971..daf31b18 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue @@ -204,9 +204,8 @@ export default { i.MeasureData.markId = i.MarkId i.MeasureData.id = i.Id } - this.psArr = [] if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) { - this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps }) + this.setPS({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps }) } return i }) @@ -317,7 +316,7 @@ export default { i.MeasureData.id = i.Id } if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) { - this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps }) + this.setPS({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps }) } return i })