mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-18 23:36:46 +08:00
面授连同周边修改
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
<div v-if="codeInfo.name&&!codeInfo.teacherName" class="codename">
|
<div v-if="codeInfo.name&&!codeInfo.teacherName" class="codename">
|
||||||
{{ codeInfo.name ? codeInfo.name : "" }}
|
{{ codeInfo.name ? codeInfo.name : "" }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="codeInfo.name&&codeInfo.teacherName" class="codename">
|
<div v-if="codeInfo.name&&codeInfo.teacherName" class="codename" :title="codeInfo.name">
|
||||||
开课:{{ codeInfo.name ? codeInfo.name : "" }}
|
开课:{{ codeInfo.name ? codeInfo.name : "" }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="codeInfo.teacherName" class="codename" :title="codeInfo.titleTeacherName">
|
<div v-if="codeInfo.teacherName" class="codename" :title="codeInfo.titleTeacherName">
|
||||||
|
|||||||
@@ -2019,7 +2019,7 @@ const columns6 = [
|
|||||||
align: "center",
|
align: "center",
|
||||||
customCell:() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
|
customCell:() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
|
||||||
customRender: ({ text }) => {
|
customRender: ({ text }) => {
|
||||||
return <a-tooltip color="white" placement="bottom" title = {text} >{text ? text : "-"}</a-tooltip>
|
return <a-tooltip color="white" placement="bottomLeft" title = {text} >{text ? text : "-"}</a-tooltip>
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -2095,7 +2095,7 @@ const columns6 = [
|
|||||||
align: "center",
|
align: "center",
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
customRender: ( text ) => {
|
customRender: ( text ) => {
|
||||||
return <a-tooltip color="white" placement="bottom" title = {text.record.createName} >{text.record.createName ? text.record.createName : "-"}</a-tooltip>
|
return <a-tooltip color="white" placement="bottom" title = {text.record.createName+text.record.createUserNo} >{text.record.createName+text.record.createUserNo}</a-tooltip>
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -2106,7 +2106,7 @@ const columns6 = [
|
|||||||
align: "center",
|
align: "center",
|
||||||
customCell:() => {return {style: {maxWidth: '200px',minWidth: '100px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
|
customCell:() => {return {style: {maxWidth: '200px',minWidth: '100px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer',padding:'0px 10px'}}},
|
||||||
customRender: ( {text} ) => {
|
customRender: ( {text} ) => {
|
||||||
return <a-tooltip color="white" placement="bottom" title = {text} >{text ? text : "-"}</a-tooltip>
|
return <a-tooltip color="white" placement="bottomLeft" title = {text} >{text ? text : "-"}</a-tooltip>
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -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 durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间');
|
||||||
|
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
|
isAssessmentId: null,
|
||||||
|
isHomeWorkId: null,
|
||||||
tableCoursePlanLoading: false,
|
tableCoursePlanLoading: false,
|
||||||
permissions:null,
|
permissions:null,
|
||||||
createId:null,
|
createId:null,
|
||||||
@@ -4210,7 +4212,7 @@ function onFocusEnd(){
|
|||||||
align: "center",
|
align: "center",
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
customRender: ({ record }) =>
|
customRender: ({ record }) =>
|
||||||
record.assessmentStatus?"已评估" : "未评估",
|
state.isAssessmentId ? record.assessmentStatus?"已评估" : "未评估":'-',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "评分",
|
title: "评分",
|
||||||
@@ -4288,15 +4290,21 @@ function onFocusEnd(){
|
|||||||
align: "center",
|
align: "center",
|
||||||
ellipsis: true,
|
ellipsis: true,
|
||||||
customRender: ({ record }) => {
|
customRender: ({ record }) => {
|
||||||
switch (String(record.workStatus)) {
|
// switch (String(record.workStatus)) {
|
||||||
case "null":
|
// case "null":
|
||||||
return "未提交";
|
// return "未提交";
|
||||||
case "0":
|
// case "0":
|
||||||
return "未提交";
|
// return "未提交";
|
||||||
case "1":
|
// case "1":
|
||||||
return "已提交";
|
// return "已提交";
|
||||||
case "2":
|
// case "2":
|
||||||
return "未提交";
|
// 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.currentPlanItem = itm;
|
||||||
state.newCourseName = itm.name;
|
state.newCourseName = itm.name;
|
||||||
|
state.isAssessmentId = itm.assessmentId;
|
||||||
|
state.isHomeWorkId = itm.homeWorkId;
|
||||||
console.log(89877766666);
|
console.log(89877766666);
|
||||||
console.log(state.currentPlanItem);
|
console.log(state.currentPlanItem);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user