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

src/views/resultShow/resultShowDetail.vue

@@ -501,6 +501,7 @@
                     pid:this.$route.query["Id"]
                 }).then(res=>{
                     let FormData = res.data;
+                    console.log(FormData)
                     this.TitleMessage = FormData[0][0]
                     this.TitleMessage['course_student'] = JSON.parse(this.TitleMessage['course_student']);
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters'])[0];
@@ -518,7 +519,7 @@
                             else this.ActivityLookFile.push({url:"",type:""})
                         })
                     };
-                    this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
+                    if(JSON.parse(FormData[5][0]['endProjectRemark'])!=null)this.endProjectRemark = JSON.parse(FormData[5][0]['endProjectRemark']);
                 }).catch(err=>{
                     console.log(err)
                 })