影像汇总导出影像、关键图

src/views/trials/trials-panel/trial-summary/image-summary/index.vue

@@ -61,8 +61,17 @@
                 <el-table-column prop="TotalStudyCount" min-width="120"
                     :label="$t('trials:imageSummary:table:TotalStudyCount')" show-overflow-tooltip sortable="custom" />
                 <!-- 影像类型 -->
-                <!-- <el-table-column prop="VisitName" min-width="120" :label="$t('trials:imageSummary:table:visit')"
-                    show-overflow-tooltip sortable="custom" /> -->
+                <el-table-column prop="VisitName" min-width="120" :label="$t('trials:imageSummary:table:imageType')"
+                    show-overflow-tooltip sortable="custom">
+                    <template slot-scope="scope">
+                        <el-tag v-if="scope.row.IsHaveDicom" type="primary">{{
+                            $fd('IsDicom', true)
+                        }}</el-tag>
+                        <el-tag v-if="scope.row.IsHaveNoneDicom" type="primary">{{
+                            $fd('IsDicom', false)
+                        }}</el-tag>
+                    </template>
+                </el-table-column>
                 <!-- 影像数量 -->
                 <el-table-column prop="TotalImageCount" min-width="120"
                     :label="$t('trials:imageSummary:table:TotalImageCount')" show-overflow-tooltip sortable="custom" />
@@ -158,6 +167,7 @@ export default {
                 console.log(err)
             }
         },
+        // 导出表格
         handleExport() { },
         // 导出影像或关键图
         async handleExportImage(IsKeyImage = false) {
@@ -173,7 +183,7 @@ export default {
                 }
                 let res = await getExportSubjectVisitImageList(data)
                 if (res.IsSuccess) {
-
+                    this.downLoad(IsKeyImage, res.Result)
                 }
             } catch (err) {
                 console.log(err)
@@ -193,6 +203,64 @@ export default {
         formatDownloadFile(IsKeyImage = false, row) {
             let files = [],
                 name = `${this.$route.query.researchProgramNo}.zip`;
+            if (!IsKeyImage) {
+                //中心ID/受试者ID/访视名/Study ID_Study Date_Modality/文件  
+                row.VisitList.forEach(visit => {
+                    if (visit.StudyList && visit.StudyList.length > 0) {
+                        visit.StudyList.forEach(study => {
+                            if (study.SeriesList && study.SeriesList.length > 0) {
+                                study.SeriesList.forEach(serie => {
+                                    if (serie.InstancePathList && serie.InstancePathList.length > 0) {
+                                        serie.InstancePathList.forEach(instance => {
+                                            let instanceArr = instance.Path.split("/")
+                                            let fileName = instanceArr[instanceArr.length - 1]
+                                            let obj = {
+                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${study.StudyTime}_${serie.Modality}/${fileName}`,
+                                                url: this.OSSclientConfig.basePath + instance.Path,
+                                            }
+                                            files.push(obj)
+                                        })
+                                    }
+                                })
+                            }
+                        })
+                    }
+                    if (visit.NoneDicomStudyList && visit.NoneDicomStudyList.length > 0) {
+                        visit.NoneDicomStudyList.forEach(noneDicomStudy => {
+                            if (noneDicomStudy.FileList && noneDicomStudy.FileList.length > 0) {
+                                noneDicomStudy.FileList.forEach(file => {
+                                    let obj = {
+                                        name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${noneDicomStudy.StudyCode}_${noneDicomStudy.ImageDate}_${noneDicomStudy.Modality}/${file.FileName}`,
+                                        url: this.OSSclientConfig.basePath + file.Path,
+                                    }
+                                    files.push(obj)
+                                })
+                            }
+                        })
+                    }
+                })
+            } else {
+                //项目研究方案号(评估标准)/中心ID/受试者ID/访视名/阅片人角色-裁判选择标记/文件名
+                row.forEach(item => {
+                    ['QuestionMarkPictureList', 'TableQuestionRowPictureList'].forEach(key => {
+                        if (item[key] && item[key].length > 0) {
+                            item[key].forEach(data => {
+                                ['PicturePath', 'otherPicturePath'].forEach(imgKey => {
+                                    if (data[imgKey]) {
+                                        let arr = data[imgKey].split("/")
+                                        let fileName = arr[arr.length - 1]
+                                        let obj = {
+                                            name: `${item.CriterionName}/${item.TrialSiteCode}/${item.SubjectCode}/${item.VisitName}/${this.$fd('ArmEnum', item.ArmEnum)}_${this.$fd('YesOrNo', item.IsJudgeSelect)}/${fileName}`,
+                                            url: this.OSSclientConfig.basePath + data[imgKey],
+                                        }
+                                        files.push(obj)
+                                    }
+                                })
+                            })
+                        }
+                    })
+                })
+            }
 
             return { files, name }
         },
@@ -282,7 +350,7 @@ export default {
 
         .size {
             display: inline-block;
-            min-width: 50px;
+            min-width: 100px;
         }
     }
 }

src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue

@@ -85,7 +85,7 @@
         <el-table-column prop="IsDicom" min-width="130" :label="$t('trials:uploadMonitor:table:imageType')"
           show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
-            {{ $fd('IsDicom', scope.row.IsDicom) }}
+            <el-tag type="primary">{{ $fd('IsDicom', scope.row.IsDicom) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 上传人 -->