diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue index 6700452b..c9d0cfc5 100644 --- a/src/components/Dicom/DicomCanvas.vue +++ b/src/components/Dicom/DicomCanvas.vue @@ -116,7 +116,7 @@ export default { components: { DicomTags }, computed: { NSTip() { - return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}` + return `${this.$store.state.trials.downloadSize}, NS: ${this.$store.state.trials.downloadTip}` } }, data() { diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index ebfe0fba..0b165d78 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -646,6 +646,7 @@ export default { resolve() }) var validFilesCount = 0 + scope.uploadQueues = [] for (var i = 0; i < checkFiles.length; ++i) { ; (function (index) { p = p.then(function () { diff --git a/src/store/modules/trials.js b/src/store/modules/trials.js index 47f88cf8..996be480 100644 --- a/src/store/modules/trials.js +++ b/src/store/modules/trials.js @@ -10,7 +10,8 @@ const getDefaultState = () => { unlock: false, config: {}, uploadTip: '0.00KB/s', - uploadSize: '', + downloadTip: '0.00KB/s', + downloadSize: '', timer: null, whiteList: [], checkTaskId: null diff --git a/src/utils/index.js b/src/utils/index.js index ca185a34..792ed76a 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -123,7 +123,7 @@ export function getNetWorkSpeed() { totalBytes = totalBytes / 1024; unit = "MB/s"; } - store.state.trials.uploadTip = totalBytes.toFixed(3) + unit; + store.state.trials.downloadTip = totalBytes.toFixed(3) + unit; } if (timeList.length >= 5) { delete bytesReceivedPerSecond[timeList[0]] @@ -189,8 +189,8 @@ export function workSpeedclose(isForce = false) { if (timer) { clearInterval(timer); timer = null; - store.state.trials.uploadTip = '0KB/s' - store.state.trials.uploadSize = '' + store.state.trials.downloadTip = '0KB/s' + store.state.trials.downloadSize = '' } bytesReceivedPerSecond = {}; lastPercentage = 0; diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 8caa0dea..6c60ead0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -299,7 +299,7 @@ export default { computed: { ...mapGetters(['visitTaskList', 'currentReadingTaskState']), NSTip() { - return `NS: ${this.$store.state.trials.uploadTip}` + return `NS: ${this.$store.state.trials.downloadTip}` } }, watch: { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue index eae19277..759c3645 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -297,7 +297,7 @@ export default { computed: { ...mapGetters(['visitTaskList', 'currentReadingTaskState']), NSTip() { - return `NS: ${this.$store.state.trials.uploadTip}` + return `NS: ${this.$store.state.trials.downloadTip}` } }, watch: { diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue index 8af6c3a0..f37090b0 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue @@ -542,7 +542,7 @@ export default { }, computed: { NSTip() { - return `NS: ${this.$store.state.trials.uploadTip}` + return `NS: ${this.$store.state.trials.downloadTip}` } }, }