From 4365cdb0ed25018ecb684c0eee38f549f5f0a6dc Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 16:56:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9C=A8=E7=BA=BF=E8=AF=BE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AD=A6?= =?UTF-8?q?=E5=91=98=E6=A8=A1=E6=9D=BF=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 7 +++---- .env.boe | 5 +---- .env.prod | 4 +--- .env.release | 4 +--- src/App.vue | 2 +- src/components/drawers/project/ProjectOnlineManage.vue | 4 ++++ src/components/drawers/router/RouterCommonManage.vue | 4 ++++ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 935cc35a..5e04d19d 100644 --- a/.env +++ b/.env @@ -20,7 +20,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVU # 课程二维码 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id= -# 导入学员模板 -发版前记得修改 -VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx -# 导入作业成绩学员模板 -VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx + +# 导入学员模板 +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx diff --git a/.env.boe b/.env.boe index 4b824494..fdaf95b3 100644 --- a/.env.boe +++ b/.env.boe @@ -6,8 +6,5 @@ VUE_APP_LOGIN_URL=https://u-pre.boe.com/web VUE_APP_BOE_API_URL=https://u-pre.boe.com - # 导入学员模板 -VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673516508029.xlsx -# 导入作业成绩学员模板 -VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673516483342.xlsx \ No newline at end of file +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file diff --git a/.env.prod b/.env.prod index 77beb64f..3fc171f3 100644 --- a/.env.prod +++ b/.env.prod @@ -13,6 +13,4 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id= -VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ - -VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx diff --git a/.env.release b/.env.release index 2479cd46..4870808f 100644 --- a/.env.release +++ b/.env.release @@ -13,6 +13,4 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id= -VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ - -VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 06c7c937..7ca7582f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.1.4------------"); + console.log("版本2.1.5------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 59caaee0..fda43def 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -380,6 +380,8 @@ export default { }); } else if(props.datasource.type == 1) { console.log("我是传递的查询参数", { + "pageNo": state.currentPage, + "pageSize": state.pageSize, "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, "status": state.projectName, "studentName": state.name, @@ -390,6 +392,8 @@ export default { }); {/* "chapterId": props.datasource.stageId=="0"?"":props.datasource.stageId, */} api.QueryOnlineManagementDetail({ + "pageNo": state.currentPage, + "pageSize": state.pageSize, "status": state.projectName, "studentName": state.name, "targetId":props.datasource.projectId, diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 40cba7dc..b9580ff7 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -384,6 +384,8 @@ export default { }); } else if(props.datasource.type == 1) { console.log("我是传递的查询参数", { + "pageNo": state.currentPage, + "pageSize": state.pageSize, "chapterId": props.datasource.chapterId, "status": state.projectName, "studentName": state.name, @@ -393,6 +395,8 @@ export default { }); api.QueryOnlineManagementDetail({ + "pageNo": state.currentPage, + "pageSize": state.pageSize, "chapterId": props.datasource.chapterId, "status": state.projectName, "studentName": state.name,