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

Merge branch 'zcwy-zsx0223' into 'master'

Browse Source 
Zcwy zsx0223

See merge request !167
This commit is contained in:
joshen
2024-03-12 14:43:17 +08:00
parent faf01e0279 27f2bdabc9
commit c8d1956438
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/NavLeft.vue
View File

@@ -1050,6 +1050,10 @@ export default {
console.log("监听路由", n, store.state.openpages, state.keysList);
// console.log("new:" + n.toLowerCase() + ",old:" + o);
let arr = state.keysList;
if(!arr.some(page => page.href === n)){
console.log('不存在',n)
return
}
arr.map((value) => {
if (n.toLowerCase() === value.href) {
localStorage.setItem("openKeys", JSON.stringify([value.openKeys]));

3
src/components/drawers/project/ProjectEvalManage.vue
View File

@@ -430,6 +430,9 @@ export default {
// 导出数据
function exportTaskStu() {
if(!props.datasource.projectTaskId){
props.datasource.projectTaskId = ''
}
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
}

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

@@ -2475,7 +2475,7 @@ export default {
if(qrCodeItems.value.length==1){
qrCode({
title: "【签到】二维码",
courseName: state.name+'项目',
courseName: state.name,
name: qrCodeItems.value[0].name+'课程签到',
createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher,
url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}&openCourseId=${qrCodeItems.value[0].id}`,
@@ -2493,7 +2493,7 @@ export default {
const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', ');
qrCode({
title: "【签到】二维码",
courseName: state.name+'项目',
courseName: state.name,
name: name+'课程签到',
createName:offteachers||teacher,
url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}&openCourseId=${id}`,
@@ -2518,7 +2518,7 @@ export default {
}));
qrCodeItemspg.value = qrCodeItemspgItem.filter(item => item.assessmentId !== null);
if(qrCodeItemspg.value.length==1){
const courseName = state.name+'项目'
const courseName = state.name
qrCode({
title: "【评估】二维码",
courseName,
@@ -2535,7 +2535,7 @@ export default {
const teacher = qrCodeItemspg.value[key].teacher;
const id = qrCodeItemspg.value[key].id;
const assessmentId = qrCodeItemspg.value[key].assessmentId;
const courseName = state.name+'项目'
const courseName = state.name
qrCode({
title: "【评估】二维码",
courseName,