配置修改

main
wangxiaoshuang 2024-04-12 10:27:25 +08:00
parent 0c42bb6161
commit 587c37cb9c
6 changed files with 59 additions and 33 deletions

View File

@ -28,7 +28,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true
VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
# 是否开启文档签署验证 true:是 false:否 # 是否开启文档签署验证 true:是 false:否
VUE_APP_WORD_FOR_PERMISSION = true VUE_APP_WORD_FOR_PERMISSION = false

View File

@ -24,7 +24,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true
VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
# 是否开启文档签署验证 true:是 false:否 # 是否开启文档签署验证 true:是 false:否
VUE_APP_WORD_FOR_PERMISSION = true VUE_APP_WORD_FOR_PERMISSION = false
# dicom文件地址 # dicom文件地址
VUE_APP_DICOM_PATH = 'http://123.56.94.154:7020' VUE_APP_DICOM_PATH = 'http://123.56.94.154:7020'

View File

@ -29,7 +29,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true
VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
# 是否开启文档签署验证 true:是 false:否 # 是否开启文档签署验证 true:是 false:否
VUE_APP_WORD_FOR_PERMISSION = true VUE_APP_WORD_FOR_PERMISSION = false
# dicom文件地址 # dicom文件地址
VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com' VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com'

View File

@ -191,15 +191,16 @@
sortable="custom" sortable="custom"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.SubmitState * 1 === 0" type="warning">{{ <el-tag
$fd("SubmitState", scope.row.SubmitState * 1) :type="
}}</el-tag> Number(scope.row.SubmitState) === 0
<el-tag v-else-if="scope.row.SubmitState * 1 === 1" type="danger">{{ ? 'warning'
$fd("SubmitState", scope.row.SubmitState * 1) : Number(scope.row.SubmitState) === 1
}}</el-tag> ? 'danger'
<el-tag v-else-if="scope.row.SubmitState * 1 === 2">{{ : ''
$fd("SubmitState", scope.row.SubmitState * 1) "
}}</el-tag> >{{ $fd("SubmitState", Number(scope.row.SubmitState)) }}</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<!-- 提交时间 --> <!-- 提交时间 -->
@ -227,6 +228,7 @@
<el-button <el-button
type="text" type="text"
v-hasPermi="['trials:trials-panel:hirVisit:edit']" v-hasPermi="['trials:trials-panel:hirVisit:edit']"
:disabled="Number(scope.row.SubmitState) > 1"
@click.stop="editStudy(scope.row)" @click.stop="editStudy(scope.row)"
>{{ $t("trials:hirVisit:button:editStudy") }}</el-button >{{ $t("trials:hirVisit:button:editStudy") }}</el-button
> >
@ -234,7 +236,10 @@
<el-button <el-button
type="text" type="text"
v-hasPermi="['trials:trials-panel:hirVisit:submit']" v-hasPermi="['trials:trials-panel:hirVisit:submit']"
v-if="scope.row.SubmitState == 1" :disabled="
Number(scope.row.SubmitState) != 1 ||
!scope.row.VisitLatestStudyTime
"
@click.stop="submit(scope.row)" @click.stop="submit(scope.row)"
>{{ $t("common:button:submit") }}</el-button >{{ $t("common:button:submit") }}</el-button
> >
@ -243,7 +248,7 @@
type="text" type="text"
v-hasPermi="['trials:trials-panel:hirVisit:remove']" v-hasPermi="['trials:trials-panel:hirVisit:remove']"
@click.stop="remove(scope.row)" @click.stop="remove(scope.row)"
:disabled="scope.row.SubmitState > 0" :disabled="Number(scope.row.SubmitState) > 0"
>{{ $t("common:button:delete") }}</el-button >{{ $t("common:button:delete") }}</el-button
> >
<!--评估结果--> <!--评估结果-->
@ -259,7 +264,10 @@
type="text" type="text"
v-hasPermi="['trials:trials-panel:hirVisit:download']" v-hasPermi="['trials:trials-panel:hirVisit:download']"
@click.stop="downloadImage(scope.row)" @click.stop="downloadImage(scope.row)"
v-if="scope.row.SubmitState > 0" :disabled="
Number(scope.row.SubmitState) === 0 ||
!scope.row.VisitLatestStudyTime
"
>{{ $t("trials:reading:button:uploadImages") }}</el-button >{{ $t("trials:reading:button:uploadImages") }}</el-button
> >
<!--下载医疗报告--> <!--下载医疗报告-->
@ -377,7 +385,9 @@ export default {
let res = await getPatientSubejctVisitList(data); let res = await getPatientSubejctVisitList(data);
this.loading = false; this.loading = false;
if (res.IsSuccess) { if (res.IsSuccess) {
console.log(res.Result.CurrentPageData[0].SubmitState, "SubmitState");
this.list = res.Result.CurrentPageData; this.list = res.Result.CurrentPageData;
console.log(this.list[0].SubmitState, "list");
this.total = res.Result.TotalCount; this.total = res.Result.TotalCount;
} }
} catch (err) { } catch (err) {
@ -472,21 +482,28 @@ export default {
const promises = []; const promises = [];
for (let patient of item.PatientList) { for (let patient of item.PatientList) {
if (!zipObj[patient.PatientIdStr]) { if (!zipObj[patient.PatientIdStr]) {
zipObj[patient.PatientIdStr] = zip.folder(patient.PatientIdStr); zipObj[patient.PatientIdStr] = zip.folder(
console.log(zipObj[patient.PatientIdStr]); `${item.SubjectCode}_${patient.PatientIdStr}`
);
} }
for (let visit of patient.VisitList) { for (let visit of patient.VisitList) {
if (!zipObj[`${patient.PatientIdStr}${visit.VisitName}`]) {
zipObj[`${patient.PatientIdStr}${visit.VisitName}`] = zipObj[
patient.PatientIdStr
].folder(visit.VisitName);
}
for (let study of visit.StudyList) { for (let study of visit.StudyList) {
let date = study.StudyTime.split(" ")[0]; let date = study.StudyTime.split(" ")[0];
if (!zipObj[`${patient.PatientIdStr}${date}`]) {
zipObj[`${patient.PatientIdStr}${date}`] =
zipObj[patient.PatientIdStr].folder(date);
}
for (let series of study.SeriesList) { for (let series of study.SeriesList) {
if (!zipObj[`${patient.PatientIdStr}${date}${series.Modality}`]) { if (
zipObj[`${patient.PatientIdStr}${date}${series.Modality}`] = !zipObj[
zipObj[`${patient.PatientIdStr}${date}`].folder( `${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
series.Modality ]
) {
zipObj[
`${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
] = zipObj[`${patient.PatientIdStr}${visit.VisitName}`].folder(
`${date}_${series.Modality}`
); );
} }
for (let instance of series.InstancePathList) { for (let instance of series.InstancePathList) {
@ -501,7 +518,9 @@ export default {
}; };
const promise = this.handleBatchDown( const promise = this.handleBatchDown(
obj, obj,
zipObj[`${patient.PatientIdStr}${date}${series.Modality}`] zipObj[
`${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
]
); );
promises.push(promise); promises.push(promise);
} }
@ -530,10 +549,8 @@ export default {
}, },
async handleBatchDown(item, zip) { async handleBatchDown(item, zip) {
return new Promise((resolve) => { return new Promise((resolve) => {
let path = `/${item.subjectCode}_${item.patientIdStr}/${item.visitName}/${item.date}_${item.modality}${item.instancePath}`;
this.getFileData( this.getFileData(
this.OSSclientConfig.basePath + path this.OSSclientConfig.basePath + item.instancePath.slice(1)
// "https://th.bing.com/th/id/OIP.duz6S7Fvygrqd6Yj_DcXAQHaF7?rs=1&pid=ImgDetMain"
).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

@ -157,7 +157,11 @@
:label="$t('trials:readTask:table:taskState')" :label="$t('trials:readTask:table:taskState')"
show-overflow-tooltip show-overflow-tooltip
sortable="custom" sortable="custom"
/> >
<template slot-scope="scope">
<span>{{ $fd("TaskState", scope.row.TaskState) }}</span>
</template>
</el-table-column>
<!-- 阅片人 --> <!-- 阅片人 -->
<el-table-column <el-table-column
prop="StudyCode" prop="StudyCode"

View File

@ -217,7 +217,12 @@ export default {
this.$emit("getList"); this.$emit("getList");
this.status = "visit"; this.status = "visit";
if (data.SubjectCode) { if (data.SubjectCode) {
this.getTrialSubejctSelectList(this.$route.query.trialId); let obj = {
PatientList: [],
SubejctId: res.Result,
SubjectCode: data.SubjectCode,
};
this.subjectIdList.unshift(obj);
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.confirmVisit.getList(); this.$refs.confirmVisit.getList();