diff --git a/src/components/TwoDimensionalCodeNew.vue b/src/components/TwoDimensionalCodeNew.vue index 600d1028..2e8518c3 100644 --- a/src/components/TwoDimensionalCodeNew.vue +++ b/src/components/TwoDimensionalCodeNew.vue @@ -25,7 +25,7 @@
{{ codeInfo.name ? codeInfo.name : "" }}
-
+
开课:{{ codeInfo.name ? codeInfo.name : "" }}
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index a56458f8..4b3caf45 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2019,7 +2019,7 @@ const columns6 = [ align: "center", customCell:() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}}, customRender: ({ text }) => { - return {text ? text : "-"} + return {text ? text : "-"} }, }, { @@ -2095,7 +2095,7 @@ const columns6 = [ align: "center", ellipsis: true, customRender: ( text ) => { - return {text.record.createName ? text.record.createName : "-"} + return {text.record.createName+text.record.createUserNo} }, }, { @@ -2106,7 +2106,7 @@ const columns6 = [ align: "center", customCell:() => {return {style: {maxWidth: '200px',minWidth: '100px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}}, customRender: ( {text} ) => { - return {text ? text : "-"} + return {text ? text : "-"} }, }, { @@ -2329,6 +2329,8 @@ export default defineComponent({ const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间'); const state = reactive({ + isAssessmentId: null, + isHomeWorkId: null, tableCoursePlanLoading: false, permissions:null, createId:null, @@ -4210,7 +4212,7 @@ function onFocusEnd(){ align: "center", ellipsis: true, customRender: ({ record }) => - record.assessmentStatus?"已评估" : "未评估", + state.isAssessmentId ? record.assessmentStatus?"已评估" : "未评估":'-', }, { title: "评分", @@ -4288,15 +4290,21 @@ function onFocusEnd(){ align: "center", ellipsis: true, customRender: ({ record }) => { - switch (String(record.workStatus)) { - case "null": - return "未提交"; - case "0": - return "未提交"; - case "1": - return "已提交"; - case "2": - return "未提交"; + // switch (String(record.workStatus)) { + // case "null": + // return "未提交"; + // case "0": + // return "未提交"; + // case "1": + // return "已提交"; + // case "2": + // return "未提交"; + // } + const status = String(record.workStatus); + if (state.isHomeWorkId) { + return ["null", "0", "2"].includes(status) ? "未提交" : "已提交"; + } else { + return '-'; } }, }, @@ -4360,6 +4368,8 @@ function onFocusEnd(){ state.currentPlanItem = itm; state.newCourseName = itm.name; + state.isAssessmentId = itm.assessmentId; + state.isHomeWorkId = itm.homeWorkId; console.log(89877766666); console.log(state.currentPlanItem);