diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue index 240404b9..292b0c91 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue @@ -13,10 +13,13 @@ - + @@ -49,6 +52,7 @@ import { } from '@/api/trials' import * as echarts from 'echarts/core'; import { LineChart } from 'echarts/charts'; +import { getToken } from '@/utils/auth' import { TitleComponent, TooltipComponent, @@ -108,13 +112,33 @@ export default { tableKey: [], tableList: [], R1ChartList: [], - R2ChartList: [] + R2ChartList: [], + openWindow: null } }, mounted() { this.getTrialCriterionList() }, methods: { + // 查看阅片结果 + lookReadingResults(id) { + if (this.openWindow) { + this.openWindow.close() + } + var token = getToken() + var path = null + let trialCriterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId) + let trialId = this.$route.query.trialId + if (trialCriterion.ReadingTool === 0 || trialCriterion.ReadingTool === 2 || trialCriterion.ReadingTool === 3) { + path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.data.Code}&subjectId=${this.data.Id}&visitTaskId=${id}&isReadingTaskViewInOrder=${trialCriterion.IsReadingTaskViewInOrder}&criterionType=${trialCriterion.CriterionType}&readingTool=${trialCriterion.ReadingTool}&TokenKey=${token}` + } else { + path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.data.Code}&subjectId=${this.data.Id}&visitTaskId=${id}&isReadingTaskViewInOrder=${trialCriterion.IsReadingTaskViewInOrder}&criterionType=${trialCriterion.CriterionType}&readingTool=${trialCriterion.ReadingTool}&TokenKey=${token}` + } + // const routeData = this.$router.resolve({ + // path: `/readingPage?subjectId=${row.SubjectId}&trialId=${row.TrialId}&visitTaskId=${row.Id}&TokenKey=${token}` + // }) + this.openWindow = window.open(path, '_blank') + }, handleChange(v) { this.getList() }, @@ -159,12 +183,14 @@ export default { this.tableList = [] if (Evaluation[1] && Evaluation[1].length > 0) { let obj = { - IsHighlight: [] + IsHighlight: [], + VisitTaskId: {} } this.tableKey.forEach((item, index) => { if (index === 0) { obj[item.key] = 'R1' } else { + obj.VisitTaskId[item.key] = Evaluation[1][index - 1].VisitTaskId obj[item.key] = Evaluation[1][index - 1].DictionaryCode ? this.$fd(Evaluation[1][index - 1].DictionaryCode, parseFloat(Evaluation[1][index - 1].Value)) : Evaluation[1][index - 1].Value if (Evaluation[1][index - 1].IsHighlight) { obj.IsHighlight.push(item.key) @@ -176,13 +202,17 @@ export default { } if (Evaluation[2] && Evaluation[2].length > 0) { let obj = { - IsHighlight: [] + IsHighlight: [], + VisitTaskId: {} } this.tableKey.forEach((item, index) => { obj[item.key] = index === 0 ? 'R2' : Evaluation[2][index - 1].DictionaryCode ? this.$fd(Evaluation[2][index - 1].DictionaryCode, parseFloat(Evaluation[2][index - 1].Value)) : Evaluation[2][index - 1].Value if (index > 0 && Evaluation[2][index - 1].IsHighlight) { obj.IsHighlight.push(item.key) } + if (index > 0) { + obj.VisitTaskId[item.key] = Evaluation[2][index - 1].VisitTaskId + } }) this.tableList.push(obj) }