diff --git a/src/api/export.js b/src/api/export.js index cb079b5..ee822f2 100644 --- a/src/api/export.js +++ b/src/api/export.js @@ -178,7 +178,14 @@ export function showReadReport(data) { data }) } - +// 预览肿瘤报告 +export function showTumorReport(data) { + return request({ + url: `/ReadingImageTask/getTumorEvaluationUrl`, + method: 'post', + data + }) +} export function getCommonEvaluationList_Export(data) { return requestDownload({ url: `/ExcelExport/getCommonEvaluationList_Export`, diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index 7b7111d..5b24268 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -30,8 +30,9 @@ {{ $t('trials:readingReport:button:refresh') }} - {{$t('trials:dicoms:button:evaluationReport')}} - {{$t('trials:dicoms:button:evaluationReport')}} + {{$t('trials:dicoms:button:tumorReport')}} + - + + + @@ -660,7 +669,7 @@ import BaseContainer from '@/components/BaseContainer' import Pagination from '@/components/Pagination' import ChatForm from './components/ChatForm' import { getToken } from '@/utils/auth' -import { showReadReport } from '@/api/export' +import { showReadReport, showTumorReport } from '@/api/export' import { downLoadFile } from '@/utils/stream.js' import { getDownloadSubjectVisitStudyInfo, @@ -754,11 +763,11 @@ export default { }, methods: { // 下拉菜单操作 - handleCommand(command, item) { - this[command](item) + handleCommand(command, item, key) { + this[command](item, key) }, // 评估报告 - async showReport(item) { + async showReport(item, key) { if (this.reportFlag[item.Id]) return let data = { VisitTaskId: item.Id, @@ -770,7 +779,12 @@ export default { if (!this.reportFlag[item.Id]) { this.reportFlag[item.Id] = true } - let res = await showReadReport(data) + let res = null; + if(key === 'evaluate'){ + res = await showReadReport(data); + }else{ + res = await showTumorReport(data); + } if (res.IsSuccess) { let a = document.createElement('a') let href = this.OSSclientConfig.basePath + res.Result diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 2ce88bd..8b19e93 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -281,12 +281,20 @@ @click="readResult(scope.row)" :disabled="scope.row.ReadingTaskState !== 2" /> - + + + @@ -331,7 +339,7 @@ import { getPatientVisitTaskList } from '@/api/readManagenent.js' import { getToken } from '@/utils/auth' // import { getSystemConfirmedCreiterionList } from "@/api/trials"; import { getTrialCriterionList } from '@/api/trials/reading' -import { showReadReport } from '@/api/export' +import { showReadReport, showTumorReport } from '@/api/export' import { downLoadFile } from '@/utils/stream.js' import { getDownloadSubjectVisitStudyInfo, @@ -389,15 +397,15 @@ export default { }, methods: { // 下拉菜单操作 - handleCommand(command, item) { - this[command](item) + handleCommand(command, item, key) { + this[command](item, key) }, // 导出 handleExport() { this.exportVisible = true }, // 评估报告 - async showReport(item) { + async showReport(item, key) { if (this.reportFlag[item.Id]) return let data = { VisitTaskId: item.Id, @@ -409,7 +417,12 @@ export default { if (!this.reportFlag[item.Id]) { this.reportFlag[item.Id] = true } - let res = await showReadReport(data) + let res = null; + if(key === 'evaluate'){ + res = await showReadReport(data); + }else{ + res = await showTumorReport(data); + } if (res.IsSuccess) { let a = document.createElement('a') let href = this.OSSclientConfig.basePath + res.Result diff --git a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue index 9b8f4e7..7614cda 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue @@ -179,7 +179,7 @@ export default { // 更新授权 putActivate() { this.activateVisible = true - console.log(this.activateVisible) + // console.log(this.activateVisible) }, initForm() { this.formLoading = true