src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue

@@ -251,6 +251,7 @@ export default {
         res.map((item) => {
           this.loadInitialImage(item)
         })
+        console.log(res)
         var i = res.findIndex(s => s.isCurrentTask)
         if (i > -1) {
           var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
@@ -267,11 +268,11 @@ export default {
             //   study.SeriesList.map((series, seriesIndex) => {
             //     if (series.modality !== 'SR') {
             //       series.imageIds.map(image => {
-            //         var p = priority - seriesIndex
+            //         var p = null
             //         if (series.seriesId === res[i].seriesId) {
             //           p = priority
             //         } else {
-            //           --p
+            //           p = priority - seriesIndex
             //         }
             //         this.imageList.push({ imageId: image, seriesId: series.seriesId, studyIndex: studyIndex, seriesIndex: seriesIndex, visitTaskId: series.visitTaskId, priority: p })
             //       })
@@ -338,9 +339,7 @@ export default {
       var p = parseInt(new Date().getTime())
       var imageId = seriesInfo.imageIds[seriesInfo.imageIdIndex]
       requestPoolManager.loadAndCacheImagePlus(imageId, seriesInfo.seriesId, p * 100).then(res => {
-        if (seriesInfo.isCurrentTask) {
+        this.imageLoaded({ studyIndex: seriesInfo.studyIndex, seriesIndex: seriesInfo.seriesIndex, imageId: res.imageId })
-          this.imageLoaded({ studyIndex: seriesInfo.studyIndex, seriesIndex: seriesInfo.seriesIndex, imageId: res.imageId }, res.data.string('x0020000e'))
-        }
       })
     },
     getStudyList() {
@@ -718,7 +717,7 @@ export default {
         // requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
           requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            this.imageLoaded(image, res.data.string('x0020000e'))
+            this.imageLoaded(image)
           })
         })
         requestPoolManager.sortTaskPool()
@@ -759,24 +758,18 @@ export default {
       requestPoolManager.removeTask(series.seriesId)
       this.$set(this.studyList[studyIndex].SeriesList[seriesIndex], 'isLoading', false)
     },
-    async imageLoaded(image, seriesUid) {
+    async imageLoaded(image) {
       // await store.dispatch('reading/updateStudyList', { visitTaskId: image.visitTaskId, imageId: image.imageId, seriesUid })
       // console.log(this.studyList[image.studyIndex].SeriesList[image.seriesIndex])
-      if (image.studyIndex > -1 && image.seriesIndex > -1) {
+      if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
-        var prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
+        this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
-        var instanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
+        var count = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount
-        if (this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.indexOf(image.imageId) < 0) {
+        this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = count + 1
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].imageloadedArr.push(image.imageId)
+      } else {
-          prefetchInstanceCount = prefetchInstanceCount + 1
+        this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = prefetchInstanceCount
+        // 设置当前序列状态为已下载完成
-        }
+        this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
-        if (prefetchInstanceCount >= instanceCount) {
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].prefetchInstanceCount = this.studyList[image.studyIndex].SeriesList[image.seriesIndex].instanceCount
-          // 设置当前序列状态为已下载完成
-          this.studyList[image.studyIndex].SeriesList[image.seriesIndex].loadStatus = true
-        }
       }
-
       // store.dispatch('reading/updateSeriesList', { visitTaskindex: this.visitTaskIdx, studyIndex: image.studyIndex, seriesIndex: image.seriesIndex, imageId: image.imageId })
     },
     // instance下载成功回调