src/components/downloadDicomAndNonedicom/index.vue

@@ -314,10 +314,9 @@ export default {
       }
     },
     // 格式化下载文件路径
-    formatDownloadFile(list) {
+    formatDownloadFile(data) {
       let files = [],
-        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+        name = `${data.SubjectCode}_${data.VisitName}.zip`
-      list.forEach((data) => {
       if (data.StudyList && data.StudyList.length > 0) {
         let StudyList = data.StudyList
         StudyList.forEach((study) => {
@@ -327,7 +326,7 @@ export default {
                 series.InstancePathList.forEach((instance) => {
                   let fileName = instance.Path.split('/').pop()
                   let obj = {
-                      name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                    name: `${data.SubjectCode}_${data.VisitName}/${this.$fd(
                       'IsDicom',
                       true
                     )}/${study.StudyCode}/${fileName}`,
@@ -347,7 +346,7 @@ export default {
           if (study.FileList.length > 0) {
             study.FileList.forEach((item) => {
               let obj = {
-                  name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                name: `${data.SubjectCode}_${data.VisitName}/${this.$fd(
                   'IsDicom',
                   false
                 )}/${study.StudyCode}/${item.FileName}`,
@@ -358,8 +357,6 @@ export default {
           }
         })
       }
-      })
-
       return { files, name }
     },
     handleOpenDialog(item) {