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

feat:合并

Browse Source
This commit is contained in:
lixg
2023-01-05 11:07:40 +08:00
parent 0bc0e91896 bfe493a47b
commit 0ea1a8de85
13 changed files with 723 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/index1.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-04 22:45:31
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-04 12:36:46
* @LastEditTime: 2023-01-05 11:06:02
* @FilePath: /fe-manage/src/api/index1.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -155,6 +155,14 @@ export const noticeList = (projectId) =>
// export const choiceEvaluation = (obj) => http.post('/evaluation/choiceEvaluation', obj);
// 获取任务学员的信息
export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, { params: obj })
// 考试导出任务学员信息
export const exportTaskStudent = (obj) => http.post('/admin/student/exportTaskStudent', obj)
// //面授课批量导入成绩
export const batchImportScore = (offcoursePlanId, obj) =>
http.post(`/admin/offcourse/batchImportScore?offcoursePlanId=${offcoursePlanId}`, obj);

4
src/api/indexTaskManage.js
View File

@@ -8,5 +8,5 @@ export const ExamManagementMessage = (obj) => http.post('/admin/exam/manage/quer
// 获取评估管理的信息
export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, { params: obj })
// 导出学员信息
export const ExportTaskStudent = (obj) => http.get('/admin/student/exportTaskStudent', { params: obj })
// 考试导出学员信息
export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', obj)

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

