diff --git a/src/App.vue b/src/App.vue index 86eaf07b..40fc2114 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本0.9.20------------"); + console.log("版本1.0------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/api/method.js b/src/api/method.js index f304aa34..d4cd4a3a 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -236,7 +236,7 @@ const setCookie = (name, value, perpetual) => { console.log('存储token到cookie') let exdate = new Date() exdate.setDate(perpetual * 24 * 60 * 60 * 1000) //exdate.setDate(exdate.getDate() + 365) - document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString() + document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/` //永久有效 //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT' } diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 9941c82c..c2e38b3f 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -46,7 +46,7 @@
-
-
- -
+
+ +
+
@@ -171,7 +171,7 @@ export default { time: undefined, caseId: null, caseName: "", - isClick: false + isClick: false, }); const closeDrawer = () => { ctx.emit("update:addcaseVisible", false); @@ -202,13 +202,13 @@ export default { width: "200px", align: "center", }, - // { - // title: "导入时间", - // dataIndex: "time", - // key: "time", - // width: "400px", - // align: "center", - // }, + // { + // title: "导入时间", + // dataIndex: "time", + // key: "time", + // width: "400px", + // align: "center", + // }, ]; return columns; }; @@ -218,6 +218,7 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; + console.log("selectedRows", selectedRows); }; const handelChangePage = (page, pageSize) => { state.selectedRowKeys = []; @@ -276,16 +277,16 @@ export default { }; const updateTask = () => { if (props.isLevel == 1) { - if(!props.isactive){ + if (!props.isactive) { message.destroy(); return message.warning("请先选中关卡"); } - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, @@ -308,12 +309,12 @@ export default { }); } } else if (props.isLevel == 2) { - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTask({ @@ -338,19 +339,21 @@ export default { }); } } else if (props.isLevel == 3) { - if(state.isClick){ - message.destroy(); - message.error('请勿频繁点击') - return - } - state.isClick = true; + if (state.isClick) { + message.destroy(); + message.error("请勿频繁点击"); + return; + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTaskTemplate({ courseId: Number(state.apiTaskList[i].casesId), name: state.apiTaskList[i].title, projectTaskId: props.projectTaskId, - projectTemplateId: Number(localStorage.getItem("projectTemplateId")), + projectTemplateId: Number( + localStorage.getItem("projectTemplateId") + ), stageId: Number(props.chooseStageId) || 0, type: 3, }) @@ -432,7 +435,7 @@ export default { .main_items { margin-top: 32px; display: flex; - + margin-bottom: 12px; flex-wrap: wrap; .mi_ipts { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index f22ce374..963c697c 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -1,34 +1,46 @@ \ No newline at end of file diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 3315950c..3bcce3ed 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -1,15 +1,23 @@ \ No newline at end of file diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue index 74fab40c..5549b39c 100644 --- a/src/components/drawers/AssessmentAll.vue +++ b/src/components/drawers/AssessmentAll.vue @@ -185,8 +185,8 @@ export default { assessmentId: info.assessmentId, name: info.assessmentName, num: num, - creator: info.createUser ? info.createUser : "-", - time: dayjs(info.createTime).format("YYYY-MM-DD"), + creator: info.createUserName ? info.createUserName : "-", + time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"), }; //更新讨论信息 state.assessment = obj; @@ -277,8 +277,8 @@ export default { assessmentId: value.assessmentId, num: num, name: value.assessmentName ? value.assessmentName : "-", - creator: value.createUser ? value.createUser : "-", - time: dayjs(value.createTime).format("YYYY-MM-DD"), + creator: value.createUserName ? value.createUserName : "-", + time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"), }; array.push(obj); }); diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue index 5ee947cf..0566d5a6 100644 --- a/src/components/drawers/AssessmentList.vue +++ b/src/components/drawers/AssessmentList.vue @@ -202,8 +202,8 @@ export default { assessmentId: value.assessmentId, num: num, name: value.assessmentName ? value.assessmentName : "-", - creator: value.createUser ? value.createUser : "-", - time: dayjs(value.createTime).format("YYYY-MM-DD"), + creator: value.createUserName ? value.createUserName : "-", + time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"), }; array.push(obj); }); diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index f62a8e6c..1054c356 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -24,7 +24,7 @@
@@ -54,20 +54,21 @@ onChange: onSelectChange, }" /> -
-
- -
+
+
+ +
+
@@ -131,20 +132,20 @@ export default { align: "center", ellipsis: true, }, - // { + // { // title: "状态", - // width: "13%", - // dataIndex: "status", - // key: "status", - // align: "center", - // }, - // { + // width: "13%", + // dataIndex: "status", + // key: "status", + // align: "center", + // }, + // { // title: "价格", // width: "13%", // dataIndex: "quiz_price", - // key: "price", - // align: "center", - // }, + // key: "price", + // align: "center", + // }, { title: "可答题人数", width: "20%", @@ -161,7 +162,7 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.evListData = selectedRows[0] ? selectedRows[0] : {}; - console.log("state.evListData",state.evListData); + console.log("state.evListData", state.evListData); }; const closeDrawer = () => { state.selectedRowKeys = []; @@ -229,13 +230,13 @@ export default { //获取测评列表 const getAllEvalText = () => { let objael = { - keyword:state.inputV1, - + keyword: state.inputV1, }; api .choiceEvaluation(objael) .then((res) => { - state.tableDataTotal=9; + state.tableDataTotal = 9; + // console.log("测评列表", res.data.data); getTableDataList(res.data.data); }) .catch(() => {}); @@ -311,7 +312,7 @@ export default { } .mi_btns { display: flex; - + cursor: pointer; .btn { padding: 0px 26px 0px 26px; diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index ea3b1f14..7767d488 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -3,70 +3,92 @@