部分问题修复

main
wangxiaoshuang 2024-04-18 17:19:07 +08:00
parent 88ad9101d4
commit c102dbe9f2
6 changed files with 68 additions and 13 deletions

View File

@ -1,6 +1,7 @@
import JSZip from "jszip"; import JSZip from "jszip";
import axios from "axios"; import axios from "axios";
import { saveAs } from "file-saver"; import { saveAs } from "file-saver";
import Vue from 'vue';
import { import {
getSubjectImageZipInfo, getSubjectImageZipInfo,
} from "@/api/trials/visit.js"; } from "@/api/trials/visit.js";
@ -89,7 +90,7 @@ const setfolder = async (item) => {
const handleBatchDown = async (item, zip) => { const handleBatchDown = async (item, zip) => {
return new Promise((resolve) => { return new Promise((resolve) => {
getFileData( getFileData(
this.OSSclientConfig.basePath + item.instancePath.slice(1) Vue.prototype.OSSclientConfig.basePath + item.instancePath.slice(1)
).then((res) => { ).then((res) => {
const fileName = item.dicomName + ".dcm"; const fileName = item.dicomName + ".dcm";
zip.file(fileName, res.data, { binary: true }); zip.file(fileName, res.data, { binary: true });

View File

@ -20,6 +20,7 @@
v-loading="loading" v-loading="loading"
:data="list" :data="list"
stripe stripe
v-adaptive="{ bottomOffset: 60 }"
height="300" height="300"
> >
<!-- <el-table-column type="selection" align="center" width="45" /> --> <!-- <el-table-column type="selection" align="center" width="45" /> -->
@ -30,6 +31,13 @@
:label="$t('trials:uploadDicomList:table:pId')" :label="$t('trials:uploadDicomList:table:pId')"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<!-- 患者姓名 -->
<el-table-column
prop="PatientName"
:label="$t('trials:uploadDicomList:table:patientName')"
min-width="80"
show-overflow-tooltip
/>
<!--检查类型--> <!--检查类型-->
<el-table-column <el-table-column
align="center" align="center"
@ -80,6 +88,13 @@
circle circle
@click="handleViewStudy(scope.row)" @click="handleViewStudy(scope.row)"
/> />
<!-- 诊断报告 -->
<el-button
icon="el-icon-document"
disabled
:title="$t('trials:inspection:button:diagnosticReport')"
circle
/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -144,7 +159,7 @@ export default {
}); });
var newWindow = window.open(routeData.href, "_blank"); var newWindow = window.open(routeData.href, "_blank");
this.$emit("setOpenWindow", newWindow); this.$emit("setOpenWindow", newWindow);
} },
}, },
}; };
</script> </script>

View File

@ -16,8 +16,23 @@
v-loading="studyLoading" v-loading="studyLoading"
:data="studyList" :data="studyList"
style="width: 100%" style="width: 100%"
v-adaptive="{ bottomOffset: 60 }"
height="300" height="300"
> >
<!-- 患者编号 -->
<el-table-column
prop="PatientIdStr"
:label="$t('trials:uploadDicomList:table:pId')"
min-width="80"
show-overflow-tooltip
/>
<!-- 患者姓名 -->
<el-table-column
prop="PatientName"
:label="$t('trials:uploadDicomList:table:patientName')"
min-width="80"
show-overflow-tooltip
/>
<!-- 检查编号 --> <!-- 检查编号 -->
<el-table-column <el-table-column
prop="StudyCode" prop="StudyCode"
@ -92,6 +107,13 @@
circle circle
@click="handleViewStudy(scope.row)" @click="handleViewStudy(scope.row)"
/> />
<!-- 诊断报告 -->
<el-button
icon="el-icon-document"
disabled
:title="$t('trials:inspection:button:diagnosticReport')"
circle
/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

View File

@ -18,9 +18,11 @@
</el-breadcrumb> </el-breadcrumb>
</span> </span>
<div class="base-modal-body"> <div class="base-modal-body">
<!-- DICOM影像 --> <!-- 已提交DICOM影像 -->
<h4 class="box-title">{{ $t("trials:crcUpload:label:dicom") }}</h4> <h4 class="box-title" v-if="rowData.SubmitState === 2">
<el-card class="box-card"> {{ $t("trials:trials-panel:hirVisit:label:subDicom") }}
</h4>
<el-card class="box-card" v-if="rowData.SubmitState === 2">
<StudyInfo <StudyInfo
v-if="rowData.SubjectId" v-if="rowData.SubjectId"
:data="rowData" :data="rowData"
@ -28,9 +30,11 @@
@setOpenWindow="setOpenWindow" @setOpenWindow="setOpenWindow"
/> />
</el-card> </el-card>
<!-- 检查列表 --> <!-- 未提交DICOM影像 -->
<h4 class="box-title">{{ $t("trials:dicom-show:nowStudy") }}</h4> <h4 class="box-title" v-if="rowData.SubmitState < 2">
<el-card class="box-card"> {{ $t("trials:trials-panel:hirVisit:label:notSubDicom") }}
</h4>
<el-card class="box-card" v-if="rowData.SubmitState < 2">
<currentStudy <currentStudy
v-if="rowData.SubjectId" v-if="rowData.SubjectId"
:data="rowData" :data="rowData"

View File

@ -275,14 +275,18 @@
v-hasPermi="['trials:trials-panel:hirVisit:result']" v-hasPermi="['trials:trials-panel:hirVisit:result']"
disabled disabled
command="result" command="result"
>{{ $t("trials:adReview:title:result") }}</el-dropdown-item >{{
$t("trials:trials-panel:hirVisit:ImageData")
}}</el-dropdown-item
> >
<!--评估报告--> <!--评估报告-->
<el-dropdown-item <el-dropdown-item
v-hasPermi="['trials:trials-panel:hirVisit:result']" v-hasPermi="['trials:trials-panel:hirVisit:result']"
disabled disabled
command="result" command="result"
>{{ $t("trials:adReview:title:result") }}</el-dropdown-item >{{
$t("trials:trials-panel:hirVisit:EvaluationReport")
}}</el-dropdown-item
> >
<!--数据导出--> <!--数据导出-->
<el-dropdown-item <el-dropdown-item
@ -499,7 +503,7 @@ export default {
downloadReport() {}, downloadReport() {},
// //
async downloadImage(item) { async downloadImage(item) {
downloadImage(item.subjectId); downloadImage(item.SubjectId);
}, },
}, },
}; };

