hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-11 11:56:46 +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

4
.env
View File

@@ -3,11 +3,13 @@ VUE_APP_BASE=/manage
# api项目基础url # api项目基础url
VUE_APP_BASE_API=/manageApi VUE_APP_BASE_API=/manageApi
# 导出url # 导出url
VUE_APP_PROXY_URL=http://111.231.196.214:30001/ VUE_APP_PROXY_URL=http://111.231.196.214/manageApi
# 登录url # 登录url
VUE_APP_LOGIN_URL=https://u-pre.boe.com/web VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
# boe域名 # boe域名
VUE_APP_BOE_API_URL=https://u-pre.boe.com VUE_APP_BOE_API_URL=https://u-pre.boe.com
#打包路径
VUE_APP_OUTPUT_DIR=./dist
# iframe嵌套url # iframe嵌套url
VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe

2
.env.alpine Normal file
View File

@@ -0,0 +1,2 @@
NODE_ENV=alpine
VUE_APP_OUTPUT_DIR=./docker/dist

3
.env.test
View File

@@ -1,5 +1,2 @@
NODE_ENV=test NODE_ENV=test
VUE_APP_BASE=/manage
VUE_APP_BASE_API=/manageApi
VUE_APP_BOE_API_URL=https://u-pre.boe.com VUE_APP_BOE_API_URL=https://u-pre.boe.com

5
docker/Dockerfile Normal file
View File

@@ -0,0 +1,5 @@
FROM devforth/spa-to-http:latest
WORKDIR /
ADD ./dist/ .
EXPOSE 8080

3
package.json
View File

