Merge branch 'uat'

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() {

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 () {

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

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.downloadTip = '0KB/s'
-    store.state.trials.uploadSize = ''
+    store.state.trials.downloadSize = ''
   }
   bytesReceivedPerSecond = {};
   lastPercentage = 0;

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: {

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: {

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}`
     }
   },
 }