View File

@ -198,6 +198,13 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<!-- 阅片完成时间 -->
<el-table-column
prop="SignTime"
:label="$t('trials:reviewTrack:table:signTime')"
show-overflow-tooltip
sortable="custom"
/>
<!-- 阅片标准 --> <!-- 阅片标准 -->
<el-table-column <el-table-column
prop="TrialReadingCriterionName" prop="TrialReadingCriterionName"
@ -233,7 +240,6 @@
icon="el-icon-download" icon="el-icon-download"
:title="$t('trials:reading:button:download')" :title="$t('trials:reading:button:download')"
@click="downloadReport(scope.row)" @click="downloadReport(scope.row)"
disabled
/> />
</template> </template>
</el-table-column> </el-table-column>
@ -256,6 +262,7 @@ import Pagination from "@/components/Pagination";
import { getPatientVisitTaskList } from "@/api/readManagenent.js"; import { getPatientVisitTaskList } from "@/api/readManagenent.js";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { getSystemConfirmedCreiterionList } from "@/api/trials"; import { getSystemConfirmedCreiterionList } from "@/api/trials";
import { downloadImage } from "@/utils/uploadZip.js";
const defaultSearchData = () => { const defaultSearchData = () => {
return { return {
SubjectCode: null, SubjectCode: null,
@ -370,7 +377,9 @@ export default {
} }
}, },
// //
downloadReport() {}, downloadReport(item) {
downloadImage(item.SubjectId);
},
// //
readResult(row) { readResult(row) {
if (this.openWindow) { if (this.openWindow) {