diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 477a7d9f..a39ff0ce 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -366,6 +366,9 @@ export default { this.modelList = item.DicomStudyList } else { this.modelList = item.NoneDicomStudyList + this.modelList.forEach((data) => { + data.SourceSubjectVisitId = item.SourceSubjectVisitId + }) } this.IsDicom = item.IsDicom this.model_cfg.visible = true @@ -396,7 +399,7 @@ export default { let trialId = this.$route.query.trialId var token = getToken() const routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`, + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`, }) this.open = window.open(routeData.href, '_blank') }, diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue index 92f06b67..520c0d73 100644 --- a/src/components/uploadDicomAndNonedicom/study-view.vue +++ b/src/components/uploadDicomAndNonedicom/study-view.vue @@ -118,10 +118,19 @@ export default { methods: { // 预览 preview(row) { - var token = getToken() - const routeData = this.$router.resolve({ - path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`, - }) + let routeData = null + if (this.IsDicom) { + var token = getToken() + routeData = this.$router.resolve({ + path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study`, + }) + } else { + let trialId = this.$route.query.trialId + var token = getToken() + routeData = this.$router.resolve({ + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`, + }) + } window.open(routeData.href, '_blank') }, },