From a14aefca2c9499fa15c5612938c277d42f84df75 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 18 Jun 2025 13:33:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=BD=B1=E5=83=8F=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uploadDicomAndNonedicom/dicomFile.vue | 39 ++++++++++++------- .../components/uploadDicomFiles2.vue | 39 ++++++++++++------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index cf951869..475314ac 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -936,19 +936,19 @@ export default { ) { ++instanceIndex } - if (instanceIndex >= fileList.length) { - fileList.push({ - instanceUid: instanceUid, - file: file, - }) - } - scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length - scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( - (prev, next) => { - return prev + next.file.size - }, - 0 - ) + // if (instanceIndex >= fileList.length) { + // fileList.push({ + // instanceUid: instanceUid, + // file: file, + // }) + // } + // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length + // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( + // (prev, next) => { + // return prev + next.file.size + // }, + // 0 + // ) var seriesUid = data.string('x0020000e') var seriesList = scope.uploadQueues[studyIndex].seriesList @@ -1046,6 +1046,19 @@ export default { } instanceList.push(instanceItem) } + if (instanceIndex >= fileList.length) { + fileList.push({ + instanceUid: instanceUid, + file: file, + }) + } + scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length + scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( + (prev, next) => { + return prev + next.file.size + }, + 0 + ) resolve() } catch (error) { console.log(error) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index 376b2fcd..e0d68081 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -952,19 +952,19 @@ export default { ) { ++instanceIndex } - if (instanceIndex >= fileList.length) { - fileList.push({ - instanceUid: instanceUid, - file: file, - }) - } - scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length - scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( - (prev, next) => { - return prev + next.file.size - }, - 0 - ) + // if (instanceIndex >= fileList.length) { + // fileList.push({ + // instanceUid: instanceUid, + // file: file, + // }) + // } + // scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length + // scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( + // (prev, next) => { + // return prev + next.file.size + // }, + // 0 + // ) var seriesUid = data.string('x0020000e') var seriesList = scope.uploadQueues[studyIndex].seriesList @@ -1065,6 +1065,19 @@ export default { } instanceList.push(instanceItem) } + if (instanceIndex >= fileList.length) { + fileList.push({ + instanceUid: instanceUid, + file: file, + }) + } + scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length + scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce( + (prev, next) => { + return prev + next.file.size + }, + 0 + ) resolve() } catch (error) { console.log(error)