XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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-01-30 16:28:45 +08:00
parent 33e7f6f1c3 06ac1a660c
commit 118acc70f3
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
View File

@ -290,7 +290,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.dicomInfo.failedFileCount"> <span v-if="!scope.row.dicomInfo.failedFileCount && !scope.row.dicomInfo.isInit">
{{$t('trials:uploadDicomList:table:status1')}}</span> {{$t('trials:uploadDicomList:table:status1')}}</span>
<span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span> <span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span>
<span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span> <span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span>
@ -759,7 +759,8 @@ export default {
SubjectInfo: {}, SubjectInfo: {},
failedFileCount: 0, failedFileCount: 0,
fileSize: 0, fileSize: 0,
fileCount: 0 fileCount: 0,
isInit: false
}, },
uploadState: { uploadState: {
@ -1101,7 +1102,7 @@ export default {
IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
}).then(async res => { }).then(async res => {
scope.uploadQueues[index].dicomInfo.failedFileCount = 0 scope.uploadQueues[index].dicomInfo.failedFileCount = 0
scope.uploadQueues[index].isInit = true scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
let dicomInfo = scope.uploadQueues[index].dicomInfo let dicomInfo = scope.uploadQueues[index].dicomInfo
let seriesNum = scope.uploadQueues[index].seriesList.length let seriesNum = scope.uploadQueues[index].seriesList.length
let fileNum = scope.uploadQueues[index].fileList.length let fileNum = scope.uploadQueues[index].fileList.length
@ -1165,7 +1166,7 @@ export default {
return new Promise(async resolve1 => { return new Promise(async resolve1 => {
try { try {
let o = v.instanceList[ii] let o = v.instanceList[ii]
let name = `${v.instanceList[ii].instanceUid}_${v.instanceList[ii].file.webkitRelativePath}` let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
if (o.isReUpload) { if (o.isReUpload) {
dicomInfo.failedFileCount++ dicomInfo.failedFileCount++
Record.Existed.push(name) Record.Existed.push(name)
@ -1368,8 +1369,15 @@ export default {
}) })
.then(() => { .then(() => {
this.$refs.uploadForm.reset() this.$refs.uploadForm.reset()
this.selectArr = []
this.uploadQueues.splice(index, 1) this.uploadQueues.splice(index, 1)
this.uploadQueues.forEach((v, i) => {
if (v.uploadState.record) {
v.uploadState.selected = false
this.$refs.dicomFilesTable.toggleRowSelection(v, true)
}
v.studyIndex = i
})
this.handleSelectionChange(this.uploadQueues)
}) })
}, },
// 当选择项发生变化时收集待上传文件数据 // 当选择项发生变化时收集待上传文件数据