+
-
@@ -2935,26 +2937,26 @@ const columns1 = [
return text ? text : "-";
},
},
- // {
- // title: "学习人数",
- // width: 130,
+ // {
+ // title: "学习人数",
+ // width: 130,
// dataIndex: "stunum",
// key: "4",
- // align: "center",
+ // align: "center",
// customRender: ({ text }) => {
// // return text ? text : "0";
// },
- // },
- // {
+ // },
+ // {
// title: "评分",
// width: 130,
// dataIndex: "grade",
- // key: "5",
+ // key: "5",
// align: "center",
- // customRender: ({ text }) => {
- // return text ? text : "0";
+ // customRender: ({ text }) => {
+ // return text ? text : "0";
// },
- // },
+ // },
{
title: "状态",
width: 130,
@@ -3303,38 +3305,38 @@ const columns7 = [
}
},
},
- {
- title: "签到状态",
- width: 200,
- dataIndex: "signstatus",
- key: "7",
- align: "center",
- customRender: ({ record }) => {
- switch (String(record.signStatus)) {
- case "0":
- return "未签到";
- case "1":
- return "已签到";
- case "2":
- return "请假";
- }
- },
- },
- {
- title: "评估状态",
- width: 200,
- dataIndex: "evastatus",
- key: "8",
- align: "center",
- customRender: ({ record }) => {
- switch (String(record.evalStatus)) {
- case "0":
- return "未评估";
- case "1":
- return "已评估";
- }
- },
- },
+ // {
+ // title: "签到状态",
+ // width: 200,
+ // dataIndex: "signstatus",
+ // key: "7",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // switch (String(record.signStatus)) {
+ // case "0":
+ // return "未签到";
+ // case "1":
+ // return "已签到";
+ // case "2":
+ // return "请假";
+ // }
+ // },
+ // },
+ // {
+ // title: "评估状态",
+ // width: 200,
+ // dataIndex: "evastatus",
+ // key: "8",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // switch (String(record.evalStatus)) {
+ // case "0":
+ // return "未评估";
+ // case "1":
+ // return "已评估";
+ // }
+ // },
+ // },
// {
// title: "结业状态",
// width: 100,
@@ -3392,10 +3394,10 @@ export default defineComponent({
const CourseModalRef = ref(null);
const state = reactive({
- stuColumns:[
+ stuColumns: [
{
title: "报名状态",
- width: '10%',
+ width: "10%",
dataIndex: "status",
key: "5",
align: "center",
@@ -3412,7 +3414,7 @@ export default defineComponent({
},
{
title: "加入方式",
- width: '10%',
+ width: "10%",
dataIndex: "join",
key: "6",
align: "center",
@@ -3425,38 +3427,38 @@ export default defineComponent({
}
},
},
- {
- title: "签到状态",
- width: '10%',
- dataIndex: "signstatus",
- key: "7",
- align: "center",
- customRender: ({ record }) => {
- switch (String(record.signStatus)) {
- case "0":
- return "未签到";
- case "1":
- return "已签到";
- case "2":
- return "请假";
- }
- },
- },
- {
- title: "评估状态",
- width: '10%',
- dataIndex: "evastatus",
- key: "8",
- align: "center",
- customRender: ({ record }) => {
- switch (String(record.evalStatus)) {
- case "0":
- return "未评估";
- case "1":
- return "已评估";
- }
- },
- },
+ // {
+ // title: "签到状态",
+ // width: '10%',
+ // dataIndex: "signstatus",
+ // key: "7",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // switch (String(record.signStatus)) {
+ // case "0":
+ // return "未签到";
+ // case "1":
+ // return "已签到";
+ // case "2":
+ // return "请假";
+ // }
+ // },
+ // },
+ // {
+ // title: "评估状态",
+ // width: '10%',
+ // dataIndex: "evastatus",
+ // key: "8",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // switch (String(record.evalStatus)) {
+ // case "0":
+ // return "未评估";
+ // case "1":
+ // return "已评估";
+ // }
+ // },
+ // },
],
shipType: 1,
addLoading: false,
@@ -3678,7 +3680,7 @@ export default defineComponent({
imageUrl: "",
imgList: [],
- validate:true,
+ validate: true,
pageSize2: 10,
currentPage2: 0,
@@ -3717,16 +3719,16 @@ export default defineComponent({
addStudentList: null, //选中列表
newCourseName: null, //新建开课名称
- EditWorkId:null,
+ EditWorkId: null,
assessment: {},
assessmentId: null,
- workName:null,
- EditTestId:null,
- testName:null,
+ workName: null,
+ EditTestId: null,
+ testName: null,
assessmentName: "",
assessmentVisible: false,
- addhomeworkvisible:false,
- addtestvisible:false,
+ addhomeworkvisible: false,
+ addtestvisible: false,
codevisible: false, //二维码弹窗
codeInfo: null, //二维码内容
codeUrl: codeUrl,
@@ -4035,7 +4037,6 @@ export default defineComponent({
let startTime = "";
let endTime = "";
if (state.projectTime) {
-
startTime = toDate(
new Date(state.projectTime[0].$d).getTime() / 1000,
"Y-M-D"
@@ -4044,7 +4045,6 @@ export default defineComponent({
new Date(state.projectTime[1].$d).getTime() / 1000,
"Y-M-D"
);
-
}
let res = await list({
pageNo: state.currentPage1,
@@ -4276,7 +4276,7 @@ export default defineComponent({
const showDrawerAddTest = () => {
state.addtestvisible = true;
};
- const logW = (e) => {
+ const logW = (e) => {
state.EditWorkId = null;
console.log(e);
};
@@ -4838,7 +4838,7 @@ export default defineComponent({
state.assessmentId = null;
state.assessmentName = "";
state.EditWorkId = null;
-
+
removePG();
};
//保存开课
@@ -4863,7 +4863,7 @@ export default defineComponent({
beginTime: startTime,
completeType: type,
endTime: endTime,
- evalFlag: Number(state.assessmentId) >0 &&state.checked4 ? 1 : 0,
+ evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
evaluateId: Number(state.assessmentId),
testId: state.EditTestId,
homeWorkId: state.EditWorkId,
@@ -4910,25 +4910,26 @@ export default defineComponent({
if (res.data.code === 200) return res.data.data;
});
- if(item.evaluateId){
- api
- .queryAppraiseDetailById({assessmentId: item.evaluateId})
- .then((res) => {
- state.assessmentName = res.data.data.assessmentName;
- })
- .catch();
- }
- if(item.homeWorkId){
- queryWorkDetailById({workId:item.homeWorkId}).then((res)=>{
+ if (item.evaluateId) {
+ api
+ .queryAppraiseDetailById({ assessmentId: item.evaluateId })
+ .then((res) => {
+ state.assessmentName = res.data.data.assessmentName;
+ })
+ .catch();
+ }
+ if (item.homeWorkId) {
+ queryWorkDetailById({ workId: item.homeWorkId }).then((res) => {
state.workName = res.data.data.workName;
});
- }
- if(item.testId){
- queryExaminationDetailById({ examinationId: item.testId }).then((res)=>{
- state.testName = res.data.data.examinationName;
- });
- }
-
+ }
+ if (item.testId) {
+ queryExaminationDetailById({ examinationId: item.testId }).then(
+ (res) => {
+ state.testName = res.data.data.examinationName;
+ }
+ );
+ }
console.log("res");
console.log("获取面授课详情", item);
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 66cade3a..08c8ee09 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -100,12 +100,20 @@
@@ -164,10 +172,10 @@
-
-
+
+