hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-15 05:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2023-03-22 14:56:00 +08:00
parent 98d97f0c27 581faa5b14
commit 705ac43a93
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -372,7 +372,7 @@ const qrcodeVisible = () => {
qrCode({ qrCode({
title: "【签到】二维码", title: "【签到】二维码",
name: props.datasource?.name, name: props.datasource?.name,
url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}&type=${props.type}`, url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`,
}); });
}; };

2
src/views/learningpath/LevelAdd.vue
View File

@@ -458,7 +458,7 @@
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <div class="timetext">开始时间</div>
<div class="timetext"> <div class="timetext">
{{ item.startTime !== null ? item.startTime : "-" }} {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
</div> </div>
</div> </div>
<div class="progress"> <div class="progress">

2
src/views/projectcenter/TaskPage.vue
View File

@@ -587,7 +587,7 @@
<div class="time"> <div class="time">
<div class="timetext">开始时间</div> <div class="timetext">开始时间</div>
<div class="timetext"> <div class="timetext">
{{ item.startTime !== null ? item.startTime : "-" }} {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
</div> </div>
</div> </div>
<div class="progress"> <div class="progress">