+
+
+
+
+
+
+ 
+
+ 编辑面授
+ 添加面授
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开课
+ 开课
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+ 已选择
+ {{ 1 }}
+ 条
+ 名称：
+ {{ selectedRows?.name }}
+
+ 项目经理：
+ {{ selectedRows?.manager }}
+
+ 创建人：
+ {{ selectedRows?.createName }}
+
+ 创建时间：
+ {{
+ selectedRows?.createTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+
+ 项目已存在，是否重复添加？
+
+
+
+
+
+ 取消
+
+
+ 确定
+
+
+
+
+
+
+
+ 编辑开课
+ 新建开课
+
+
+
+ 面授名称：{{ newCourseName }}
+
+
+
+
+
+
+ 
+
+ 开课名称
+
+
+
+
+
+
+
+
+
+
+ 地点
+
+
+
+ {{ xjkkinputV2.length }}/50
+
+
+
+
+
+
+
+
+
+ 面授时间
+
+
+
+
+
+
+
+
+
+
+ 授课教师
+
+
+
+
+
+
+ 考勤设置：
+
+
+
+ 签到
+
+ 开始前：
+
+ 分钟
+
+
+ 开始后：
+
+ 分钟
+
+
+
+
+
+ 报名设置
+
+
+
+ 是否允许公开报名
+
+
+
+
+
+
+ 现场参与
+
+
+
+
+ 允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加)
+
+
+ 允许项目外人员临时到场参加
+
+
+
+
+
+ 评估设置
+
+
+
+ 是否需要评估
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ assessmentName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ workInfo.workName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ examInfo.examinationName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
+
+
+
+
+
+
+
+
- 
-
【面授】{{ projectTaskInfo?.name }}
+ 【面授】{{ datasource?.name }}
-
-
+
- 起止时间：{{
- projectTaskInfo && projectTaskInfo.startTime
- ? projectTaskInfo.startTime
- : "-"
- }}
- ～
- {{
- projectTaskInfo && projectTaskInfo.endTime
- ? projectTaskInfo.endTime
- : "-"
- }}
-
-
- 允许签到时段：{{ beginTime }}~{{ endTime }}
+
@@ -45,12 +53,12 @@
placeholder="请输入姓名"
/>
+
+
+
+ 第{{item}}次开课
+ 2023年管理者面授课程（{{item}}）
+
+ 
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+ 
+ 京东方大厦（{{item}}）号楼
+
+
+ 京东方大厦（{{item}}）号楼
+
+ 
+ 董瑞华
+
+
+ 董瑞华
+ 签到状态：
@@ -82,13 +90,13 @@
- 搜索
+
重置
+
-
导入学员
+
-
- -->
+ -->
批量签到
+
@@ -121,14 +129,13 @@
导出数据
清空
- // {
- // console.log("点击签到", e);
- // }}
- // >
- // 签到
- //
- // {/**
- // {
- // console.log("点击签退", e);
- // }}
- // >
- // 签退
- //
- // */}
- // {
- // console.log("点击请假", e);
- // }}
- // >
- // 请假
- //
- //
- // );
- // });
- // state.tabledata = arr;
- // };
- // getTableData();
+
const tableDataFunc = () => {
const columns = [
{
@@ -500,7 +472,7 @@ export default {
dataIndex: "studentUserNo",
// width: "30%",
key: "studentUserNo",
- width: 50,
+ width: 120,
align: "center",
ellipsis: true,
className: "h",
@@ -538,10 +510,10 @@ export default {
dataIndex: "studentDepartName",
// width: "30%",
key: "studentDepartName",
- width: 50,
+ width: 60,
+ ellipsis: true,
align: "center",
className: "h",
- ellipsis: true,
customRender: (text) => {
return (
@@ -590,6 +562,38 @@ export default {
);
},
},
+ {
+ title: "考勤",
+ dataIndex: "signTime",
+ key: "signTime",
+ width: 110,
+ align: "center",
+ ellipsis: true,
+ className: "h",
+ customRender: (text) => {
+ return (
+
{
console.log("点击签到", e);
let obj = {
- courseId: Number(props.projectTaskInfo.courseId),
- projectId: Number(props.projectTaskInfo.projectId),
- // routerId: Number(props.projectTaskInfo.projectId),
+ courseId: Number(props.datasource.courseId),
+ // projectId: 0,
+ routerId: Number(props.datasource.routerId),
ids: [text.record.studentId],
studentName: text.record.studentName,
- taskId: Number(props.projectTaskInfo.projectTaskId),
- taskType: Number(props.projectTaskInfo.type),
- type: 3,
- // userName: "",
+ taskId: Number(props.datasource.routerTaskId),
+ taskType: Number(props.datasource.type),
+ type: 2,
};
api
.attendanceSign(obj)
@@ -688,16 +653,17 @@ export default {
value="2"
checked={text.record.leaveStatus}
onChange={(e) => {
- console.log("点击请假", e, props.projectTaskInfo);
+ console.log("点击请假", e, props.datasource);
let obj = {
- courseId: Number(props.projectTaskInfo.courseId),
- projectId: Number(props.projectTaskInfo.projectId),
- // routerId: Number(props.projectTaskInfo.projectId),
+ courseId: Number(props.datasource.courseId),
+ // projectId: 0,
+ routerId: Number(props.datasource.routerId),
ids: [text.record.studentId],
studentName: text.record.studentName,
- taskId: Number(props.projectTaskInfo.projectTaskId),
- taskType: Number(props.projectTaskInfo.type),
- type: 3,
+ taskId: Number(props.datasource.routerTaskId),
+ taskType: Number(props.datasource.type),
+ type: 2,
+ // userName: "",
};
api
.attendanceLeave(obj)
@@ -717,76 +683,6 @@ export default {
>
请假
-
- {/**
- {
- console.log("点击签到", e);
- let obj = {
- courseId: Number(props.projectTaskInfo.courseId),
- projectId: Number(props.projectTaskInfo.projectId),
- // routerId: Number(props.projectTaskInfo.projectId),
- ids: [Number(text.record.studentId)],
- studentName: text.record.studentName,
- taskId: Number(props.projectTaskInfo.projectTaskId),
- taskType: Number(props.projectTaskInfo.type),
- type: 1,
- // userName: "",
- };
- api
- .attendanceSign(obj, (res) => {
- console.log("签到结果", res, obj, e);
- if (res.data.code === 200) {
- text.record.signIn = true;
- }
- })
- .catch((err) => {
- console.log("签到失败", err, obj);
- text.record.signIn = false;
- });
- }}
- >
- 签到
-
- {
- console.log("点击请假", e, props.projectTaskInfo);
- let obj = {
- courseId: Number(props.projectTaskInfo.courseId),
- projectId: Number(props.projectTaskInfo.projectId),
- // routerId: Number(props.projectTaskInfo.projectId),
- studentId: Number(text.record.studentId),
- studentName: text.record.studentName,
- taskId: Number(props.projectTaskInfo.projectTaskId),
- taskType: Number(props.projectTaskInfo.type),
- type: 1,
- };
- api
- .attendanceLeave(obj, (res) => {
- console.log("请假结果", res, obj, e);
- if (res.data.code === 200) {
- text.record.leave = true;
- }
- })
- .catch((err) => {
- console.log("请假结果", err, obj);
- text.record.leave = false;
- });
- }}
- >
- 请假
-
- {
- console.log("点击签退", e);
- }}
- >
- 签退
-
- */}
);
},
@@ -797,18 +693,30 @@ export default {
//获取学员
const getStudent = () => {
+ console.log("我是传递的查询参数222", props.datasource, {
+ pageNo: state.currentPage,
+ pageSize: state.pageSize,
+ currentStageId: props.datasource.chapterId,
+ type: 2,
+ pid: props.datasource.routerId,
+ // status: Number(state.name),
+ studentName: state.name,
+ signStatus: state.projectName2,
+ taskId: props.datasource.routerTaskId,
+ taskType: props.datasource.type,
+ });
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
- currentStageId: props.projectTaskInfo.stageId,
+ // currentStageId: props.datasource.chapterId,
type: 3,
- pid: props.projectTaskInfo.courseId,
+ pid: props.datasource.courseId,
// status: Number(state.name),
- studentName: state.name,
- // taskId: props.projectTaskInfo.projectTaskId,
signStatus: state.projectName2,
- // taskType: props.projectTaskInfo.type,
+ studentName: state.name,
+ // taskId: props.datasource.routerTaskId,
+ // taskType: props.datasource.type,
})
.then((res) => {
console.log("获取面授管理学员", res);
@@ -826,6 +734,7 @@ export default {
.catch((err) => {
console.log(err);
state.tabledata = [];
+ state.tabledata = [{name:'测试数据'}];
});
};
//搜索学员
@@ -837,6 +746,7 @@ export default {
};
// 重置按钮
function resetTaskList() {
+ state.projectName = undefined;
state.currentPage = 1;
state.name = null;
state.projectName2 = undefined;
@@ -853,27 +763,33 @@ export default {
};
// 导出数据
function exportTaskStu() {
- console.log("props.projectTaskInfo", props.projectTaskInfo);
+ console.log("props.datasource", props.datasource);
window.open(
- `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=6`
+ `${
+ process.env.VUE_APP_BASE_API
+ }/admin/student/exportTaskStudent?currentStageId=${
+ props.datasource.chapterId
+ }&type=3&pid=${props.datasource.courseId}&thirdType=7&taskId=${props.datasource.routerTaskId}`
);
- // api
- // .exportTaskStudent({
- // pageNo: state.currentPage,
- // pageSize: state.pageSize,
- // currentStageId: props.projectTaskInfo.stageId,
- // currentTaskId: props.projectTaskInfo.projectTaskId,
- // type: 1,
- // pid: props.projectTaskInfo.projectId,
- // })
- // .then((res) => {
- // console.log(res);
- // })
- // .catch((err) => {
- // console.log(err);
- // });
}
+ //二维码
+ const qrcodeVisible = () => {
+ state.codevisible = true;
+ state.codeInfo = {
+ title: "【签到】二维码",
+ name: props.datasource?.name,
+ url:
+ process.env.VUE_APP_BASE_API +
+ `/admin/student/studentSign?taskId=${
+ props.datasource.routerTaskId
+ }&taskType=${props.datasource.type}&type=${2}`,
+ };
+ console.log("codeInfo", state.codeInfo);
+ state.codeIndex = 0;
+ state.codeType = 1;
+ };
+
{
/* 添加学员弹框关闭，重新获取学员列表 */
}
@@ -886,42 +802,35 @@ export default {
getStudent();
}
};
+
// 计算签到时间
const isSignClick = () => {
- console.log("props.projectTaskInfo.startTime", props.projectTaskInfo);
- let beginTime = new Date(props.projectTaskInfo.startTime).getTime();
- let endTime = !props.projectTaskInfo.afterStart
- ? new Date(props.projectTaskInfo.endTime).getTime()
- : new Date(props.projectTaskInfo.startTime).getTime();
- console.log("beginTime，endTime", beginTime, endTime);
- if (
- props.projectTaskInfo.beforeStart &&
- props.projectTaskInfo.afterStart
- ) {
+ 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.beforeStart && props.datasource.afterStart) {
//有开始前有开始后
- beginTime = beginTime - props.projectTaskInfo.beforeStart * 60 * 1000;
- endTime = endTime + props.projectTaskInfo.afterStart * 60 * 1000;
- console.log("1111");
- } else if (
- props.projectTaskInfo.beforeStart &&
- !props.projectTaskInfo.afterStart
- ) {
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
+ console.log("1111", beginTime, endTime);
+ } else if (props.datasource.beforeStart && !props.datasource.afterStart) {
//只有开始前无开始后
- beginTime = beginTime - props.projectTaskInfo.beforeStart * 60 * 1000;
- console.log("11112222");
- } else if (
- !props.projectTaskInfo.beforeStart &&
- props.projectTaskInfo.afterStart
- ) {
+ beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
+ console.log("11112222", beginTime);
+ } else if (!props.datasource.beforeStart && props.datasource.afterStart) {
//无开始前有开始后
- endTime = endTime + props.projectTaskInfo.afterStart * 60 * 1000;
- console.log("1111333");
+ endTime = endTime + props.datasource.afterStart * 60 * 1000;
+ console.log("1111333", endTime);
}
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m");
console.log("beginTime,endTime", state.beginTime, state.endTime);
};
+
return {
...toRefs(state),
selectProjectName,
@@ -933,16 +842,18 @@ export default {
showCopyModal,
closeCopyModal,
// closeStopModal,
- qrcodeVisible,
+ signQR,
afterVisibleChange,
-
+ checkPer,
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu,
clearLine,
+ qrcodeVisible,
AddImpStuvisibleClose,
batchSign,
+ ChoiceCourse,
};
},
};
@@ -1065,7 +976,7 @@ export default {
}
}
}
-.ProjectFaceStu {
+.RouterFaceStu {
// // width: 80%;
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
@@ -1161,7 +1072,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
- background-image: url(../../../assets/images/courseManage/reset1.png);
+ background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -1202,7 +1113,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
- background-image: url(../../../assets/images/coursewareManage/export.png);
+ background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 920d5c7e..fa6379c7 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -17,17 +17,30 @@
+ {text.record.signTime ? text.record.signTime : "-"}
+
+ );
+ },
+ },
+ {
+ title: "签到状态",
+ dataIndex: "signTime",
+ key: "signTime",
+ width: 110,
+ align: "center",
+ ellipsis: true,
+ className: "h",
+ customRender: (text) => {
+ return (
+
+ {text.record.signTime ? text.record.signTime : "-"}
+
+ );
+ },
+ },
// {
// title: "签退时间",
// dataIndex: "jin",
@@ -598,45 +602,6 @@ export default {
// align: "center",
// className: "h",
// },
- {
- title: "考勤",
- dataIndex: "signStatus",
- key: "signStatus",
- width: 50,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: (text) => {
- // console.log("text", text);
- return (
-
-
- {text.record.signStatus
- ? "签到"
- : text.record.leaveStatus
- ? "请假"
- : "-"}
-
-
- );
- },
- },
- {
- title: "签到状态",
- dataIndex: "signStatus",
- key: "signStatus",
- width: 50,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: (text) => {
- return (
-
- { text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常" }
-
- );
- },
- },
{
title: "考勤情况",
ellipsis: true,
@@ -648,6 +613,7 @@ export default {
// scopedSlots: { customRender: "action" }, //引入的插槽
customRender: (text) => {
+ // console.log("text.record.signStatus", text.record.signStatus);
return (
- 起止时间：{{
- projectTaskInfo && projectTaskInfo.startTime
- ? projectTaskInfo.startTime
- : "-"
- }}
- ～
- {{
- projectTaskInfo && projectTaskInfo.endTime
- ? projectTaskInfo.endTime
- : "-"
- }}
+
+
+
+
+
+ 第{{item}}次开课
+ 2023年管理者面授课程（{{item}}）
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 董瑞华
+
+
+ 董瑞华
+
@@ -60,29 +73,29 @@
- 搜索
+
重置
-
-
+
+
-
批量标注完成
+
-
批量录入成绩
+
-
导出数据
+
@@ -105,7 +118,6 @@
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
- :loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 1300 }"
@expand="expandTable"
:pagination="false"
@@ -283,7 +295,7 @@ export default {
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
- width: '15%',
+ width: '10%',
align: "left",
className: "h head",
customRender: (text) => {
@@ -317,7 +329,7 @@ export default {
title: "所在部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
- width: '15%',
+ width: '10%',
align: "center",
className: "h",
ellipsis: true,
@@ -433,111 +445,35 @@ export default {
title: "操作",
dataIndex: "operation",
key: "operation",
- width: 100,
align: "center",
ellipsis: true,
className: "h",
- customRender: (text, {record:{examStatus,workStatus}}) => {
- return (examStatus || workStatus) && (导出作业
- {workStatus===1 && {
+ customRender: () => {
+ return (
+ )
- }
+ }}>查看答卷
+
+ );
+ },
}
],
exportHomeWorkV: false,
downloadUrl: null,
+ currentCourse: 1
});
- // //面授直播管理列表操作
- // const ListOpera = () => {
- // let arr = state.tabledata;
- // arr.map((value) => {
- // if (value.finishStatus == 1) {
- // value.operation = (
- //
- // {
- // state.CWvisible = true;
- // }}
- // >
- // 查看作业
- //
- // {
- // state.CQvisible = true;
- // }}
- // >
- // 查看答卷
- //
- //
- // );
- // } else {
- // value.operation = (
- //
- //
- // 查看作业
- //
- //
- // 查看答卷
- //
- //
- // );
- // }
- // });
- // };
+
+ const ChoiceCourse = (n) => {
+ state.currentCourse = n;
+ }
+
const closeDrawer = () => {
ctx.emit("update:Fvisible", false);
state.name = "";
@@ -621,6 +557,7 @@ export default {
.catch((err) => {
console.log(err);
state.tabledata = [];
+ state.tabledata = [{name:'测试数据'}];
});
};
//搜索学员
@@ -718,6 +655,7 @@ export default {
exportHomeWorkShow,
exportHomeWork,
getStudent,
+ ChoiceCourse
};
},
};
@@ -802,7 +740,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
- background-image: url(../../../assets/images/courseManage/reset1.png);
+ background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -847,7 +785,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
- background-image: url(../../../assets/images/coursewareManage/export.png);
+ background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 195f90c5..802c7568 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -17,15 +17,29 @@
-
-
+
- 起止时间：{{
- datasource && datasource.startTime ? datasource.startTime : "-"
- }}
- ～
- {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
-
-
- 允许签到时段：{{ beginTime }}~{{ endTime }}
+
@@ -39,12 +53,12 @@
placeholder="请输入姓名"
/>
+
+
+
+ 第{{item}}次开课
+ 2023年管理者面授课程（{{item}}）
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 董瑞华
+
+
+ 董瑞华
+ 签到状态：
@@ -76,7 +90,7 @@
- 搜索
+
@@ -94,10 +108,10 @@
- 重置
导入学员
+
-
批量签到
+
@@ -122,7 +136,6 @@
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tabledata"
- :loading="tableDataTotal === -1 ? true : false"
expandRowByClick="true"
@expand="expandTable"
:scroll="{ x: 1300 }"
@@ -232,6 +245,7 @@ import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
import { message } from "ant-design-vue";
import { toDate } from "../../../api/method";
import {checkPer} from "@/utils/utils";
+
export default {
name: "FaceManage",
components: {
@@ -270,6 +284,7 @@ export default {
closeStop: false, //签退弹窗关闭图标
signQRvisible: false, //二维码弹窗
name: null,
+ projectName: undefined,
projectName2: undefined,
showmodal: false, //勾选提示框
closable: false, //modal右上角的关闭按钮
@@ -282,23 +297,23 @@ export default {
projectNameList: [
{
id: 1,
- value: "项目一",
- label: "项目一",
+ value: "签到",
+ label: "签到",
},
{
id: 2,
- value: "项目二",
- label: "项目二",
+ value: "缺勤",
+ label: "缺勤",
},
{
id: 3,
- value: "项目三",
- label: "项目三",
+ value: "迟到",
+ label: "迟到",
},
{
id: 4,
- value: "项目四",
- label: "项目四",
+ value: "请假",
+ label: "请假",
},
],
projectNameList2: [
@@ -349,7 +364,13 @@ export default {
codeInfo: null, //二维码内容
beginTime: null, //签到开始时间
endTime: null, //签到结束时间
+ currentCourse: 1,
});
+
+ const ChoiceCourse = (n) => {
+ state.currentCourse = n;
+ }
+
const afterVisibleChange = (bol) => {
if (bol == true) {
getStudent();
@@ -541,6 +562,38 @@ export default {
);
},
},
+ {
+ title: "考勤",
+ dataIndex: "signTime",
+ key: "signTime",
+ width: 110,
+ align: "center",
+ ellipsis: true,
+ className: "h",
+ customRender: (text) => {
+ return (
+ {
- let obj = {
- courseId: Number(props.datasource.courseId),
- // projectId: 0,
- routerId: Number(props.datasource.routerId),
- ids: [text.record.studentId],
- studentName: text.record.studentName,
- taskId: Number(props.datasource.routerTaskId),
- taskType: Number(props.datasource.type),
- type: 2,
- // userName: "",
- };
- api
- .attendanceSign(obj, (res) => {
- console.log("签到结果", res, obj, e);
- if (res.data.code === 200) {
- text.record.signIn = true;
- }
- })
- .catch((err) => {
- console.log("签到失败", err, obj);
- text.record.signIn = false;
- });
- // console.log(
- // "点击签到",
- // e,
- // text.record,
- // props.datasource,
- // obj
- // );
- }}
- >
- 签到
-
- {
- console.log("点击请假", e, props.datasource);
- let obj = {
- courseId: Number(props.datasource.courseId),
- // projectId: 0,
- routerId: Number(props.datasource.routerId),
- studentId: Number(text.record.studentId),
- studentName: text.record.studentName,
- taskId: Number(props.datasource.routerTaskId),
- taskType: Number(props.datasource.type),
- type: 2,
- // userName: "",
- };
- api
- .attendanceLeave(obj, (res) => {
- console.log("请假结果", res, obj, e);
- if (res.data.code === 200) {
- text.record.leave = true;
- }
- })
- .catch((err) => {
- console.log("请假结果", err, obj);
- text.record.leave = false;
- });
- }}
- >
- 请假
-
- {
- console.log("点击签退", e);
- }}
- >
- 签退
-
- */}
);
},
@@ -797,6 +734,7 @@ export default {
.catch((err) => {
console.log(err);
state.tabledata = [];
+ state.tabledata = [{name:'测试数据'}];
});
};
//搜索学员
@@ -808,6 +746,7 @@ export default {
};
// 重置按钮
function resetTaskList() {
+ state.projectName = undefined;
state.currentPage = 1;
state.name = null;
state.projectName2 = undefined;
@@ -832,21 +771,6 @@ export default {
props.datasource.chapterId
}&type=3&pid=${props.datasource.courseId}&thirdType=7&taskId=${props.datasource.routerTaskId}`
);
- // api
- // .exportTaskStudent({
- // pageNo: state.currentPage,
- // pageSize: state.pageSize,
- // currentStageId: props.datasource.stageId,
- // currentTaskId: props.datasource.projectTaskId,
- // type: 1,
- // pid: props.datasource.projectId,
- // })
- // .then((res) => {
- // console.log(res);
- // })
- // .catch((err) => {
- // console.log(err);
- // });
}
//二维码
@@ -929,6 +853,7 @@ export default {
qrcodeVisible,
AddImpStuvisibleClose,
batchSign,
+ ChoiceCourse,
};
},
};
@@ -1147,7 +1072,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
- background-image: url(../../../assets/images/courseManage/reset1.png);
+ background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -1188,7 +1113,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
- background-image: url(../../../assets/images/coursewareManage/export.png);
+ background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index e447559b..8cd47999 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -18,11 +18,30 @@
导出数据
+ {text.record.signTime ? text.record.signTime : "-"}
+
+ );
+ },
+ },
+ {
+ title: "签到状态",
+ dataIndex: "signTime",
+ key: "signTime",
+ width: 110,
+ align: "center",
+ ellipsis: true,
+ className: "h",
+ customRender: (text) => {
+ return (
+
+ {text.record.signTime ? text.record.signTime : "-"}
+
+ );
+ },
+ },
// {
// title: "签退时间",
// dataIndex: "jin",
@@ -549,45 +602,6 @@ export default {
// align: "center",
// className: "h",
// },
- {
- title: "考勤",
- dataIndex: "signStatus",
- key: "signStatus ",
- width: 50,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: (text) => {
- // console.log("text", text);
- return (
-
-
- {text.record.signStatus
- ? "签到"
- : text.record.leaveStatus
- ? "请假"
- : "-"}
-
-
- );
- },
- },
- {
- title: "签到状态",
- dataIndex: "signStatus",
- key: "signStatus",
- width: 50,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: (text) => {
- return (
-
- {text.record.signStatus == null && new Date().getTime() > new Date(state.endTime).getTime() ? "异常" : text.record.signStatus ? "正常" : text.record.leaveStatus ? "异常" : text.record.signStatus == null ? "-" : "异常"}
-
- );
- },
- },
{
title: "考勤情况",
ellipsis: true,
@@ -669,83 +683,6 @@ export default {
>
请假
-
- {/**
-
- 起止时间：{{
- datasource && datasource.startTime ? datasource.startTime : "-"
- }}
- ～
- {{ datasource && datasource.endTime ? datasource.endTime : "-" }}
+
+
+
+
+
+ 第{{item}}次开课
+ 2023年管理者面授课程（{{item}}）
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 京东方大厦（{{item}}）号楼
+
+
+ 董瑞华
+
+
+ 董瑞华
+
@@ -55,28 +74,28 @@
- 搜索
+
重置
-
-
-
+
+ 批量标注完成
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/common/RangePicker.vue b/src/components/common/RangePicker.vue
new file mode 100644
index 00000000..e43eba33
--- /dev/null
+++ b/src/components/common/RangePicker.vue
@@ -0,0 +1,47 @@
+
+
-
批量录入成绩
+
-
+
+
diff --git a/src/components/common/QrCode.vue b/src/components/common/QrCode.vue
new file mode 100644
index 00000000..1bf006a9
--- /dev/null
+++ b/src/components/common/QrCode.vue
@@ -0,0 +1,266 @@
+
+ 导出数据
+
@@ -98,7 +117,6 @@
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
- :loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
@@ -242,18 +260,7 @@ export default {
currentPage: 1,
tableDataTotal: -1,
tableDataTotal2: 0,
- tabledata: [
- // {
- // workNum: "123",
- // userName: "li",
- // deptName: "开发",
- // jobName: "前端开发",
- // score: 89,
- // exam: 98,
- // testscore: 80,
- // status: "已完成",
- // },
- ],
+ tabledata: [],
tablecolumns: [
{
title: "工号",
@@ -433,12 +440,33 @@ export default {
align: "center",
ellipsis: true,
className: "h",
+ customRender: () => {
+ return (
+ 导出作业
+ {
+ state.CWvisible = true;
+ }}
+ style="margin-right:12px;">查看作业
+ {
+ state.CAvisible = true;
+ }}>查看答卷
+
+ );
+ },
},
],
exportHomeWorkV: false,
downloadUrl: null,
- CAvisible: false
+ CAvisible: false,
+ currentCourse: 1
});
+
+ const ChoiceCourse = (n) => {
+ state.currentCourse = n;
+ }
+
//面授直播管理列表操作
const ListOpera = () => {
let arr = state.tabledata;
@@ -540,7 +568,6 @@ export default {
newData.push(res.data.data.records[i]);
}
state.tabledata = newData;
- state.tabledata = [{name:'小星星',workStatus:1}];
ListOpera();
state.tableDataTotal = res.data.data.total;
state.tableDataTotal2 = res.data.data.total;
@@ -549,6 +576,7 @@ export default {
.catch((err) => {
console.log(err);
state.tabledata = [];
+ state.tabledata = [{name:'测试数据',workStatus:1}];
});
};
//搜索学员
@@ -652,6 +680,7 @@ export default {
checkPer,
clearLine,
searchTaskList,
+ ChoiceCourse,
resetTaskList,
changePaginationStu,
exportTaskStu,
@@ -742,7 +771,7 @@ export default {
.img2 {
width: 16px;
height: 18px;
- background-image: url(../../../assets/images/courseManage/reset1.png);
+ background-image: url(../../../assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
@@ -787,7 +816,7 @@ export default {
.img2 {
width: 17px;
height: 16px;
- background-image: url(../../../assets/images/coursewareManage/export.png);
+ background-image: url(../../../assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
diff --git a/src/utils/const.js b/src/utils/const.js
index a5fad570..3ba6c7f0 100644
--- a/src/utils/const.js
+++ b/src/utils/const.js
@@ -1,5 +1,5 @@
import onLineImg from '@/assets/images/leveladd/zai.png'
-// import faceCourseImg from '@/assets/images/leveladd/mian.png'
+import faceCourseImg from '@/assets/images/leveladd/mian.png'
import caseImg from '@/assets/images/leveladd/an.png'
import workImg from '@/assets/images/leveladd/zuo.png'
import exaImg from '@/assets/images/leveladd/kao.png'
@@ -24,7 +24,7 @@ import AddVote from "@/components/vote/AddVote.vue";
import AddLive from "@/components/drawers/AddLive.vue";
import AddRef from "@/components/drawers/AddRef.vue";
import AddProject from "@/components/drawers/AddProject.vue";
-// import AddFaceteach from "@/components/drawers/AddFaceteach.vue";
+import AddFaceClass from "@/components/drawers/AddFaceClass.vue";
export const TASK_TYPE = {
1: {
@@ -32,11 +32,11 @@ export const TASK_TYPE = {
img: onLineImg,
component: AddOnline
},
- // 2: {
- // name: '面授',
- // img: faceCourseImg,
- // component: AddFaceteach
- // },
+ 2: {
+ name: '面授',
+ img: faceCourseImg,
+ component: AddFaceClass
+ },
3: {
name: '案例',
img: caseImg,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index ed2773b0..76cca403 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -279,10 +279,15 @@
margin-right: 20px;">
+
+ 开课
+
编辑
@@ -360,6 +365,8 @@
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+ {{ name }}
+
+
+
+ 链接
+ 复制链接
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/drawers/AddFaceClass.vue b/src/components/drawers/AddFaceClass.vue
index 2b723175..3cf84403 100644
--- a/src/components/drawers/AddFaceClass.vue
+++ b/src/components/drawers/AddFaceClass.vue
@@ -1,278 +1,271 @@
-
+
+ 创建时间：
+
-
-
-
-
-
- 编辑面授
- 添加面授
-
-
-
-
+
-
+
+
+
+
-
+
+
+ 编辑面授
+ 添加面授
+
+
+
-
-
-
-
+}
+
\ No newline at end of file
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 8e9ee1ba..8b7cad30 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -1,1382 +1,1202 @@
-
-
+
-
+
-
-
-
-
-
+
+
+
开课
- 开课
-
+
+
+
+
+
+ 开课
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+ 重置
+
-
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formData.id ? "编辑开课" : "新建开课" }}
+
+
+
+ 面授名称：{{ courseName }}
+
+
+
+
-
+
+ 开课名称
-
-
-
+ 搜索
+
+
+
+
+
-
-
-
-
-
+ 重置
+ 地点
+
+
+ {{ formData.address.length || 0 }}/50
-
-
-
-
-
-
-
-
-
-
-
-
- 已选择
- {{ 1 }}
- 条
- 名称：
- {{ selectedRows?.name }}
-
- 项目经理：
- {{ selectedRows?.manager }}
-
- 创建人：
- {{ selectedRows?.createName }}
-
- 创建时间：
- {{
- selectedRows?.createTime
- }}
-
-
+
+
-
+
-
+
+ 面授时间
-
-
-
+
-
-
-
-
-
-
-
-
- 提示
-
-
-
- 项目已存在，是否重复添加？
-
-
-
-
-
- 取消
-
-
-
-
- 确定
+
+
+
-
+
+
+
+ 授课教师
+
+
-
-
-
-
- 编辑开课
- 新建开课
-
+
+
+ 考勤设置：
-
- 面授名称：{{ newCourseName }}
-
-
-
-
-
-
-
-
- 开课名称
-
-
-
-
-
-
-
-
-
-
- 地点
-
-
-
- {{ xjkkinputV2.length }}/50
-
-
-
-
-
-
-
-
-
- 面授时间
-
-
-
-
-
-
-
-
-
-
- 授课教师
-
-
-
-
-
- 考勤设置：
+
+
- 签到
+
+ 开始前：
+
+ 分钟
-
签到
-
- 开始前：
-
-
- 开始后：
-
- 分钟
-
+ v-model:value="formData.afterStart"
+ >
+ 分钟
-
+
- 报名设置
-
-
-
- 是否允许公开报名
-
-
+
+
-
+ 报名设置
+
+
+ 是否允许公开报名
+
+
+
-
- 现场参与
-
-
-
-
- 允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加)
-
-
- 允许项目外人员临时到场参加
-
-
+
+
-
+ 现场参与
+
+
+ 允许项目内人员临时到场参加(不在本场次培训的人员可以临时签到参加)
+
+
+ 允许项目外人员临时到场参加
+
+
+
-
- 评估设置
-
-
-
- 是否需要评估
-
-
+
+
+ 评估设置
-
-
-
-
-
-
-
+
-
-
- {{ assessmentName }}
-
-
-
-
+
+ 是否需要评估
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ workInfo.workName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ examInfo.examinationName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+}
+
+.createschooltime {
+ z-index: 999;
+ width: 879px;
+ background: #ffffff;
+ box-shadow: 0 1px 35px 0 rgba(118, 136, 166, 0.21);
+ position: absolute;
+ left: 50%;
+ top: -100%;
+ transform: translate(-50%, -50%);
+
+ .cst_header {
+ position: absolute;
+ width: 100%;
+ height: 40px;
+ background: linear-gradient(
+ rgba(78, 166, 255, 0.2) 0%,
+ rgba(78, 166, 255, 0) 100%
+ );
+ }
+
+ .cst_main {
+ width: 100%;
+ max-height: 700px;
+ overflow-y: auto;
+ position: relative;
+
+ .cstm_header {
+ display: flex;
+ align-items: center;
+ padding-top: 20px;
+ padding-left: 26px;
+ font-size: 16px;
+
+ .add_icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 10px;
+ background-image: url(@/assets/images/coursewareManage/add1.png);
+ background-size: 100% 100%;
+ }
+
+ .close_exit {
+ position: absolute;
+ right: 42px;
+ cursor: pointer;
+ width: 20px;
+ height: 20px;
+ background-image: url(@/assets/images/coursewareManage/close.png);
+ background-size: 100% 100%;
+ }
+ }
+
+ .cstm_title {
+ margin: 10px auto 20px 51px;
+ font-weight: bold;
+ }
+
+ .cstm_items {
+ display: flex;
+ width: 80%;
+ margin: auto;
+ align-items: center;
+ margin-bottom: 23px;
+
+ .signbox {
+ display: flex;
+ justify-content: end;
+ width: 100px;
+ margin-right: 6px;
+
+ .sign {
+ margin-top: -5px;
+ margin-right: 4px;
+ }
+ }
+
+ .b_input {
+ flex: 1;
+ position: relative;
+
+ .upload_box {
+ display: flex;
+ cursor: pointer;
+
+ .upload_icon {
+ width: 16px;
+ height: 16px;
+ margin-right: 5px;
+ }
+ }
+
+ .inp_num {
+ position: absolute;
+ top: 9px;
+ right: 10px;
+ }
+ }
+ }
+
+ .items_fj {
+ margin-bottom: 1px;
+
+ .fujian {
+ display: none;
+ }
+
+ .mbl_items12 {
+ width: 440px;
+ margin-right: 56px;
+
+ .i12_box1 {
+ display: flex;
+ align-items: center;
+ padding: 17px 0 17px 21px;
+ border: 1px solid #eff4fc;
+ border-radius: 8px;
+ margin-bottom: 10px;
+
+ .file_img {
+ width: 27px;
+ height: 32px;
+ background-image: url(@/assets/images/coursewareManage/imgs.png);
+ margin-right: 22px;
+
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .file_detail {
+ width: 250px;
+ margin-right: 21px;
+
+ .file_updata {
+ display: flex;
+ align-items: center;
+
+ .updatabox {
+ position: relative;
+ width: 230px;
+ height: 5px;
+ background-color: rgba(192, 192, 192, 0.25);
+ border-radius: 3px;
+
+ .updatacolor {
+ position: absolute;
+ left: 0;
+ width: 100%;
+ height: 5px;
+ background-color: #57c887;
+ border-radius: 3px;
+ }
+
+ .updatacolor2 {
+ position: absolute;
+ left: 0;
+ width: 80%;
+ height: 5px;
+ background-color: #ff7474;
+ border-radius: 3px;
+ }
+
+ .updatacolor3 {
+ position: absolute;
+ left: 0;
+ width: 60%;
+ height: 5px;
+ background-color: #4ea6ff;
+ border-radius: 3px;
+ }
+
+ .updataxq {
+ position: absolute;
+ right: 2px;
+ top: -30px;
+ color: #57c887;
+ }
+
+ .updataxq2 {
+ position: absolute;
+ right: 2px;
+ top: -30px;
+ color: #ff7474;
+ }
+
+ .updataxq3 {
+ position: absolute;
+ right: 2px;
+ top: -30px;
+ color: #4ea6ff;
+ }
+ }
+ }
+ }
+
+ .file_operation {
+ display: flex;
+
+ .fobox {
+ margin-right: 5px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+ }
+
+ .items_btn {
+ display: flex;
+ justify-content: center;
+ margin-top: 20px;
+ margin-bottom: 20px;
+
+ .cstm_btn {
+ width: 100px;
+ height: 40px;
+ background: rgba(64, 158, 255, 0);
+ border-radius: 8px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 14px;
+ flex-shrink: 0;
+ cursor: pointer;
+
+ .btnText {
+ font-size: 14px;
+ font-weight: 400;
+ line-height: 40px;
+ }
+ }
+
+ .btn5 {
+ border: 1px solid rgba(64, 158, 255, 1);
+ color: #4ea6ff;
+ }
+
+ .btn6 {
+ background-color: #4ea6ff;
+ color: #ffffff;
+ }
+ }
+ }
+}
+
\ No newline at end of file
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index a1611ca4..a774b1f2 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -50,6 +50,8 @@
-
- 取消
-
+
+
-
+
- 确定
-
+
+
+
+
+
+ {{ formData.assessmentName }}
+
+
+
-
【面授】{{ title }}
+ 【面授】{{ datasource?.name }}
-
-
+
+
-
-
+
-
第{{item}}次开课
- 2023年管理者面授课程（{{item}}）
+ :style="{background:n===coursePlanIndex?'rgb(247, 251, 253)':'rgb(250, 250, 250)'}">
+ 第{{ data.length - n }}次开课
+ {{ item.name }}
-
- 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+ {{ item.beginTime }} ~ {{ item.endTime }}
-
- 京东方大厦（{{item}}）号楼
+
+ {{ item.address }}
-
- 董瑞华
+
+ {{ item.teacher }}
-
-
- 姓名：
-
- 任务状态：
-
-
+
+
+ 姓名：
+
+
完成状态：
+
+
@@ -73,601 +75,445 @@
- 搜索
+
重置
-
-
+
-
- 催促学习
+
- 批量标注完成
-
- 批量录入成绩
-
+
-
-
+
+
+ 批量录入成绩
+
- 导出数据
+
-
-
+
导出作业
-
-
-
+
+
@@ -16,66 +16,51 @@
/>
-
-
+
+
-
-
-
+
-
第{{item}}次开课
- 2023年管理者面授课程（{{item}}）
+ :style="{background:n===coursePlanIndex?'rgb(247, 251, 253)':'rgb(250, 250, 250)'}">
+ 第{{ data.length - n }}次开课
+ {{ item.name }}
-
- 2023.3.14 12:34 ~ 2023.3.17 12:34
+
+ {{ item.beginTime }} ~ {{ item.endTime }}
-
- 京东方大厦（{{item}}）号楼
+
+ {{ item.address }}
-
- 董瑞华
+
+ {{ item.teacher }}
-
-
-
-
-
- 姓名：
-
考勤：
-
-
-
- 签到状态：
@@ -90,7 +75,7 @@
搜索
+
-
@@ -104,11 +89,27 @@
>
重置
签到二维码
-
-
- 导入学员
-
+
-
-
+
+ 添加学员
+
+
+
+ 导入学员
+
批量签到
@@ -116,747 +117,264 @@
导出数据
-
-
-
+
-
-
-
-
-
- 提示
-
-
-
- 您确定要批量签到吗
-
-
-
-
- 取消
-
-
- 确定
-