@@ -8,7 +8,8 @@
"build:boe": "vue-cli-service build --mode boe", "build:boe": "vue-cli-service build --mode boe",
"build:release": "vue-cli-service build --mode release", "build:release": "vue-cli-service build --mode release",
"build:prod": "vue-cli-service build --mode prod", "build:prod": "vue-cli-service build --mode prod",
"build:test": "vue-cli-service build --mode test" "build:test": "vue-cli-service build --mode test",
"build:alpine": "vue-cli-service build --mode alpine"
}, },
"dependencies": { "dependencies": {
"@wangeditor/editor": "^5.1.23", "@wangeditor/editor": "^5.1.23",

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本2.0.3------------"); console.log("版本2.0.4------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

2
src/api/config.js
View File

@@ -58,7 +58,7 @@ http.interceptors.response.use(
return response; return response;
} else { } else {
if (code === 1000) { if (code === 1000) {
process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL) (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test') ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
} }
console.log("api %o", msg); console.log("api %o", msg);
} }

116
src/components/drawers/AddLevelImportStu.vue
View File

@@ -31,13 +31,27 @@
name="uploadFile" name="uploadFile"
:multiple="false" :multiple="false"
@change="handleChange" @change="handleChange"
:data=" courseType==1?{ :data="
courseType == 1
? {
stageId: Number(courseId), stageId: Number(courseId),
type: 3 type: 3,
}:{ }
: courseType == 3
? {
targetId: Number(courseId), targetId: Number(courseId),
type: 3 type: 1,
}" }
: courseType == 4
? {
targetId: Number(courseId),
type: 2,
}
: {
targetId: Number(courseId),
type: 3,
}
"
:showUploadList="false" :showUploadList="false"
> >
<p class="ant-upload-drag-icon"> <p class="ant-upload-drag-icon">
@@ -53,33 +67,61 @@
<div class="tipz">支持扩展名：.xls/.xlsx</div> <div class="tipz">支持扩展名：.xls/.xlsx</div>
</div> --> </div> -->
<div class="loadstate"> <div class="loadstate">
<div v-if="uploadpercent !== -1" class="loadborder">
<div v-if="uploadpercent!==-1" class="loadborder">
<div class="content"> <div class="content">
<div class="img"></div> <div class="img"></div>
<div class="timebox"> <div class="timebox">
<div class="timetop"> <div class="timetop">
<div class="tit">京东方商业模型.xls</div> <div class="tit">京东方商业模型.xls</div>
<div v-if="uploadErr" class="stateloading" style="color:red;">上传失败</div> <div
<div v-else class="stateloading">{{uploadpercent==100?"上传成功":"正在上传"}}</div> v-if="uploadErr"
class="stateloading"
style="color: red"
>
上传失败
</div>
<div v-else class="stateloading">
{{ uploadpercent == 100 ? "上传成功" : "正在上传" }}
</div>
</div> </div>
<div class="prog"> <div class="prog">
<div class="inprogloading" :style="{width:uploadpercent==-1?0:uploadpercent+'%', background:uploadErr?'#ff7474':'#35ae69'}"></div> <div
class="inprogloading"
:style="{
width: uploadpercent == -1 ? 0 : uploadpercent + '%',
background: uploadErr ? '#ff7474' : '#35ae69',
}"
></div>
</div> </div>
</div> </div>
<div class="curloading"> <div class="curloading">
<div class="cur">{{uploadpercent==-1?0:uploadpercent}}%</div> <div class="cur">
<div class="cancel" style="margin-left: 20px;cursor: pointer;" @click="removeUpload">删除</div> {{ uploadpercent == -1 ? 0 : uploadpercent }}%
</div>
<div
class="cancel"
style="margin-left: 20px; cursor: pointer"
@click="removeUpload"
>
删除
</div>
<div class="cancel" style="margin-left: 15px"></div> <div class="cancel" style="margin-left: 15px"></div>
</div> </div>
<div v-if="errNum!==0" class="defeat"> <div v-if="errNum !== 0" class="defeat">
<div class="detext" @click="downloadEeeorData">下载失败数据</div> <div class="detext" @click="downloadEeeorData">
下载失败数据
</div> </div>
</div> </div>
</div> </div>
<div v-if="showBottomBar" :class="errNum==0?'succebox':'defeatbox'"> </div>
<div
v-if="showBottomBar"
:class="errNum == 0 ? 'succebox' : 'defeatbox'"
>
<div class="lefimg"></div> <div class="lefimg"></div>
<div class="tacl">{{succNum}}条数据导入成功，{{errNum}}条数据导入失败</div> <div class="tacl">
{{ succNum }}条数据导入成功，{{ errNum }}条数据导入失败
</div>
</div> </div>
<!-- <div class="loadborder"> <!-- <div class="loadborder">
@@ -169,8 +211,10 @@ export default {
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
template: process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx", template:
importStudent: process.env.VUE_APP_BASE_API + "admin/student/importStudent", process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx",
importStudent:
process.env.VUE_APP_BASE_API + "admin/student/importStudent",
timers: "", // 定时器，用于清空定时器使用 timers: "", // 定时器，用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表 isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1, uploadpercent: -1,
@@ -179,9 +223,12 @@ export default {
fileList: [], fileList: [],
succNum: 0, //成功数据数 succNum: 0, //成功数据数
errNum: 0, //失败数据数 errNum: 0, //失败数据数
downloadErrUrl: '', downloadErrUrl: "",
showBottomBar: false, // 显示底部成功条数和失败条数 showBottomBar: false, // 显示底部成功条数和失败条数
locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/' locationHref:
location.href.indexOf("http://") !== -1
? "http://111.231.196.214:12016/"
: location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
}); });
const closeDrawer = () => { const closeDrawer = () => {
clearInterval(state.timers); clearInterval(state.timers);
@@ -206,14 +253,14 @@ export default {
const handleChange = (info) => { const handleChange = (info) => {
console.log("info", info); console.log("info", info);
if(info){ if (info) {
var FileExt = info.file.name.replace(/.+\./, ""); var FileExt = info.file.name.replace(/.+\./, "");
if (['xls','xlsx'].indexOf(FileExt.toLowerCase()) === -1){ if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
state.fileList = []; state.fileList = [];
state.uploadpercent = -1; state.uploadpercent = -1;
message.destroy() message.destroy();
message.error("请上传正确的文件格式") message.error("请上传正确的文件格式");
return return;
} }
} }
@@ -226,13 +273,13 @@ export default {
console.log(info.file, info.fileList); console.log(info.file, info.fileList);
} }
if (status === "done") { if (status === "done") {
console.log('上传成功返回的UUID', info.file.response.data) console.log("上传成功返回的UUID", info.file.response.data);
console.log('上传成功返回的UUID----->', info) console.log("上传成功返回的UUID----->", info);
console.log("我是导入学员接口传递的参数", { console.log("我是导入学员接口传递的参数", {
uploadFile: info.file.originFileObj, uploadFile: info.file.originFileObj,
targetId: props.courseId, targetId: props.courseId,
type: 3 type: 3,
}) });
let i = 0; let i = 0;
state.timers = setInterval(() => { state.timers = setInterval(() => {
let uid = info.file.response.data; let uid = info.file.response.data;
@@ -269,16 +316,15 @@ export default {
state.uploadErr = true; state.uploadErr = true;
message.error(`${info.file.name}上传失败`); message.error(`${info.file.name}上传失败`);
} }
}; };
// 下载失败数据 // 下载失败数据
const downloadEeeorData = () => { const downloadEeeorData = () => {
console.log(state.locationHref + state.downloadErrUrl) console.log(state.locationHref + state.downloadErrUrl);
if(state.downloadErrUrl!==""){ if (state.downloadErrUrl !== "") {
window.open(state.locationHref + state.downloadErrUrl) window.open(state.locationHref + state.downloadErrUrl);
}
} }
};
//删除 //删除
const removeUpload = () => { const removeUpload = () => {
@@ -301,7 +347,7 @@ export default {
handleChange, handleChange,
BATCH_IMPORT_SCORE, BATCH_IMPORT_SCORE,
downloadEeeorData, downloadEeeorData,
removeUpload removeUpload,
}; };
}, },
}; };

2
src/components/drawers/ExportScore.vue
View File

@@ -36,7 +36,7 @@
:showUploadList="false" :showUploadList="false"
:data="{ :data="{
type: type, type: type,
targetid: Number(id), targetId: Number(id),
}" }"
> >
<p class="ant-upload-drag-icon"> <p class="ant-upload-drag-icon">

27
src/components/drawers/project/ProjectEvalManage.vue
View File

@@ -4,7 +4,7 @@
:visible="Evalvisible" :visible="Evalvisible"
class="drawerStyle ProjectEvalManage" class="drawerStyle ProjectEvalManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -20,7 +20,7 @@
</div> </div>
<div class="main"> <div class="main">
<div <div
v-if="datasource.startTime" v-if="datasource.startTime && datasource.endTime"
class="endtime" class="endtime"
> >
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
@@ -35,7 +35,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -44,12 +44,11 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
allowClear
showSearch
></a-select> ></a-select>
</div> </div>
</div> </div>
@@ -159,7 +158,7 @@ export default {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
projectName: "", projectName:undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -186,9 +185,10 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentUserNo", dataIndex: "studentUserNo",
key: "studentUserNo", key: "studentUserNo",
width: 50, width: 60,
align: "center", align: "center",
className: "h head", className: "h head",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -203,6 +203,7 @@ export default {
key: "studentName", key: "studentName",
width: 50, width: 50,
align: "left", align: "left",
ellipsis: true,
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -218,6 +219,7 @@ export default {
key: "studentDepartName", key: "studentDepartName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -233,6 +235,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -248,6 +251,7 @@ export default {
key: "currentStageName", key: "currentStageName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: () => { customRender: () => {
return ( return (
@@ -263,6 +267,7 @@ export default {
key: "endStudyTime", key: "endStudyTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -279,6 +284,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -294,6 +300,7 @@ export default {
key: "PDFstatus", key: "PDFstatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -311,7 +318,7 @@ export default {
ctx.emit("update:Evalvisible", false); ctx.emit("update:Evalvisible", false);
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tabledata = []; state.tabledata = [];
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
@@ -385,7 +392,7 @@ export default {
state.tableDataTotalLoading = true; state.tableDataTotalLoading = true;
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
getData(); getData();
} }

20
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -4,7 +4,7 @@
:visible="TMvisible" :visible="TMvisible"
class="drawerStyle ProjectExamManage" class="drawerStyle ProjectExamManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -23,7 +23,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -32,7 +32,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 170px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -155,7 +155,7 @@ export default {
const state = reactive({ const state = reactive({
name: "", name: "",
open: false, open: false,
projectName: "", projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -185,7 +185,7 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentCode", dataIndex: "studentCode",
key: "studentCode", key: "studentCode",
width: 50, width: 60,
align: "center", align: "center",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -217,6 +217,7 @@ export default {
key: "studentDepartName", key: "studentDepartName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -232,6 +233,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -247,6 +249,7 @@ export default {
key: "testNumber", key: "testNumber",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -262,6 +265,7 @@ export default {
key: "score", key: "score",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -278,6 +282,7 @@ export default {
key: "finishedTime", key: "finishedTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -293,6 +298,7 @@ export default {
key: "status", key: "status",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
console.log(text.record.status); console.log(text.record.status);
@@ -310,7 +316,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:TMvisible", false); ctx.emit("update:TMvisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tabledata = []; state.tabledata = [];
@@ -395,7 +401,7 @@ export default {
state.loadingData = true; state.loadingData = true;
state.currentPage = 1; state.currentPage = 1;
state.name = ''; state.name = '';
state.projectName = ''; state.projectName = undefined;
getData(); getData();
} }

49
src/components/drawers/project/ProjectFaceStu.vue
View File

@@ -30,7 +30,9 @@
: "-" : "-"
}} }}
</div> </div>
<div class="endtime" style="margin-left: 64px">签到时间：14:00</div> <div class="endtime" style="margin-left: 64px">
签到时间：{{ beginTime }}~{{ endTime }}
</div>
</div> </div>
<div class="search"> <div class="search">
@@ -39,7 +41,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -62,7 +64,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName2" v-model:value="projectName2"
style="width: 160px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList2" :options="projectNameList2"
@change="selectProjectName2" @change="selectProjectName2"
@@ -234,6 +236,7 @@ import SignQR from "../SignQR.vue";
import * as api from "../../../api/index1"; import * as api from "../../../api/index1";
import TwoDimensionalCode from "../../../components/TwoDimensionalCode"; import TwoDimensionalCode from "../../../components/TwoDimensionalCode";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { toDate } from "../../../api/method";
export default { export default {
name: "FaceManage", name: "FaceManage",
components: { components: {
@@ -264,7 +267,7 @@ export default {
closeStop: false, //签退弹窗关闭图标 closeStop: false, //签退弹窗关闭图标
signQRvisible: false, //二维码弹窗 signQRvisible: false, //二维码弹窗
name: null, name: null,
projectName2: null, projectName2: undefined,
showmodal: false, //勾选提示框 showmodal: false, //勾选提示框
closable: false, //modal右上角的关闭按钮 closable: false, //modal右上角的关闭按钮
pageSize: 10, pageSize: 10,
@@ -341,10 +344,13 @@ export default {
codeIndex: null, codeIndex: null,
codeInfo: null, //二维码内容 codeInfo: null, //二维码内容
// selectOption: [], // selectOption: [],
beginTime: null, //签到开始时间
endTime: null, //签到结束时间
}); });
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
if (bol == true) { if (bol == true) {
getStudent(); getStudent();
isSignClick();
} }
}; };
//考勤 //考勤
@@ -358,7 +364,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:FSvisible", false); ctx.emit("update:FSvisible", false);
state.name = null; state.name = null;
state.projectName2 = null; state.projectName2 = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.selectedStudents = []; state.selectedStudents = [];
state.currentPage = 1; state.currentPage = 1;
@@ -492,6 +498,7 @@ export default {
key: "studentUserNo", key: "studentUserNo",
width: 50, width: 50,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -530,6 +537,7 @@ export default {
width: 50, width: 50,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -548,6 +556,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 50, width: 50,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -567,6 +576,7 @@ export default {
key: "signTime", key: "signTime",
width: 110, width: 110,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -590,6 +600,7 @@ export default {
key: "signStatus", key: "signStatus",
width: 50, width: 50,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
// console.log("text", text); // console.log("text", text);
@@ -612,6 +623,7 @@ export default {
key: "signStatus", key: "signStatus",
width: 50, width: 50,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -623,6 +635,7 @@ export default {
}, },
{ {
title: "考勤情况", title: "考勤情况",
ellipsis: true,
className: "h", className: "h",
dataIndex: "opacation", dataIndex: "opacation",
key: "opacation", key: "opacation",
@@ -831,7 +844,7 @@ export default {
function resetTaskList() { function resetTaskList() {
state.currentPage = 1; state.currentPage = 1;
state.name = null; state.name = null;
state.projectName2 = null; state.projectName2 = undefined;
state.tableDataTotal = -1; state.tableDataTotal = -1;
state.tableDataTotal2 = 0; state.tableDataTotal2 = 0;
getStudent(); getStudent();
@@ -882,7 +895,31 @@ export default {
getStudent(); getStudent();
} }
}; };
// 计算签到时间
const isSignClick = () => {
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 { return {
...toRefs(state), ...toRefs(state),
selectProjectName, selectProjectName,

17
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -34,7 +34,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -43,7 +43,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -228,7 +228,7 @@ export default {
name: "", name: "",
open: false, open: false,
projectName: null, projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 0, id: 0,
@@ -307,6 +307,7 @@ export default {
width: 60, width: 60,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -325,6 +326,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -344,6 +346,7 @@ export default {
key: "workScore", key: "workScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -363,6 +366,7 @@ export default {
key: "examinationScore", key: "examinationScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -383,6 +387,7 @@ export default {
key: "assessmentScore", key: "assessmentScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -403,6 +408,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -427,6 +433,7 @@ export default {
key: "operation", key: "operation",
width: 100, width: 100,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return text.record.finishStatus == 1 ? ( return text.record.finishStatus == 1 ? (
@@ -558,7 +565,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:Fvisible", false); ctx.emit("update:Fvisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tableDataTotal = -1; state.tableDataTotal = -1;
@@ -651,7 +658,7 @@ export default {
function resetTaskList() { function resetTaskList() {
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tableDataTotal = -1; state.tableDataTotal = -1;
state.tableDataTotal2 = 0; state.tableDataTotal2 = 0;
getStudent(); getStudent();

19
src/components/drawers/project/ProjectHomeWorkManage.vue
View File

@@ -3,7 +3,7 @@
:visible="Wvisible" :visible="Wvisible"
class="drawerStyle ProjectHomeWorkManage" class="drawerStyle ProjectHomeWorkManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
:zIndex="100" :zIndex="100"
> >
@@ -35,7 +35,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -44,7 +44,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -197,7 +197,7 @@ export default {
name: "", name: "",
open: false, open: false,
projectName: null, projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -276,6 +276,7 @@ export default {
width: 60, width: 60,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -294,6 +295,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -313,6 +315,7 @@ export default {
key: "studentOrgName", key: "studentOrgName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -332,6 +335,7 @@ export default {
key: "workScore", key: "workScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -352,6 +356,7 @@ export default {
key: "lastStudyTime", key: "lastStudyTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -369,6 +374,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -393,6 +399,7 @@ export default {
key: "operation", key: "operation",
width: 100, width: 100,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
}, },
], ],
@@ -449,7 +456,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:Wvisible", false); ctx.emit("update:Wvisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tableDataTotal = -1; state.tableDataTotal = -1;
@@ -542,7 +549,7 @@ export default {
function resetTaskList() { function resetTaskList() {
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tableDataTotal = -1; state.tableDataTotal = -1;
state.tableDataTotal2 = 0; state.tableDataTotal2 = 0;
getStudent(); getStudent();

15
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -4,7 +4,7 @@
:visible="Tvisible" :visible="Tvisible"
class="drawerStyle ProjectOnlineManage" class="drawerStyle ProjectOnlineManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -51,7 +51,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -60,7 +60,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -175,7 +175,7 @@ export default {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
projectName: "", projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -234,6 +234,7 @@ export default {
key: "studentDepartName", key: "studentDepartName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -249,6 +250,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -264,6 +266,7 @@ export default {
key: "currentStageName", key: "currentStageName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: () => { customRender: () => {
return ( return (
@@ -279,6 +282,7 @@ export default {
key: "lastStudyTime", key: "lastStudyTime",
width: 100, width: 100,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -294,6 +298,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -311,7 +316,7 @@ export default {
ctx.emit("update:Tvisible", false); ctx.emit("update:Tvisible", false);
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tabledata = []; state.tabledata = [];
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {

16
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -51,7 +51,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 170px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -60,7 +60,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 170px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -174,13 +174,9 @@ export default {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
projectName: "", projectName: undefined,
projectNameList: [ projectNameList: [
{
id: 0,
value: '',
label: "全部",
},
{ {
id: 1, id: 1,
value: "0", value: "0",
@@ -323,7 +319,7 @@ export default {
ctx.emit("update:CommonModelVisible", false); ctx.emit("update:CommonModelVisible", false);
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tabledata = []; state.tabledata = [];
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
@@ -444,7 +440,7 @@ export default {
state.tableDataTotalLoading = true; state.tableDataTotalLoading = true;
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
getData(); getData();
} }

76
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<a-drawer <a-drawer
v-if="EvaluationModelVisible" v-if="EvaluationModelVisible"
:visible="EvaluationModelVisible" :visible="EvaluationModelVisible"
class="drawerStyle ProjectOnlineManage" class="drawerStyle ProjectOnlineManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -20,7 +20,7 @@
</div> </div>
<div class="main"> <div class="main">
<div <div
v-if="datasource.startTime" v-if="datasource.startTime && datasource.endTime"
class="endtime" class="endtime"
> >
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
@@ -34,7 +34,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -43,7 +43,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -110,14 +110,14 @@
</div> </div>
</div> </div>
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import { toRefs, reactive, onMounted, onUnmounted } from "vue"; import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
// import * as api from "../../../api/index"; // import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage"; import * as api from "../../../api/indexTaskManage";
export default { export default {
name: "RouterEvaluationManage", name: "RouterEvaluationManage",
props: { props: {
@@ -157,7 +157,7 @@
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
tableDataTotal: 0, tableDataTotal: 0,
projectName: "", projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -185,7 +185,7 @@
title: "工号", title: "工号",
dataIndex: "studentUserNo", dataIndex: "studentUserNo",
key: "studentUserNo", key: "studentUserNo",
width: 50, width: 120,
align: "center", align: "center",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -201,8 +201,8 @@
dataIndex: "studentName", dataIndex: "studentName",
key: "studentName", key: "studentName",
width: 50, width: 50,
align: "left", align: "center",
className: "h head", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -218,6 +218,7 @@
width: 60, width: 60,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -232,6 +233,7 @@
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -247,6 +249,7 @@
key: "currentStageName", key: "currentStageName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: () => { customRender: () => {
return ( return (
@@ -262,6 +265,7 @@
key: "endStudyTime", key: "endStudyTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -278,6 +282,7 @@
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -293,6 +298,7 @@
key: "PDFstatus", key: "PDFstatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -311,7 +317,7 @@
ctx.emit("update:EvaluationModelVisible", false); ctx.emit("update:EvaluationModelVisible", false);
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tabledata = []; state.tabledata = [];
}; };
const afterVisibleChange = (bol) => { const afterVisibleChange = (bol) => {
@@ -385,7 +391,7 @@
state.tableDataTotalLoading = true; state.tableDataTotalLoading = true;
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
getData(); getData();
} }
@@ -419,22 +425,22 @@
exportTaskStu, exportTaskStu,
}; };
}, },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
// .drawerStyle { // .drawerStyle {
// .ant-drawer-content-wrapper { // .ant-drawer-content-wrapper {
// // max-width: 1000px; // // max-width: 1000px;
// .ant-drawer-header { // .ant-drawer-header {
// display: none !important; // display: none !important;
// } // }
// .ant-drawer-body { // .ant-drawer-body {
// padding: 0; // padding: 0;
// } // }
// } // }
// } // }
.ProjectOnlineManage { .ProjectOnlineManage {
// overflow-x: auto; // overflow-x: auto;
.drawerMain { .drawerMain {
min-width: 550px; min-width: 550px;
@@ -652,6 +658,6 @@
} }
} }
} }
} }
</style> </style>

57
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -1,10 +1,10 @@
<template> <template>
<a-drawer <a-drawer
v-if="ExaminationModelVisible" v-if="ExaminationModelVisible"
:visible="ExaminationModelVisible" :visible="ExaminationModelVisible"
class="drawerStyle ProjectExamManage" class="drawerStyle ProjectExamManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
> >
<div class="drawerMain"> <div class="drawerMain">
@@ -23,7 +23,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -32,7 +32,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -115,16 +115,16 @@
<!-- 导出成绩抽屉 --> <!-- 导出成绩抽屉 -->
<EScore v-model:eScorevisible="eScorevisible" /> <EScore v-model:eScorevisible="eScorevisible" />
</a-drawer> </a-drawer>
</template> </template>
<script> <script>
import { toRefs, reactive } from "vue"; import { toRefs, reactive } from "vue";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import EScore from "../ExportScore.vue"; import EScore from "../ExportScore.vue";
import * as api from '../../../api/indexTaskManage'; import * as api from '../../../api/indexTaskManage';
// import * as api from "../../../api/index"; // import * as api from "../../../api/index";
export default { export default {
name: "RouterExaminationManage", name: "RouterExaminationManage",
components: { components: {
EScore, EScore,
@@ -158,7 +158,7 @@
const state = reactive({ const state = reactive({
name: "", name: "",
open: false, open: false,
projectName: "", projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -188,7 +188,7 @@
title: "工号", title: "工号",
dataIndex: "studentCode", dataIndex: "studentCode",
key: "studentCode", key: "studentCode",
width: 50, width: 120,
align: "center", align: "center",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -204,8 +204,8 @@
dataIndex: "studentName", dataIndex: "studentName",
key: "studentName", key: "studentName",
width: 50, width: 50,
align: "left", align: "center",
className: "h head", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -220,7 +220,7 @@
key: "studentDepartName", key: "studentDepartName",
width: 60, width: 60,
align: "center", align: "center",
className: "h", ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -235,6 +235,7 @@
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -250,6 +251,7 @@
key: "currentStageId", key: "currentStageId",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: () => { customRender: () => {
return ( return (
@@ -265,6 +267,7 @@
key: "testNumber", key: "testNumber",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -280,6 +283,7 @@
key: "score", key: "score",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -296,6 +300,7 @@
key: "finishedTime", key: "finishedTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -311,6 +316,7 @@
key: "status", key: "status",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
console.log(text.record.status); console.log(text.record.status);
@@ -328,7 +334,7 @@
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:ExaminationModelVisible", false); ctx.emit("update:ExaminationModelVisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tabledata = []; state.tabledata = [];
@@ -414,7 +420,7 @@
state.loadingData = true; state.loadingData = true;
state.currentPage = 1; state.currentPage = 1;
state.name = ''; state.name = '';
state.projectName = ''; state.projectName = undefined;
getData(); getData();
} }
@@ -454,11 +460,11 @@
exportData exportData
}; };
}, },
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.ProjectExamManage { .ProjectExamManage {
.drawerMain { .drawerMain {
min-width: 550px; min-width: 550px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
@@ -748,6 +754,5 @@
} }
} }
} }
} }
</style> </style>

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

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

23
src/components/drawers/router/RouterFaceTeachManage.vue
View File

@@ -29,7 +29,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -38,7 +38,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -211,7 +211,7 @@ export default {
name: "", name: "",
open: false, open: false,
projectName: null, projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 0, id: 0,
@@ -253,7 +253,7 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentUserNo", dataIndex: "studentUserNo",
key: "studentUserNo", key: "studentUserNo",
width: 50, width: 120,
align: "left", align: "left",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -272,7 +272,8 @@ export default {
key: "studentName", key: "studentName",
width: 50, width: 50,
align: "left", align: "left",
className: "h head", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -290,6 +291,7 @@ export default {
width: 60, width: 60,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -308,6 +310,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -327,6 +330,7 @@ export default {
key: "chapterName", key: "chapterName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -344,6 +348,7 @@ export default {
key: "workScore", key: "workScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -363,6 +368,7 @@ export default {
key: "examinationScore", key: "examinationScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -383,6 +389,7 @@ export default {
key: "assessmentScore", key: "assessmentScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -403,6 +410,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -427,6 +435,7 @@ export default {
key: "operation", key: "operation",
width: 100, width: 100,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
}, },
], ],
@@ -501,7 +510,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:FaceTeachModelVisible", false); ctx.emit("update:FaceTeachModelVisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tableDataTotal = -1; state.tableDataTotal = -1;
@@ -595,7 +604,7 @@ export default {
function resetTaskList() { function resetTaskList() {
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName =undefined;
state.tableDataTotal = -1; state.tableDataTotal = -1;
state.tableDataTotal2 = 0; state.tableDataTotal2 = 0;
getStudent(); getStudent();

25
src/components/drawers/router/RouterHomeworkManage.vue
View File

@@ -4,7 +4,7 @@
:visible="HomeworkModelVisible" :visible="HomeworkModelVisible"
class="drawerStyle ProjectHomeWorkManage" class="drawerStyle ProjectHomeWorkManage"
placement="right" placement="right"
width="60%" width="80%"
@after-visible-change="afterVisibleChange" @after-visible-change="afterVisibleChange"
:zIndex="100" :zIndex="100"
> >
@@ -30,7 +30,7 @@
<div class="name">姓名：</div> <div class="name">姓名：</div>
<a-input <a-input
v-model:value="name" v-model:value="name"
style="width: 270px; height: 40px; border-radius: 8px" style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名" placeholder="请输入姓名"
/> />
</div> </div>
@@ -39,7 +39,7 @@
<div class="select"> <div class="select">
<a-select <a-select
v-model:value="projectName" v-model:value="projectName"
style="width: 270px" style="width: 200px"
placeholder="请选择" placeholder="请选择"
:options="projectNameList" :options="projectNameList"
@change="selectProjectName" @change="selectProjectName"
@@ -192,7 +192,7 @@ export default {
name: "", name: "",
open: false, open: false,
projectName: null, projectName: undefined,
projectNameList: [ projectNameList: [
{ {
id: 1, id: 1,
@@ -233,7 +233,7 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentUserNo", dataIndex: "studentUserNo",
key: "studentUserNo", key: "studentUserNo",
width: 50, width: 120,
align: "left", align: "left",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -252,7 +252,8 @@ export default {
key: "studentName", key: "studentName",
width: 50, width: 50,
align: "left", align: "left",
className: "h head", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -270,6 +271,7 @@ export default {
width: 60, width: 60,
align: "center", align: "center",
className: "h", className: "h",
ellipsis: true,
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
@@ -288,6 +290,7 @@ export default {
key: "studentJobName", key: "studentJobName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -307,6 +310,7 @@ export default {
key: "chapterName", key: "chapterName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -324,6 +328,7 @@ export default {
key: "studentOrgName", key: "studentOrgName",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -343,6 +348,7 @@ export default {
key: "workScore", key: "workScore",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -363,6 +369,7 @@ export default {
key: "lastStudyTime", key: "lastStudyTime",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -380,6 +387,7 @@ export default {
key: "finishStatus", key: "finishStatus",
width: 60, width: 60,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
customRender: (text) => { customRender: (text) => {
return ( return (
@@ -404,6 +412,7 @@ export default {
key: "operation", key: "operation",
width: 100, width: 100,
align: "center", align: "center",
ellipsis: true,
className: "h", className: "h",
}, },
], ],
@@ -461,7 +470,7 @@ export default {
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:HomeworkModelVisible", false); ctx.emit("update:HomeworkModelVisible", false);
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.selectedRowKeys = []; state.selectedRowKeys = [];
state.currentPage = 1; state.currentPage = 1;
state.tableDataTotal = -1; state.tableDataTotal = -1;
@@ -551,7 +560,7 @@ export default {
function resetTaskList() { function resetTaskList() {
state.currentPage = 1; state.currentPage = 1;
state.name = ""; state.name = "";
state.projectName = ""; state.projectName = undefined;
state.tableDataTotal = -1; state.tableDataTotal = -1;
getStudent(); getStudent();
} }

2
src/components/student/TableStudent.vue
View File

@@ -359,7 +359,7 @@
v-model:AddImpStuvisible="AddImpStuvisible" v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose" @AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id" :courseId="id"
:type="type" :courseType="type === 1 ? 3 : 4"
/> />
</template> </template>
<script setup> <script setup>

3
src/views/login.vue
View File

@@ -50,7 +50,8 @@ export default {
const router = useRouter(); const router = useRouter();
const state = reactive({ const state = reactive({
form: { form: {
account: "10181457", account: "00004409",
// account: "10181457",
password: "1234567890Aa", password: "1234567890Aa",
}, },
}); });

6
vue.config.js
View File

@@ -6,19 +6,17 @@
* @FilePath: /fe-manage/vue.config.js * @FilePath: /fe-manage/vue.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
const { defineConfig } = require("@vue/cli-service"); const {defineConfig} = require("@vue/cli-service");
module.exports = defineConfig({ module.exports = defineConfig({
publicPath: process.env.VUE_APP_BASE, publicPath: process.env.VUE_APP_BASE,
// transpileDependencies: true, outputDir: process.env.VUE_APP_OUTPUT_DIR,
devServer: { devServer: {
port: 8080, port: 8080,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
target: process.env.VUE_APP_PROXY_URL, target: process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
// secure: false,
// ws: false, //表示WebSocket协议
pathRewrite: { pathRewrite: {
"^/manageApi": "", "^/manageApi": "",
}, },