feat:增加查看作业

This commit is contained in:
lixg
2023-01-29 14:27:05 +08:00
9 changed files with 434 additions and 310 deletions

View File

@@ -39,7 +39,9 @@
</div>
<div class="select">
<a-tree-select
:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
:getPopupContainer="
(triggerNode) => triggerNode.parentNode || document.body
"
v-model:value="sysTypeId"
show-search
style="width: 200px"
@@ -2285,7 +2287,8 @@ import {
shallowRef,
onMounted,
onBeforeUnmount,
watch, computed,
watch,
computed,
} from "vue";
import * as api from "../../api/indexInvist.js";
@@ -2346,7 +2349,7 @@ import AddTest from "../../components/drawers/AddTest.vue";
import TableStudent from "@/components/student/TableStudent";
import FJUpload from "@/components/common/FJUpload";
import { updateStudent } from "@/api/indexProjStu";
import {useStore} from "vuex";
import { useStore } from "vuex";
//列表表格
const columns1 = [
@@ -2418,16 +2421,16 @@ const columns1 = [
return text ? text : "-";
},
},
// {
// title: "学习人数",
// width: 130,
// dataIndex: "stunum",
// key: "4",
// align: "center",
// customRender: ({ text }) => {
// // return text ? text : "0";
// },
// },
{
title: "学习人数",
width: 130,
dataIndex: "stunum",
key: "4",
align: "center",
customRender: ({ text }) => {
return text ? text : "0";
},
},
// {
// title: "评分",
// width: 130,
@@ -2538,7 +2541,7 @@ const columns2 = [
key: "studentName",
width: "6%",
align: "center",
customRender: ({record: {studentName}}) => (studentName || "-")
customRender: ({ record: { studentName } }) => studentName || "-",
},
{
title: "工号",
@@ -2547,7 +2550,7 @@ const columns2 = [
width: "12%",
ellipsis: true,
align: "center",
customRender: ({record: {studentUserNo}}) => (studentUserNo || "-")
customRender: ({ record: { studentUserNo } }) => studentUserNo || "-",
},
{
title: "开课名称",
@@ -2556,7 +2559,7 @@ const columns2 = [
width: "12%",
ellipsis: true,
align: "center",
customRender: ({record: {name}}) => (name || "-")
customRender: ({ record: { name } }) => name || "-",
},
{
title: "地点",
@@ -2565,7 +2568,7 @@ const columns2 = [
width: "12%",
ellipsis: true,
align: "center",
customRender: ({record: {address}}) => (address || "-")
customRender: ({ record: { address } }) => address || "-",
},
{
title: "数据来源",
@@ -2574,7 +2577,8 @@ const columns2 = [
ellipsis: true,
width: "12%",
align: "center",
customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"),
customRender: ({ record: { courseName, routerName } }) =>
courseName || routerName || "开课",
},
{
title: "学习时间",
@@ -2583,7 +2587,7 @@ const columns2 = [
width: "10%",
align: "center",
ellipsis: true,
customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-")
customRender: ({ record: { lastStudyTime } }) => lastStudyTime || "-",
},
{
title: "签到时间",
@@ -2592,7 +2596,7 @@ const columns2 = [
width: "10%",
align: "center",
ellipsis: true,
customRender: ({record:{signTime}}) => (signTime || "-")
customRender: ({ record: { signTime } }) => signTime || "-",
},
{
title: "状态",
@@ -2994,7 +2998,8 @@ export default defineComponent({
dataIndex: "signstatus",
key: "7",
align: "center",
customRender: ({ record }) => record.signStatus?'已签到':'未签到',
customRender: ({ record }) =>
record.signStatus ? "已签到" : "未签到",
},
{
title: "评估状态",
@@ -3025,7 +3030,7 @@ export default defineComponent({
// >
// 成绩录入
// </span>
<span></span>
<span></span>
)}
</div>
);
@@ -3683,7 +3688,7 @@ export default defineComponent({
// 渲染列表1操作
const getTableDate = async () => {
console.log('我是点击搜索的数据',state.sysTypeId)
console.log("我是点击搜索的数据", state.sysTypeId);
// let datas = state.tableData1;
let startTime = "";
let endTime = "";
@@ -3701,8 +3706,8 @@ export default defineComponent({
pageNo: state.currentPage1,
pageSize: state.pageSize1,
auditStatus: state.auditStatus,
// categoryId: state.categoryId,
sysTypeId: state.sysTypeId,
// categoryId: state.categoryId,
sysTypeId: state.sysTypeId,
projectName: state.projectName,
name: state.name,
createName: state.createName,
@@ -3739,16 +3744,32 @@ export default defineComponent({
datas.forEach((itm) => {
itm.pageNo = pageNo;
itm.contentTxt = findClassFullName(sysTypeOptions.value,itm.sysTypeId) || '-'
itm.contentTxt =
findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
});
state.tableData1 = datas;
};
function findClassFullName(list,classify, name = '') {
return list && list.length && list
.map(e => classify == e.dictCode ? name ? name + '-' + e.dictName : e.dictName : findClassFullName(e.children, classify,name ? name + '-' + e.dictName : e.dictName))
.filter(name => name)
.join('') || ''
function findClassFullName(list, classify, name = "") {
return (
(list &&
list.length &&
list
.map((e) =>
classify == e.dictCode
? name
? name + "-" + e.dictName
: e.dictName
: findClassFullName(
e.children,
classify,
name ? name + "-" + e.dictName : e.dictName
)
)
.filter((name) => name)
.join("")) ||
""
);
}
getTableDate();
@@ -5754,7 +5775,7 @@ export default defineComponent({
height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
.daochu{
.daochu {
width: 16px;
height: 18px;
background-image: url("../../assets/images/coursewareManage/export.png");
@@ -6858,7 +6879,7 @@ export default defineComponent({
}
}
.btn2 {
.btn2 {
.search {
width: 16px;
height: 18px;
@@ -6866,7 +6887,6 @@ export default defineComponent({
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
}
}
}
@@ -7523,23 +7543,21 @@ export default defineComponent({
background-image: url(../../assets/images/coursewareManage/export1.png);
}
}
}
.btn3 {
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
}
}
/**
/**
.btn3 {
width: 130px;
height: 40px;