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

feat:登录项目和学习路径导入学员

Browse Source
This commit is contained in:
lixg
2023-01-11 17:40:28 +08:00
parent 55a64cd6ef aee6d4bbf4
commit 397071c425
24 changed files with 1624 additions and 1484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -24,7 +24,9 @@
～
{{ datasource && datasource.endTime ? datasource.endTime : "-" }}
</div>
<div class="endtime" style="margin-left: 64px">签到时间：14:00</div>
<div class="endtime" style="margin-left: 64px">
签到时间：{{ beginTime }}~{{ endTime }}
</div>
</div>
<div class="search">
@@ -33,7 +35,7 @@
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
@@ -56,7 +58,7 @@
<div class="select">
<a-select
v-model:value="projectName2"
style="width: 160px"
style="width: 200px"
placeholder="请选择"
:options="projectNameList2"
@change="selectProjectName2"
@@ -228,6 +230,7 @@ import SignQR from "../SignQR.vue";
import * as api from "../../../api/index1";
import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
import { message } from "ant-design-vue";
import { toDate } from "../../../api/method";
export default {
name: "FaceManage",
components: {
@@ -258,7 +261,7 @@ export default {
closeStop: false, //签退弹窗关闭图标
signQRvisible: false, //二维码弹窗
name: null,
projectName2: null,
projectName2: undefined,
showmodal: false, //勾选提示框
closable: false, //modal右上角的关闭按钮
pageSize: 10,
@@ -335,10 +338,14 @@ export default {
codeType: null,
codeIndex: null,
codeInfo: null, //二维码内容
beginTime: null, //签到开始时间
endTime: null, //签到结束时间
});
const afterVisibleChange = (bol) => {
if (bol == true) {
getStudent();
console.log("1111");
isSignClick();
}
};
//考勤
@@ -352,7 +359,7 @@ export default {
const closeDrawer = () => {
ctx.emit("update:FSvisible", false);
state.name = null;
state.projectName2 = null;
state.projectName2 = undefined;
state.selectedRowKeys = [];
state.selectedStudents = [];
state.currentPage = 1;
@@ -431,8 +438,9 @@ export default {
dataIndex: "studentUserNo",
// width: "30%",
key: "studentUserNo",
width: 50,
width: 120,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
@@ -468,7 +476,8 @@ export default {
dataIndex: "studentDepartName",
// width: "30%",
key: "studentDepartName",
width: 50,
width: 60,
ellipsis: true,
align: "center",
className: "h",
customRender: (text) => {
@@ -489,6 +498,7 @@ export default {
key: "studentJobName",
width: 50,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
@@ -508,6 +518,7 @@ export default {
key: "signTime",
width: 110,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
@@ -531,6 +542,7 @@ export default {
key: "signStatus ",
width: 50,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
// console.log("text", text);
@@ -553,6 +565,7 @@ export default {
key: "signStatus",
width: 50,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
@@ -564,6 +577,7 @@ export default {
},
{
title: "考勤情况",
ellipsis: true,
className: "h",
dataIndex: "opacation",
key: "opacation",
@@ -728,7 +742,7 @@ export default {
//获取学员
const getStudent = () => {
console.log("我是传递的查询参数", props.datasource, {
console.log("我是传递的查询参数222", props.datasource, {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
@@ -779,7 +793,7 @@ export default {
function resetTaskList() {
state.currentPage = 1;
state.name = null;
state.projectName2 = null;
state.projectName2 = undefined;
state.tableDataTotal = -1;
state.tableDataTotal2 = 0;
getStudent();
@@ -848,53 +862,33 @@ export default {
}
};
//计算签到时间
// function isSignClick() {
// let beginTime = new Date(datasource.startTime).getTime();
// let endTime = datasource.endTime
// timer = setInterval(() => {
// let beginTime = new Date(data.value.planDto.beginTime).getTime();
// let endTime = !data.value.planDto.afterStart
// ? new Date(data.value.planDto.endTime).getTime()
// : new Date(data.value.planDto.beginTime).getTime();
// let nowTime = new Date().getTime();
// if (data.value.planDto.beforeStart && data.value.planDto.afterStart) {
// //有开始前有开始后
// beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
// endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
// console.log("1111");
// } else if (
// data.value.planDto.beforeStart &&
// !data.value.planDto.afterStart
// ) {
// //只有开始前无开始后
// beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000;
// console.log("11112222");
// } else if (
// !data.value.planDto.beforeStart &&
// data.value.planDto.afterStart
// ) {
// //无开始前有开始后
// endTime = endTime + data.value.planDto.afterStart * 60 * 1000;
// console.log("1111333");
// }
// if (nowTime < endTime && nowTime > beginTime) {
// state.isAllowSign = true;
// } else {
// state.isAllowSign = false;
// }
// // console.log(
// // "isAllowSign",
// // state.isAllowSign,
// // nowTime,
// // endTime,
// // beginTime,
// // nowTime < endTime,
// // nowTime > beginTime
// // );
// }, 1000);
// }
// isSignClick();
// 计算签到时间
const isSignClick = () => {
console.log("计算签到时间");
let beginTime = new Date(props.datasource.startTime).getTime();
let endTime = !props.datasource.afterStart
? new Date(props.datasource.endTime).getTime()
: new Date(props.datasource.beginTime).getTime();
if (props.datasource.beforeStart && props.datasource.afterStart) {
//有开始前有开始后
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111");
} else if (props.datasource.beforeStart && !props.datasource.afterStart) {
//只有开始前无开始后
beginTime = beginTime - props.datasource.beforeStart * 60 * 1000;
console.log("11112222");
} else if (!props.datasource.beforeStart && props.datasource.afterStart) {
//无开始前有开始后
endTime = endTime + props.datasource.afterStart * 60 * 1000;
console.log("1111333");
}
state.beginTime = toDate(beginTime / 1000, "Y/M/D h:m:s");
state.endTime = toDate(endTime / 1000, "Y/M/D h:m:s");
console.log("beginTime,endTime", state.beginTime, state.endTime);
};
return {
...toRefs(state),
selectProjectName,