hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-11 11:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-zsx' into 'master'

Browse Source 
Zcwy zsx

See merge request !44
This commit is contained in:
joshen
2024-03-21 17:26:54 +08:00
parent f284aa276a 83b889b269
commit abdceddba9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ballot/BallotPage.vue
View File

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

3
src/views/survey/SurveyDetail.vue
View File

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