Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-09-09 15:00:19 +08:00
commit 4f4934523f
3 changed files with 9 additions and 9 deletions

View File

@ -5,6 +5,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="beforeClose" :before-close="beforeClose"
:append-to-body="true" :append-to-body="true"
v-loading="btnLoading"
class="downloadDicomAndNonedicom" class="downloadDicomAndNonedicom"
> >
<span slot="title">{{ title }}</span> <span slot="title">{{ title }}</span>
@ -14,7 +15,6 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
:loading="btnLoading"
v-if="hasDicom" v-if="hasDicom"
@click.stop="getIRReadingDownloadStudyInfo('dicom')" @click.stop="getIRReadingDownloadStudyInfo('dicom')"
> >
@ -23,7 +23,6 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
:loading="btnLoading"
v-if="hasNonedicom" v-if="hasNonedicom"
@click.stop="getIRReadingDownloadStudyInfo('noneDicom')" @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
> >
@ -32,7 +31,6 @@
<el-button <el-button
type="primary" type="primary"
size="mini" size="mini"
:loading="btnLoading"
@click.stop="getIRReadingDownloadStudyInfo('all')" @click.stop="getIRReadingDownloadStudyInfo('all')"
> >
{{ $t('download:button:downloadAll') }} {{ $t('download:button:downloadAll') }}
@ -362,7 +360,7 @@ export default {
return { files, name } return { files, name }
}, },
handleOpenDialog(item) { handleOpenDialog(item) {
this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
if (item.IsDicom) { if (item.IsDicom) {
this.modelList = item.DicomStudyList this.modelList = item.DicomStudyList
} else { } else {

View File

@ -137,7 +137,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="top" style="margin: 10px 0"> <div style="margin: 10px 0">
<span>{{ $t('upload:dicom:uploadTitle') }}</span> <span>{{ $t('upload:dicom:uploadTitle') }}</span>
<span style="margin-left: 10px">{{ $store.state.trials.uploadTip }}</span> <span style="margin-left: 10px">{{ $store.state.trials.uploadTip }}</span>
</div> </div>
@ -297,7 +297,7 @@
<span> <span>
{{ $t('trials:uploadDicomList:table:uploadNow') {{ $t('trials:uploadDicomList:table:uploadNow')
}}{{ scope.row.dicomInfo.failedFileCount }} / }}{{ scope.row.dicomInfo.failedFileCount }} /
{{ scope.row.dicomInfo.fileCount }}:[{{ {{ scope.row.dicomInfo.fileCount }}: [{{
(scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
}}MB/{{ }}MB/{{
(scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
@ -626,7 +626,7 @@ export default {
}, },
// //
handleOpenDialog(item, list) { handleOpenDialog(item, list) {
this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
this.modelList = item[list] this.modelList = item[list]
this.model_cfg.visible = true this.model_cfg.visible = true
}, },

View File

@ -407,7 +407,7 @@
<span> <span>
{{ $t('trials:uploadDicomList:table:uploadNow') {{ $t('trials:uploadDicomList:table:uploadNow')
}}{{ scope.row.dicomInfo.failedFileCount }} / }}{{ scope.row.dicomInfo.failedFileCount }} /
{{ scope.row.dicomInfo.fileCount }}:[{{ {{ scope.row.dicomInfo.fileCount }}: [{{
(scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
}}MB/{{ }}MB/{{
(scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
@ -1679,7 +1679,9 @@ export default {
dicomInfo.failedFileCount++ dicomInfo.failedFileCount++
Record.FileCount++ Record.FileCount++
} else { } else {
let path = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${ let path = `/${params.trialId}/Image/${
params.subjectId
}/${params.subjectVisitId}/${
dicomInfo.studyUid dicomInfo.studyUid
}/${scope.getGuid( }/${scope.getGuid(
dicomInfo.studyUid + dicomInfo.studyUid +