@@ -354,25 +354,24 @@ export default {
// 计算签到时间
const isSignClick = () => {
- // debugger
- console.log("计算签到时间", props.datasource.info);
- let beginTime = new Date(props.datasource.info.liveStartTime).getTime();
- let endTime = !props.datasource.info.afterSignIn
- ? new Date(props.datasource.info.liveEndTime).getTime()
- : new Date(props.datasource.info.liveStartTime).getTime();
+ console.log("计算签到时间", props.datasource);
+ let beginTime = new Date(props.datasource.startTime).getTime();
+ let endTime = !props.datasource.afterStart
+ ? new Date(props.datasource.endTime).getTime()
+ : new Date(props.datasource.startTime).getTime();
- if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ if (props.datasource.beforeStart && props.datasource.afterStart) {
//有开始前有开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111", beginTime, endTime);
- } else if (props.datasource.info.beforeSignIn && !props.datasource.info.afterSignIn) {
+ } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
//只有开始前无开始后
- beginTime = beginTime - props.datasource.info.beforeSignIn * 60 * 1000;
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
console.log("11112222", beginTime);
- } else if (!props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
+ } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
//无开始前有开始后
- endTime = endTime + props.datasource.info.afterSignIn * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111333", endTime);
}
@@ -393,7 +392,6 @@ export default {
};
const getTableData = () => {
- debugger
// debugger
console.log('当前是项目还是路径图 1 项目 2 路径图', props)
console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
@@ -690,7 +688,6 @@ export default {
{
- debugger
{/* debugger */ }
console.log("点击签到", value);
// 获取当前时间
@@ -858,7 +855,6 @@ export default {
// 导出数据
function exportTaskStu() {
- debugger
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);
diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index ab4fa38f..c88bb7d8 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -85,7 +85,6 @@ const selectGroup = (e, v) => {
};
//确认换组
const changeGroup = (item) => {
- debugger
console.log("换组", selectGroupId.value, item);
props.checkgroupStuId.forEach(stu => {
let obj = {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index e6ce26d4..bd9e004a 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -427,7 +427,6 @@ const stuRowSelection = computed(() => ({
//显示学员换组弹窗
function showChangeGroupModal() {
- debugger
console.log("批量")
const d = props.groupList
console.log("d" + d)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index c1ed3866..b9b1e719 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,7 +3747,7 @@ export default defineComponent({
state.cstm_hs = true;
state.kk_eidt = true;
};
- const columnFun = (itm) => {
+ const columnFun = () => {
//新加
state.stuColumns = [
{
diff --git a/vue.config.js b/vue.config.js
index 6723a260..dd5b1af5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,8 +15,8 @@ module.exports = defineConfig({
port: 8070,
proxy: {
"/manageApi": {
- target: 'http:' + process.env.VUE_APP_PROXY_URL,
- //target: 'http://localhost:30001',
+ // target: 'http:' + process.env.VUE_APP_PROXY_URL,
+ target: 'http://localhost:30001',
changeOrigin: true, //表示是否改变原域名
pathRewrite: {
"^/manageApi": "",
From be5704f2d6f63e32ccaaca9d1b31e34bb73cd526 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 26 Feb 2023 01:01:25 +0800
Subject: [PATCH 31/37] -- fix bug
---
src/components/drawers/router/RouterCommonManage.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 3d01f886..317ea972 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -465,6 +465,9 @@ export default {
if(props.datasource.type==1){
{/* 在线课导出 */}
window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
+ }else if(props.datasource.type==11){
+ {/* 评估导出 */}
+ window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}else{
window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
}
From ed3c9c2336d1bd99697df0a4254f6f123539597d Mon Sep 17 00:00:00 2001
From: lpq
Date: Sun, 26 Feb 2023 01:01:57 +0800
Subject: [PATCH 32/37] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/courselibrary/CoursewareManage.vue | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 997fd927..336a7f14 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3747,12 +3747,8 @@ export default defineComponent({
state.cstm_hs = true;
state.kk_eidt = true;
};
-<<<<<<< HEAD
- const columnFun = () => {
-=======
const columnFun = (itm) => {
console.log("itm", itm);
->>>>>>> 2c0ee70d8d8b2d087356a3f9c9a352e1440cef1b
//新加
state.stuColumns = [
{
From 1d786e427ac21264166e6174b539ed5315219396 Mon Sep 17 00:00:00 2001
From: lpq
Date: Sun, 26 Feb 2023 01:03:11 +0800
Subject: [PATCH 33/37] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue.config.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/vue.config.js b/vue.config.js
index dd5b1af5..fb1e86d9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 14:32:52
* @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-24 09:03:55
+ * @LastEditTime: 2022-12-14 17:38:38
* @FilePath: /fe-manage/vue.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -15,8 +15,7 @@ module.exports = defineConfig({
port: 8070,
proxy: {
"/manageApi": {
- // target: 'http:' + process.env.VUE_APP_PROXY_URL,
- target: 'http://localhost:30001',
+ target: 'http:' + process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名
pathRewrite: {
"^/manageApi": "",
From f26797140f96848c72dde2211564a7a66542fe11 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 26 Feb 2023 01:03:26 +0800
Subject: [PATCH 34/37] -- fix bug
---
src/components/drawers/project/ProjectVoteManage.vue | 4 ++--
src/components/drawers/router/RouterVoteManage.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index 657a1dcc..8d1a1aa6 100644
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -428,8 +428,8 @@
// 导出数据
function exportTaskStu() {
console.log("导出数据")
- console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
+ console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
}
return {
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 05d058b9..31ff2388 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -448,8 +448,8 @@
// 导出数据
function exportTaskStu() {
- console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${1}&voteId=${props.datasource.courseId}`)
+ console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.courseId}`)
}
return {
From 9beacf9024fc8c6ebb3efd32652248d0619c8970 Mon Sep 17 00:00:00 2001
From: lpq
Date: Sun, 26 Feb 2023 01:13:43 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/ActiveAttendance.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index 2c5b5b16..185ef73b 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -855,6 +855,7 @@ export default {
// 导出数据
function exportTaskStu() {
+ debugger
{/* debugger */ }
console.log("props.datasource此处的taskId 应该是router_task 表中主键", props.datasource);
console.log("props.datasource", props.datasource);
@@ -862,13 +863,13 @@ export default {
window.open(
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId
- }&type=2&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+ }&type=2&pid=${props.datasource.routerId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
} else {
window.open(
`${process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId
- }&type=1&pid=${props.datasource.courseId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
+ }&type=1&pid=${props.datasource.projectId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
}
From 722165dae5d0e3e86b15a17cfd37db324344c13a Mon Sep 17 00:00:00 2001
From: lpq
Date: Sun, 26 Feb 2023 01:37:13 +0800
Subject: [PATCH 36/37] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/CheckWork.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/components/drawers/CheckWork.vue b/src/components/drawers/CheckWork.vue
index ac26b74a..83cd35d8 100644
--- a/src/components/drawers/CheckWork.vue
+++ b/src/components/drawers/CheckWork.vue
@@ -183,6 +183,7 @@ export default {
};
//获取作业详情
const getWorkDetail = () => {
+ debugger
console.log("props.workId, props.stuId", props.workId, props.stuId);
getWorkSubmitInfo(props.workId, props.stuId)
.then((res) => {
@@ -346,4 +347,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
From ce8a3659c89a108901344c4b7e7439cf85a4648b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sun, 26 Feb 2023 02:18:16 +0800
Subject: [PATCH 37/37] -- fix bug
---
src/components/drawers/router/RouterVoteManage.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 31ff2388..4fb98e93 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -381,7 +381,7 @@
"studentName": state.name,
"targetId":props.datasource.projectId,
"taskId": props.datasource.courseId,
- "type": 1
+ "type": 2
});
api.QueryVoteManagementDetail({
"pageNo": state.currentPage,
@@ -391,7 +391,7 @@
"studentName": state.name,
"targetId":props.datasource.routerId,
"taskId": props.datasource.courseId,
- "type": 1
+ "type": 2
}).then(res=>{
console.log('投票数据获取', res)
if(res.data.code==200){
