From fd677062698664548f36a96faae7b29648723f22 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 31 May 2024 11:20:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E8=AE=BF=E8=A7=86=E9=98=85=E7=89=87=E7=BB=93=E6=9E=9C?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/global-review/components/IRecistTable.vue | 5 +++-- .../reading/global-review/components/LuganoTable.vue | 3 ++- .../reading/global-review/components/RecistBMTable.vue | 5 +++-- .../reading/global-review/components/RecistTable.vue | 5 +++-- .../trials/trials-panel/reading/global-review/index.vue | 5 +++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue index 3e9065d1..93e6589a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue @@ -356,11 +356,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue index 0022c210..cc1e6d96 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue @@ -360,9 +360,10 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue index 8687fb2e..ff94183a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue @@ -353,11 +353,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue index a38257c8..d5bf2b1a 100644 --- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue +++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue @@ -347,11 +347,12 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) var newWindow = window.open(routeData.href, '_blank') diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue index 979acdde..745baa1c 100644 --- a/src/views/trials/trials-panel/reading/global-review/index.vue +++ b/src/views/trials/trials-panel/reading/global-review/index.vue @@ -460,15 +460,16 @@ export default { try { var token = getToken() var visitTaskId = row.VisitTaskId + var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId var criterionType = this.$router.currentRoute.query.criterionType var readingTool = this.$router.currentRoute.query.readingTool readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool) var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder var path = '' if (readingTool === 0) { - path = `/readingDicoms?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } else { - path = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` + path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` } const routeData = this.$router.resolve({ path }) this.openWindow = window.open(routeData.href, '_blank')