From 69ba30e5a9534efcdcad4b4ffb71537759e9dae0 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 7 Jul 2026 10:25:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E8=B6=8B=E5=8A=BF=E5=9B=BE?= =?UTF-8?q?=E3=80=91=E8=B6=8B=E5=8A=BF=E5=9B=BE=E8=AE=BF=E8=A7=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=90=8E=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=B7=B2?= =?UTF-8?q?=E9=98=85=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subject-list/components/SubjectChart.vue | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) 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) } From 7bc70bfd6c0ea84e8cb9dbf83c96bf06647bba5d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 7 Jul 2026 17:35:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=B8=AD=E5=BF=83=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E3=80=91=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E8=A1=A8?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=97=B6=EF=BC=8C=E5=90=8Cpc=E4=B8=80?= =?UTF-8?q?=E6=A0=B7=E4=B9=9F=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E3=80=82=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B9=9F=E8=A6=81=E8=83=BD=E6=AD=A3=E5=B8=B8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/linkExpired.vue | 9 +- .../research-mobile/components/BasicInfo.vue | 488 +++++++++++++++--- .../components/EquipmentForm.vue | 217 ++++++-- .../research-mobile/components/Equipments.vue | 94 ++-- src/views/research-mobile/detail.vue | 48 +- src/views/research-mobile/login.vue | 380 +++++++++----- src/views/research/components/BaseInfo.vue | 1 + .../research/components/EquipmentList.vue | 1 - .../subject-list/components/SubjectChart.vue | 6 +- 9 files changed, 909 insertions(+), 335 deletions(-) diff --git a/src/views/linkExpired.vue b/src/views/linkExpired.vue index 8bf46f28..26dd8f10 100644 --- a/src/views/linkExpired.vue +++ b/src/views/linkExpired.vue @@ -1,6 +1,6 @@ diff --git a/src/views/research-mobile/components/EquipmentForm.vue b/src/views/research-mobile/components/EquipmentForm.vue index 80c83c8e..3b2c3d01 100644 --- a/src/views/research-mobile/components/EquipmentForm.vue +++ b/src/views/research-mobile/components/EquipmentForm.vue @@ -1,59 +1,107 @@