#

src/views/resultShow/components/resultDetail_MakerSpace.vue

@@ -559,6 +559,7 @@
                     if(this.ProjectEndFile!=null && this.ProjectEndFile!='')this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
                     console.log(FormData[4][0]);
+                    
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{

src/views/resultShow/components/resultDetail_student.vue

@@ -628,27 +628,53 @@
                     console.log(this.TitleMessage['multiSelectProject']);
 
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters']);
-                     // //项目附件
-                    this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
-                    if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
-                    else this.ProjectLookFile = {url:'',type:""};
+                //      // //项目附件
+                //     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                //     if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
+                //     else this.ProjectLookFile = {url:'',type:""};
+
+                //     //项目结题附件
+                //     console.log(JSON.parse(FormData[3][0]['endFile']));
+                //     this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'');
+                //     if(this.ProjectEndFile!=null && this.ProjectEndFile.length!=0) this.ProjectEndLookFile = this.ProjectEndFile[0];
+                //     else this.ProjectEndLookFile = {url:"",type:""}
+                //     console.log(111);
+
+                //     if(FormData[4][0]['title']!=null){
+                //         this.AllActivity = FormData[4]
+                //         this.AllActivity.forEach(item=>{
+                //             if(item['reportFile']!=null&&item['reportFile']!=''){
+                //                 item['reportFile'] = JSON.parse(item['reportFile']);
+                //                 if(item['reportFile'].length!=0)  this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                //                 else this.ActivityLookFile.push({url:"",type:""})
+                //             }else this.ActivityLookFile.push({url:"",type:""})
+                //         })
+                //     };
+                //     // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                //    this.loading = false;
+
+                    //项目附件
+                    // this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])
+                    // if(this.ProjectFile!=null)this.ProjectLookFile = this.ProjectFile[0] 
+                    // else this.ProjectLookFile = {url:'',type:""};
                     //项目结题附件
-                    this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'');
-                    if(this.ProjectEndFile!=null) this.ProjectEndLookFile = this.ProjectEndFile[0];
+                    this.ProjectEndFile = FormData[3][0]['endFile']!=''?JSON.parse(FormData[3][0]['endFile']):'';
+                    if(this.ProjectEndFile!=null && this.ProjectEndFile!='')this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
-                    // return  
-
+                    console.log(FormData[4][0]);
+                    
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
                             if(item['reportFile']!=null&&item['reportFile']!=''){
                                 item['reportFile'] = JSON.parse(item['reportFile']);
-                                this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                                if(item['reportFile'].length!=0)this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
+                                else this.ActivityLookFile.push({url:"",type:""})
                             }else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
-                    if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
-                   this.loading = false;
+                    // if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    this.loading = false;
                 }).catch(err=>{
                     console.log(err)
                 })