Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/resultShow/resultShowDetail.vue

@@ -309,7 +309,7 @@
                             <div class="TextView" >
                                 <VueEditor v-model="JSON.parse(item.chapters)[3]" :disabled="true"></VueEditor>
                             </div>
-                            <div class="brief_title MarginTop30px">
+                            <div class="brief_title MarginTop30px" v-if="ActivityLookFile[index].url!=''">
                                 <img src="@/assets/anliDetail/jdTitle.png" alt="">
                                 <!-- <i class="el-icon-money"></i> -->
                                 <span>活动完结报告</span>
@@ -511,12 +511,14 @@
                     this.ProjectEndFile = JSON.parse(FormData[3][0]['endFile']);
                     if(this.ProjectEndFile!=null)this.ProjectEndLookFile = this.ProjectEndFile[0];
                     else this.ProjectEndLookFile = {url:"",type:""}
+                    console.log(FormData[4])
                     if(FormData[4][0]['title']!=null){
                         this.AllActivity = FormData[4]
                         this.AllActivity.forEach(item=>{
-                            item['reportFile'] = JSON.parse(item['reportFile'])
-                            if(item['reportFile']!=null)this.ActivityLookFile.push({url:item['reportFile'][0].url,fileName:item['reportFile'][0].fileName})
-                            else this.ActivityLookFile.push({url:"",type:""})
+                            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})
+                            }else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
                     if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);