hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-11 11:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dongwu_develop' into develop

Browse Source
This commit is contained in:
BOE\10867418
2023-03-21 17:13:20 +08:00
parent bd3b9ec181 2fb750722a
commit a727f5f937
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
console.log("版本2.2.0------------"); console.log("版本2.2.1------------");
// 监听关闭浏览器 // 监听关闭浏览器
let time1 = ref(0); let time1 = ref(0);

6
src/components/drawers/AddOpenCourse.vue
View File

@@ -166,7 +166,7 @@
</div> </div>
<span style="margin-right: 3px">授课教师</span> <span style="margin-right: 3px">授课教师</span>
</div> </div>
<div class="select" style="width: 88%"> <div class="select" style="width: 74.5%">
<ProjectManager <ProjectManager
v-model:value="formData.teacherId" v-model:value="formData.teacherId"
v-model:name="formData.teacher" v-model:name="formData.teacher"
@@ -531,9 +531,9 @@ const createNewCourse = () => {
offcourseId: params.value.offcourseId, offcourseId: params.value.offcourseId,
draftTaskId: params.value.draftTaskId, draftTaskId: params.value.draftTaskId,
}); });
onceName.value = "";
dateTime.value = []; dateTime.value = [];
validated.value = 0; validated.value = 0;
onceName.value = "";
offCourseNewVisiable.value = true; offCourseNewVisiable.value = true;
}; };
const handleCancelStu = () => offCourseNewVisiable.value = false; const handleCancelStu = () => offCourseNewVisiable.value = false;
@@ -576,6 +576,7 @@ async function coursePlanConfirm() {
} }
function planEdit(record) { function planEdit(record) {
onceName.value = record.name;
formData.value = { ...record }; formData.value = { ...record };
validated.value = 0; validated.value = 0;
formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data); formData.value.homeWorkId && request(WORK_DETAIL(formData.value.homeWorkId), {}).then(res => formData.value.workInfo = res.data);
@@ -590,7 +591,6 @@ function openDrawer(row) {
params.value.draftTaskId = row.id; params.value.draftTaskId = row.id;
formData.value.offcourseId = row.courseId; formData.value.offcourseId = row.courseId;
formData.value.draftTaskId = row.id; formData.value.draftTaskId = row.id;
onceName.value = row.name;
courseName.value = row.name; courseName.value = row.name;
nextTick(tableRef.value.fetch); nextTick(tableRef.value.fetch);
} }

2
src/components/drawers/project/ProjectFaceTaskManage.vue
View File

@@ -242,7 +242,7 @@ const columns = ref([
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
customRender: ({ record: { workScore } }) => <span> {workScore || "-"}</span> customRender: ({ record: { workScore } }) => <span> {workScore!==-2?workScore:"-" || "-"}</span>
}, },
{ {
title: "考试成绩", title: "考试成绩",

8
src/views/learningpath/LevelAdd.vue
View File

@@ -2661,9 +2661,9 @@ export default {
item.courseId; item.courseId;
} }
if (item.type == 2) { if (item.type == 2) {
let date1 = new Date(item.endTime).getTime(); // let date1 = new Date(item.endTime).getTime();
let date2 = new Date().getTime(); // let date2 = new Date().getTime();
if (date1 < date2) return message.warning("当前面授课已结束"); // if (date1 < date2) return message.warning("当前面授课已结束");
// if (item.taskStatus == 1 || item.taskStatus == 2) // if (item.taskStatus == 1 || item.taskStatus == 2)
// return message.error("该任务无法学习，请联系管理员进行替换。"); // return message.error("该任务无法学习，请联系管理员进行替换。");
codeUrl = codeUrl =
@@ -2672,7 +2672,7 @@ export default {
"/faceteach?type=2&courseId=" + "/faceteach?type=2&courseId=" +
item.courseId + item.courseId +
"&id=" + "&id=" +
item.projectTaskId; item.id;
} }
if (item.type == 3) return message.error("请在pc端完成"); if (item.type == 3) return message.error("请在pc端完成");