-
签到
@@ -1849,7 +1848,7 @@ import ProjectManager from "@/components/project/ProjectManagerNewTeacher";
import SeeModal from "./components/seeModal.vue";
import CourseModal from "./courseModal.vue";
import * as moment from "moment";
-import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+import TwoDimensionalCode from "../../components/TwoDimensionalCodeNew.vue";
import { codeUrl, toDate } from "@/api/method";
import { queryWorkDetailById } from "@/api/indexWork";
import { queryExaminationDetailById } from "@/api/indexExam";
@@ -1863,7 +1862,7 @@ import DropDown from "@/components/common/DropDown";
import { checkPer, checkOwner } from "@/utils/utils";
import dayjs from "dayjs";
import {duration} from "moment";
-import { DeleteOutlined } from '@ant-design/icons-vue';
+import { DeleteOutlined,DownOutlined } from '@ant-design/icons-vue';
//列表表格
const moreLine = (item) => {
@@ -2032,17 +2031,6 @@ const columns6 = [
ellipsis: true,
slots: { customRender: "teacherName" },
},
- {
- title: "时长",
- dataIndex: "duration",
- key: "duration",
- width: "12%",
- ellipsis: true,
- align: "center",
- customRender: ({ text }) => {
- return text ? Math.floor(text / 60) : "-";
- },
- },
{
title: "面授时间",
dataIndex: "starttime",
@@ -2054,6 +2042,17 @@ const columns6 = [
return text.record.beginTime + ' ~ ' + text.record.endTime
},
},
+ {
+ title: "时长",
+ dataIndex: "duration",
+ key: "duration",
+ width: "12%",
+ ellipsis: true,
+ align: "center",
+ customRender: ({ text }) => {
+ return text ? text : "-";
+ },
+ },
{
title: "学员数",
dataIndex: "studentCnt",
@@ -2095,8 +2094,8 @@ const columns6 = [
width: "10%",
align: "center",
ellipsis: true,
- customRender: ({ text }) => {
- return text ? text : "-";
+ customRender: ( text ) => {
+ return
{text.record.createName ? text.record.createName : "-"}
},
},
{
@@ -2105,9 +2104,9 @@ const columns6 = [
key: "saddress",
width: "30%",
align: "center",
- ellipsis: true,
- customRender: ({ text }) => {
- return text ? text : "-";
+ customCell:() => {return {style: {maxWidth: '200px',minWidth: '100px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
+ customRender: ( {text} ) => {
+ return
{text ? text : "-"}
},
},
{
@@ -2320,13 +2319,14 @@ export default defineComponent({
// },
addOnlineCourse,
TwoDimensionalCode,
- DeleteOutlined
+ DeleteOutlined,
+ DownOutlined
},
setup() {
const CourseModalRef = ref(null);
const store = useStore();
const sysTypeOptions = computed(() => store.state.content_type);
- const durationText = computed(() => state.xjkkinputV3?.length?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute'):'请输入持续时间');
+ const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间');
const state = reactive({
tableCoursePlanLoading: false,
@@ -2981,6 +2981,10 @@ export default defineComponent({
watch(durationText,(val)=>{
nums.value++
if(nums.value>1){
+ if(val == '请输入持续时间'){
+ state.duration = null;
+ return
+ }
state.duration = val;
}
})
@@ -4043,6 +4047,9 @@ function onFocusEnd(){
message.error('请填写结业时间')
return
}
+ if(state.checked4 && !state.assessmentId){
+ return message.error('请选择评估');
+ }
console.log(postData,'传输的数据')
// if(!postData.duration){
// return message.error("请输入持续时间");
@@ -4133,7 +4140,7 @@ function onFocusEnd(){
state.stuColumns = [
{
title: "岗位",
- width: "8%",
+ width: "160px",
dataIndex: "studentJobName",
key: "7",
align: "center",
@@ -4151,10 +4158,11 @@ function onFocusEnd(){
},
{
title: "Band",
- width: "8%",
+ width: "120px",
dataIndex: "studentBandDesc",
key: "7",
align: "center",
+ ellipsis: true,
customRender: (text) => {
return (
@@ -4167,10 +4175,11 @@ function onFocusEnd(){
},
{
title: "报名状态",
- width: "8%",
+ width: "120px",
dataIndex: "status",
key: "5",
align: "center",
+ ellipsis: true,
customRender: ({ record }) => {
switch (String(record.status)) {
case "0":
@@ -4185,28 +4194,31 @@ function onFocusEnd(){
{
title: "签到状态",
- width: "8%",
+ width: "120px",
dataIndex: "signstatus",
key: "7",
align: "center",
+ ellipsis: true,
customRender: ({ record }) =>
record.signStatus ? "已签到" : "未签到",
},
{
title: "评估状态",
- width: "8%",
+ width: "120px",
dataIndex: "evastatus",
key: "8",
align: "center",
+ ellipsis: true,
customRender: ({ record }) =>
record.assessmentStatus?"已评估" : "未评估",
},
{
title: "评分",
- width: "8%",
+ width: "120px",
dataIndex: "studentScore",
key: "8",
align: "center",
+ ellipsis: true,
customRender: ({ record }) => {
return (
@@ -4270,36 +4282,39 @@ function onFocusEnd(){
// },
{
title: "作业状态",
- width: "8%",
+ width: "120px",
dataIndex: "workStatus",
key: "5",
align: "center",
+ ellipsis: true,
customRender: ({ record }) => {
switch (String(record.workStatus)) {
case "null":
- return "未完成";
+ return "未提交";
case "0":
- return "未完成";
+ return "未提交";
case "1":
- return "已完成";
+ return "已提交";
case "2":
- return "未完成";
+ return "未提交";
}
},
},
{
title: "考试成绩",
- width: "8%",
+ width: "120px",
dataIndex: "examinationScore",
key: "8",
align: "center",
+ ellipsis: true,
},
{
title: "结业状态",
- width: "15%",
+ width: "120px",
dataIndex: "completionStatus",
key: "8",
align: "center",
+ ellipsis: true,
customRender: ({ record }) => {
return (
@@ -5222,11 +5237,11 @@ function onFocusEnd(){
const qrcodeVisible = (record, type) => {
// `${location.protocol}//${location.host}${import.meta.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${record.id}`
state.codevisible = true;
- let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
+ let teacherNames = record.offteachers?.filter(teacher => teacher.name !== null).map(teacher => teacher.name);
state.codeInfo = {
title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
- name: record.name ? record.name + type == 2 ?'签到' : '评估' : "",
- teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "",
+ name: record.name,
+ teacherName: teacherNames.length > 3 ? teacherNames.slice(0,3).join(',')+'...' : teacherNames.join(','),
url:
type == 1
? process.env.VUE_APP_BASE_API +
@@ -5236,7 +5251,8 @@ function onFocusEnd(){
record.id
}&taskType=${2}&type=${3}&openCourseId=${
record.id
- }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}`
+ }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}`,
+ titleTeacherName: moreLine(record.offteachers),
};
console.log("codeInfo", state.codeInfo, record);
state.codeIndex = 0;
@@ -7585,8 +7601,9 @@ function onFocusEnd(){
}
.stmm_i5 {
- display: flex;
- justify-content: space-between;
+ // display: flex;
+ // justify-content: space-between;
+ margin-right: 20px;
}
.stmm_i6 {