@@ -1,5 +1,6 @@
<template>
<a-drawer
v-if="Evalvisible"
:visible="Evalvisible"
class="drawerStyle ProjectEvalManage"
placement="right"
@@ -8,7 +9,9 @@
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">【测评】{{ title }}</div>
<div class="headerTitle">
【测评】{{ title }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../../assets/images/basicinfo/close.png"
@@ -16,28 +19,38 @@
/>
</div>
<div class="main">
<div class="endtime">起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00</div>
<div
v-if="datasource.startTime"
class="endtime"
>
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
</div>
<div v-else class="endtime">
起止时间：—
</div>
<div class="search">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; 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: 270px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
<div class="sealeft">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; 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: 270px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
</div>
</div>
</div>
<div class="btns">
@@ -58,67 +71,52 @@
<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 class="wz">催促学习</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<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">
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:columns="tableDataFunc()"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:loading="tableDataTotalLoading"
:scroll="{ x: 900 }"
: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"
/>
<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 class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage";
export default {
name: "ProjectEvalManage",
@@ -131,210 +129,332 @@ export default {
type: String,
default: "",
},
levelName: {
type: String,
default: "",
},
projectTaskId: {
type: Number,
default: null,
},
itemsType: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
return {};
},
},
},
setup(props, ctx) {
const state = reactive({
visible: props.Evalvisible,
name: "",
open: false,
projectName: null,
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: "",
projectNameList: [
// {
// id: 1,
// value: "-1",
// label: "未开始",
// },
{
id: 1,
value: "-1",
label: "未开始",
},
{
id: 2,
value: "0",
label: "未完成",
},
{
id: 3,
id: 2,
value: "1",
label: "已完成",
},
],
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 1,
tabledata: [
{
workNum: "123",
userName: "li",
deptName: "开发",
jobName: "前端开发",
submitTime: "2022-07-22 14:00:30",
status: "已完成",
PDFstatus: "未生成",
},
],
tablecolumns: [
{
title: "工号",
dataIndex: "workNum",
key: "workNum",
width: 50,
align: "left",
className: "h head",
},
{
title: "姓名",
dataIndex: "userName",
key: "userName",
width: 50,
align: "left",
className: "h head",
},
{
title: "所在部门",
dataIndex: "deptName",
key: "userName",
width: 60,
align: "center",
className: "h",
},
{
title: "所在岗位",
dataIndex: "jobName",
key: "jobName",
width: 60,
align: "center",
className: "h",
},
{
title: "提交时间",
dataIndex: "submitTime",
key: "submitTime",
width: 60,
align: "center",
className: "h",
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
width: 60,
align: "center",
className: "h",
},
{
title: "PDF状态",
dataIndex: "PDFstatus",
key: "PDFstatus",
width: 60,
align: "center",
className: "h",
},
],
tabledata: [],
tableDataTotalLoading: true, // 表格loading加载配置
});
const tableDataFunc = () => {
const columns = [
{
title: "工号",
dataIndex: "studentUserNo",
key: "studentUserNo",
width: 50,
align: "center",
className: "h head",
},
{
title: "姓名",
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "left",
className: "h head",
},
{
title: "所在部门",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: 60,
align: "center",
className: "h",
},
{
title: "所在岗位",
dataIndex: "studentJobName",
key: "studentJobName",
width: 60,
align: "center",
className: "h",
},
{
title: "学员关卡",
dataIndex: "currentStageName",
key: "currentStageName",
width: 60,
align: "center",
className: "h",
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "提交时间",
dataIndex: "endStudyTime",
key: "endStudyTime",
width: 60,
align: "center",
className: "h",
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
width: 60,
align: "center",
className: "h",
},
{
title: "PDF状态",
dataIndex: "PDFstatus",
key: "PDFstatus",
width: 60,
align: "center",
className: "h",
}
]
return columns;
};
const closeDrawer = () => {
ctx.emit("update:Evalvisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = "";
state.selectedRowKeys = [];
state.currentPage = 1;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
// getManageList();
console.log("当前是什么类型", props.datasource.type);
state.tableDataTotalLoading = true;
getData();
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
const onSelectChange = (selectedRowKeys) => {
if (selectedRowKeys.length > 2) {
return;
}
state.selectedRowKeys = selectedRowKeys;
};
//催促学员学习
//催促
const godie = () => {
message.destroy();
message.success("催促" + props.title + "成功");
};
//表头清空
const clearLine = () => {
state.selectedRowKeys = [];
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
// 获取数据
function getData() {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
.then((res) => {
console.log(res);
if (res.status == 200) {
state.tabledata = res.data.data.records;
state.tableDataTotal = res.data.data.total;
state.tableDataTotalLoading = false;
}
})
.catch((err) => {
console.log(err);
state.tableDataTotalLoading = false;
state.tabledata = [];
});
}
// 搜索按钮
function searchTaskList() {
state.currentPage = 1;
state.tableDataTotalLoading = true;
getData();
}
// 重置按钮
function resetTaskList() {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = "";
getData();
}
//分页
const changePaginationStu = (page) => {
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
// 导出数据
function exportTaskStu() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
}
return {
...toRefs(state),
selectProjectName,
closeDrawer,
afterVisibleChange,
onSelectChange,
tableDataFunc,
godie,
clearLine,
onMounted,
onUnmounted,
onChange,
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu,
};
},
};
</script>
<style lang="scss">
// .drawerStyle {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
// .ant-drawer-header {
// display: none !important;
// }
// .ant-drawer-body {
// padding: 0;
// }
// }
// }
.ProjectEvalManage {
// overflow-x: auto;
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.noticebox {
width: 240px;
height: 64px;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
position: absolute;
top: 161px;
display: flex;
align-items: center;
justify-content: center;
.notext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
font-weight: 500;
margin-left: 20px;
}
}
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
flex-shrink: 0;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
overflow: auto;
// background-color: #bfa;
overflow-y: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
justify-content: space-between;
.namecon {
.sealeft {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
flex-wrap: wrap;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
white-space: nowrap;
}
}
}
.btns {
display: flex;
flex-wrap: nowrap;
@@ -347,7 +467,6 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -355,7 +474,6 @@ export default {
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
@@ -370,7 +488,6 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
@@ -379,7 +496,6 @@ export default {
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
@@ -392,15 +508,13 @@ export default {
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
width: 18px;
height: 18px;
background-image: url(../../../assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
@@ -415,127 +529,41 @@ export default {
color: #ffffff;
}
.btn2 {
background: #ffffff;
margin-right: 20px;
color: #4ea6ff;
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;
}
.tab {
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;
.tableBox {
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-item,
.ant-pagination-options {
margin-bottom: 10px;
}
}
}
}
}
@@ -544,14 +572,13 @@ export default {
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
background-color: #fff;
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;
@@ -561,7 +588,6 @@ export default {
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
@@ -576,3 +602,4 @@ export default {
}
}
</style>

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

@@ -61,7 +61,7 @@
<div class="img1"></div>
<div class="wz">催促考试</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="exportData">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
@@ -90,10 +90,6 @@
:loading="loadingData"
:scroll="{ x: 900 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<div class="pa">
@@ -189,7 +185,7 @@ export default {
dataIndex: "studentCode",
key: "studentCode",
width: 50,
align: "left",
align: "center",
className: "h head"
},
{
@@ -358,6 +354,21 @@ export default {
getData();
};
{/* 导出数据 */}
function exportData() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId,
"taskId": props.datasource.courseId,
"type": 1
}).then(res=>{
console.log(res)
}).catch(err=>{
console.log(err)
}) */}
}
return {
...toRefs(state),
selectProjectName,
@@ -369,7 +380,8 @@ export default {
showEScoreModal,
searchTableData,
reseatTableData,
changePaginationStu
changePaginationStu,
exportData
};
},
};

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

@@ -152,7 +152,7 @@ import CKWork from "../CheckWork.vue";
import CQue from "../CheckQue.vue";
import EntryScores from "../EntryScores.vue";
// import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage";
import * as api from "../../../api/index1";
export default {
name: "ProjectFaceTaskManage",
components: {
@@ -548,7 +548,7 @@ export default {
// 导出数据
function exportTaskStu() {
api
.ExportTaskStudent({
.exportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId,

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

@@ -113,9 +113,9 @@
hideOnSinglePage="true"
:pageSize="pageSize"
:current="currentPage"
:total="tableDataTotal2"
:total="tableDataTotal"
class="pagination"
v-if="tableDataTotal2 > 10"
v-if="tableDataTotal > 10"
@change="changePaginationStu"
/>
</div>
@@ -146,7 +146,7 @@ import CQue from "../CheckQue.vue";
// import EntryScores from "../EntryScores.vue";
import EScore from "../ExportScore.vue";
// import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage";
import * as api from "../../../api/index1";
export default {
name: "ProjectHomeWorkManage",
components: {
@@ -451,7 +451,7 @@ export default {
// 导出数据
function exportTaskStu() {
api
.ExportTaskStudent({
.exportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId,

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

@@ -36,7 +36,7 @@
</div>
<div class="main">
<div
v-if="datasource.type !== 6 || datasource.type !== 9"
v-if="datasource.type !== 6 && datasource.type !== 9"
class="endtime"
>
起止时间：—
@@ -298,7 +298,7 @@ export default {
// 获取数据
function getData() {
if (props.datasource.type == 11) {
if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
@@ -306,6 +306,8 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
@@ -316,6 +318,8 @@ export default {
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
taskId: props.datasource.projectTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
@@ -362,20 +366,8 @@ export default {
// 导出数据
function exportTaskStu() {
api
.ExportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.stageId,
type: 1,
pid: props.datasource.projectId,
})
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
}
return {

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

@@ -36,7 +36,7 @@
</div>
<div class="main">
<div
v-if="datasource.type !== 6 || datasource.type !== 9"
v-if="datasource.type !== 6 && datasource.type !== 9"
class="endtime"
>
起止时间：—
@@ -298,7 +298,7 @@ export default {
// 获取数据
function getData() {
if (props.datasource.type == 11) {
if (props.datasource.type == 11 || props.datasource.type == 9 || props.datasource.type == 6 || props.datasource.type == 7) {
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
@@ -306,6 +306,8 @@ export default {
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
@@ -316,6 +318,8 @@ export default {
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
@@ -362,20 +366,9 @@ export default {
// 导出数据
function exportTaskStu() {
api
.ExportTaskStudent({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
})
.then((res) => {
console.log(res);
})
.catch((err) => {
console.log(err);
});
console.log(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
}
return {

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

@@ -2,14 +2,16 @@
<a-drawer
v-if="EvaluationModelVisible"
:visible="EvaluationModelVisible"
class="drawerStyle ProjectEvalManage"
class="drawerStyle ProjectOnlineManage"
placement="right"
width="60%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain">
<div class="header">
<div class="headerTitle">【测评】{{ title }}</div>
<div class="headerTitle">
【测评】{{ title }}
</div>
<img
style="width: 29px; height: 29px; cursor: pointer"
src="../../../assets/images/basicinfo/close.png"
@@ -17,28 +19,38 @@
/>
</div>
<div class="main">
<div class="endtime">起止时间：2022-07-21 14:00 ～ 2022-7-30 14:00</div>
<div
v-if="datasource.type !== 6 && datasource.type !== 9"
class="endtime"
>
起止时间：—
</div>
<div v-else class="endtime">
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
</div>
<div class="search">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; 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: 270px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
<div class="sealeft">
<div class="namecon" style="margin-right: 30px">
<div class="name">姓名：</div>
<a-input
v-model:value="name"
style="width: 270px; 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: 270px"
placeholder="请选择"
:options="projectNameList"
@change="selectProjectName"
allowClear
showSearch
></a-select>
</div>
</div>
</div>
<div class="btns">
@@ -59,69 +71,54 @@
<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 class="wz">催促学习</div>
</div>
<div class="btn btn2">
<div class="btn btn2" @click="exportTaskStu">
<div class="img2"></div>
<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">
<div class="tab" style="margin-top: 20px; margin-bottom: 100px">
<a-table
style="border: 1px solid #f2f6fe"
:columns="tablecolumns"
:columns="tableDataFunc()"
:data-source="tabledata"
:loading="tableDataTotal === -1 ? true : false"
:loading="tableDataTotalLoading"
:scroll="{ x: 900 }"
: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"
/>
<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 class="btnn">
<button class="btn1">取消</button>
<button class="btn2">确定</button>
<button class="btn1" @click="closeDrawer">取消</button>
<button class="btn2" @click="closeDrawer">确定</button>
</div>
</div>
</a-drawer>
</template>
<script>
import { toRefs, reactive } from "vue";
import { toRefs, reactive, onMounted, onUnmounted } from "vue";
import { message } from "ant-design-vue";
// import * as api from "../../../api/index";
import * as api from "../../../api/indexTaskManage";
export default {
name: "RouterCommonManage",
name: "RouterEvaluationManage",
props: {
EvaluationModelVisible: {
@@ -132,10 +129,18 @@
type: String,
default: "",
},
levelName: {
type: String,
default: "",
},
projectTaskId: {
type: Number,
default: null,
},
itemsType: {
type: Number,
default: null,
},
datasource: {
type: Object,
default: function () {
@@ -146,89 +151,87 @@
setup(props, ctx) {
const state = reactive({
visible: props.EvaluationModelVisible,
name: "",
open: false,
projectName: null,
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 0,
projectName: "",
projectNameList: [
// {
// id: 1,
// value: "-1",
// label: "未开始",
// },
{
id: 1,
value: "-1",
label: "未开始",
},
{
id: 2,
value: "0",
label: "未完成",
},
{
id: 3,
id: 2,
value: "1",
label: "已完成",
},
],
selectedRowKeys: [],
pageNo: 1,
pageSize: 10,
currentPage: 1,
tableDataTotal: 1,
tabledata: [
{
workNum: "123",
userName: "li",
deptName: "开发",
jobName: "前端开发",
submitTime: "2022-07-22 14:00:30",
status: "已完成",
PDFstatus: "未生成",
},
],
tablecolumns: [
tabledata: [],
tableDataTotalLoading: true, // 表格loading加载配置
});
const tableDataFunc = () => {
const columns = [
{
title: "工号",
dataIndex: "workNum",
key: "workNum",
dataIndex: "studentUserNo",
key: "studentUserNo",
width: 50,
align: "left",
align: "center",
className: "h head",
},
{
title: "姓名",
dataIndex: "userName",
key: "userName",
dataIndex: "studentName",
key: "studentName",
width: 50,
align: "left",
className: "h head",
},
{
title: "所在部门",
dataIndex: "deptName",
key: "userName",
dataIndex: "studentDepartName",
key: "studentDepartName",
width: 60,
align: "center",
className: "h",
},
{
title: "所在岗位",
dataIndex: "jobName",
key: "jobName",
dataIndex: "studentJobName",
key: "studentJobName",
width: 60,
align: "center",
className: "h",
},
{
title: "学员关卡",
dataIndex: "level",
key: "level",
dataIndex: "currentStageName",
key: "currentStageName",
width: 60,
align: "center",
className: "h",
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "提交时间",
dataIndex: "submitTime",
key: "submitTime",
dataIndex: "endStudyTime",
key: "endStudyTime",
width: 60,
align: "center",
className: "h",
@@ -249,123 +252,212 @@
width: 60,
align: "center",
className: "h",
},
],
});
}
]
return columns;
};
const closeDrawer = () => {
ctx.emit("update:EvaluationModelVisible", false);
state.currentPage = 1;
state.name = "";
state.projectName = "";
state.selectedRowKeys = [];
state.currentPage = 1;
state.tabledata = [];
};
const afterVisibleChange = (bol) => {
if (bol == true) {
console.log("当前是什么类型", props.datasource.type);
state.tableDataTotalLoading = true;
getData();
}
};
const selectProjectName = (value) => {
state.projectName = value;
};
const onSelectChange = (selectedRowKeys) => {
if (selectedRowKeys.length > 2) {
return;
}
state.selectedRowKeys = selectedRowKeys;
};
//催促学员学习
//催促
const godie = () => {
message.destroy();
message.success("催促" + props.title + "成功");
};
//表头清空
const clearLine = () => {
state.selectedRowKeys = [];
const onChange = (pageNumber) => {
console.log("Page: ", pageNumber);
};
// 获取数据
function getData() {
state.tabledata = [
{
workNum: "123",
userName: "li",
deptName: "开发",
jobName: "前端开发",
submitTime: "2022-07-22 14:00:30",
status: "已完成",
PDFstatus: "未生成",
},
]
// 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
console.log("我是传递的查询参数", {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
});
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
type: 2,
pid: props.datasource.routerId,
taskId: props.datasource.routerTaskId,
taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
.then((res) => {
console.log(res);
if (res.status == 200) {
state.tabledata = res.data.data.records;
state.tableDataTotal = res.data.data.total;
state.tableDataTotalLoading = false;
}
})
.catch((err) => {
console.log(err);
state.tableDataTotalLoading = false;
state.tabledata = [];
});
}
// 搜索按钮
function searchTaskList() {
state.currentPage = 1;
state.tableDataTotalLoading = true;
getData();
}
// 重置按钮
function resetTaskList() {
state.tableDataTotalLoading = true;
state.currentPage = 1;
state.name = "";
state.projectName = "";
getData();
}
//分页
const changePaginationStu = (page) => {
state.tableDataTotalLoading = true;
state.currentPage = page;
getData();
};
// 导出数据
function exportTaskStu() {
console.log(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
// window.open(`${process.env.VUE_APP_PROXY_URL}admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
}
return {
...toRefs(state),
selectProjectName,
closeDrawer,
afterVisibleChange,
onSelectChange,
tableDataFunc,
godie,
clearLine,
onMounted,
onUnmounted,
onChange,
searchTaskList,
resetTaskList,
changePaginationStu,
exportTaskStu,
};
},
};
</script>
<style lang="scss">
.ProjectEvalManage {
// .drawerStyle {
// .ant-drawer-content-wrapper {
// // max-width: 1000px;
// .ant-drawer-header {
// display: none !important;
// }
// .ant-drawer-body {
// padding: 0;
// }
// }
// }
.ProjectOnlineManage {
// overflow-x: auto;
.drawerMain {
min-width: 550px;
margin: 0px 32px 0px 32px;
overflow-x: auto;
display: flex;
flex-direction: column;
.noticebox {
width: 240px;
height: 64px;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
position: absolute;
top: 161px;
display: flex;
align-items: center;
justify-content: center;
.notext {
color: rgba(51, 51, 51, 1);
font-size: 14px;
font-weight: 500;
margin-left: 20px;
}
}
.header {
height: 73px;
border-bottom: 1px solid #e8e8e8;
display: flex;
flex-shrink: 0;
justify-content: space-between;
align-items: center;
// background-color: red;
margin-bottom: 20px;
.headerTitle {
font-size: 18px;
font-weight: 600;
color: #333333;
line-height: 25px;
// margin-left: 24px;
}
}
.main {
width: 100%;
height: 100%;
overflow: auto;
// background-color: #bfa;
overflow-y: auto;
padding-right: 10px;
.endtime {
font-size: 16px;
font-weight: 500;
color: #333333;
}
.search {
width: 100%;
display: flex;
flex-wrap: wrap;
margin-top: 20px;
justify-content: space-between;
.namecon {
.sealeft {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
flex-wrap: wrap;
.namecon {
display: flex;
flex-wrap: nowrap;
margin-bottom: 10px;
.name {
margin-top: 8px;
white-space: nowrap;
}
}
}
.btns {
display: flex;
flex-wrap: nowrap;
@@ -378,7 +470,6 @@
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
@@ -386,7 +477,6 @@
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 16px;
height: 18px;
@@ -401,7 +491,6 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
@@ -410,7 +499,6 @@
}
}
}
.btnss {
display: flex;
flex-wrap: nowrap;
@@ -423,15 +511,13 @@
display: flex;
justify-content: center;
align-items: center;
.img1 {
width: 15px;
height: 17px;
width: 18px;
height: 18px;
background-image: url(../../../assets/images/basicinfo/call.png);
background-size: 100% 100%;
margin-right: 7px;
}
.img2 {
width: 17px;
height: 16px;
@@ -446,127 +532,41 @@
color: #ffffff;
}
.btn2 {
background: #ffffff;
margin-right: 20px;
color: #4ea6ff;
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;
}
.tab {
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;
.tableBox {
.pa {
// left: 0;
margin-top: 15px;
width: 100%;
// height: 20px;
// background-color: red;
display: flex;
justify-content: center;
// position: absolute;
// bottom: 20px;
.ant-pagination-prev,
.ant-pagination-next,
.ant-pagination-item,
.ant-pagination-options {
margin-bottom: 10px;
}
}
}
}
}
@@ -575,14 +575,13 @@
height: 72px;
width: 100%;
position: absolute;
background-color: #fff;
bottom: 0;
left: 0;
background-color: #fff;
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;
@@ -592,7 +591,6 @@
background-color: #fff;
cursor: pointer;
}
.btn2 {
cursor: pointer;
width: 100px;
@@ -607,4 +605,4 @@
}
}
</style>

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

@@ -61,8 +61,8 @@
<div class="img1"></div>
<div class="wz">催促考试</div>
</div>
<div class="btn btn2">
<div class="img2"></div>
<div class="btn btn2" @click="exportData">
<div class="img2"></div>
<div class="wz">导出数据</div>
</div>
<!-- <div class="btn btn2" @click="showEScoreModal">
@@ -90,10 +90,6 @@
:loading="loadingData"
:scroll="{ x: 900 }"
:pagination="false"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
/>
<div class="pa">
@@ -142,6 +138,10 @@
type: String,
default: "",
},
levelName: {
type: String,
default: "",
},
projectTaskId: {
type: Number,
default: null,
@@ -189,7 +189,7 @@
dataIndex: "studentCode",
key: "studentCode",
width: 50,
align: "left",
align: "center",
className: "h head"
},
{
@@ -223,6 +223,13 @@
width: 60,
align: "center",
className: "h",
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
</div>
);
},
},
{
title: "考试次数",
@@ -367,6 +374,20 @@
getData();
};
{/* 导出数据 */}
function exportData() {
window.open(`${process.env.VUE_APP_PROXY_URL}admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId,
"taskId": props.datasource.courseId,
"type": 1
}).then(res=>{
console.log(res)
}).catch(err=>{
console.log(err)
}) */}
}
return {
...toRefs(state),
selectProjectName,
@@ -378,7 +399,8 @@
showEScoreModal,
searchTableData,
reseatTableData,
changePaginationStu
changePaginationStu,
exportData
};
},
};

23
src/views/learningpath/LevelAdd.vue
View File

@@ -496,11 +496,11 @@
: item.type === 2
? faceTeachModel(item)
: item.type === 4
? evaluationModel(item)
: item.type === 5
? examinationModel(item)
: item.type === 10
? homeworkModel(item)
: item.type === 5
? examinationModel(item, value.name)
: item.type === 10
? evaluationModel(item, value.name)
: null
"
>
@@ -1106,11 +1106,11 @@
<!-- 面授管理抽屉 结束-->
<!-- 考试管理抽屉 开始-->
<router-examination-manage v-model:ExaminationModelVisible="examinationModelVisible" :title="examinationModelVisibleTitle" :datasource="examinationData" />
<router-examination-manage v-model:ExaminationModelVisible="examinationModelVisible" :title="examinationModelVisibleTitle" :datasource="examinationData" :levelName="examLevelName"/>
<!-- 考试管理抽屉 结束-->
<!-- 测评管理抽屉 开始-->
<router-evaluation-manage v-model:EvaluationModelVisible="evaluationModelVisible" :title="evaluationModelVisibleTitle" :datasource="evaluationData" />
<router-evaluation-manage v-model:EvaluationModelVisible="evaluationModelVisible" :title="evaluationModelVisibleTitle" :datasource="evaluationData" :levelName="evaluationLevelName" />
<!-- 测评管理抽屉 结束-->
<!-- 作业管理抽屉 开始-->
@@ -1361,8 +1361,9 @@ export default {
evaluationData: '',
homeworkData: '',
commonData: '',
commonLevelName: ''
commonLevelName: '',
examLevelName: '',
evaluationLevelName: ''
});
const levelList = reactive({
@@ -1637,16 +1638,18 @@ export default {
// 面授课弹框名称 RouterFaceTeachManage
}
// 考试点击管理弹框
const examinationModel = (data) => {
const examinationModel = (data, levelname) => {
console.log(data)
state.examLevelName = levelname;
state.examinationModelVisible = true;
state.examinationModelVisibleTitle = data.name;
state.examinationData = data;
// 考试弹框名称 RouterExaminationManage
}
// 测评点击管理弹框
const evaluationModel = (data) => {
const evaluationModel = (data, levelname) => {
console.log(data)
state.evaluationLevelName = levelname;
state.evaluationModelVisible = true;
state.evaluationModelVisibleTitle = data.name;
state.evaluationData = data;

10
src/views/projectcenter/TaskPage.vue
View File

@@ -625,7 +625,7 @@
: item.type == '5'
? showTest(item.name, item.projectTaskId, item)
: item.type == '10'
? showEval(item.name, item.projectTaskId)
? showEval(item.name, item.projectTaskId, item.type, item)
: item.type == '12'
? showWork(item.name, item.projectTaskId)
: item.type == '13'
@@ -1123,6 +1123,8 @@
v-model:Evalvisible="Evalvisible"
:title="showTestText"
:projectTaskId="projectTaskId"
:itemsType="evaltype"
:datasource="evalData"
/>
<!-- 学员（小组管理）创建小组抽屉 -->
@@ -2452,6 +2454,8 @@ export default {
examData: "",
commonData: "",
commonLevelName: "",
evaltype: "",
evalData: ""
});
const levelList = reactive({
@@ -2751,8 +2755,10 @@ export default {
state.projectTaskId = id;
};
//测评抽屉
const showEval = (name, id) => {
const showEval = (name, id, type, datasource) => {
console.log("点击测评");
state.evaltype = type;
state.evalData = datasource;
state.Evalvisible = true;
state.showTestText = name;
state.projectTaskId = id;

53
src/views/research/ManagePage.vue
View File

@@ -27,23 +27,23 @@
<div class="messagebox">
<div style="width: 186px; margin-right: 126px; float: left">
<span class="name">评估名称:</span>
<span class="descript">课程评估</span>
<span class="descript">{{basicInfo.assessmentName}}</span>
</div>
<div style="width: 103px; margin-right: 126px; float: left">
<span class="name">创建人:</span>
<span class="descript">管理员</span>
<span class="descript">{{basicInfo.createName}}</span>
</div>
<div style="width: 88px; margin-right: 126px; float: left">
<span class="name">状态:</span>
<span class="descript">已发布</span>
<span class="descript">{{basicInfo.releaseStatus?basicInfo.releaseStatus==1?"待发布":basicInfo.releaseStatus==2?"已发布":"已结束":''}}</span>
</div>
<div style="width: 192px; margin-right: 126px; float: left">
<span class="name">创建时间:</span>
<span class="descript">2022-07-22 9:30</span>
<span class="descript">{{basicInfo.createTime}}</span>
</div>
<div style="width: 192px; margin-right: 126px; float: left">
<span class="name">发布时间:</span>
<span class="descript">2022-07-22 9:30</span>
<span class="descript">{{basicInfo.releaseTime}}</span>
</div>
</div>
</div>
@@ -81,22 +81,49 @@ import ViewAssess from "../../components/drawers/ViewAssess";
import { reactive, toRefs } from "vue";
import { queryAssessmentDetailList } from "@/api/indexResearch";
import { useRouter } from "vue-router";
export default {
name: "ManagePage",
components: { ViewAssess },
setup() {
const router = useRouter();
const getInfoDate = async () => {
let res = await queryAssessmentDetailList({
assessmentId: router.currentRoute.value.params.id,
});
console.log(res);
};
getInfoDate();
const state = reactive({
Assessvisible: false,
basicInfo: "" ,
currentPage: 1,
pageSize: 10,
tableDataTotalLoading: true,
tabledata: [],
tableDataTotal: 0,
});
const getInfoDate = async () => {
state.tableDataTotalLoading = true;
await queryAssessmentDetailList({
assessmentId: router.currentRoute.value.params.id,
}).then(res=>{
console.log('获取评估信息', res);
if(res.data.code==200){
state.basicInfo = res.data.data;
}
}).catch(err=>{
console.log(err)
});
// 获取学员信息
console.log('传递的请求学员信息的参数',{
pageNo: state.currentPage,
pageSize: state.pageSize,
type: 3,
taskId: router.currentRoute.value.params.id,
pid: router.currentRoute.value.params.id
})
// createName
};
getInfoDate();
const showassess = () => {
state.Assessvisible = true;
};