导出
@@ -102,16 +102,16 @@
@@ -125,20 +125,20 @@
课程名称：
@@ -167,15 +167,15 @@
@@ -183,8 +183,8 @@
@@ -192,14 +192,14 @@
- 1、课程名称统一不加书名号。
+ 1、课程名称统一不加书名号。
2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息 之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先 - 看到的是课程内容主题。
+ 看到的是课程内容主题。
3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用 版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。 @@ -209,8 +209,8 @@
@@ -234,9 +234,9 @@
面授
@@ -251,8 +251,8 @@
@@ -262,18 +262,18 @@
是
否
@@ -297,9 +297,9 @@
- 编辑
- 开课
- 查看
- 管理
-
+ 编辑
+
+ 开课
+
+ 查看
+
+ 管理
+
+
权限名单
查看权
管理权
-
+
复制
撤回
- 停用
- 启用
- 删除
+ 停用
+
+ 启用
+
+ 删除
+
@@ -341,34 +354,34 @@
@@ -401,11 +414,11 @@
查看详情
@@ -591,28 +604,28 @@
开课
@@ -621,24 +634,24 @@
@@ -715,8 +728,8 @@
{
handleCopyP(record);
}
@@ -748,7 +761,7 @@
复制
{
handleDeleteKaike(record);
}
@@ -765,7 +778,7 @@
@@ -776,14 +789,14 @@
学员管理
- 审核通过
- 拒绝
- 撤回
+ 审核通过
+
+ 拒绝
+
+ 撤回
+
@@ -1120,13 +1139,13 @@
@@ -1226,17 +1245,17 @@
+ 1、课程名称统一不加书名号。
2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息 之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先 - 看到的是课程内容主题。
+ 看到的是课程内容主题。
3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用 版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。 @@ -209,8 +209,8 @@
在线课程管理
@@ -379,9 +392,9 @@
查看详情
开课
更多
-
@@ -819,18 +832,18 @@
开课名称
@@ -846,10 +859,10 @@
{{ xjkkinputV2.length }}/50
@@ -860,21 +873,21 @@
面授时间
@@ -883,16 +896,16 @@
-
学员管理
@@ -1099,16 +1112,22 @@
@@ -1171,13 +1190,13 @@
@@ -1192,18 +1211,18 @@
得分
@@ -1213,9 +1232,9 @@
取消
确定
@@ -1250,8 +1269,8 @@
结业
@@ -1261,18 +1280,18 @@
结业
+ v-model:checked="checked"
+ :value="1"
+ @click="clear_jyradioV1"
+ >结业
不结业
+ v-model:checked="checked"
+ :value="2"
+ @click="clear_jyradioV1"
+ >不结业
@@ -1294,16 +1313,16 @@
@@ -1340,17 +1359,17 @@
-->
-
+
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index c9d32502..7f8462d8 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -128,7 +128,7 @@ const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, {
totalPage: res => res.result.total_page_num,
total: res => res.result.count
})
-console.log(data)
+console.log(data,222)
watch(taskIndex, () => {
if (taskIndex.value >= 0) {
rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
@@ -194,19 +194,26 @@ function confirm() {
}
if (taskIndex.value === -1) {
let list = props.taskList
- list.push({
+ console.log(props,222,list);
+ if(list!=undefined){
+ list.push({
name: selectsData.value[0].title,
type: 3,
courseId: selectsData.value[0].id,
info: selectsData.value[0]
})
+ }
+
} else {
const data = props.taskList[taskIndex.value]
data.name = selectsData.value[0].title
data.courseId = selectsData.value[0].id
data.info = selectsData.value[0]
}
- emit('update:taskList', [...props.taskList])
+ if(props.taskList!=undefined){
+ emit('update:taskList', [...props.taskList])
+ }
+
closeDrawer()
}
@@ -1314,14 +1333,14 @@
请确定是否同意此学员学习此课程
请确定是否拒绝此学员学习此课程
@@ -1358,16 +1377,16 @@
Date: Fri, 17 Feb 2023 21:25:08 +0800
Subject: [PATCH 02/53] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=80=83=E8=AF=95?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=AD=94=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/CheckAnsware.vue | 2 +-
src/components/drawers/project/ProjectExamManage.vue | 3 +--
src/components/drawers/router/RouterExaminationManage.vue | 2 +-
src/views/learningpath/LevelAdd.vue | 2 +-
src/views/projectcenter/TaskPage.vue | 2 +-
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/components/drawers/CheckAnsware.vue b/src/components/drawers/CheckAnsware.vue
index 95799c8d..cdd8b6e4 100644
--- a/src/components/drawers/CheckAnsware.vue
+++ b/src/components/drawers/CheckAnsware.vue
@@ -21,7 +21,7 @@
+
+
+
+
\ No newline at end of file
From a9b1dcd19bec8dac96690159993d000e2127b837 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 18 Feb 2023 19:21:42 +0800
Subject: [PATCH 32/53] =?UTF-8?q?demand=20=E5=9C=A8=E7=BA=BF=E8=AF=BE?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../student/OnlineClassModelStudent.vue | 133 +++---------------
src/views/courselibrary/OnlineManage.vue | 6 +-
2 files changed, 21 insertions(+), 118 deletions(-)
diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index 7b3a32e7..cc6e5b4e 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -2,22 +2,22 @@
-
Date: Sun, 19 Feb 2023 09:32:23 +0800
Subject: [PATCH 46/53] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=8A=95=E7=A5=A8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../drawers/project/ProjectVoteManage.vue | 14 ++------------
src/components/drawers/router/RouterVoteManage.vue | 12 +-----------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index 999fd54e..461402bc 100644
--- a/src/components/drawers/project/ProjectVoteManage.vue
+++ b/src/components/drawers/project/ProjectVoteManage.vue
@@ -176,21 +176,11 @@
value: "1",
label: "未开始",
},
- {
- id: 2,
- value: "2",
- label: "进行中",
- },
{
id: 3,
value: "3",
label: "已完成",
},
- {
- id: 4,
- value: "4",
- label: "未完成",
- },
],
tabledata: [],
tableDataTotalLoading: true, // 表格loading加载配置
@@ -438,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.projectTaskId}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.projectTaskId}`)
+ console.log(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.id}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.id}`)
}
return {
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index a1c150eb..44b2c255 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -180,21 +180,11 @@
value: "1",
label: "未开始",
},
- {
- id: 2,
- value: "2",
- label: "进行中",
- },
{
id: 3,
value: "3",
label: "已完成",
- },
- {
- id: 4,
- value: "4",
- label: "未完成",
- },
+ }
],
tabledata: [],
tableDataTotalLoading: true, // 表格loading加载配置
From ed539fef717596f468d4fd5dae408c6c11f2a4c2 Mon Sep 17 00:00:00 2001
From: wyx
Date: Sun, 19 Feb 2023 09:49:35 +0800
Subject: [PATCH 47/53] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=8A=95=E7=A5=A8=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E5=8F=82?=
=?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/project/ProjectVoteManage.vue | 4 ++--
src/components/drawers/router/RouterVoteManage.vue | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/project/ProjectVoteManage.vue b/src/components/drawers/project/ProjectVoteManage.vue
index 461402bc..657a1dcc 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.id}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/vote/manage/export/vote?type=${2}&voteId=${props.datasource.id}`)
+ 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 {
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index 44b2c255..05d058b9 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -353,6 +353,7 @@
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log("当前是什么类型", props.datasource.type);
+ console.log("当前是什么类型", props.datasource);
state.tableDataTotalLoading = true;
getData();
}
From f2c54e57ca8dbcbd87b2aa9fadd71e83a34d3d52 Mon Sep 17 00:00:00 2001
From: wyx
Date: Sun, 19 Feb 2023 10:14:41 +0800
Subject: [PATCH 48/53] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=80=83=E8=AF=95?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8F=82=E6=95=B0targetid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/project/ProjectExamManage.vue | 3 ++-
src/components/drawers/router/RouterExaminationManage.vue | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index ed5febf3..2bb9e61b 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -347,6 +347,7 @@ export default {
const afterVisibleChange = (bol) => {
if (bol == true) {
state.loadingData = true;
+ console.log(props.datasource)
getData();
}
};
@@ -415,7 +416,7 @@ export default {
{/* 导出数据 */}
function exportData() {
// window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.stageId}&type=${2}&pid=${props.datasource.projectId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.stageId}&type=${2}&targetId=${props.datasource.projectId}&pid=${props.datasource.projectId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index c53245b5..879d30a9 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -435,7 +435,7 @@ export default {
{/* 导出数据 */}
function exportData() {
// window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
From e92fdf1b69d9dcb71ac3ecfe40c15506774ccd1b Mon Sep 17 00:00:00 2001
From: wyx
Date: Sun, 19 Feb 2023 11:59:17 +0800
Subject: [PATCH 49/53] =?UTF-8?q?fix:=E7=B3=BB=E7=BB=9F=E5=A4=96=E9=83=A8?=
=?UTF-8?q?=E8=80=83=E8=AF=95=E5=8C=BA=E5=88=86=EF=BC=8C=E5=A4=96=E9=83=A8?=
=?UTF-8?q?=E8=80=83=E8=AF=95=E7=AE=A1=E7=90=86=E5=AD=A6=E5=91=98=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../drawers/project/ProjectExternalExamManage.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index dde5557c..151ec439 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -155,6 +155,10 @@
return {};
},
},
+ outchapter: {
+ type: Number,
+ default: null,
+ },
},
setup(props, ctx) {
@@ -371,13 +375,13 @@
function getData() {
state.loadingData = true;
api.QueryExternalExamManageDetail({
- chapterId: props.datasource.stageId,
+ chapterId: props.outchapter,
pageNo: state.currentPage,
pageSize: state.pageSize,
status: state.projectName,
studentName: state.name,
targetId: props.datasource.projectId,
- taskId: props.datasource.projectTaskId,
+ taskId: props.datasource.courseId,
type: 2,
}).then(res=>{
console.log(res)
From 79f929202e851cc3ae1b065e619ccf20750b0cac Mon Sep 17 00:00:00 2001
From: wyx
Date: Sun, 19 Feb 2023 12:04:34 +0800
Subject: [PATCH 50/53] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95=E5=AD=A6=E5=91=98=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E5=8F=82=E6=95=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/project/ProjectExternalExamManage.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index 151ec439..ed8bef75 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -375,7 +375,6 @@
function getData() {
state.loadingData = true;
api.QueryExternalExamManageDetail({
- chapterId: props.outchapter,
pageNo: state.currentPage,
pageSize: state.pageSize,
status: state.projectName,
From f48145eb5bb79473bb31a2c5a4c3599310874f1d Mon Sep 17 00:00:00 2001
From: wyx
Date: Sun, 19 Feb 2023 12:25:53 +0800
Subject: [PATCH 51/53] fix
---
src/components/drawers/project/ProjectExternalExamManage.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue
index ed8bef75..151ec439 100644
--- a/src/components/drawers/project/ProjectExternalExamManage.vue
+++ b/src/components/drawers/project/ProjectExternalExamManage.vue
@@ -375,6 +375,7 @@
function getData() {
state.loadingData = true;
api.QueryExternalExamManageDetail({
+ chapterId: props.outchapter,
pageNo: state.currentPage,
pageSize: state.pageSize,
status: state.projectName,
From b1c4b80be3bf25cf387b80e7b5bdde40c736eeed Mon Sep 17 00:00:00 2001
From: lpq
Date: Sun, 19 Feb 2023 13:38:30 +0800
Subject: [PATCH 52/53] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=AD=BE=E5=88=B0?=
=?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/ActiveAttendance.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index fe816382..8af1e4ed 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -409,10 +409,10 @@ export default {
const isSignClick = () => {
debugger
console.log("计算签到时间", props.datasource);
- let beginTime = new Date(props.datasource.info.activityStartTime).getTime();
+ let beginTime = new Date(props.datasource.startTime).getTime();
let endTime = !props.datasource.info.afterSignIn
- ? new Date(props.datasource.info.endTime).getTime()
- : new Date(props.datasource.info.startTime).getTime();
+ ? new Date(props.datasource.endTime).getTime()
+ : new Date(props.datasource.startTime).getTime();
if (props.datasource.info.beforeSignIn && props.datasource.info.afterSignIn) {
//有开始前有开始后
From 0f14ed29aee03b12f5f7a306a7b57a0687912bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Sun, 19 Feb 2023 13:44:23 +0800
Subject: [PATCH 53/53] =?UTF-8?q?BUG=20=E5=AD=A6=E4=B9=A0=E8=B7=AF?=
=?UTF-8?q?=E5=BE=84=E4=B8=8B=20=E5=AD=A6=E5=91=98=E5=88=97=E8=A1=A8=20?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=20?=
=?UTF-8?q?=E6=B2=A1=E5=87=BA=E6=9D=A5=EF=BC=88=E4=B9=8B=E5=89=8D=E6=98=AF?=
=?UTF-8?q?=E5=A5=BD=E7=9A=84=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/CheckStu.vue | 8 ++++----
src/components/drawers/EvList.vue | 13 ++++++++++---
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 135b6c1e..0b92ab72 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -22,8 +22,8 @@
- 
+
+
- 
+
提示
@@ -1399,9 +1418,9 @@
+
-
+
);
},
},
@@ -1860,7 +1879,7 @@ const columns6 = [
width: "15%",
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1871,7 +1890,7 @@ const columns6 = [
width: "15%",
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1882,7 +1901,7 @@ const columns6 = [
width: "8%",
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1894,7 +1913,7 @@ const columns6 = [
width: "12%",
ellipsis: true,
align: "center",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
// return text ? getdateToTime(text * 1000) : "-";
return text ? text : "-";
},
@@ -1906,7 +1925,7 @@ const columns6 = [
width: "12%",
ellipsis: true,
align: "center",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
// return text ? getdateToTime(text * 1000) : "-";
return text ? text : "-";
},
@@ -1918,7 +1937,7 @@ const columns6 = [
width: "8%",
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1929,7 +1948,7 @@ const columns6 = [
width: 100,
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1960,7 +1979,7 @@ const columns7 = [
width: 200,
dataIndex: "name",
key: "name",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1970,7 +1989,7 @@ const columns7 = [
dataIndex: "number",
key: "1",
align: "center",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -1980,7 +1999,7 @@ const columns7 = [
dataIndex: "department",
key: "2",
align: "center",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -2000,7 +2019,7 @@ const columns7 = [
dataIndex: "band",
key: "4",
align: "center",
- customRender: ({ text }) => {
+ customRender: ({text}) => {
return text ? text : "-";
},
},
@@ -2010,7 +2029,7 @@ const columns7 = [
dataIndex: "status",
key: "5",
align: "center",
- customRender: ({ record }) => {
+ customRender: ({record}) => {
switch (String(record.status)) {
case "0":
return "审核通过";
@@ -2027,7 +2046,7 @@ const columns7 = [
dataIndex: "join",
key: "6",
align: "center",
- customRender: ({ record }) => {
+ customRender: ({record}) => {
switch (String(record.source)) {
case "1":
return "导入";
@@ -2126,7 +2145,7 @@ export default defineComponent({
setup() {
const CourseModalRef = ref(null);
const store = useStore();
-
+
const state = reactive({
tableLoading: false,
//新加
@@ -2139,13 +2158,13 @@ export default defineComponent({
align: "center",
customRender: (text) => {
return (
-
{" "}
{text.record.finishStatus == 0 || text.record.finishStatus == null
- ? "未开始"
- : "已完成"}
+ ? "未开始"
+ : "已完成"}
-
+
+
);
},
},
@@ -2157,11 +2176,11 @@ export default defineComponent({
align: "center",
customRender: (record) => {
return (
-
{text && text.record.studentJobName
- ? text.record.studentJobName
- : "-"}
+ ? text.record.studentJobName
+ : "-"}
-
+
+
);
},
},
@@ -2171,7 +2190,7 @@ export default defineComponent({
dataIndex: "status",
key: "5",
align: "center",
- customRender: ({ record }) => {
+ customRender: ({record}) => {
switch (String(record.status)) {
case "0":
return "审核通过";
@@ -2189,8 +2208,8 @@ export default defineComponent({
dataIndex: "signstatus",
key: "7",
align: "center",
- customRender: ({ record }) =>
- record.signStatus ? "已签到" : "未签到",
+ customRender: ({record}) =>
+ record.signStatus ? "已签到" : "未签到",
},
{
title: "评估状态",
@@ -2198,8 +2217,8 @@ export default defineComponent({
dataIndex: "evastatus",
key: "8",
align: "center",
- customRender: ({ record }) =>
- record.assessmentStatus ? "已评估" : "未评估",
+ customRender: ({record}) =>
+ record.assessmentStatus ? "已评估" : "未评估",
},
{
title: "作业成绩",
@@ -2207,24 +2226,24 @@ export default defineComponent({
dataIndex: "workScore",
key: "7",
align: "center",
- customRender: ({ record }) => {
+ customRender: ({record}) => {
return (
-
{record.studentBandDesc ? record.studentBandDesc : "-"}
-
+
- {record.workScore === -2 ? (
- "-"
- ) : record.workScore ? (
- {record.workScore}
- ) : (
- {
- handlJoinStu(record);
- }}
- >
+
);
// switch (String(record.status)) {
// case "0":
@@ -2258,26 +2277,26 @@ export default defineComponent({
dataIndex: "completionStatus",
key: "8",
align: "center",
- customRender: ({ record }) => {
+ customRender: ({record}) => {
return (
-
+ {record.workScore === -2 ? (
+ "-"
+ ) : record.workScore ? (
+ {record.workScore}
+ ) : (
+ {
+ handlJoinStu(record);
+ }}
+ >
成绩录入
- )}
-
+ )}
+
- {record.finishStatus == 1 &&
- record.workScore != -2 &&
- record.signStatus == 1 ? (
-
+ {
- handleOverStu(record);
- }}
- >
- 结业
-
- ) : record.completionStatus == 1 ? (
- 已结业
- ) : (
- -
- )}
-
+ {record.finishStatus == 1 &&
+ record.workScore != -2 &&
+ record.signStatus == 1 ? (
+
);
},
},
@@ -2290,7 +2309,7 @@ export default defineComponent({
selectedRowKeys7: [],
auditDescription: "",
isEdit: 0,
- member: { name: "", value: "" },
+ member: {name: "", value: ""},
//列表表格
tableData1: [
// {
@@ -2756,7 +2775,7 @@ export default defineComponent({
const toolbarConfig = {
excludeKeys: ["insertVideo", "insertImage"],
};
- const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} };
+ const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
editorConfig.MENU_CONF["uploadImage"] = {
// 自定义上传
async customUpload(file, insertFn) {
@@ -2791,12 +2810,12 @@ export default defineComponent({
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
const isJpgOrPng =
- file.type === "image/jpg" ||
- file.type === "image/jpeg" ||
- file.type === "image/png" ||
- file.type === "image/svg" ||
- file.type === "image/bmp" ||
- file.type === "image/gif";
+ file.type === "image/jpg" ||
+ file.type === "image/jpeg" ||
+ file.type === "image/png" ||
+ file.type === "image/svg" ||
+ file.type === "image/bmp" ||
+ file.type === "image/gif";
if (!isJpgOrPng) {
message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
return reject(false);
@@ -2810,7 +2829,7 @@ export default defineComponent({
}
let w = 0,
- h = 0;
+ h = 0;
let reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = () => {
@@ -2836,7 +2855,7 @@ export default defineComponent({
return resolve(true);
} else {
message.error(
- "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
+ "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
);
return reject(false);
}
@@ -2865,7 +2884,7 @@ export default defineComponent({
];
if (!fileType.includes(file.name.split(".")[1])) {
message.error(
- "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
+ "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
);
return false;
}
@@ -2908,12 +2927,12 @@ export default defineComponent({
let endTime = "";
if (state.projectTime) {
startTime = toDate(
- new Date(state.projectTime[0].$d).getTime() / 1000,
- "Y-M-D"
+ new Date(state.projectTime[0].$d).getTime() / 1000,
+ "Y-M-D"
);
endTime = toDate(
- new Date(state.projectTime[1].$d).getTime() / 1000,
- "Y-M-D"
+ new Date(state.projectTime[1].$d).getTime() / 1000,
+ "Y-M-D"
);
}
let res = await list({
@@ -2929,38 +2948,38 @@ export default defineComponent({
beginTime: startTime,
});
console.log("获取面授课列表", res);
- const { rows, total, pageNo } = res.data.data;
+ const {rows, total, pageNo} = res.data.data;
console.log(res.data.data);
state.tableDataTotal1 = total;
for (let i = 0; i < rows.length; i++) {
- rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
+ rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
}
const datas = traverseArr(
- rows,
- {
- key: "offcourseId",
- num: "num",
- name: "name",
- content: "sysTypeId",
- courseform: "type",
- project: "projectName",
- stunum: "studentCnt",
- grade: "score",
- status: "auditStatus",
- ynpub: "publishStatus",
- creator: "createName",
- createtime: "createTime",
- pubtime: "publishTime",
- kkty: "status",
- offcourseId: "offcourseId",
- },
- true
+ rows,
+ {
+ key: "offcourseId",
+ num: "num",
+ name: "name",
+ content: "sysTypeId",
+ courseform: "type",
+ project: "projectName",
+ stunum: "studentCnt",
+ grade: "score",
+ status: "auditStatus",
+ ynpub: "publishStatus",
+ creator: "createName",
+ createtime: "createTime",
+ pubtime: "publishTime",
+ kkty: "status",
+ offcourseId: "offcourseId",
+ },
+ true
);
datas.forEach((itm) => {
itm.pageNo = pageNo;
- itm.contentTxt =
- findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
+ itm.contentTxt =
+ findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
});
state.tableData1 = datas;
console.log("state.tableData1", state.tableData1);
@@ -2969,22 +2988,22 @@ export default defineComponent({
function findClassFullName(list, classify, name = "") {
return (
- (list &&
- list.length > 0 &&
- list.map((e) =>
- classify == e.code
- ? name
- ? name + "-" + e.name
- : e.name
- : findClassFullName(
- e.children,
- classify,
- name ? name + "-" + e.name : e.name
- )
- )
- .filter((name) => name)
- .join("")) ||
- ""
+ (list &&
+ list.length > 0 &&
+ list.map((e) =>
+ classify == e.code
+ ? name
+ ? name + "-" + e.name
+ : e.name
+ : findClassFullName(
+ e.children,
+ classify,
+ name ? name + "-" + e.name : e.name
+ )
+ )
+ .filter((name) => name)
+ .join("")) ||
+ ""
);
}
@@ -3222,7 +3241,7 @@ export default defineComponent({
console.log("获取学员信息", obj);
let res = await studentList(obj);
console.log("获取学员列表", res);
- const { rows, total, pageNo } = res.data.data;
+ const {rows, total, pageNo} = res.data.data;
state.tableDataTotal3 = total;
for (let i = 0; i < rows.length; i++) {
@@ -3235,22 +3254,22 @@ export default defineComponent({
};
});
const data2 = traverseArr(
- rows,
- {
- key: "studentId",
- num: "num",
- name: "name",
- number: "studentId",
- department: "deptName",
- postion: "jobName",
- band: "bandDesc",
- status: "applyStatus",
- join: "source",
- signstatus: "signStatus",
- evastatus: "evalStatus",
- overstatus: "status",
- },
- true
+ rows,
+ {
+ key: "studentId",
+ num: "num",
+ name: "name",
+ number: "studentId",
+ department: "deptName",
+ postion: "jobName",
+ band: "bandDesc",
+ status: "applyStatus",
+ join: "source",
+ signstatus: "signStatus",
+ evastatus: "evalStatus",
+ overstatus: "status",
+ },
+ true
);
data2.forEach((itm) => {
itm.pageNo = pageNo;
@@ -3356,24 +3375,24 @@ export default defineComponent({
console.log("获取开obj", obj, state.selectTime);
let res = await planList(obj);
console.log("开课res", res);
- const { rows, total, pageNo } = res.data.data;
+ const {rows, total, pageNo} = res.data.data;
state.tableDataTotal222 = total;
for (let i = 0; i < rows.length; i++) {
rows[i].num = i + 1 + (state.currentPage222 - 1) * 10;
}
const datas = traverseArr(
- rows,
- {
- key: "offcoursePlanId",
- num: "num",
- organization: "name",
- address: "address",
- starttime: "beginTime",
- createtime: "createTime",
- createName: "createName",
- },
- true
+ rows,
+ {
+ key: "offcoursePlanId",
+ num: "num",
+ organization: "name",
+ address: "address",
+ starttime: "beginTime",
+ createtime: "createTime",
+ createName: "createName",
+ },
+ true
);
datas.forEach((itm) => {
itm.pageNo = pageNo;
@@ -3506,9 +3525,9 @@ export default defineComponent({
return message.warning("该课程名称已存在");
}
console.log(
- "state.bs_hs && state.valueE1 == 2",
- state.bs_hs,
- state.valueE1 == 2
+ "state.bs_hs && state.valueE1 == 2",
+ state.bs_hs,
+ state.valueE1 == 2
);
if (!state.valueE1 && !state.valueE2) {
message.destroy();
@@ -3622,7 +3641,7 @@ export default defineComponent({
const handleSureStu = () => {
let startTime,
- endTime = 0;
+ endTime = 0;
if (state.xjkkinputV3) {
startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm') //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
@@ -3665,9 +3684,9 @@ export default defineComponent({
}
state.addLoading = true;
editPlan(postData).then(() => {
- getTableDate3();
- handleCancelStu();
- rest();
+ getTableDate3();
+ handleCancelStu();
+ rest();
state.addLoading = false;
});
};
@@ -3675,26 +3694,26 @@ export default defineComponent({
//编辑开课
const handelEditStu = async (item) => {
state.offcourseId = item.offcourseId;
- state.offcoursePlanId = item.id;
+ state.offcoursePlanId = item.id;
if (item.evaluateId) {
api
- .queryAppraiseDetailById({ assessmentId: item.evaluateId })
- .then((res) => {
- state.assessmentName = res.data.data.assessmentName;
- })
- .catch();
+ .queryAppraiseDetailById({assessmentId: item.evaluateId})
+ .then((res) => {
+ state.assessmentName = res.data.data.assessmentName;
+ })
+ .catch();
}
if (item.homeWorkId) {
- queryWorkDetailById({ workId: item.homeWorkId }).then((res) => {
+ queryWorkDetailById({workId: item.homeWorkId}).then((res) => {
state.workName = res.data.data.workName;
});
}
if (item.testId) {
- queryExaminationDetailById({ examinationId: item.testId }).then(
- (res) => {
- state.testName = res.data.data.examinationName;
- }
+ queryExaminationDetailById({examinationId: item.testId}).then(
+ (res) => {
+ state.testName = res.data.data.examinationName;
+ }
);
}
@@ -3707,8 +3726,8 @@ export default defineComponent({
let str = "";
for (let i = 0; i < arrss.length; i++) {
i == arrss.length - 1
- ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
- : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
+ ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
+ : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
}
console.log(str);
state.attach = str;
@@ -3720,9 +3739,9 @@ export default defineComponent({
options4CurId.value = item.teacherId;
// (state.regisCom = item.completeType.split(",")[0] == "1" ? true : false),
(state.signCom = item.completeType.split(",")[0] == "1" ? true : false),
- (state.comLeave =
- item.completeType.split(",")[1] == "1" ? true : false),
- (state.checked4 = item.evalFlag === 1 ? true : false);
+ (state.comLeave =
+ item.completeType.split(",")[1] == "1" ? true : false),
+ (state.checked4 = item.evalFlag === 1 ? true : false);
state.assessmentId = String(item.evaluateId);
state.EditTestId = Number(item.testId);
state.EditWorkId = String(item.homeWorkId);
@@ -3740,7 +3759,7 @@ export default defineComponent({
state.xjkkradioV1 = "";
}
*/
- state.member = { value: item.teacherId, name: item.teacher };
+ state.member = {value: item.teacherId, name: item.teacher};
state.cstm_hs = true;
state.kk_eidt = true;
@@ -3832,7 +3851,7 @@ export default defineComponent({
handle({
offcourseId: state.offcourseId,
type: 0,
- }).then((res) => {
+ }).then((res) => {
if (res.data.code === 200) {
getTableDate();
}
@@ -3852,24 +3871,24 @@ export default defineComponent({
delete_exit1();
} else {
api1
- .updateStudent({
- workScore: state.lrcj_inputV1,
- workId: state.homeWorkId,
- studentId: state.studentId,
- })
- .then((res) => {
- console.log("成绩录入", res);
- if (res.data.code === 200) {
- // getTableDate2();
- state.isgetStudent = true;
- delete_exit1();
- state.lrcj_inputV1 = "";
- state.scoreId = null;
- }
- })
- .catch((err) => {
- console.log("录入失败", err);
- });
+ .updateStudent({
+ workScore: state.lrcj_inputV1,
+ workId: state.homeWorkId,
+ studentId: state.studentId,
+ })
+ .then((res) => {
+ console.log("成绩录入", res);
+ if (res.data.code === 200) {
+ // getTableDate2();
+ state.isgetStudent = true;
+ delete_exit1();
+ state.lrcj_inputV1 = "";
+ state.scoreId = null;
+ }
+ })
+ .catch((err) => {
+ console.log("录入失败", err);
+ });
}
}
};
@@ -3878,17 +3897,17 @@ export default defineComponent({
// state.studentItem.id
// console.log("state.studentItem.id", state.studentItem.id);
api1
- .batchUpdateStatus({
- completionStatus: 1,
- ids: [state.studentItem?.id],
- // status: 1,
- })
- .then((res) => {
- if (res.data.code === 200) {
- getTableDate2();
- delete_exit1();
- }
- });
+ .batchUpdateStatus({
+ completionStatus: 1,
+ ids: [state.studentItem?.id],
+ // status: 1,
+ })
+ .then((res) => {
+ if (res.data.code === 200) {
+ getTableDate2();
+ delete_exit1();
+ }
+ });
}
};
//确认复制
@@ -3966,48 +3985,20 @@ export default defineComponent({
}
}
if (state.copy_hs) {
- console.log(2222222);
if (state.offcourseId && state.offcoursePlanId) {
- copyCoursePlan({offcoursePlanId:state.offcoursePlanId}).then(() => {
- message.destroy();
- message.success("复制成功");
- getTableDate3();
- delete_exit1();
- rest();
- });
+ state.tableLoading = true;
+ message.success("复制成功");
+ delete_exit1();
+ rest();
+ await copyCoursePlan({offcoursePlanId: state.offcoursePlanId})
+ getTableDate3();
} else if (state.offcourseId) {
- console.log(87887);
- // 拿数据
- const item = await detail({
- offcourseId: Number(state.offcourseId),
- }).then((res) => {
- if (res.data.code === 200) return res.data.data;
- });
- const postData = {
- offcourseId: null, //不传代表新增
- name: item.name + "(1)",
- picUrl: item.picUrl,
- targetUser: item.targetUser,
- meaning: item.meaning,
- // categoryId: item.categoryId,
- sysTypeId: item.sysTypeId,
- sceneId: item.sceneId,
- tips: item.tips,
- teacherId: item.teacherId, //?
- intro: item.intro,
- attach: item.attach,
- outline: item.outline,
- teacher: item.teacher,
- };
- edit(postData).then((res) => {
- if (res.data.code === 200) {
- message.destroy();
- message.success("复制成功");
- getTableDate();
- delete_exit1();
- rest();
- }
- });
+ delete_exit1();
+ rest();
+ message.success("复制成功");
+ state.tableLoading = true;
+ await copyCourse({courseId: state.offcourseId})
+ getTableDate();
}
}
if (state.nouse_hs) {
@@ -4049,11 +4040,11 @@ export default defineComponent({
let endTime = "";
if (state.projectTime) {
startTime = parseInt(
- new Date(state.projectTime[0].$d).getTime() / 1000
+ new Date(state.projectTime[0].$d).getTime() / 1000
);
endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000);
}
- console.log(startTime,endTime)
+ console.log(startTime, endTime)
// list({
// pageNo: 1,
@@ -4099,17 +4090,17 @@ export default defineComponent({
// })
window.open(
- `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
- state.currentPage1
- }&pageSize=${state.pageSize1}&auditStatus=${
- state.auditStatus ? state.auditStatus : ""
- }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
- state.projectName ? state.projectName : ""
- }&name=${state.name ? state.name : ""}&createName=${
- state.createName ? state.createName : ""
- }&endTime=${endTime ? endTime : ""}&beginTime=${
- startTime ? startTime : ""
- }&type=3`
+ `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
+ state.currentPage1
+ }&pageSize=${state.pageSize1}&auditStatus=${
+ state.auditStatus ? state.auditStatus : ""
+ }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
+ state.projectName ? state.projectName : ""
+ }&name=${state.name ? state.name : ""}&createName=${
+ state.createName ? state.createName : ""
+ }&endTime=${endTime ? endTime : ""}&beginTime=${
+ startTime ? startTime : ""
+ }&type=3`
);
// {
@@ -4140,14 +4131,14 @@ export default defineComponent({
keyWord: options4CurName.value,
id: options4CurId.value ? options4CurId.value : null,
})
- .then((res) => {
- console.log("获取授课教师", res);
- if (res.data.code === 200) return res.data.data;
- })
- .catch((err) => {
- console.log("获取授课教师失败", err);
- });
- const { rows, total } = item1;
+ .then((res) => {
+ console.log("获取授课教师", res);
+ if (res.data.code === 200) return res.data.data;
+ })
+ .catch((err) => {
+ console.log("获取授课教师失败", err);
+ });
+ const {rows, total} = item1;
state.tableDataTotalTea1 = total;
state.tableDataTotalTea2 = total;
let newArr = [];
@@ -4209,17 +4200,17 @@ export default defineComponent({
state.teacher = item.teacher;
state.teacherId = item.teacherId;
state.qdms_inputV6 = item.intro;
- state.member = { value: item.teacherId, name: item.teacher };
+ state.member = {value: item.teacherId, name: item.teacher};
if (item.attach == "") {
state.imgList = [];
} else {
if (item.attach.indexOf(",")) {
const arr = item.attach.split(",");
arr.forEach((item) => {
- state.imgList.push({ img: item });
+ state.imgList.push({img: item});
});
} else {
- state.imgList = [{ img: item.attach }];
+ state.imgList = [{img: item.attach}];
}
}
@@ -4399,7 +4390,7 @@ export default defineComponent({
];
if (!fileType.includes(file.name.split(".")[1])) {
message.error(
- "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
+ "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
);
return false;
}
@@ -4455,24 +4446,24 @@ export default defineComponent({
id: state.currentFaceId,
});
apis
- .GetCourseStudent({
- pageNo: state.currentPage222,
- pageSize: 10,
- status: state.gl_selectV2,
- studentName: state.gl_inputV2,
- id: state.currentFaceId,
- })
- .then((res) => {
- console.log("获取开课管理学员信息", res);
- // tableData3 tableDataTotal222 currentPage222 handelChangePage222
- state.tableData3 = res.data.data.records;
- state.tableDataTotal222 = res.data.data.total;
- state.manageStuLoading = false;
- })
- .catch((err) => {
- console.log(err);
- state.manageStuLoading = false;
- });
+ .GetCourseStudent({
+ pageNo: state.currentPage222,
+ pageSize: 10,
+ status: state.gl_selectV2,
+ studentName: state.gl_inputV2,
+ id: state.currentFaceId,
+ })
+ .then((res) => {
+ console.log("获取开课管理学员信息", res);
+ // tableData3 tableDataTotal222 currentPage222 handelChangePage222
+ state.tableData3 = res.data.data.records;
+ state.tableDataTotal222 = res.data.data.total;
+ state.manageStuLoading = false;
+ })
+ .catch((err) => {
+ console.log(err);
+ state.manageStuLoading = false;
+ });
}
const handlePostSure = (obj) => {
@@ -4568,67 +4559,67 @@ export default defineComponent({
};
//添加权限
watch(
- () => state.addAuthList,
- (res) => {
- console.log("res", res, state.addAuthList);
- if (state.authClassify === 1 || state.authClassify === 2) {
- let obj = {
- type: 3,
- tag:
- state.authClassify === 1
- ? 3
- : state.authClassify === 2
- ? 4
- : null,
- opt: 3,
- deptList: res[1],
- groupList: res[2],
- refId: state.selectCourseId,
- pageNo: 20,
- pageSize: 1,
- studentList: res[0],
- keyWord: "",
- };
- console.log("obj", obj);
- api1
- .optionAuthPerm(obj)
- .then((res) => {
- console.log("添加授权成功", res);
- message.success("添加授权成功");
- })
- .catch((err) => {
- console.log("添加授权失败", err);
- });
+ () => state.addAuthList,
+ (res) => {
+ console.log("res", res, state.addAuthList);
+ if (state.authClassify === 1 || state.authClassify === 2) {
+ let obj = {
+ type: 3,
+ tag:
+ state.authClassify === 1
+ ? 3
+ : state.authClassify === 2
+ ? 4
+ : null,
+ opt: 3,
+ deptList: res[1],
+ groupList: res[2],
+ refId: state.selectCourseId,
+ pageNo: 20,
+ pageSize: 1,
+ studentList: res[0],
+ keyWord: "",
+ };
+ console.log("obj", obj);
+ api1
+ .optionAuthPerm(obj)
+ .then((res) => {
+ console.log("添加授权成功", res);
+ message.success("添加授权成功");
+ })
+ .catch((err) => {
+ console.log("添加授权失败", err);
+ });
+ }
}
- }
);
//添加学员
watch(
- () => state.addAuthList,
- (res) => {
- console.log("res", res, state.addStudentList);
- if (state.authClassify === 3) {
- let obj = {
- deptList: res[1],
- groupList: res[2],
- offcourseId: state.offcourseId,
- offcoursePlanId: state.offcoursePlanId, //开课id
- studentList: res[0],
- };
- console.log("obj", obj);
- api1
- .addStudentCourse(obj)
- .then((res) => {
- console.log("添加学员成功", res);
- message.success("添加学员成功");
- getTableDate2();
- })
- .catch((err) => {
- console.log("添加学员失败", err);
- });
+ () => state.addAuthList,
+ (res) => {
+ console.log("res", res, state.addStudentList);
+ if (state.authClassify === 3) {
+ let obj = {
+ deptList: res[1],
+ groupList: res[2],
+ offcourseId: state.offcourseId,
+ offcoursePlanId: state.offcoursePlanId, //开课id
+ studentList: res[0],
+ };
+ console.log("obj", obj);
+ api1
+ .addStudentCourse(obj)
+ .then((res) => {
+ console.log("添加学员成功", res);
+ message.success("添加学员成功");
+ getTableDate2();
+ })
+ .catch((err) => {
+ console.log("添加学员失败", err);
+ });
+ }
}
- }
);
const range = (start, end) => {
const result = [];
@@ -4656,6 +4647,7 @@ export default defineComponent({
disabledSeconds: () => [55, 56],
};
};
+
function auditStudent(record) {
updateStudent(record);
}
@@ -4667,12 +4659,12 @@ export default defineComponent({
title: type == 1 ? "【课程】二维码" : "【签到】二维码",
name: record.name ? record.name : "",
url:
- type == 1
- ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
- : process.env.VUE_APP_BASE_API +
- `/admin/student/studentSign?taskId=${
- record.id
- }&taskType=${2}&type=${3}`,
+ type == 1
+ ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
+ : process.env.VUE_APP_BASE_API +
+ `/admin/student/studentSign?taskId=${
+ record.id
+ }&taskType=${2}&type=${3}`,
};
console.log("codeInfo", state.codeInfo);
state.codeIndex = 0;
@@ -4959,6 +4951,7 @@ export default defineComponent({
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
+
.daochu {
width: 16px;
height: 18px;
@@ -4975,6 +4968,7 @@ export default defineComponent({
color: #ffffff;
}
}
+
/**
.btn1:active {
background: #0982ff;
@@ -5042,8 +5036,8 @@ export default defineComponent({
}
.ant-table-tbody
- > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
- > td {
+ > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+ > td {
background: #f6f9fd;
}
@@ -5092,8 +5086,8 @@ export default defineComponent({
width: 100%;
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -5256,8 +5250,8 @@ export default defineComponent({
width: 100%;
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -5342,9 +5336,11 @@ export default defineComponent({
.items_fj {
margin-bottom: 1px;
+
.fujian {
display: none;
}
+
.mbl_items12 {
width: 440px;
margin-right: 56px;
@@ -5506,8 +5502,8 @@ export default defineComponent({
width: calc(100%);
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -5603,8 +5599,8 @@ export default defineComponent({
width: calc(100%);
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -5725,8 +5721,8 @@ export default defineComponent({
width: calc(100%);
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -5854,8 +5850,8 @@ export default defineComponent({
width: 100%;
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -6552,8 +6548,8 @@ export default defineComponent({
}
.ant-table-tbody
- > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
- > td {
+ > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+ > td {
background: #f6f9fd;
}
@@ -6718,6 +6714,7 @@ export default defineComponent({
line-height: 36px;
margin-left: 5px;
}
+
.btn2 {
margin-right: 0px;
@@ -6728,6 +6725,7 @@ export default defineComponent({
}
}
}
+
.btn3 {
.search {
width: 17px;
@@ -6741,6 +6739,7 @@ export default defineComponent({
}
}
}
+
/**
.btn3 {
width: 130px;
@@ -6850,8 +6849,8 @@ export default defineComponent({
}
.ant-table-tbody
- > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
- > td {
+ > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+ > td {
background: #f6f9fd;
}
@@ -6896,6 +6895,7 @@ export default defineComponent({
.stusmanageModal {
.ant-modal {
max-width: 1800px;
+
.ant-modal-content {
// width:1358px !important;
.ant-modal-body {
@@ -6974,8 +6974,8 @@ export default defineComponent({
}
.ant-table-tbody
- > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
- > td {
+ > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+ > td {
background: #f6f9fd;
}
@@ -7146,8 +7146,8 @@ export default defineComponent({
width: calc(100%);
height: 40px;
background: linear-gradient(
- rgba(78, 166, 255, 0.2) 0%,
- rgba(78, 166, 255, 0) 100%
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
);
}
@@ -7279,9 +7279,11 @@ export default defineComponent({
.tableSelect {
position: relative;
+
.hoverList {
display: none;
}
+
&:hover {
.hoverList {
display: block;
From a90c667b2d287afec83b44f3948f480de3eccba4 Mon Sep 17 00:00:00 2001
From: wyx {
+ handleOverStu(record);
+ }}
+ >
+ 结业
+
+ ) : record.completionStatus == 1 ? (
+ 已结业
+ ) : (
+ -
+ )}
+
-
-->
- xxxxxxxx课程
+
+ xxxxxxxx 课程
- 内容分类:12312
+ 内容分类：12312
- 授课教师:12312
+ 授课教师：12312
- 状态审核:12312
+ 审核状态：12312
@@ -41,21 +41,14 @@
style="background: #4ea6ff; color: #fff; width: 100px"
@click="searchStu"
>
-
- 
+
+
搜索
-
- 
+
重置
@@ -65,7 +58,6 @@
type="flex"
gutter="12"
style="padding-left: 20px; margin-right: 0px"
- v-if="checkPer(permissions)"
>
- 
+
+
添加学员
-
-
-
- 
- 导入学员
-
-
-
-
-
- 导出学习信息
-
-
-
-
-
- 导出学习信息
-
-
-
-
- 
- 批量删除
-
-
-
-
-
- 批量调整关卡
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/components/drawers/router/RouterVoteManage.vue b/src/components/drawers/router/RouterVoteManage.vue
index fd5d03c8..a1c150eb 100644
--- a/src/components/drawers/router/RouterVoteManage.vue
+++ b/src/components/drawers/router/RouterVoteManage.vue
@@ -23,7 +23,7 @@
v-if="datasource.type !== 6 && datasource.type !== 9"
class="endtime"
>
-
+
@@ -112,13 +112,13 @@
+
+
搜索
+
重置
+
+
添加学员
- 导入学员
-
- 批量删除
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
- 批量录入成绩
-
-
- 批量结业
-
-
- 批量通过
-
-
- 批量拒绝
-
-
-
-
- 导出
-
-
- 导出作业
-
@@ -48,7 +48,7 @@
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
-
+
>
-
{{pro.name}}
- {{pro.deptName?pro.deptName:"" + '-' + pro.jobName?pro.jobName:""}}
+ {{pro.userInfoBo.userName}}
+ {{pro.userInfoBo.deptName?pro.userInfoBo.deptName:"" + '-' + pro.userInfoBo.jobName?pro.userInfoBo.jobName:""}}
进度排名
@@ -68,7 +68,7 @@