Compare commits

..

No commits in common. "3d5229d3c02845c8da0e44af5ebfc2778f612b44" and "f80bd64ede825c64226d9427d7f017afe81ef443" have entirely different histories.

5 changed files with 5 additions and 19 deletions

View File

@ -4,9 +4,7 @@
<span>{{ $t('upload:dicom:title') }}</span> <span>{{ $t('upload:dicom:title') }}</span>
<div class="tip"> <div class="tip">
<i class="el-icon-warning-outline"></i> <i class="el-icon-warning-outline"></i>
<div <div v-html="$t('upload:dicom:tip:message1')"></div>
v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
></div>
</div> </div>
</div> </div>
<!--检查列表--> <!--检查列表-->
@ -488,7 +486,7 @@ export default {
return {} return {}
}, },
}, },
TaskId: { VisitTaskId: {
type: String, type: String,
default: '', default: '',
}, },
@ -496,10 +494,6 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
isReadingTaskViewInOrder: {
type: Number,
default: 0,
},
}, },
components: { components: {
'study-view': studyView, 'study-view': studyView,
@ -573,8 +567,8 @@ export default {
TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId, TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
SubjectCode: this.SubjectCode, SubjectCode: this.SubjectCode,
} }
if (this.TaskId) { if (this.VisitTaskId) {
params.VisitTaskId = this.TaskId params.VisitTaskId = this.VisitTaskId
} }
this.loading = true this.loading = true
let res = await getSubjectImageUploadList(params) let res = await getSubjectImageUploadList(params)

View File

@ -18,9 +18,8 @@
:SubjectId="SubjectId" :SubjectId="SubjectId"
:SubjectCode="SubjectCode" :SubjectCode="SubjectCode"
:Criterion="Criterion" :Criterion="Criterion"
:TaskId="VisitTaskId" :VisitTaskId="VisitTaskId"
:isUpload.sync="isUpload" :isUpload.sync="isUpload"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
@ -69,10 +68,6 @@ export default {
type: String, type: String,
default: '', default: '',
}, },
isReadingTaskViewInOrder: {
type: Number,
default: 0,
},
}, },
data() { data() {
return { return {

View File

@ -720,7 +720,6 @@
:criterion="uploadTrialCriterion" :criterion="uploadTrialCriterion"
:visible.sync="uploadImageVisible" :visible.sync="uploadImageVisible"
:VisitTaskId="taskId" :VisitTaskId="taskId"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder"
/> />
<download-dicom-and-nonedicom <download-dicom-and-nonedicom
v-if="downloadImageVisible" v-if="downloadImageVisible"

View File

@ -666,7 +666,6 @@
:Criterion="uploadTrialCriterion" :Criterion="uploadTrialCriterion"
:visible.sync="uploadImageVisible" :visible.sync="uploadImageVisible"
:VisitTaskId="taskId" :VisitTaskId="taskId"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder"
/> />
<download-dicom-and-nonedicom <download-dicom-and-nonedicom
v-if="downloadImageVisible" v-if="downloadImageVisible"

View File

@ -274,7 +274,6 @@
:SubjectId="uploadSubjectId" :SubjectId="uploadSubjectId"
:SubjectCode="uploadSubjectCode" :SubjectCode="uploadSubjectCode"
:Criterion="uploadTrialCriterion" :Criterion="uploadTrialCriterion"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder"
:visible.sync="uploadImageVisible" :visible.sync="uploadImageVisible"
/> />
<download-dicom-and-nonedicom <download-dicom-and-nonedicom