Merge branch '250213-prod-master_1202-gx-copy' into test20250220

This commit is contained in:
gengxin
2025-02-25 17:49:27 +08:00
19 changed files with 917 additions and 3481 deletions

View File

@@ -18,8 +18,8 @@ import { boeRequest } from "@/api/request";
// "application/x-www-form-urlencoded";
axios.defaults.withCredentials = true;
const http = axios.create({
baseURL: '/growth',
// baseURL: process.env.VUE_APP_BASE_API_GROWTH,
// baseURL: '/growth',
baseURL: process.env.VUE_APP_BASE_API_GROWTH,
timeout: 1000 * 15,
// headers: { "Content-Type": "multipart/form-data" },
headers: { "Content-Type": "application/json" },

View File

@@ -1003,6 +1003,12 @@ export default {
selectedKeys: "sub25",
pagename: "专业力必修",
},
{
href: "/growthaddpath",
openKeys: "sub25",
selectedKeys: "sub25",
pagename: "专业力必修",
},
{
href: "/leveladd",
openKeys: "sub1",

View File

@@ -1,689 +0,0 @@
<template>
<a-drawer :visible="eScorevisible" class="drawerStyle ExportScore" placement="right" width="700px"
@after-visible-change="afterVisibleChange">
<div class="drawerMain">
<div class="header">
<div class="headerTitle">导入成绩</div>
<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
@click="closeDrawer(false)" />
</div>
<div class="main">
<div class="minatitl">
<div class="up1">请下载</div>
<div class="up2" @click="downTemplate" style="cursor: pointer">
模板
</div>
<div class="up1">按要求填写数据并导入</div>
</div>
<div class="upload">
<div class="text">上传</div>
<div class="right">
<div style="height: 176px; margin-bottom: 20px">
<a-upload-dragger v-model:fileList="fileList" :action="importHomeWork" name="file" :multiple="true"
:headers="headers"
@change="handleChange" :showUploadList="false" :data="{
// type: type,
// taskId: Number(id),
// workId: datesource.info?datesource.info.id:id,
// targetId: Number(id),
growId: id,
examinationId: examinationId.examinationId,
}">
<p class="ant-upload-drag-icon">
<inbox-outlined></inbox-outlined>
</p>
<p class="ant-upload-text">点击或将文件拖拽到此处上传</p>
<p class="ant-upload-hint">支持扩展名.xls/.xlsx</p>
</a-upload-dragger>
</div>
<!-- <div class="load">
<div class="cloud"></div>
<div class="tip">点击或将文件拖拽到此处上传</div>
<div class="tipz">支持扩展名.xls/.xlsx</div>
</div> -->
<div class="loadstate">
<div class="loadborder" v-if="uploadpercent < 100 && uploadpercent !== -1">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="stateloading">正在上传</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogloading"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">55%</div> -->
<!-- <div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div> -->
</div>
</div>
</div>
<div class="loadborder" v-if="uploadErr">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="statedefeat">上传失败</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogdefeat"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">55%</div> -->
<div style="color: #387df7; margin-left: 20px; cursor: pointer">
下载失败数据
</div>
<!-- <div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div> -->
</div>
<div class="defeat" style="display: flex; align-items: center">
<div style="color: #ff7474">
{{ succNum }}条数据解析成功{{ errNum }}条数据解析失败
</div>
</div>
</div>
</div>
<!-- v-if="uploadpercent === 100" -->
<div class="loadborder" v-if="uploadpercent === 100">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="statesucce">上传成功</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogsucce"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">100%</div> -->
<div class="cancel" style="margin-left: 20px; cursor: pointer" @click="removeUpload">
删除
</div>
</div>
</div>
<div v-if="errNum">
<div class="downloadErr" @click="downloadEeeorData">
下载失败数据
</div>
</div>
</div>
<div v-if="uploadpercent === 100" class="defeat" style="
display: flex;
align-items: center;
width: 500px;
height: 40px;" :style="{
background: errNum
? 'rgba(255, 116, 116, 0.1)'
: 'rgba(53, 174, 105, 0.1)',
border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
}">
<img style="width: 14px; height: 14px; margin-left: 16px" :src="
errNum
? require('../../assets/images/err.png')
: require('../../assets/images/success.png')
" />
<div style="margin-left: 8px" :style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }">
{{ succNum }}条数据解析成功{{ errNum }}条数据解析失败
</div>
</div>
</div>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer(false)">取消</button>
<button class="btn2" @click="closeDrawer(true)">确定</button>
</div>
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
</a-drawer>
</template>
<script>
import { reactive, toRefs } from "vue";
import { message } from "ant-design-vue";
import * as api from "../../api/index1";
import { getImportStatus,saveGrowExamScoreToDatabase } from "@/api/growthpath"
import {getCookieForName} from "@/api/method";
import dialog from "@/utils/dialog";
export default {
name: "ESGrowthcore",
props: {
eScorevisible: {
type: Boolean,
default: false,
},
datesource: {
type: Object,
default: function () {
return {};
},
},
//type=3:面授课
type: {
type: String,
default: null,
},
id: {
type: Number,
default: null,
},
pid: {
type: Number,
default: null,
},
searchTaskList: {
type: Function,
default: null,
},
examinationId:{
type: Object,
default: function () {
return {};
},
}
},
setup(props, ctx) {
// debugger
const state = reactive({
fileType: ["xls", "xlsx"],
importHomeWork:
process.env.VUE_APP_BASE_API + "/admin/grow/importExamScoreToCache",
uploadpercent: -1,
uploadErr: false, //上传失败
addLoading: false,
fileList: [],
succNum: 0, //成功数据数
redisKey: '',
errNum: 0, //失败数据数
downloadErrUrl: null, //下载失败数据
fileName: "",
});
const headers = { token: getCookieForName("token") };
const closeDrawer = (item) => {
ctx.emit("update:eScorevisible", false);
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
if(state.redisKey&&state.succNum!=0&&item){
saveGrowExamScoreToDatabase({
redisKey: state.redisKey,
growId: props.id,
}).then(res=>{
message.success("导入成功");
ctx.emit("isTrue", true);
console.log(res,'res')
}).catch(err=>{
message.error("导入失败");
// message.error(err.data.msg)
})
// dialog({
// content: "导入的学员会覆盖原数据,确认导入吗?",
// ok:()=>{
// }
// })
}
state.redisKey = ''
state.succNum = 0
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
console.log(props.datesource)
};
//上传文件
const handleChange = (info) => {
if (info) {
var FileExt = info.file.name.replace(/.+\./, "");
if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
state.fileList = [];
state.uploadpercent = -1;
message.destroy();
message.error("文件格式错误");
return;
}
if(info.file.size > 50000000){
state.fileList = [];
state.uploadpercent = -1;
message.destroy();
message.error("文件大小超出50M请重新上传")
return;
}
}
state.addLoading = true;
state.uploadpercent = parseInt(info.file.percent);
console.log("我是文件上传的进度---------->", info.file.percent);
const status = info.file.status;
if (status !== "uploading") {
// console.log(info.file, info.fileList);
}
if (status === "done") {
state.fileName = info.file.name;
let i = 0;
let timeouts = setTimeout(() => {
clearInterval(timer)
state.addLoading = false;
message.destroy();
message.error(`文件导入超时`);
}, 30000);
if(info.file.response.code == 1){
state.fileList = [];
state.addLoading = false;
state.uploadpercent = -1;
message.destroy();
message.error(info.file.response.msg)
return
}
let timer = setInterval(() => {
state.redisKey = info.file.response.data;
getImportStatus({redisKey:state.redisKey})
.then((res) => {
console.log("查询导入状态", res);
if (res.data.code === 200) {
if (res.data.data.status !== "START") {
i++;
if (i === 1) {
message.destroy();
// message.success(`${info.file.name}解析成功`);
state.addLoading = false;
props.searchTaskList && props.searchTaskList();
}
state.succNum = res.data.data.successNum;
state.errNum = res.data.data.failedNum;
state.downloadErrUrl = res.data.data.url;
console.log("props.getStudent", props.getStudent);
clearInterval(timer);
clearTimeout(timeouts);
}
} else {
state.addLoading = false;
message.destroy();
clearTimeout(timeouts);
}
})
.catch((err) => {
state.addLoading = false;
clearInterval(timer);
clearTimeout(timeouts);
console.log("查询导入状态失败", err);
});
}, 500);
} else if (status === "error") {
state.uploadErr = true;
message.error(`文件解析失败,请联系管理员`);
}
};
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
// const isJpgOrPng =
// file.name.indexOf(".xlsx") !== "-1" ||
// file.name.indexOf(".xls") !== "-1";
// if (!isJpgOrPng) {
// message.destroy();
// message.error("仅支持xls、xlsx格式!");
// return reject(false);
// }
const formData = new FormData();
formData.append("file", file);
// let progress = { percent: 1 };
// const intervalId = setInterval(() => {
// if (progress.percent < 100) {
// progress.percent++;
// file.onProgress(progress);
// } else {
// clearInterval(intervalId);
// }
// }, 100);
api.batchImportScore(formData).then((res) => {
if (res.data.code === 200) {
console.log("上传成功", res);
return reject(true);
}
});
return reject(false);
});
};
const handleUpload = (e) => {
console.log("handleUpload", e);
};
//删除
const removeUpload = () => {
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
state.succNum = 0;
state.redisKey = ''
state.errNum = 0;
state.downloadErrUrl = null;
state.addLoading = false;
};
// 下载失败数据
const downloadEeeorData = () => {
if (state.downloadErrUrl !== "") {
window.open(process.env.VUE_APP_BOE_API_URL + '/upload/boe/file' + state.downloadErrUrl);
}
};
function downTemplate() {
window.open(`${process.env.VUE_APP_BOE_API_URL}/upload/files/2024/7/专业力必修-系统考试录入成绩模板.xlsx`);
}
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
handleChange,
downTemplate,
headers,
beforeUpload,
handleUpload,
removeUpload,
downloadEeeorData,
};
},
};
</script>
<style lang="scss">
.ExportScore {
.drawerMain {
min-width: 600px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
flex-shrink: 0;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
overflow-y: auto;
.minatitl {
display: flex;
.up1 {
font-size: 16px;
font-weight: 400;
color: #333333;
}
.up2 {
font-size: 16px;
font-weight: 400;
color: #4ea6ff;
margin-left: 4px;
}
}
.upload {
margin-top: 32px;
display: flex;
.text {
font-size: 14px;
font-weight: 400;
color: #333333;
}
.right {
margin-left: 6px;
.load {
width: 500px;
height: 176px;
background: #f5f9fd;
border-radius: 4px;
// opacity: 0.3;
border: 1px dashed #caddfd;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 20px;
.cloud {
margin-top: 52px;
width: 28px;
height: 28px;
background-image: url(../../assets/images/basicinfo/cloud.png);
}
.tip {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
margin-top: 15px;
cursor: pointer;
}
.tipz {
font-size: 14px;
font-weight: 400;
color: #999999;
margin-top: 10px;
}
}
.loadstate {
width: 500px;
margin-bottom: 100px;
.loadborder {
width: 500px;
height: 173px;
border-radius: 4px;
border: 1px dashed #eaeaea;
margin-bottom: 30px;
display: flex;
flex-direction: column;
justify-content: center;
position: relative;
.content {
display: flex;
margin-left: 20px;
position: relative;
.defeat {
width: 400px;
position: absolute;
left: 46px;
top: 38px;
font-size: 14px;
font-weight: 500;
justify-content: space-between;
}
.img {
width: 30px;
height: 34px;
background-image: url(../../assets/images/basicinfo/exl.png);
}
.timebox {
margin-left: 15px;
margin-top: -5px;
.timetop {
display: flex;
width: 262px;
justify-content: space-between;
// margin-bottom: 8px;
.tit {
width: 200px;
font-size: 14px;
font-weight: 400;
color: #333333;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.stateloading {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
}
.statedefeat {
font-size: 14px;
font-weight: 400;
color: #ff7474;
}
.statesucce {
font-size: 14px;
font-weight: 400;
color: #35ae69;
}
}
.prog {
width: 262px;
height: 5px;
background: #eaf1fe;
border-radius: 4px;
.inprogloading {
width: 55%;
height: 5px;
border-radius: 4px;
background: #4ea6ff;
}
//下载失败条
.inprogdefeat {
width: 55%;
height: 5px;
border-radius: 4px;
background: #ff7474;
}
//下载成功条
.inprogsucce {
width: 100%;
height: 5px;
border-radius: 4px;
background: #57c887;
}
}
}
.curloading {
margin-left: 15px;
margin-top: 15px;
display: flex;
.cur {
font-size: 14px;
font-weight: 400;
color: #333333;
}
.cancel {
font-size: 14px;
font-weight: 400;
color: #387df7;
}
}
}
.downloadErr {
width: 120px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid #387df7;
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 20px;
cursor: pointer;
margin-left: 66px;
margin-top: 16px;
position: absolute;
bottom: 28;
}
}
}
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -267,7 +267,7 @@ const rulesRef = ref({
},
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
const durationText = computed(() =>
dateTime.value?.length
? dayjs(dateTime.value[1]).diff(dayjs(dateTime.value[0]), "minute")
@@ -349,7 +349,7 @@ function openDrawer(row) {
dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"),
dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm"),
]);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -794,11 +794,20 @@ export default {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = null;
state.signStatus = undefined;
state.signStatus = "";
state.username = null;
state.tableDataTotal = 0;
getTableData();
}
function buildUrl(url, params) {
const searchParams = new URLSearchParams();
Object.keys(params).forEach((key) => {
if(params[key]){
searchParams.append(key, params[key]);
}
});
return `${url}?${searchParams.toString()}`;
}
// 导出数据
function exportTaskStu() {
@@ -811,8 +820,21 @@ export default {
);
console.log("props.datasource", props.datasource);
window.open(
`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=0&type=2&pid=${props.datasource.growthId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
);
buildUrl(
`${process.env.VUE_APP_BOE_API_URL}${
process.env.VUE_APP_BASE_API_GROWTH || ""
}/professional/task/attendanceExport`,
{
username: state.username,
taskId: props.datasource.id,
taskType: props.datasource.taskType,
signStatus: state.signStatus,
}
)
);
// window.open(
// `${process.env.VUE_APP_BASE_API}/professional/task/attendanceExport?currentStageId=0&type=2&pid=${props.datasource.growthId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`
// );
// if (props.types == 2) {
// window.open(
// `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=0&type=2&pid=${props.datasource.growthId}&thirdType=1&taskId=${props.datasource.id}&taskType=${props.datasource.type}`

View File

@@ -94,7 +94,7 @@ const props = defineProps({
growId: String,
});
const visible = ref(false);
const formData = useResetRef({
const formData = ref({
info: {
discussName: "",
discussExplain: "",
@@ -118,12 +118,17 @@ const rulesRef = ref({
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate
let validate = null;
const closeDrawer = () => {
visible.value = false;
dateTime.value = [];
formData.reset();
formData.value.info = {};
formData.value = {
info: {
discussName: "",
discussExplain: "",
discussSettings: true,
},
};
};
async function confirm() {
@@ -161,7 +166,7 @@ function openDrawer(row) {
row.info.discussSettings === "false" || row.info.discussSettings === false
? false
: true);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -1,786 +0,0 @@
<template>
<a-drawer
v-if="TMvisible"
:visible="TMvisible"
class="drawerStyle ProjectExamManage"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">考试{{ title }}</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="@/assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="endtime">起止时间{{titleData.examinationStartTime}} {{titleData.examinationEndTime}}</div>
<div class="search">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名/工号</div>
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名/工号"
/>
</div>
<div class="namecon" style="margin-right: 50px">
<div class="name">任务状态</div>
<div class="select">
<a-select
v-model:value="projectName"
style="width: 170px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
></a-select>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTableData"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="reseatTableData">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div class="btnss" style="margin-top: 20px" v-if="checkGrowthPer(permissions)">
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<!-- <div class="img1"></div> -->
<div class="wz">催促考试</div>
</div>
<div class="btn btn2" @click="exportData">
<!-- <div class="img2"></div> -->
<div class="wz">导出数据</div>
</div>
<div class="btn btn2" @click="showEScoreModal">
<div class="wz">录入成绩</div>
</div>
</div>
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
<div class="text" style="margin-left: 10px">已选择</div>
<div class="text2">{{ selectedRowKeys.length }}</div>
<div class="text"></div>
<div class="text3">列表选项总计</div>
<div class="text4">{{ tableDataTotal }}</div>
</div>
<div class="right" @click="clearLine">清空</div>
</div>
</div> -->
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="loadingData"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
v-if="tableDataTotal > 10"
@change="changePaginationStu"
/>
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>-->
</div>
<!-- 导出成绩抽屉 -->
<ESGrowthcore @isTrue="isTrue" v-model:eScorevisible="eScorevisible" :examinationId="titleData" :id="targetId" />
</a-drawer>
<!-- 查看答卷抽屉 -->
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1"/>
</template>
<script lang="jsx">
import { toRefs, reactive,watch } from "vue";
import { message } from "ant-design-vue";
import ESGrowthcore from "./ExportScore.vue";
import CheckAnsware from '@/components/drawers/CheckAnsware.vue'
import { queryExamManagementMessage,batchSendMessage } from "@/api/growthpath"
import {checkGrowthPer} from "@/utils/utils";
export default {
name: "GrowthExamManage",
components: {
ESGrowthcore,
CheckAnsware
},
props: {
createId: {
type: Number,
default: null,
},
permissions: {
type: String,
default: null,
},
TMvisible: {
type: Boolean,
default: false,
},
title: {
type: String,
default: "",
},
targetId: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
return {};
},
},
},
setup(props, ctx) {
const state = reactive({
titleData: {},
name: "",
open: false,
projectName: undefined,
projectNameList: [
{
id: 1,
value: "0",
label: "未开始",
},
// {
// id: 3,
// value: "1",
// label: "进行中",
// },
{
id: 2,
value: "1",
label: "已完成",
},
],
selectedRowKeys: [],
eScorevisible: false, //导入成绩抽屉
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
tabledata: [],
tablecolumns: [
{
title: "工号",
dataIndex: "studentCode",
key: "studentCode",
width: 60,
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentCode?text.record.studentCode:"-"}</span>
</div>
);
},
},
{
title: "姓名",
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "归属组织",
dataIndex: "studentOrgName",
key: "studentOrgName",
width: 160,
align: "center",
ellipsis: true,
className: "h",
// customRender: (text) => {
// return (
// <div class="racona">
// <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
// </div>
// );
// },
},
{
title: "所在岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "考试次数",
dataIndex: "testNumber",
key: "testNumber",
width: 50,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.testNumber?text.record.testNumber:"-"}</span>
</div>
);
},
},
{
title: "成绩",
dataIndex: "score",
key: "score",
width: 40,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.score === -1||text.record.score ===null||text.record.score ===''?"-":text.record.score}</span>
</div>
);
},
},
{
title: "完成时间",
dataIndex: "finishedTime",
key: "finishedTime",
width: 90,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({2:'进行中',0:'未开始',1:'已完成'}[status] || '未开始'),
},
{
title: "操作",
dataIndex: "studentKid",
key: "studentKid",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
{text.record.answerId == 'importFlag' ?
<span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;"> - </span>
:text.record.status === 1 ?
<a onClick={()=>{
state.studentKid = text.record.studentKid;
state.datasource1 = text.record;
state.CAvisible = true;
}}>查看答卷 </a> :
<span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;"> 查看答卷 </span>
}
</div>
);
},
},
],
loadingData: true,
studentKid: '',
CAvisible: false,
datasource1: ''
});
const isTrue = (item) => {
if(item){
state.loadingData = true;
getData();
}
}
watch(() => props, (bol) => {
console.log(bol,'bolllllllllll')
},{immediate:true,deep:true})
const closeDrawer = () => {
ctx.emit("update:TMvisible", false);
state.name = "";
state.projectName = undefined;
state.selectedRowKeys = [];
state.currentPage = 1;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
state.loadingData = true;
console.log(props.datasource)
getData();
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
const onSelectChange = (selectedRowKeys) => {
console.log('表格前方选中项目', selectedRowKeys)
if (selectedRowKeys.length > 2) {
return;
}
state.selectedRowKeys = selectedRowKeys;
};
//催促学员学习
const godie = () => {
//项目催促请求报文
var obj = {
'courseId': props.datasource.courseId,//任务的Id
'courseName': props.title,//任务的名称
'logo': '14',//项目或径的标识 1-项目 2-路径图 3面授课
'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld
'targetId': props.targetId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
'taskType': props.datasource.type,//催促的任务的类型
'chapterId': null,//阶段或关卡Id
examType: 1
};
batchSendMessage(obj).then(res => {
console.log(res)
message.success("催促学员成功");
}).catch(err => {
console.log(err)
})
};
//导入成绩
const showEScoreModal = () => {
state.eScorevisible = true;
};
//表头清空
const clearLine = () => {
state.selectedRowKeys = [];
};
// 获取数据
function getData() {
queryExamManagementMessage({
searchTerms: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize,
// chapterId: props.datasource.chapterId,
type: 14,
taskId: props.datasource.courseId,
targetId: props.targetId,
status: state.projectName,
}).then(res=>{
state.titleData = res.data.data
state.tabledata = res.data.data.managementDtoList.records;
state.tableDataTotal = res.data.data.managementDtoList.total;
state.loadingData = false;
})
}
// 搜索
function searchTableData() {
state.loadingData = true;
getData();
}
// 重置
function reseatTableData() {
state.loadingData = true;
state.currentPage = 1;
state.name = '';
state.projectName = undefined;
getData();
}
//分页
const changePaginationStu = (page) => {
state.loadingData = true;
state.currentPage = page;
getData();
};
{/* 导出数据 */}
function exportData() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExamGrow?type=${14}&targetId=${props.targetId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`)
}
return {
...toRefs(state),
selectProjectName,
checkGrowthPer,
closeDrawer,
isTrue,
afterVisibleChange,
onSelectChange,
godie,
clearLine,
showEScoreModal,
searchTableData,
reseatTableData,
changePaginationStu,
exportData
};
},
};
</script>
<style lang="scss" >
.drawerStyle {
.ant-drawer-content-wrapper {
max-width: 1300px;
.ant-drawer-header {
display: none !important;
}
.ant-drawer-body {
padding: 0;
}
}
}
.ProjectExamManage {
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
}
}
.main {
width: 100%;
height: 100%;
overflow: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
}
}
.btns {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 100px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/courseManage/search0.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
background-image: url(@/assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 130px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
background-image: url(@/assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #FFFFFF;
border-radius: 8px;
border: 1px solid #65A4F8;
color: #65A4F8;
margin-right:16px;
}
}
.line {
width: 100%;
height: 40px;
background-color: #e9f6fe;
display: flex;
justify-content: center;
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
.left {
height: 100%;
display: flex;
align-items: center;
.img {
width: 14px;
height: 15px;
background-image: url(@/assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right {
font-size: 14px;
font-weight: 400;
color: #387df7;
height: 100%;
display: flex;
align-items: center;
cursor: pointer;
}
}
}
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
}
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-options {
margin-bottom: 10px;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
}
.ant-table-selection-column {
padding: 0 !important;
}
th.h {
background-color: #eff4fc !important;
}
.head {
padding-left: 0px !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.studentopea1 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.studentopea2 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
padding-left: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.pa {
margin-top: 15px;
width: 100%;
display: flex;
justify-content: center;
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -1,791 +0,0 @@
<template>
<a-drawer
v-if="TMvisibleExternal"
:visible="TMvisibleExternal"
class="drawerStyle ProjectExamManage"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">考试{{ title }}</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="@/assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<!-- <div class="endtime">起止时间{{titleData.examinationStartTime}} {{titleData.examinationEndTime}}</div> -->
<div class="search">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名/工号</div>
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名/工号"
/>
</div>
<div class="namecon" style="margin-right: 50px">
<div class="name">任务状态</div>
<div class="select">
<a-select
v-model:value="projectName"
style="width: 170px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
></a-select>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTableData"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="reseatTableData">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div class="btnss" style="margin-top: 20px" v-if="checkGrowthPer(permissions)">
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<!-- <div class="img1"></div> -->
<div class="wz">催促考试</div>
</div>
<div class="btn btn2" @click="exportData">
<!-- <div class="img2"></div> -->
<div class="wz">导出数据</div>
</div>
<div class="btn btn2" @click="showEScoreModal">
<div class="wz">录入成绩</div>
</div>
</div>
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
<div class="text" style="margin-left: 10px">已选择</div>
<div class="text2">{{ selectedRowKeys.length }}</div>
<div class="text"></div>
<div class="text3">列表选项总计</div>
<div class="text4">{{ tableDataTotal }}</div>
</div>
<div class="right" @click="clearLine">清空</div>
</div>
</div> -->
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="loadingData"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
v-if="tableDataTotal > 10"
@change="changePaginationStu"
/>
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>-->
</div>
<!-- 导出成绩抽屉 -->
<!-- <ESGrowthcore v-model:eScorevisible="eScorevisible" :examinationId="titleData" :id="targetId" /> -->
<ExportAchievement
@closeDraw="closeDraw"
v-model:eScorevisibleExternalExternal="eScorevisibleExternalExternal"
:type="14"
:targetId="targetId"
:courseId="datasource.courseId"
:taskId="datasource.id"
:chapterId="datasource.chapterId" />
</a-drawer>
<!-- 查看答卷抽屉 -->
<CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1"/>
</template>
<script lang="jsx">
import { toRefs, reactive,watch } from "vue";
import { message } from "ant-design-vue";
import ESGrowthcore from "./ExportScore.vue";
import CheckAnsware from '@/components/drawers/CheckAnsware.vue'
import { queryExternalExamManageDetail,batchSendMessage } from "@/api/growthpath"
import {checkGrowthPer} from "@/utils/utils";
import ExportAchievement from "@/components/growthpath/ExportScoreExtern.vue"
export default {
name: "GrowthExamManage",
components: {
ESGrowthcore,
CheckAnsware,
ExportAchievement
},
props: {
createId: {
type: Number,
default: null,
},
permissions: {
type: String,
default: null,
},
TMvisibleExternal: {
type: Boolean,
default: false,
},
title: {
type: String,
default: "",
},
targetId: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
return {};
},
},
},
setup(props, ctx) {
const state = reactive({
titleData: {},
name: "",
open: false,
projectName: undefined,
projectNameList: [
{
id: 1,
value: "0",
label: "未开始",
},
{
id: 2,
value: "2",
label: "进行中",
},
{
id: 3,
value: "1",
label: "已完成",
},
],
selectedRowKeys: [],
eScorevisibleExternalExternal: false, //导入成绩抽屉
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
tabledata: [],
tablecolumns: [
{
title: "工号",
dataIndex: "studentCode",
key: "studentCode",
width: 60,
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentCode?text.record.studentCode:"-"}</span>
</div>
);
},
},
{
title: "姓名",
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "center",
ellipsis: true,
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "归属组织",
dataIndex: "studentOrgName",
key: "studentOrgName",
width: 160,
align: "center",
ellipsis: true,
className: "h",
// customRender: (text) => {
// return (
// <div class="racona">
// <span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
// </div>
// );
// },
},
{
title: "所在岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "考试次数",
dataIndex: "testNum",
key: "testNum",
width: 50,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.testNum?text.record.testNum:"-"}</span>
</div>
);
},
},
{
title: "成绩",
dataIndex: "score",
key: "score",
width: 40,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.score == -1 || text.record.score ==null||text.record.score ==''?"-":text.record.score}</span>
</div>
);
},
},
{
title: "完成时间",
dataIndex: "finishedTime",
key: "finishedTime",
width: 90,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: ({record:{status}}) => ({2:'进行中',0:'未开始',1:'已完成'}[status] || '未开始'),
},
// {
// title: "操作",
// dataIndex: "studentKid",
// key: "studentKid",
// width: 60,
// align: "center",
// ellipsis: true,
// className: "h",
// customRender: (text) => {
// return (
// <div class="racona">
// {text.record.status === 9 ?
// <a onClick={()=>{
// state.studentKid = text.record.studentKid;
// state.datasource1 = text.record;
// state.CAvisible = true;
// }}>查看答卷 </a> :
// <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;"> 查看答卷 </span>
// }
// </div>
// );
// },
// },
],
loadingData: true,
studentKid: '',
CAvisible: false,
datasource1: ''
});
watch(() => props, (bol) => {
console.log(bol,'bolllllllllll')
},{immediate:true,deep:true})
const closeDrawer = () => {
ctx.emit("update:TMvisibleExternal", false);
state.name = "";
state.projectName = undefined;
state.selectedRowKeys = [];
state.currentPage = 1;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
state.loadingData = true;
getData();
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
const closeDraw = () => {
searchTableData()
}
const onSelectChange = (selectedRowKeys) => {
console.log('表格前方选中项目', selectedRowKeys)
if (selectedRowKeys.length > 2) {
return;
}
state.selectedRowKeys = selectedRowKeys;
};
//催促学员学习
const godie = () => {
//项目催促请求报文
var obj = {
'courseId': props.datasource.courseId,//任务的Id
'courseName': props.title,//任务的名称
'logo': '14',//项目或径的标识 1-项目 2-路径图 3面授课
'routerTaskId': props.datasource.id,//任务的routerTaskld或projectTaskld
'targetId': props.targetId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话
'taskType': props.datasource.type,//催促的任务的类型
// 'chapterId': null,//阶段或关卡Id
examType: 2
};
batchSendMessage(obj).then(res => {
console.log(res)
message.success("催促学员成功");
}).catch(err => {
console.log(err)
})
};
//导入成绩
const showEScoreModal = () => {
state.eScorevisibleExternalExternal = true;
};
//表头清空
const clearLine = () => {
state.selectedRowKeys = [];
};
// 获取数据
function getData() {
queryExternalExamManageDetail({
searchTerms: state.name,
pageNo: state.currentPage,
pageSize: state.pageSize,
// chapterId: props.datasource.chapterId,
type: 14,
taskId: props.datasource.id,
targetId: props.targetId,
status: state.projectName,
courseId: props.datasource.courseId,
}).then(res=>{
state.titleData = res.data.data
state.tabledata = res.data.data.records;
state.tableDataTotal = res.data.data.total;
state.loadingData = false;
})
}
// 搜索
function searchTableData() {
state.loadingData = true;
getData();
}
// 重置
function reseatTableData() {
state.loadingData = true;
state.currentPage = 1;
state.name = '';
state.projectName = undefined;
getData();
}
//分页
const changePaginationStu = (page) => {
state.loadingData = true;
state.currentPage = page;
getData();
};
{/* 导出数据 */}
function exportData() {
window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExamOfGrow?type=${14}&targetId=${props.targetId}&taskId=${props.datasource.id}&courseId=${props.datasource.courseId}`)
}
return {
...toRefs(state),
selectProjectName,
checkGrowthPer,
closeDrawer,
afterVisibleChange,
onSelectChange,
closeDraw,
godie,
clearLine,
showEScoreModal,
searchTableData,
reseatTableData,
changePaginationStu,
exportData
};
},
};
</script>
<style lang="scss" >
.drawerStyle {
.ant-drawer-content-wrapper {
max-width: 1300px;
.ant-drawer-header {
display: none !important;
}
.ant-drawer-body {
padding: 0;
}
}
}
.ProjectExamManage {
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
}
}
.main {
width: 100%;
height: 100%;
overflow: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
}
}
.btns {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 100px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/courseManage/search0.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
background-image: url(@/assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 130px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
background-image: url(@/assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #FFFFFF;
border-radius: 8px;
border: 1px solid #65A4F8;
color: #65A4F8;
margin-right:16px;
}
}
.line {
width: 100%;
height: 40px;
background-color: #e9f6fe;
display: flex;
justify-content: center;
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
.left {
height: 100%;
display: flex;
align-items: center;
.img {
width: 14px;
height: 15px;
background-image: url(@/assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right {
font-size: 14px;
font-weight: 400;
color: #387df7;
height: 100%;
display: flex;
align-items: center;
cursor: pointer;
}
}
}
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
}
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-options {
margin-bottom: 10px;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
}
.ant-table-selection-column {
padding: 0 !important;
}
th.h {
background-color: #eff4fc !important;
}
.head {
padding-left: 0px !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.studentopea1 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.studentopea2 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
padding-left: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.pa {
margin-top: 15px;
width: 100%;
display: flex;
justify-content: center;
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -198,12 +198,13 @@ async function confirm() {
} else {
message.success("添加成功");
}
closeDrawer();
emit("refresh");
} else {
message.error(res.msg);
}
});
closeDrawer();
}
let validate = null;
function openDrawer(row) {

View File

@@ -1,985 +0,0 @@
<template>
<a-drawer
v-if="HomeworkModelVisible"
:visible="HomeworkModelVisible"
class="drawerStyle ProjectHomeWorkManage"
placement="right"
width="80%"
@after-visible-change="afterVisibleChange"
:zIndex="100"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">作业{{ datasource.taskName }}</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="@/assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div>
<div class="main">
<div class="endtime">
起止时间{{ datasource.info.submitStartTime }}
{{ datasource.info.submitEndTime }}
</div>
<div class="search">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名</div>
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名"
/>
</div>
<div class="namecon" style="margin-right: 50px">
<div class="name">任务状态</div>
<div class="select">
<a-select
v-model:value="projectName"
style="width: 200px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
></a-select>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="resetTaskList">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div
class="btnss"
style="margin-top: 20px"
v-if="checkPer(permissions, createId)"
>
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
<div class="btn btn2" @click="exportHomeWorkShow">
<div class="wz">导出作业</div>
</div>
<div class="btn btn2">
<div class="wz" @click="showEntryScore">导入成绩</div>
</div>
</div>
<!-- <div class="line">
<div class="inline">
<div class="left">
<div class="img"></div>
<div class="text" style="margin-left: 10px">已选择</div>
<div class="text2">{{ selectedRowKeys.length }}</div>
<div class="text"></div>
<div class="text3">列表选项总计</div>
<div class="text4">{{ tableDataTotal }}</div>
</div>
<div class="right" @click="clearLine">清空</div>
</div>
</div> -->
<div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:scroll="{ x: 1300 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
v-if="tableDataTotal > 10"
@change="changePaginationStu"
/>
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>-->
</div>
</a-drawer>
<!-- 录入成绩抽屉 -->
<EScore
v-model:eScorevisible="Evisible"
:type="2"
:id="datasource?.id"
:pid="datasource?.routerId"
v-model:searchTaskList="searchTaskList"
/>
<!-- 查看作业抽屉 -->
<CKWork
v-model:CWvisible="CWvisible"
:workId="datasource?.courseId"
v-model:stuId="stuId"
/>
<!-- 查看答卷抽屉 -->
<CQue v-model:CQvisible="CQvisible" />
<!-- 导出作业提示框 -->
<ExportHomeWork
v-model:exportHomeWorkV="exportHomeWorkV"
:downloadUrl="downloadUrl"
/>
</template>
<script lang="jsx">
import { toRefs, reactive } from "vue";
import { message } from "ant-design-vue";
// import CKWork from "../CheckWork.vue";
// import CQue from "../CheckQue.vue";
// import EScore from "../ExportScore.vue";
import * as api from "@/api/index1";
// import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
import { checkPer } from "@/utils/utils";
import { batchSendMessage } from "@/api/index1";
import { getStudentTaskPage } from "@/api/growthpath";
export default {
name: "GrowthHomeworkManage",
components: {
// CKWork,
// CQue,
// EScore,
// ExportHomeWork,
},
props: {
createId: {
type: Number,
default: null,
},
permissions: {
type: String,
default: null,
},
HomeworkModelVisible: {
type: Boolean,
default: false,
},
projectTaskId: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
return {};
},
},
},
setup(props, ctx) {
const state = reactive({
Evisible: false, //录入成绩抽屉
CWvisible: false, //查看作业抽屉
CQvisible: false, //查看答卷抽屉
ASOvervisible: false, //批量标注完成弹窗
name: "",
open: false,
projectName: undefined,
projectNameList: [
{
id: 1,
value: "0",
label: "未开始",
},
// {
// id: 2,
// value: "2",
// label: "进行中",
//},
{
id: 3,
value: "1",
label: "已完成",
},
],
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: -1,
tabledata: [
// {
// workNum: "123",
// userName: "li",
// deptName: "开发",
// jobName: "前端开发",
// score: 89,
// group: "-",
// comptime: "2022-07-22 14:00:30",
// status: "已完成",
// },
],
tablecolumns: [
{
title: "工号",
dataIndex: "username",
key: "username",
width: 120,
align: "left",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.username ? text.record.username : "-"}
</span>
</div>
);
},
},
{
title: "姓名",
dataIndex: "username",
key: "username",
width: 50,
align: "center",
className: "h",
ellipsis: true,
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.username ? text.record.username : "-"}
</span>
</div>
);
},
},
{
title: "所在部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: 60,
align: "center",
className: "h",
ellipsis: true,
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.studentDepartName
? text.record.studentDepartName
: "-"}
</span>
</div>
);
},
},
{
title: "所在岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.studentJobName
? text.record.studentJobName
: "-"}
</span>
</div>
);
},
},
{
title: "学员关卡",
dataIndex: "chapterName",
key: "chapterName",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.chapterName ? text.record.chapterName : "-"}
</span>
</div>
);
},
},
{
title: "成绩",
dataIndex: "workScore",
key: "workScore",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.workScore || text.record.workScore == 0
? text.record.workScore < 0
? "-"
: text.record.workScore
: "-"}
</span>
</div>
);
},
},
{
title: "完成时间",
dataIndex: "lastStudyTime",
key: "lastStudyTime",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.lastStudyTime ? text.record.lastStudyTime : "-"}
</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
ellipsis: true,
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span>
{text.record.finishStatus == 0 ||
text.record.finishStatus == null
? "未开始"
: text.record.finishStatus == 1
? "已完成"
: text.record.finishStatus == 2
? "进行中"
: "-"}
</span>
</div>
);
},
},
{
title: "操作",
dataIndex: "operation",
key: "operation",
width: 100,
align: "center",
ellipsis: true,
className: "h",
},
],
exportHomeWorkV: false,
downloadUrl: null,
stuId: null,
});
//面授直播管理列表操作
const ListOpera = () => {
let arr = state.tabledata;
arr.map((value) => {
if (value.finishStatus == 1) {
value.operation = (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<a-button
type="link"
class="operation"
style="cursor:pointer;margin-right:10px;color: rgba(56, 125, 247, 1);"
onClick={() => {
state.stuId = value.studentId;
state.CWvisible = true;
}}
>
查看
</a-button>
</div>
);
} else {
value.operation = (
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<a-button
disabled
class="operation"
style="margin-right:10px;color:rgba(56, 125, 247, 0.5)"
>
查看
</a-button>
</div>
);
}
});
};
const closeDrawer = () => {
ctx.emit("update:HomeworkModelVisible", false);
state.name = "";
state.projectName = undefined;
state.selectedRowKeys = [];
state.currentPage = 1;
state.tableDataTotal = -1;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
getStudent();
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
const onSelectChange = (selectedRowKeys) => {
// if (selectedRowKeys.length > 2) {
// return;
// }
state.selectedRowKeys = selectedRowKeys;
};
const allStuOver = () => {
state.ASOvervisible = true;
};
const showEntryScore = () => {
state.Evisible = true;
};
//催促学员学习
const godie = () => {
//考试催促请求报文
var obj = {
courseId: props.datasource.courseId, //任务的Id
courseName: props.datasource.taskName, //任务的名称
logo: "2", //项目或径的标识 1-项目 2-路径图 3面授课
routerTaskId: props.datasource.id, //任务的routerTaskld或projectTaskld
targetId: props.datasource.routerId, //路径图的就是routerId,项目的是projectId;根据这张图来看的话
taskType: props.datasource.type, //催促的任务的类型
chapterId: props.datasource.chapterId, //阶段或关卡Id
};
batchSendMessage(obj)
.then((res) => {
console.log(res);
message.success("催促" + props.title + "成功");
})
.catch((err) => {
console.log(err);
});
};
//表头清空
const clearLine = () => {
state.selectedRowKeys = [];
};
//获取学员
const getStudent = () => {
console.log(props.datasource);
{
/* debugger */
}
console.log("我是传递的查询参数", props.datasource.courseId, {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.id,
taskType: props.datasource.type,
status: state.projectName,
username: state.name,
});
getStudentTaskPage({
pageNo: state.currentPage,
pageSize: state.pageSize,
taskId: props.datasource.id,
taskType: props.datasource.taskType,
status: state.projectName,
username: state.name,
})
.then((res) => {
{
/* debugger */
}
console.log("获取作业管理学员", res);
if (res.data.code == 200) {
let newData = [];
for (let i = 0; i < res.data.data.records.length; i++) {
res.data.data.records[i].key = res.data.data.records[i].id;
newData.push(res.data.data.records[i]);
}
state.tabledata = newData;
ListOpera();
state.tableDataTotal = res.data.data.total;
}
})
.catch((err) => {
console.log(err);
state.tabledata = [];
});
};
//搜索学员
const searchTaskList = () => {
state.currentPage = 1;
state.tableDataTotal = -1;
getStudent();
};
// 重置按钮
function resetTaskList() {
state.currentPage = 1;
state.name = "";
state.projectName = undefined;
state.tableDataTotal = -1;
getStudent();
}
//分页
const changePaginationStu = (page) => {
state.currentPage = page;
state.tableDataTotal = -1;
getStudent();
};
// 导出数据
function exportTaskStu() {
console.log("props.datasource", props.datasource);
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskType=${4}&taskId=${
props.datasource.id
}`
);
// 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);
// });
}
//显示导出作业弹窗
const exportHomeWorkShow = () => {
// state.exportHomeWorkV = true;
// exportHomeWork();
let obj = {
currentStageId: props.datasource.chapterId,
pid: props.datasource.routerId,
taskId: props.datasource.id,
taskType: props.datasource.type,
type: 2,
};
api
.exportHomeWork(obj)
.then((res) => {
console.log("导出作业", res.data.data);
if (res.data.code === 200) {
// debugger
// message.destroy();
// message.success("导出作业成功");
state.exportHomeWorkV = true;
state.downloadUrl = res.data.data;
}
})
.catch((err) => {
message.destroy();
message.error("导出作业失败");
console.log("导出作业失败", err);
});
};
//导出作业
function exportHomeWork() {
console.log("props.datasource", props.datasource);
window.open(
`${
process.env.VUE_APP_BASE_API
}/admin/student/exportHomeWork?currentStageId=${
props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId
}&taskType=${props.datasource.type}`
);
}
return {
...toRefs(state),
selectProjectName,
closeDrawer,
afterVisibleChange,
onSelectChange,
allStuOver,
showEntryScore,
godie,
checkPer,
clearLine,
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu,
exportHomeWork,
exportHomeWorkShow,
getStudent,
};
},
};
</script>
<style lang="scss">
.ProjectHomeWorkManage {
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
}
}
.main {
width: 100%;
height: 100%;
overflow: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
}
}
.btns {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 100px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/courseManage/search0.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
background-image: url(@/assets/images/courseManage/reset0.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #4ea6ff;
color: #fff;
border: 1px solid #4ea6ff;
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
.btn {
cursor: pointer;
width: 130px;
height: 40px;
border-radius: 8px;
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
background-image: url(@/assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
background-image: url(@/assets/images/coursewareManage/export1.png);
background-size: 100% 100%;
margin-right: 7px;
}
}
.btn1 {
background: #4ea6ff;
color: #ffffff;
}
.btn2 {
background: #4ea6ff;
margin-right: 20px;
color: #fff;
border: 1px solid #4ea6ff;
}
}
.line {
width: 100%;
height: 40px;
background-color: #e9f6fe;
display: flex;
justify-content: center;
align-items: center;
margin-top: 20px;
border: 1px solid #c3e6fc;
.inline {
width: 95%;
height: 100%;
display: flex;
justify-content: space-between;
.left {
height: 100%;
display: flex;
align-items: center;
.img {
width: 14px;
height: 15px;
background-image: url(@/assets/images/leveladd/gan.png);
background-size: 100% 100%;
}
.text {
color: #999ba3;
}
.text2 {
color: #4ea6ff;
margin-left: 5px;
margin-right: 5px;
}
.text3 {
color: #999ba3;
margin-left: 20px;
}
}
.right {
font-size: 14px;
font-weight: 400;
color: #387df7;
height: 100%;
display: flex;
align-items: center;
cursor: pointer;
}
}
}
.tableBox {
.ant-table-selection-column {
padding: 0px !important;
}
.ant-pagination-item,
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-options {
margin-bottom: 10px;
}
.ant-table-thead > tr > th {
background-color: rgba(239, 244, 252, 1) !important;
}
.ant-table-selection-column {
padding: 0 !important;
}
th.h {
background-color: #eff4fc !important;
}
.head {
padding-left: 0px !important;
}
.ant-table-tbody
> tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
> td {
background: #f6f9fd;
}
.studentopea1 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.studentopea2 {
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 22px;
padding-right: 8px;
padding-left: 8px;
border-right: 1px solid #e9e9e9;
cursor: pointer;
}
.pa {
margin-top: 15px;
width: 100%;
display: flex;
justify-content: center;
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
}
</style>

View File

@@ -356,7 +356,7 @@ const props = defineProps({
});
const visible = ref(false);
const headers = { token: getCookieForName("token") };
const formData = useResetRef({
const formData = ref({
info: {
liveName: "",
liveLink: "",
@@ -436,7 +436,7 @@ const rulesRef = ref({
},
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
const { resetFields } = Form.useForm(formData.value.info, rulesRef);
const durationText = computed(() =>
dateTime.value?.length
@@ -451,8 +451,26 @@ const closeDrawer = () => {
imageUrl.value = "";
visible.value = false;
dateTime.value = [];
formData.reset();
formData.value.info = {};
formData.value = {
info: {
liveName: "",
liveLink: "",
liveStartTime: "",
liveEndTime: "",
liveNotice: "",
liveDuration: "",
liveTeacherId: "",
liveTeacherName: "",
liveCover: "",
beforeSignIn: "",
afterSignIn: "",
isEvaluate: false,
assessmentId: "",
assessmentName: "",
livePlayback: "",
liveExplain: "",
},
};
resetFields();
}
};
@@ -495,11 +513,11 @@ async function confirm() {
} else {
message.success("添加成功");
}
closeDrawer();
emit("refresh");
} else {
message.error(res.msg);
}
closeDrawer();
});
}
@@ -507,7 +525,7 @@ function openDrawer(row) {
row && (formData.value = row);
row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
row && (imageUrl.value = row.info.liveCover);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -18,125 +18,129 @@
@click="closeDrawer"
/>
</div>
<div class="main">
<!-- <div
v-if="datasource.taskType !== 6 && datasource.taskType !== 9"
class="endtime"
> -->
<!--
起止时间 -->
<!-- </div> -->
<!-- <div class="endtime">
起止时间{{ titleData.beginTime }} {{ titleData.endTime }}
</div> -->
<div class="search" style="justify-content: flex-start">
<div class="sealeft">
<div class="namecon" style="margin-right: 16px">
<PostSelectNew width="200px" v-model:value="stdPosition">
</PostSelectNew>
<template v-if="step == 1">
<div class="main">
<template v-if="datasource.taskType == 4">
<div class="endtime">
起止时间{{ datasource.info.submitStartTime }}
{{ datasource.info.submitEndTime }}
</div>
<div class="namecon" style="margin-right: 16px">
<OfficeSelect
v-model:value="qualsLevelCode"
:searchData="stdPosition"
width="200px"
/>
</div>
<div class="namecon" style="margin-right: 16px">
<div class="select">
<a-select
v-model:value="completionStatus"
style="width: 200px"
placeholder="任务状态"
:options="projectNameList"
@change="selectCompletionStatus"
allowClear
></a-select>
</template>
<div class="search" style="justify-content: flex-start">
<div class="sealeft">
<div class="namecon" style="margin-right: 16px">
<PostSelectNew width="200px" v-model:value="stdPosition">
</PostSelectNew>
</div>
<div class="namecon" style="margin-right: 16px">
<OfficeSelect
v-model:value="qualsLevelCode"
:searchData="stdPosition"
width="200px"
/>
</div>
<div class="namecon" style="margin-right: 16px">
<div class="select">
<a-select
v-model:value="completionStatus"
style="width: 200px"
placeholder="任务状态"
:options="projectNameList"
@change="selectCompletionStatus"
allowClear
></a-select>
</div>
</div>
<div class="namecon" style="margin-right: 16px">
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名/工号"
/>
</div>
</div>
<div class="namecon" style="margin-right: 16px">
<a-input
v-model:value="name"
style="width: 200px; height: 40px; border-radius: 8px"
placeholder="请输入姓名/工号"
/>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="resetTaskList">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div class="btns">
<div
class="btn btn1"
style="margin-right: 20px"
@click="searchTaskList"
>
<div class="img1"></div>
<div class="wz">搜索</div>
</div>
<div class="btn btn2" @click="resetTaskList">
<div class="img2"></div>
<div class="wz">重置</div>
</div>
</div>
</div>
<div
class="btnss"
style="margin-top: 20px"
>
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
<div class="btnss" style="margin-top: 20px">
<template v-if="tableData.length">
<div class="btn btn1" @click="godie" style="margin-right: 20px">
<div class="img1"></div>
<div class="wz">催促学习</div>
</div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
<!-- <template v-if="datasource.taskType == 4">
<div
class="btn btn2"
@click="exportHomeWorkShow"
style="margin-left: 20px"
>
<div class="wz">导出作业</div>
</div>
<div class="btn btn2" style="margin-left: 20px">
<div class="wz" @click="showEntryScore">导入成绩</div>
</div>
</template> -->
</div>
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotalLoading"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
v-if="tableDataTotal > 10"
/>
<template v-if="datasource.taskType == 4">
<div
class="btn btn2"
@click="exportHomeWorkShow"
style="margin-left: 20px"
>
<div class="wz">导出作业</div>
</div>
<div class="btn btn2" style="margin-left: 20px">
<div class="wz" @click="showEntryScore">导入成绩</div>
</div>
</template>
</template>
</div>
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tableDataFunc()"
:data-source="tableData"
:loading="tableDataTotalLoading"
:scroll="{ x: 900 }"
:pagination="false"
/>
<div class="tableBox">
<div class="pa">
<a-pagination
:showSizeChanger="false"
showQuickJumper="true"
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal"
class="pagination"
@change="changePaginationStu"
v-if="tableDataTotal > 10"
/>
</div>
</div>
</div>
</div>
</div>
<!--
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>-->
</template>
<template v-if="step == 2">
<EScore
:type="2"
@close="closeImport"
:id="datasource?.id"
:pid="datasource?.growthId"
:datesource="datasource"
v-model:searchTaskList="searchTaskList"
/>
</template>
</div>
</a-drawer>
<!-- <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
:basicdata="datasource.info" /> -->
</template>
@@ -145,12 +149,15 @@
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import ViewAssess from "../ViewAssess";
import { checkGrowthPer } from "@/utils/utils";
import EScore from "@/components/growthpath/GrowthScore.vue";
import {
getStudentTaskPage,
batchSendMessage,
exportStudentTaskPage,
} from "@/api/growthpath";
import * as api from "@/api/index1";
import { TASK_TYPE } from "@/utils/constGrown";
import PostSelectNew from "@/components/growthpath/PostSelect";
import OfficeSelect from "@/components/growthpath/OfficeSelect";
@@ -160,6 +167,7 @@ export default {
components: {
OfficeSelect,
PostSelectNew,
EScore,
},
props: {
createId: {
@@ -199,6 +207,8 @@ export default {
visible: props.Tvisible,
name: "",
pageNum: 1,
step: 1, // 步骤数
Evisible: false, //录入成绩抽屉
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
@@ -228,6 +238,12 @@ export default {
evalDataSource: "",
Assessvisible: false,
});
// 关闭导入成绩
const closeImport = () => {
state.step = 1;
state.tableDataTotalLoading = true;
getData();
};
const tableDataFunc = () => {
const columns = [
{
@@ -427,13 +443,19 @@ export default {
};
const closeDrawer = () => {
ctx.emit("update:Tvisible", false);
state.currentPage = 1;
state.name = "";
state.completionStatus = undefined;
state.tableData = [];
state.stdPosition = null;
state.qualsLevelCode = null;
if (state.step == 1) {
ctx.emit("update:Tvisible", false);
state.currentPage = 1;
state.name = "";
state.completionStatus = undefined;
state.tableData = [];
state.stdPosition = null;
state.qualsLevelCode = null;
} else {
state.step = 1;
state.tableDataTotalLoading = true;
getData();
}
};
const afterVisibleChange = (bol) => {
if (bol == true) {
@@ -447,9 +469,9 @@ export default {
};
//催促
const godie = () => {
if(!state.tableData.length){
if (!state.tableData.length) {
message.warning("当前学习任务没有可催促的学员");
return
return;
}
var obj = {
courseId: props.datasource.taskId
@@ -472,7 +494,10 @@ export default {
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
// 导入成绩
const showEntryScore = () => {
state.step = 2;
};
// 获取数据
function getData() {
getStudentTaskPage({
@@ -556,32 +581,15 @@ export default {
//显示导出作业弹窗
const exportHomeWorkShow = () => {
// state.exportHomeWorkV = true;
// exportHomeWork();
let obj = {
currentStageId: props.datasource.chapterId,
pid: props.datasource.routerId,
let params = {
taskId: props.datasource.id,
taskType: props.datasource.type,
type: 2,
};
api
.exportHomeWork(obj)
.then((res) => {
console.log("导出作业", res.data.data);
if (res.data.code === 200) {
// debugger
// message.destroy();
// message.success("导出作业成功");
state.exportHomeWorkV = true;
state.downloadUrl = res.data.data;
}
})
.catch((err) => {
message.destroy();
message.error("导出作业失败");
console.log("导出作业失败", err);
});
window.open(
buildUrl(
`${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH}/professional/task/workExport`,
params
)
);
};
return {
...toRefs(state),
@@ -592,9 +600,11 @@ export default {
afterVisibleChange,
tableDataFunc,
godie,
closeImport,
onMounted,
onUnmounted,
onChange,
showEntryScore,
searchTaskList,
resetTaskList,
changePaginationStu,

View File

@@ -96,7 +96,7 @@ const props = defineProps({
growId: String,
});
const visible = ref(false);
const formData = useResetRef({
const formData = ref({
info: {
linkName: "",
linkAddress: "",
@@ -121,13 +121,18 @@ const rulesRef = ref({
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
const closeDrawer = () => {
visible.value = false;
dateTime.value = [];
formData.reset();
formData.value.info = {};
formData.value = {
info: {
linkName: "",
linkAddress: "",
linkDescription: "",
},
};
};
async function confirm() {
@@ -160,7 +165,7 @@ async function confirm() {
function openDrawer(row) {
row && (formData.value = row);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -0,0 +1,647 @@
<template>
<div class="ExportScore">
<div class="minatitl">
<div class="up1">请下载</div>
<div class="up2" @click="downTemplate" style="cursor: pointer">模板</div>
<div class="up1">按要求填写数据并导入</div>
</div>
<div class="upload">
<div class="text">上传</div>
<div class="right">
<div style="height: 176px; margin-bottom: 20px">
<a-upload-dragger
v-model:fileList="fileList"
:action="importHomeWork"
name="uploadFile"
:multiple="true"
:headers="headers"
@change="handleChange"
:showUploadList="false"
:data="{
type: 4,
// taskId: Number(id),
workId: datesource.info ? datesource.info.id : id,
// targetId: Number(id),
}"
>
<p class="ant-upload-drag-icon">
<inbox-outlined></inbox-outlined>
</p>
<p class="ant-upload-text">点击或将文件拖拽到此处上传</p>
<p class="ant-upload-hint">支持扩展名.xls/.xlsx</p>
</a-upload-dragger>
</div>
<!-- <div class="load">
<div class="cloud"></div>
<div class="tip">点击或将文件拖拽到此处上传</div>
<div class="tipz">支持扩展名.xls/.xlsx</div>
</div> -->
<div class="loadstate">
<div
class="loadborder"
v-if="uploadpercent < 100 && uploadpercent !== -1"
>
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="stateloading">正在上传</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogloading"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">55%</div> -->
<!-- <div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div> -->
</div>
</div>
</div>
<div class="loadborder" v-if="uploadErr">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="statedefeat">上传失败</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogdefeat"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">55%</div> -->
<div style="color: #387df7; margin-left: 20px; cursor: pointer">
下载失败数据
</div>
<!-- <div class="cancel" style="margin-left: 20px">暂停</div>
<div class="cancel" style="margin-left: 15px">取消</div> -->
</div>
<div class="defeat" style="display: flex; align-items: center">
<div style="color: #ff7474">
{{ succNum }}条数据导入成功{{ errNum }}条数据导入失败
</div>
</div>
</div>
</div>
<!-- v-if="uploadpercent === 100" -->
<div class="loadborder" v-if="uploadpercent === 100">
<div class="content">
<div class="img"></div>
<div class="timebox">
<div class="timetop">
<div class="tit">{{ fileName }}</div>
<div class="statesucce">上传成功</div>
</div>
<a-progress :percent="uploadpercent" />
<!-- <div class="prog">
<div class="inprogsucce"></div>
</div> -->
</div>
<div class="curloading">
<!-- <div class="cur">100%</div> -->
<div
class="cancel"
style="margin-left: 20px; cursor: pointer"
@click="removeUpload"
>
删除
</div>
</div>
</div>
<div v-if="errNum">
<div class="downloadErr" @click="downloadEeeorData">
下载失败数据
</div>
</div>
</div>
<div
v-if="uploadpercent === 100"
class="defeat"
style="
display: flex;
align-items: center;
width: 500px;
height: 40px;
"
:style="{
background: errNum
? 'rgba(255, 116, 116, 0.1)'
: 'rgba(53, 174, 105, 0.1)',
border: errNum ? '1px solid #ff7474' : '1px solid #35AE69',
}"
>
<img
style="width: 14px; height: 14px; margin-left: 16px"
:src="
errNum
? require('../../assets/images/err.png')
: require('../../assets/images/success.png')
"
/>
<div
style="margin-left: 8px"
:style="{ color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)' }"
>
{{ succNum }}条数据导入成功{{ errNum }}条数据导入失败
</div>
</div>
</div>
</div>
</div>
</div>
<div class="btnn">
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
<!-- 加载动画 -->
<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
<a-spin :spinning="addLoading" tip="" />
</div>
</template>
<script>
import { reactive, toRefs } from "vue";
import { message } from "ant-design-vue";
import * as api from "../../api/index1";
import { BATCH_IMPORT_SCORE } from "@/api/config";
import { getCookieForName } from "@/api/method";
export default {
name: "EScore",
props: {
eScorevisible: {
type: Boolean,
default: false,
},
datesource: {
type: Object,
default: function () {
return {};
},
},
//type=3:面授课
type: {
type: String,
default: null,
},
id: {
type: Number,
default: null,
},
pid: {
type: Number,
default: null,
},
searchTaskList: {
type: Function,
default: null,
},
},
setup(props, ctx) {
// debugger
const state = reactive({
fileType: ["xls", "xlsx"],
importHomeWork:
process.env.VUE_APP_BASE_API + "/admin/student/importHomeWork",
uploadpercent: -1,
uploadErr: false, //上传失败
addLoading: false,
fileList: [],
succNum: 0, //成功数据数
errNum: 0, //失败数据数
downloadErrUrl: null, //下载失败数据
fileName: "",
});
const headers = { token: getCookieForName("token") };
const closeDrawer = () => {
ctx.emit("update:eScorevisible", false);
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
ctx.emit("close");
};
const afterVisibleChange = (bool) => {
console.log("state", bool);
console.log(props.datesource);
};
//上传文件
const handleChange = (info) => {
if (info) {
var FileExt = info.file.name.replace(/.+\./, "");
if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) {
state.fileList = [];
state.uploadpercent = -1;
message.destroy();
message.error("请上传正确的文件格式");
return;
}
}
state.addLoading = true;
state.uploadpercent = parseInt(info.file.percent);
console.log("我是文件上传的进度---------->", info.file.percent);
const status = info.file.status;
if (status !== "uploading") {
// console.log(info.file, info.fileList);
}
if (status === "done") {
state.fileName = info.file.name;
let i = 0;
let timeouts = setTimeout(() => {
clearInterval(timer);
state.addLoading = false;
message.destroy();
message.error(`文件导入超时`);
}, 30000);
let timer = setInterval(() => {
let uid = info.file.response.data;
api
.getImportStatus(uid)
.then((res) => {
console.log("查询导入状态", res);
if (res.data.code === 200) {
if (res.data.data.status !== "START") {
if (res.data.data.status === "SUCCESS") {
state.addLoading = false;
state.fileList = [];
state.uploadpercent = -1;
message.destroy();
message.error(`当前开课暂无作业,无法导入成绩`);
clearInterval(timer);
clearTimeout(timeouts);
return;
}
i++;
if (i === 1) {
message.destroy();
message.success(`${info.file.name}上传成功`);
state.addLoading = false;
props.searchTaskList && props.searchTaskList();
}
state.succNum = res.data.data.successNum;
state.errNum = res.data.data.failedNum;
state.downloadErrUrl = res.data.data.url;
console.log("props.getStudent", props.getStudent);
clearInterval(timer);
clearTimeout(timeouts);
}
} else {
state.addLoading = false;
message.destroy();
clearTimeout(timeouts);
}
})
.catch((err) => {
state.addLoading = false;
clearInterval(timer);
clearTimeout(timeouts);
console.log("查询导入状态失败", err);
});
}, 500);
} else if (status === "error") {
state.uploadErr = true;
message.error(`${info.file.name}上传失败`);
}
};
const beforeUpload = (file) => {
return new Promise((resolve, reject) => {
// const isJpgOrPng =
// file.name.indexOf(".xlsx") !== "-1" ||
// file.name.indexOf(".xls") !== "-1";
// if (!isJpgOrPng) {
// message.destroy();
// message.error("仅支持xls、xlsx格式!");
// return reject(false);
// }
const formData = new FormData();
formData.append("uploadFile", file);
// let progress = { percent: 1 };
// const intervalId = setInterval(() => {
// if (progress.percent < 100) {
// progress.percent++;
// file.onProgress(progress);
// } else {
// clearInterval(intervalId);
// }
// }, 100);
api.batchImportScore(formData).then((res) => {
if (res.data.code === 200) {
console.log("上传成功", res);
return reject(true);
}
});
return reject(false);
});
};
const handleUpload = (e) => {
console.log("handleUpload", e);
};
//删除
const removeUpload = () => {
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
state.succNum = 0;
state.errNum = 0;
state.downloadErrUrl = null;
state.addLoading = false;
};
// 下载失败数据
const downloadEeeorData = () => {
if (state.downloadErrUrl !== "") {
window.open(process.env.VUE_APP_FILE_PATH + state.downloadErrUrl);
}
};
function buildUrl(url, params) {
const searchParams = new URLSearchParams();
Object.keys(params).forEach((key) => {
searchParams.append(key, params[key]);
});
return `${url}?${searchParams.toString()}`;
}
function downTemplate() {
window.open(
`${process.env.VUE_APP_BOE_API_URL}/growth/professional/task/downloadHomeWorkTemplate.do?taskId=${props.id}`
);
}
return {
...toRefs(state),
afterVisibleChange,
closeDrawer,
handleChange,
downTemplate,
headers,
buildUrl,
BATCH_IMPORT_SCORE,
beforeUpload,
handleUpload,
removeUpload,
downloadEeeorData,
};
},
};
</script>
<style lang="scss">
.ExportScore {
overflow-y: auto;
.minatitl {
display: flex;
.up1 {
font-size: 16px;
font-weight: 400;
color: #333333;
}
.up2 {
font-size: 16px;
font-weight: 400;
color: #4ea6ff;
margin-left: 4px;
}
}
.upload {
margin-top: 32px;
display: flex;
.text {
font-size: 14px;
font-weight: 400;
color: #333333;
}
.right {
margin-left: 6px;
.load {
width: 500px;
height: 176px;
background: #f5f9fd;
border-radius: 4px;
// opacity: 0.3;
border: 1px dashed #caddfd;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 20px;
.cloud {
margin-top: 52px;
width: 28px;
height: 28px;
background-image: url(../../assets/images/basicinfo/cloud.png);
}
.tip {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
margin-top: 15px;
cursor: pointer;
}
.tipz {
font-size: 14px;
font-weight: 400;
color: #999999;
margin-top: 10px;
}
}
.loadstate {
width: 500px;
margin-bottom: 100px;
.loadborder {
width: 500px;
height: 173px;
border-radius: 4px;
border: 1px dashed #eaeaea;
margin-bottom: 30px;
display: flex;
flex-direction: column;
justify-content: center;
position: relative;
.content {
display: flex;
margin-left: 20px;
position: relative;
.defeat {
width: 400px;
position: absolute;
left: 46px;
top: 38px;
font-size: 14px;
font-weight: 500;
justify-content: space-between;
}
.img {
width: 30px;
height: 34px;
background-image: url(../../assets/images/basicinfo/exl.png);
}
.timebox {
margin-left: 15px;
margin-top: -5px;
.timetop {
display: flex;
width: 262px;
justify-content: space-between;
// margin-bottom: 8px;
.tit {
font-size: 14px;
font-weight: 400;
color: #333333;
}
.stateloading {
font-size: 14px;
font-weight: 400;
color: #4ea6ff;
}
.statedefeat {
font-size: 14px;
font-weight: 400;
color: #ff7474;
}
.statesucce {
font-size: 14px;
font-weight: 400;
color: #35ae69;
}
}
.prog {
width: 262px;
height: 5px;
background: #eaf1fe;
border-radius: 4px;
.inprogloading {
width: 55%;
height: 5px;
border-radius: 4px;
background: #4ea6ff;
}
//下载失败条
.inprogdefeat {
width: 55%;
height: 5px;
border-radius: 4px;
background: #ff7474;
}
//下载成功条
.inprogsucce {
width: 100%;
height: 5px;
border-radius: 4px;
background: #57c887;
}
}
}
.curloading {
margin-left: 15px;
margin-top: 15px;
display: flex;
.cur {
font-size: 14px;
font-weight: 400;
color: #333333;
}
.cancel {
font-size: 14px;
font-weight: 400;
color: #387df7;
}
}
}
.downloadErr {
width: 120px;
height: 32px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
border: 1px solid #387df7;
font-size: 14px;
font-weight: 400;
color: #387df7;
line-height: 20px;
cursor: pointer;
margin-left: 66px;
margin-top: 16px;
position: absolute;
bottom: 28;
}
}
}
}
}
.btnn {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn1 {
width: 100px;
height: 40px;
border: 1px solid #4ea6ff;
border-radius: 8px;
color: #4ea6ff;
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
height: 40px;
background: #4ea6ff;
border-radius: 8px;
border: 0;
margin-left: 15px;
color: #fff;
}
}
}
</style>

View File

@@ -144,7 +144,7 @@ const title = computed(() => {
// 步骤数
const step = ref(1);
const visible = ref(false);
const formData = useResetRef({
const formData = ref({
info: {
voteName: "",
voteStartTime: "",
@@ -182,7 +182,7 @@ const rulesRef = ref({
],
});
let validate = Form.useForm(formData.value.info, rulesRef).validate;
let validate = null;
// 关闭弹窗
const closeDrawer = () => {
if (step.value > 1) {
@@ -190,9 +190,14 @@ const closeDrawer = () => {
} else {
visible.value = false;
dateTime.value = [];
formData.reset();
formData.value.info = {
voteStemDtoList: [],
formData.value = {
info: {
voteName: "",
voteStartTime: "",
voteEndTime: "",
voteStemDtoList: [],
voteExplain: "",
},
};
}
};
@@ -245,7 +250,7 @@ function openDrawer(row) {
dayjs(row.info.voteStartTime, "YYYY-MM-DD HH:mm"),
dayjs(row.info.voteEndTime, "YYYY-MM-DD HH:mm"),
]);
row && (validate = Form.useForm(formData.value.info, rulesRef).validate);
validate = Form.useForm(formData.value.info, rulesRef).validate;
visible.value = true;
}

View File

@@ -35,8 +35,7 @@
:multiple="false"
@change="handleChange"
:data="{
growthId: Number(courseId),
type: courseType,
growthId: String(growId),
}"
:showUploadList="false"
>
@@ -219,7 +218,7 @@ export default {
type: Boolean,
default: false,
},
courseId: {
growId: {
type: String,
default: "",
},
@@ -238,7 +237,6 @@ export default {
importStudent: `${process.env.VUE_APP_BOE_API_URL}${
process.env.VUE_APP_BASE_API_GROWTH || ""
}/professional/allocation/importLearner`,
timers: "", // 定时器,用于清空定时器使用
isAddStudent: false, // 用于判断用户是否关闭弹框需要重新获取学员列表
uploadpercent: -1,
@@ -268,7 +266,7 @@ export default {
if (state.redisKey && state.succNum != 0 && item) {
saveStudent({
redisKey: state.redisKey,
growId: props.courseId,
growId: props.growId,
isImportNotMatchStudent: state.groupValue ? 1 : 0,
})
.then((res) => {
@@ -343,7 +341,7 @@ export default {
console.log("上传成功返回的UUID----->", info);
console.log("我是导入学员接口传递的参数", {
file: info.file.originFileObj,
targetId: props.courseId,
targetId: props.growId,
type: 14,
});
state.fileName = info.file.name;

View File

@@ -286,7 +286,7 @@
<ImportStu
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id"
:growId="growId"
:courseType="type"
/>
<GrowthDrawer ref="GrowthDrawerRef" title="新增学员" width="1200px">
@@ -732,11 +732,8 @@ const AddImpStuvisible = ref(false); //导入学员抽屉
const showImpStu = () => {
AddImpStuvisible.value = true;
};
const AddImpStuvisibleClose = (isget) => {
console.log("关闭了导入学员弹框", isget);
if (isget) {
getStuList();
}
const AddImpStuvisibleClose = () => {
getStuList();
};
function startLoading() {

View File

@@ -47,12 +47,10 @@
<div class="line"></div>
</template>
<router-link to="/growthpath"
><div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
</router-link>
<div style="display: flex" @click="goBack">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
</div>
</div>
</div>
<div class="split"></div>
@@ -615,22 +613,7 @@
v-model:studentId="studentId"
v-model:growId="growId"
/>
<!-- 系统考试管理抽屉 -->
<GrowthExamManage
:permissions="preId"
v-model:TMvisible="TMvisible"
:title="showTestText"
:targetId="targetId"
:datasource="examData"
/>
<!-- 外部考试管理抽屉 -->
<GrowthExternalExamManage
:permissions="preId"
v-model:TMvisibleExternal="TMvisibleExternal"
:title="showTestText"
:targetId="targetId"
:datasource="examData"
/>
<!-- 在线、案例等管理抽屉 -->
<GrowthOnlineManage
:permissions="preId"
@@ -638,12 +621,6 @@
:title="showTimeText"
:datasource="commonData"
/>
<!-- 作业管理抽屉 开始-->
<GrowthHomeworkManage
:permissions="preId"
v-model:HomeworkModelVisible="homeworkModelVisible"
:datasource="homeworkData"
/>
</a-spin>
</div>
@@ -743,8 +720,6 @@ import StudentManage from "@/components/growthpath/StudentManage";
import { useRoute, useRouter } from "vue-router";
import { getCookieForName } from "@/api/method";
import seeStu from "@/components/growthpath/StudentSeeStu";
import GrowthExternalExamManage from "@/components/growthpath/GrowthExternalExamManage";
import GrowthExamManage from "@/components/growthpath/GrowthExamManage";
import GrowthOnlineManage from "@/components/growthpath/GrowthOnlineManage";
import CommonStudent from "@/components/student/CommonStudent";
import GrowthOpenCourse from "@/components/growthpath/GrowthOpenCourse.vue";
@@ -757,7 +732,6 @@ import TwoDimensionalCode from "@/components/TwoDimensionalCode.vue";
import GrowthFaceStu from "@/components/growthpath/GrowthFaceStu";
import { DownOutlined, CloseCircleOutlined } from "@ant-design/icons-vue";
import GrowthFaceTaskManage from "../../components/growthpath/GrowthFaceTaskManage";
import GrowthHomeworkManage from "@/components/growthpath/GrowthHomeworkManage";
import { courseData } from "@/api/index1";
import { checkMenu } from "@/utils/utils";
import GrowthActiveAttendance from "@/components/growthpath/GrowthActiveAttendance";
@@ -782,12 +756,9 @@ export default {
components: {
StudentManage,
seeStu,
GrowthExternalExamManage,
GrowthExamManage,
GrowthOnlineManage,
CommonStudent,
TwoDimensionalCode,
GrowthHomeworkManage,
Draggable,
GrowthFaceTaskManage,
GrowthOpenCourse,
@@ -864,6 +835,11 @@ export default {
query: { growId: state.routerId, pre: state.preId },
});
};
// 返回
const goBack = () => {
router.go(-1);
};
// 列表拖动结束
const draggableOnEnd = () => {
// 开启加载弹窗getListTask请求完成后会关闭弹框
@@ -919,7 +895,6 @@ export default {
type: 4,
offcourseId: item.taskId,
};
state.spinning = true
await courseData(planParams).then((res) => {
qrCodeItems.value = res.data.data.map((dataItem) => ({
...dataItem,
@@ -944,7 +919,6 @@ export default {
if (qrCodeItems.value.length == 0) {
message.info("暂无签到二维码");
}
state.spinning = false
});
};
function handleMenuClick({ key }) {
@@ -975,7 +949,6 @@ export default {
type: 4,
offcourseId: item.taskId,
};
state.spinning = true
await courseData(planParams).then((res) => {
const qrCodeItemspgItem = res.data.data.map((dataItem) => ({
...dataItem,
@@ -1000,7 +973,6 @@ export default {
if (qrCodeItemspg.value.length == 0) {
message.info("暂无评估二维码");
}
state.spinning = false
});
};
@@ -1470,6 +1442,7 @@ export default {
qrcodeAssement,
handleMenuClickpg,
draggableOnEnd,
goBack,
handleMenuClick,
qrcodeVisible,
handlerSuperiors,

View File

@@ -18,16 +18,16 @@ module.exports = defineConfig({
overlay: false,// 解决代码抛出异常
},
proxy: {
// "/professional": {
// target: 'http://192.168.38.211:32002',
// // target: 'http://192.168.50.195:32002',
// // target: 'http://192.168.86.195:32002',
// changeOrigin: true,
// },
"/growth": {
target: 'https:' + process.env.VUE_APP_BOE_API_URL,
"/professional": {
target: 'http://192.168.31.211:32002',
// target: 'http://192.168.50.195:32002',
// target: 'http://192.168.86.195:32002',
changeOrigin: true,
},
// "/growth": {
// target: 'https:' + process.env.VUE_APP_BOE_API_URL,
// changeOrigin: true,
// },
"/manageApi": {
target: 'https:' + process.env.VUE_APP_PROXY_URL,
changeOrigin: true, //表示是否改变原域名