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

src/views/resultShow/components/resultDetail_student.vue

@@ -80,10 +80,21 @@
                         <img src="@/assets/anliDetail/jdTitle.png" alt="">
                         <span>项目基础信息</span>
                     </div>
-                    <el-descriptions>
-                        <el-descriptions-item label="优先支持项目">{{ TitleMessage.multiSelectProject }}</el-descriptions-item>
-                        <el-descriptions-item label="美丽校园改造项目">{{ TitleMessage.schoolRemould }}</el-descriptions-item>
-                        <el-descriptions-item label="项目申请人">{{ TitleMessage.projectApplyperson }}</el-descriptions-item>
+                    <el-descriptions style="width: 100%;" :column="2" border>
+                        <el-descriptions-item label="优先支持项目">
+                            {{ TitleMessage.multiSelectProject[0]?'大赛选拔项目':'' }}
+                            {{ TitleMessage.multiSelectProject[1]?'落地注册项目':'' }}
+                            {{ TitleMessage.multiSelectProject[2]?'社会征集项目':'' }}
+                            {{ TitleMessage.multiSelectProject[3]?'产业命题项目':'' }}
+
+                        </el-descriptions-item>
+                        <el-descriptions-item label="美丽校园改造项目">
+                            {{ TitleMessage.schoolRemould==1?'校园安全项目':'' }}
+                            {{ TitleMessage.schoolRemould==2?'环境治理项目':'' }}
+                            {{ TitleMessage.schoolRemould==3?'校园服务项目':'' }}
+                            {{ TitleMessage.schoolRemould==4?'文创装置项目':'' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label="项目申请人">{{ TitleMessage.projectApplyperson==1?'在校学生':'入驻学校孵化基地的初创企业法人' }}</el-descriptions-item>
                         <el-descriptions-item label="联系电话">{{ TitleMessage.phone }}</el-descriptions-item>
                     </el-descriptions>
                 </div>
@@ -626,6 +637,7 @@
                     this.TitleMessage['teacher'] = JSON.parse(this.TitleMessage['teacher'])
                     // 学生表格
                     this.TitleMessage['student'] = JSON.parse(this.TitleMessage['student'])
+                    this.TitleMessage['multiSelectProject']=JSON.parse(this.TitleMessage['multiSelectProject'])
                     this.DetailMessage= JSON.parse(FormData[1][0]['chapters']);
                     console.log(FormData[1][0])
                     this.ProjectFile = JSON.parse(FormData[2][0]['projectFile'])