Merge branch 'zcwy-zsx' into 'master'

Zcwy zsx

See merge request !44

src/views/ballot/BallotPage.vue

@@ -261,6 +261,8 @@ const submitVote = () => {
     type: btype, // 1 项目  2 路径图
     voteId: dataInfo.value.id,
     voteName: dataInfo.value.voteName,
+    studentId: userInfo.value.userId,
+    studentName: userInfo.value.realName,
   };
   useRequest(VOTE_DETAIL_SUBMIT, obj);
   // 增加参与数目

src/views/survey/SurveyDetail.vue

@@ -34,7 +34,7 @@
     <!-- 标题 -->
     <!-- 基本信息 -->
     <div class="bascinfo">
-      <div class="header_wrap" v-if="data.projectInfoList&&type!=1">
+      <div class="header_wrap" v-if="data.projectInfoList&&data.projectInfoList.length!=0&&type!=1">
         <div class="header_wrap_item" v-if="level!=0">项目名称：{{ data.projectInfoList[0].projectName }}</div>
         <div class="header_wrap_item">开课名称：{{ data.projectInfoList[0].courseName }}</div>
         <div>培训讲师：{{ data.projectInfoList.map(item => item.teacherName).join('，') }}</div>
@@ -280,6 +280,7 @@ function orderArr(a, b) {
   return arrs;
 }
 onMounted(() => {
+console.log(data.value,'aaaa')
   if(isSubmitTrue==true){
     open();
     return