Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/components/downloadDicomAndNonedicom/index.vue

@@ -142,6 +142,7 @@
       :modelList="modelList"
       :bodyPart="bodyPart"
       :IsDicom="IsDicom"
+      :visitTaskId="modelTaskId"
     />
   </el-dialog>
 </template>
@@ -217,6 +218,7 @@ export default {
       downloadId: null,
       IsReadingTaskViewInOrder: 0, // 阅片规则
       bodyPart: [],
+      modelTaskId: null,
     }
   },
   async mounted() {
@@ -442,6 +444,7 @@ export default {
           data.SourceSubjectVisitId = item.SourceSubjectVisitId
         })
       }
+      this.modelTaskId = item.VisitTaskId
       this.IsDicom = item.IsDicom
       this.model_cfg.visible = true
     },

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -136,6 +136,9 @@ export default {
         return []
       },
     },
+    visitTaskId: {
+      type: String,
+    },
     IsDicom: {
       required: true,
       type: Boolean,
@@ -152,7 +155,7 @@ export default {
       if (this.IsDicom) {
         var token = getToken()
         routeData = this.$router.resolve({
-          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`,
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}`,
         })
       } else {
         let trialId = this.$route.query.trialId