|
|
@ -150,6 +150,7 @@
|
|
|
|
<el-table
|
|
|
|
<el-table
|
|
|
|
ref="dicomFilesTable"
|
|
|
|
ref="dicomFilesTable"
|
|
|
|
:data="uploadQueues"
|
|
|
|
:data="uploadQueues"
|
|
|
|
|
|
|
|
:row-key="row => row.studyIndex"
|
|
|
|
class="dicomFiles-table"
|
|
|
|
class="dicomFiles-table"
|
|
|
|
@selection-change="handleSelectionChange"
|
|
|
|
@selection-change="handleSelectionChange"
|
|
|
|
>
|
|
|
|
>
|
|
|
@ -931,6 +932,7 @@ export default {
|
|
|
|
if (item.ErrorMesseage) {
|
|
|
|
if (item.ErrorMesseage) {
|
|
|
|
this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
|
|
|
|
this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
|
|
|
|
this.$refs.dicomFilesTable.toggleRowSelection(this.uploadQueues[i])
|
|
|
|
this.$refs.dicomFilesTable.toggleRowSelection(this.uploadQueues[i])
|
|
|
|
|
|
|
|
this.uploadQueues[i].uploadState.selected = true
|
|
|
|
const msg = `${item.ErrorMesseage}`
|
|
|
|
const msg = `${item.ErrorMesseage}`
|
|
|
|
messageArr.push(msg)
|
|
|
|
messageArr.push(msg)
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -967,11 +969,22 @@ export default {
|
|
|
|
await this.archiveStudy(index, res.OtherInfo)
|
|
|
|
await this.archiveStudy(index, res.OtherInfo)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.uploadQueues = this.uploadQueues.filter(v => {
|
|
|
|
console.log(1)
|
|
|
|
return !!v.uploadState.record.Failed.length
|
|
|
|
this.$set(this, 'uploadQueues', [...this.uploadQueues.filter(v => {
|
|
|
|
|
|
|
|
return !v.uploadState.record || (v.uploadState.record && !!v.uploadState.record.Failed.length)
|
|
|
|
|
|
|
|
})])
|
|
|
|
|
|
|
|
console.log(2)
|
|
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
|
|
|
this.selectArr = []
|
|
|
|
|
|
|
|
this.uploadQueues.forEach(v => {
|
|
|
|
|
|
|
|
if (v.uploadState.record) {
|
|
|
|
|
|
|
|
v.uploadState.selected = false
|
|
|
|
|
|
|
|
this.$refs.dicomFilesTable.toggleRowSelection(v, true)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
this.$refs.pathClear.value = ''
|
|
|
|
|
|
|
|
this.btnLoading = false
|
|
|
|
})
|
|
|
|
})
|
|
|
|
this.$refs.pathClear.value = ''
|
|
|
|
|
|
|
|
this.btnLoading = false
|
|
|
|
|
|
|
|
}).catch(_ => { this.btnLoading = false })
|
|
|
|
}).catch(_ => { this.btnLoading = false })
|
|
|
|
},
|
|
|
|
},
|
|
|
|
objectToQuery() {
|
|
|
|
objectToQuery() {
|
|
|
@ -1038,6 +1051,7 @@ export default {
|
|
|
|
fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
|
|
|
|
fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
|
|
|
|
IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
|
|
|
|
IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
|
|
|
|
}).then(async res => {
|
|
|
|
}).then(async res => {
|
|
|
|
|
|
|
|
scope.uploadQueues[index].dicomInfo.failedFileCount = 0
|
|
|
|
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
|
|
|
@ -1109,7 +1123,6 @@ export default {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${o.instanceUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
|
|
|
|
let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${o.instanceUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
|
|
|
|
let res = await dcmUpload(path, o.file, config)
|
|
|
|
let res = await dcmUpload(path, o.file, config)
|
|
|
|
console.log('imageRes', res)
|
|
|
|
|
|
|
|
if (!res || !res.url) {
|
|
|
|
if (!res || !res.url) {
|
|
|
|
params.failedFileCount++
|
|
|
|
params.failedFileCount++
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
@ -1222,10 +1235,7 @@ export default {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
scope.$alert(scope.$t('trials:uploadDicomList:label:uploadFailed'))
|
|
|
|
scope.$alert(scope.$t('trials:uploadDicomList:label:uploadFailed'))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// scope.uploadQueues[index].uploadState.selected = true
|
|
|
|
|
|
|
|
scope.uploadQueues[index].uploadState.selected = true
|
|
|
|
|
|
|
|
scope.uploadQueues[index].uploadState.record = Record
|
|
|
|
scope.uploadQueues[index].uploadState.record = Record
|
|
|
|
// scope.$refs.dicomFilesTable.toggleRowSelection(scope.uploadQueues[index])
|
|
|
|
|
|
|
|
scope.getStudyInfo()
|
|
|
|
scope.getStudyInfo()
|
|
|
|
if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
|
|
|
|
if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
|
|
|
|
scope.$emit('getList')
|
|
|
|
scope.$emit('getList')
|
|
|
@ -1233,13 +1243,15 @@ export default {
|
|
|
|
clearInterval(t)
|
|
|
|
clearInterval(t)
|
|
|
|
resolve()
|
|
|
|
resolve()
|
|
|
|
}).catch((res) => {
|
|
|
|
}).catch((res) => {
|
|
|
|
scope.uploadQueues[index].uploadState.record = Record
|
|
|
|
|
|
|
|
reject()
|
|
|
|
reject()
|
|
|
|
|
|
|
|
scope.uploadQueues[index].uploadState.record = Record
|
|
|
|
|
|
|
|
scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed'))
|
|
|
|
clearInterval(t)
|
|
|
|
clearInterval(t)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed'))
|
|
|
|
|
|
|
|
reject()
|
|
|
|
reject()
|
|
|
|
|
|
|
|
scope.uploadQueues[index].uploadState.record = Record
|
|
|
|
|
|
|
|
scope.$alert(scope.$t('trials:uploadDicomList:label:generateLogFailed'))
|
|
|
|
clearInterval(t)
|
|
|
|
clearInterval(t)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|