diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue index df5fa473..e07b92a9 100644 --- a/src/components/Dicom/DicomCanvas.vue +++ b/src/components/Dicom/DicomCanvas.vue @@ -123,7 +123,7 @@ export default { components: { DicomTags }, computed: { NSTip() { - return `${this.$store.state.trials.uploadSize},NS: ${this.$store.state.trials.uploadTip}` + return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}` } }, data() { diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js index b1874ec5..c4d547d4 100644 --- a/src/store/modules/reading.js +++ b/src/store/modules/reading.js @@ -1076,7 +1076,7 @@ const actions = { let file = series.instanceInfoList.find(item => item.ImageId === obj.imageId) if (file) { getNetWorkSpeed() - setNetWorkSpeedSizeAll(obj.percentComplete, file.FileSize, obj.imageId) + setNetWorkSpeedSizeAll(obj.percentComplete, obj.FileTotal, obj.imageId) } if (prefetchInstanceCount >= instanceCount * 100) { series.prefetchInstanceCount = instanceCount * 100 diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue index 24ced2b6..c6aaa622 100644 --- a/src/views/dicom-show/dicom-study.vue +++ b/src/views/dicom-show/dicom-study.vue @@ -861,7 +861,7 @@ export default { let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId) if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) { getNetWorkSpeed() - setNetWorkSpeedSize(percentComplete, file.FileSize, imageId) + setNetWorkSpeedSize(percentComplete, e.detail.total, imageId) } if (prefetchInstanceCount >= instanceCount * 100) { this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100 diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index 6fe076ff..78ba2223 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -921,7 +921,7 @@ export default { let file = series.instanceInfoList.find(item => item.ImageId === imageId) if (file && this.activeSeriesId === series.seriesId) { getNetWorkSpeed() - setNetWorkSpeedSize(percentComplete, file.FileSize, imageId) + setNetWorkSpeedSize(percentComplete, e.detail.total, imageId) } if (prefetchInstanceCount >= instanceCount * 100) { series.prefetchInstanceCount = instanceCount * 100 diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue index 216123a0..5016e2ea 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue @@ -8,7 +8,8 @@
{{ + :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)"> + {{ s.TaskBlindName }}
@@ -510,13 +511,13 @@ export default { }, cornerstoneimageloadprogress(e) { const imageId = e.detail.imageId - console.log(imageId,'imageId') const params = {} const searchParams = new URLSearchParams(imageId.split('?')[1]) for (const [key, value] of searchParams.entries()) { params[key] = value } params.percentComplete = e.detail.percentComplete + params.FileTotal = e.detail.total params.imageId = imageId store.dispatch('reading/setImageLoadedProgress', params) } diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue index c098ca0f..f51d3978 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue @@ -663,6 +663,7 @@ export default { params[key] = value } params.percentComplete = e.detail.percentComplete + params.FileTotal = e.detail.total params.imageId = imageId store.dispatch('reading/setImageLoadedProgress', params) } 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 c4ad8b1a..ba925186 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue @@ -1326,7 +1326,7 @@ export default { let file = series.find(item => item.ImageId === imageId) if (file) { getNetWorkSpeed() - setNetWorkSpeedSizeAll(percentComplete, file.FileSize, imageId) + setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId) } if (percentComplete === 100) { workSpeedclose()