From 6cf0aacec0364cb3fae95520c23475ede4667e7c Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 14 Dec 2022 23:12:21 +0800 Subject: [PATCH 01/79] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index a27b84b0..0bea34c6 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -315,6 +315,7 @@ export default { classifyList5: [], courseSyncFlag: false, auditDescription: "", + ptojectType: null, }); // 封面图选择 From fd19dd049cd96be618d6f37936af7e98fb01cc13 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 14 Dec 2022 23:55:02 +0800 Subject: [PATCH 02/79] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/App.vue b/src/App.vue index b85229f3..01016e23 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ \ No newline at end of file diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue new file mode 100644 index 00000000..9e5e6572 --- /dev/null +++ b/src/components/student/TableStudent.vue @@ -0,0 +1,213 @@ + + + \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 2dfe28b8..f818f770 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2276,236 +2276,168 @@ {{ currentPlanItem.teacher }}
-
- - -
-
-
搜索
-
-
-
-
重置
-
-
-
-
-
-
添加学员
-
- - -
+ + + + + + +
- - - -
-
- -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -2604,11 +2536,11 @@
-
-
取消
+
+
取消
-
-
确定
+
+
确定
@@ -2930,6 +2862,7 @@ import { queryWorkDetailById } from "@/api/indexWork"; import { queryExaminationDetailById } from "@/api/indexExam"; import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; +import TableStudent from "@/components/student/TableStudent"; //列表表格 const columns1 = [ // { @@ -3448,6 +3381,7 @@ export default defineComponent({ AddHomework, AddTest, NameInput, + TableStudent, // VNodes: (_, {attrs}) => { // return attrs.vnodes; // }, @@ -3458,6 +3392,72 @@ export default defineComponent({ const CourseModalRef = ref(null); const state = reactive({ + stuColumns:[ + { + title: "报名状态", + width: '10%', + dataIndex: "status", + key: "5", + align: "center", + customRender: ({ record }) => { + switch (String(record.source)) { + case "0": + return "待审核"; + case "1": + return "审核通过"; + case "2": + return "审核拒绝"; + } + }, + }, + { + title: "加入方式", + width: '10%', + dataIndex: "join", + key: "6", + align: "center", + customRender: ({ record }) => { + switch (String(record.source)) { + case "1": + return "手动加入"; + case "2": + 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, currentPlanItem: {}, @@ -8640,6 +8640,30 @@ export default defineComponent({ margin-bottom: 20px; } +.cus-btn { + width: 100%; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16px; + border: 1px solid #4ea6ff; + border-radius: 8px; + background: #4ea6ff; + cursor: pointer; + color: #fff; +} + +.white { + background: #fff; + color: #4ea6ff; +} + +.cus-input { + height: 40px; + border-radius: 8px; +} + // .tableSelect { // position: relative; // .hoverList { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index f5ee9805..7342bdd8 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -505,127 +505,7 @@
-
-
-
-
-
- -
-
-
- 搜索 - -
-
-
- 重置 -
-
-
-
- - - -
- 批量删除 - -
-
- - -
- - -
- -
-
-
-
-
+
{{ act }}
{{ act }}
{{ act }}
{{ act }}
@@ -163,15 +163,15 @@ 更多
--> - +
- +
返回
 @@ -180,11 +180,11 @@
@@ -196,8 +196,8 @@
- +
- +
- +
添加任务 @@ -222,18 +222,18 @@
快速添加任务/阶段
- +
- +
- +
添加学员 @@ -271,27 +271,27 @@
{{ - projectInfoOverview.totalStudentCnt - }} + projectInfoOverview.totalStudentCnt + }}
总人数
{{ - projectInfoOverview.studyStudentCnt - }} + projectInfoOverview.studyStudentCnt + }}
学习人数
{{ - projectInfoOverview.completeStudentCnt - }} + projectInfoOverview.completeStudentCnt + }}
完成人数
{{ - projectInfoOverview.onlineCourseCnt - }}%
在线课程数
@@ -299,8 +299,8 @@
{{ - projectInfoOverview.offLineCourseCnt - }}%
面授课程数
@@ -308,8 +308,8 @@
{{ - projectInfoOverview.completeRatio - }}%
总完成率
@@ -324,13 +324,13 @@
-->
{{ item.stage }}
@@ -344,28 +344,28 @@
课程完成率
考试通过率
作业完成率
@@ -376,8 +376,8 @@
阶段任务总数
@@ -386,8 +386,8 @@
必修课
@@ -396,8 +396,8 @@
选修课
@@ -415,12 +415,12 @@ 批量面授报名 --> @@ -437,8 +437,8 @@
-->
\ No newline at end of file diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 9b87b4f0..5a7932fd 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -118,7 +118,7 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "20%", + width: "10%", align: "left", className: "h", }, @@ -126,7 +126,7 @@ const tablecolumns = ref([ title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: "10%", + width: "20%", align: "center", className: "h", ellipsis: true, @@ -135,7 +135,7 @@ const tablecolumns = ref([ title: "部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: "10%", + width: "20%", align: "center", className: "h", ellipsis: true, @@ -144,7 +144,7 @@ const tablecolumns = ref([ title: "加入方式", dataIndex: "source", key: "source", - width: "10%", + width: "20%", align: "center", customRender: ({record: {source}}) => ({1: "快速添加", 2: "组织", 3: "受众"}[source]), @@ -174,7 +174,7 @@ const tableData = ref({ }); const stuRowSelection = computed(() => ({ - columnWidth: 20, + columnWidth: 10, selectedRowKeys: stuSelectKeys.value, onChange: onStuSelectChange, preserveSelectedRowKeys: true, From b9bfcd6a8cefbdb86f7088cd139ca07ca80f9b96 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 10:51:59 +0800 Subject: [PATCH 54/79] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=95=E5=8D=B7=E9=80=89=E6=8B=A9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=90=8E=E6=9C=AA=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 1607 +++++++++++++------------- src/components/drawers/AddTest.vue | 1527 ++++++++++++------------ 2 files changed, 1531 insertions(+), 1603 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 25549958..fc8eadc6 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -1,48 +1,34 @@ \ No newline at end of file diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 38ac3dd1..3315950c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -1,23 +1,15 @@ \ No newline at end of file From a2dce95b4fcc449ecb7c1c5a5ccb69418287363f Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 10:58:53 +0800 Subject: [PATCH 55/79] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E5=90=8C=E9=98=B6=E6=AE=B5=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E4=B8=80=E5=9C=A8=E7=BA=BF=E5=92=8C?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddInvist.vue | 897 ++++++++++++++------------- 1 file changed, 452 insertions(+), 445 deletions(-) diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index ddb7666f..3bb6dc62 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -1,472 +1,479 @@ From dd3a40320cb82ef787bfdf545ddb81a5a2837218 Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 20 Dec 2022 12:27:32 +0800 Subject: [PATCH 56/79] =?UTF-8?q?fix:=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E7=99=BD=E5=B1=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courselibrary/components/seeModal.vue | 1593 ++++++++--------- 1 file changed, 768 insertions(+), 825 deletions(-) diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index 1d9971d6..877cb44f 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -1,214 +1,154 @@ From 12a5829d3019c71553f891dce961c4046f4c1b2a Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 13:28:45 +0800 Subject: [PATCH 57/79] -- bug --- src/components/student/CommonStudent.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 57aca2bc..72966904 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -505,6 +505,7 @@ watch(visiable, () => { stuSelectKeys.value = [] orgSelectKeys.value = [] auditSelectKeys.value = [] + stuData.value = [] selectsData.value = { stageId: '', studentList: [], From b971e9eca86196dec09ad700cfa8af2365fd4b25 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 13:55:01 +0800 Subject: [PATCH 58/79] -- bug --- src/components/student/CommonStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index c5895a47..5b03382f 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -362,7 +362,7 @@ const { loading: audiLoading, total: audiTotal } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, { - init: false, + init: true, result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})), totalPage: res => res.result.totalPage, total: res => res.result.totalElement From febf4774eea1c95782a9f9ae4c7f3685969675ff Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 20 Dec 2022 14:16:03 +0800 Subject: [PATCH 59/79] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddFaceteach.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 12d12538..6f29ed3b 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -495,6 +495,7 @@ export default { innerPersion: false, outPersion: false, assessmentName: null, + isClick: false }); const clear = () => { state.courseName = ""; @@ -643,6 +644,12 @@ export default { message.destroy(); return message.warning("请输入必填字段"); } else { + if(state.isClick){ + message.destroy(); + message.error("请勿频繁点击") + return + } + state.isClick = true; let type = state.onlySign ? "1," : "0,"; let t = state.completeLeave ? "1" : "0"; let p = state.innerPersion ? "1," : "0,"; @@ -681,10 +688,12 @@ export default { // message.success(`添加成功`); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; closeDrawer(); }) .catch((e) => { console.log(e); + state.isClick = false; message.destroy(); message.error(`添加失败`); }); From 4442ca956d7be9d441ebd221ac4b54601af0f97e Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 20 Dec 2022 15:35:04 +0800 Subject: [PATCH 60/79] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A2=91=E7=B9=81=E7=82=B9=E5=87=BB=E5=A2=9E=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 12 +++++++++++ src/components/drawers/AddCase.vue | 25 +++++++++++++++++++++ src/components/drawers/AddHomework.vue | 19 ++++++++++++++++ src/components/drawers/AddInvist.vue | 30 ++++++++++++++++++++++++++ src/components/drawers/AddLive.vue | 15 ++++++++++++- src/components/drawers/AddOnline.vue | 29 +++++++++++++++++++++++++ src/components/drawers/AddRef.vue | 19 ++++++++++++++-- 7 files changed, 146 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index a8987e13..17cc3de3 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -317,6 +317,7 @@ export default { textV2: "", radioV1: "", time: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addactiveVisible", false); @@ -464,6 +465,13 @@ export default { return message.warning("请输入活动地址"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + let obj = { activityAddress: state.inputV3, //活动地址 activityDuration: state.inputV2, //活动时长 @@ -489,10 +497,12 @@ export default { ctx.emit("changeData", false); message.destroy(); message.success("更新成功"); + state.isClick = false; }) .catch(() => { message.destroy(); message.error("更新失败"); + state.isClick = false; }); } else { //新建活动信息 @@ -504,10 +514,12 @@ export default { closeDrawer(); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) .catch(() => { message.destroy(); message.error("创建失败"); + state.isClick = false; }); } }; diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 6621e360..9941c82c 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -171,6 +171,7 @@ export default { time: undefined, caseId: null, caseName: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addcaseVisible", false); @@ -279,6 +280,12 @@ export default { message.destroy(); return message.warning("请先选中关卡"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, @@ -293,12 +300,20 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + state.isClick = false; }); } } else if (props.isLevel == 2) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTask({ @@ -314,13 +329,21 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } } else if (props.isLevel == 3) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; for (let i = 0; i < state.apiTaskList.length; i++) { apiTask .addTaskTemplate({ @@ -336,10 +359,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } } diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ba5830b3..3e99ec49 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -194,6 +194,7 @@ export default { const state = reactive({ addLoading: false, workEnclosureAddress: "", + isClick: false }); const formRef = ref(); @@ -337,29 +338,47 @@ export default { workName: formState.workName, workRequirement: formState.workRequirement, }; + if (props.EditWorkId > 0) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + updateWorkTaskUsing(obj) .then(async(res) => { // console.log("添加成功", res); await updateTask(res); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch((err) => { message.destroy(); message.error(`添加失败${err}`); + state.isClick = false; }); } else { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; createWorkTask(obj) .then(async(res) => { console.log("添加成功", res); await updateTask(res); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch((err) => { message.destroy(); message.error(`添加失败${err}`); + state.isClick = false; }); } }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 3bb6dc62..aab3d6dc 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -105,6 +105,7 @@ export default { assessment1: null, assessmentVisible: false, titleTag: false, + isClick: false }); // const getCheckedAss = (ass) => { // state.assessmentId = ass.assessmentId; @@ -153,6 +154,12 @@ export default { message.destroy(); return message.warning("请先选中关卡"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistence({ chapterId: Number(props.isactive), courseTaskId: l_data_id, @@ -174,6 +181,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { RouterEditTask({ @@ -192,17 +200,26 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + state.isClick = false; }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 2) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProject({ courseTaskId: l_data_id, projectId: props.projectId, @@ -224,6 +241,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { apiTask @@ -239,16 +257,25 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 3) { + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProjectTemplate({ courseTaskId: l_data_id, projectTemplateId: props.projectTemplateId, @@ -269,6 +296,7 @@ export default { } message.destroy(); message.warning("评估（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { addTempTask({ @@ -284,10 +312,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); } }); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8e1f08c6..e6ab1960 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -482,6 +482,7 @@ export default { switchC2: false, assessmentVisible: false, assessmentName: "", + isClick: false }); const closeDrawer = () => { ctx.emit("update:addliveVisible", false); @@ -693,6 +694,13 @@ export default { message.destroy(); return message.warning("请输入直播公告"); } + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + const regular = /^[+]{0,1}(\d+)$/; if (!regular.test(state.inputV2)) { message.destroy(); @@ -743,9 +751,11 @@ export default { message.success("提交成功"); closeDrawer(); await updateTask(res); + state.isClick = false; }) .catch((err) => { console.log(err); + state.isClick = false; }); } else { api @@ -755,8 +765,11 @@ export default { message.success("提交成功"); await updateTask(res); closeDrawer(); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } }; const beforeUpload = (file) => { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index fc8eadc6..f22ce374 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -232,6 +232,7 @@ export default { pageSize: 10, choicecourse: true, ddLoading: false, + isClick: false }); const ChoiceCourse = () => { state.choicecourse = false; @@ -455,6 +456,12 @@ export default { l_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", l_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistence({ chapterId: Number(props.isactive), courseTaskId: l_data_id, @@ -475,6 +482,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; state.addLoading = false; return; } else { @@ -498,6 +506,7 @@ export default { ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; + state.isClick = false; }) .catch(() => { state.addLoading = false; @@ -505,12 +514,14 @@ export default { message.error( `${props.edit ? "编辑" : "新增"}关卡任务失败` ); + state.isClick = false; }); }); } }) .catch((err) => { console.log(err); + state.isClick = false; }); } else if (props.isLevel == 2) { console.log("我是要便利的数据2", state.addOnlineList); @@ -520,6 +531,12 @@ export default { p_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", p_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProject({ courseTaskId: p_data_id, projectId: Number(props.projectId), @@ -540,6 +557,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { state.addOnlineList.map((value) => { @@ -557,10 +575,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}任务失败`); + state.isClick = false; }); }); } @@ -576,6 +596,12 @@ export default { p_data_id.push(item["courseId"]); }); console.log("需要查询的在线课ID", p_data_id); + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; IsExistenceProjectTemplate({ courseTaskId: p_data_id, projectTemplateId: props.projectTemplateId, @@ -595,6 +621,7 @@ export default { } message.destroy(); message.warning("在线课（" + tipStr + "）重复添加"); + state.isClick = false; return; } else { state.addOnlineList.map((value) => { @@ -614,10 +641,12 @@ export default { message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`); ctx.emit("changeData", false); closeDrawer(); + state.isClick = false; }) .catch(() => { message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); + state.isClick = false; }); }) } diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 62537d96..275bc7ed 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -155,6 +155,7 @@ export default { inputV2: "", textV1: "", title: null, + isClick: false }); const closeDrawer = () => { ctx.emit("update:addrefVisible", false); @@ -253,6 +254,14 @@ export default { return message.warning("请输入合法的链接地址"); } } + + if(state.isClick){ + message.destroy(); + message.error('请勿频繁点击') + return + } + state.isClick = true; + let obj = { linkAddress: state.inputV2, linkDescription: state.textV1, @@ -266,8 +275,11 @@ export default { message.success("编辑成功"); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } else { api .createExternalChain(obj) @@ -275,8 +287,11 @@ export default { message.success("提交成功"); await updateTask(res); ctx.emit("changeData", false); + state.isClick = false; }) - .catch(() => {}); + .catch(() => { + state.isClick = false; + }); } }; // 查询任务 From 22356826b897765e01de5950b7ac2bf49b1f96c3 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 20 Dec 2022 15:59:23 +0800 Subject: [PATCH 61/79] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8E=A5=E5=8F=A3=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/method.js | 37 +---- src/components/BreadCrumb.vue | 14 ++ src/components/NavTop.vue | 10 ++ src/components/drawers/AddHomework.vue | 105 +++++++----- src/components/drawers/AddLive.vue | 73 +++++---- src/components/student/TableStudent.vue | 102 ++++++------ src/views/learningpath/LevelAdd.vue | 205 ++++++++++++------------ 7 files changed, 289 insertions(+), 257 deletions(-) diff --git a/src/api/method.js b/src/api/method.js index 98913705..557c4988 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -179,41 +179,7 @@ function throttle(fn, delay = 200) { }; } -//把token存到cookie -//name 字段名 value 字段值 perpetual 有效期 -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()};path=/` - //永久有效 - //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT' -} -//获取cookie数据 -//先写一个方法 -function getCookie(name) { - return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || '' - //1.获取cookie字符串 - // const cookies = document.cookie; - // console.log('cookies',cookies) - // //通过；来分割字符串 - // const cookie = cookies.split(";"); - // // console.log('cookie', cookie) - // //遍历，使键值对匹配上 - // for (var i = 0; i < cookie.length; i++) { - // var arr = cookie[i].split("token="); - // // console.log('arr', arr) - // console.log('name', name) - // // if (arr[0] == name) { - // // console.log('arr[1]', arr[1]) - // // return arr[1]; - // // } - // // console.log('arr[1]', arr[1]) - // return arr[1] - // } - // return ""; -} //滚动加载信息 @@ -288,8 +254,7 @@ export { getWeek, autoComma, formatNumber, - setCookie, - getCookie, + scrollLoad, changeOwnership, commonData, diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index b5e57c20..f8f0b742 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -122,6 +122,20 @@ export default { }, ]; } + if ( + n.indexOf("/projectadd?projectId") !== -1 || + n.indexOf("/ProjectAdd?projectId") !== -1 + ) { + state.list = [ + { + name: "项目", + href: "/projectmanage", + }, + { + name: "编辑项目", + }, + ]; + } if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) { state.list = [ { diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index b69ba583..a1146bdd 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -127,6 +127,16 @@ export default { localStorage.removeItem("pathmapPic"); localStorage.removeItem("projectClass"); localStorage.removeItem("projectPic"); + + localStorage.removeItem("routerId"); + localStorage.removeItem("selectedKeys"); + localStorage.removeItem("openKeys"); + localStorage.removeItem("stageId"); + localStorage.removeItem("openpages"); + localStorage.removeItem("memberInitInfo"); + localStorage.removeItem("projectId"); + localStorage.removeItem("projectTemplateId"); + localStorage.removeItem("orgtreeList"); window.open("https://u-pre.boe.com/web/", "_self"); }; return { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ba5830b3..ac0c8d4a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -31,23 +31,23 @@
- +
- -
- + +
@@ -159,7 +159,7 @@ export default { type: Number, default: null, }, - workName:{ + workName: { type: String, default: null, }, @@ -256,16 +256,39 @@ export default { const resetForm = () => { // formRef.value.resetFields(); - formState.workName = '' - formState.workRequirement = '' - formState.choosedTime = [] + formState.workName = ""; + formState.workRequirement = ""; + formState.choosedTime = []; }; const handleValidate = (...args) => { console.log(args); }; + const beforeUpload = (file) => { + console.log("file", file); + const isJpgOrPng = + file.name.indexOf(".pdf") === -1 && + file.name.indexOf(".ppt") === -1 && + file.name.indexOf(".pptx") === -1 && + file.name.indexOf(".doc") === -1 && + file.name.indexOf(".docx") === -1 && + file.name.indexOf(".xls") === -1 && + file.name.indexOf(".xlsx") === -1 && + file.name.indexOf(".jpg") === -1 && + file.name.indexOf(".jpeg") === -1 && + file.name.indexOf(".png") === -1 && + file.name.indexOf(".gif") === -1 && + file.name.indexOf(".zip") === -1; + // console.log("isJpgOrPng", isJpgOrPng); + return isJpgOrPng; + }; const handleChange = (info) => { - console.log("info", info); + const isfileformat = beforeUpload(info.file); + if (isfileformat) { + fileList.value = []; + message.destroy(); + return message.error("请上传正确格式附件"); + } if (info.file.status !== "uploading") { console.log(info.file, info.fileList); // state.workEnclosureAddress = info.fileList[0].response.data; @@ -315,11 +338,11 @@ export default { // 重置表单选项 const afterVisibleChange = () => { - console.log('11223344', props.EditWorkId) + console.log("11223344", props.EditWorkId); if (props.EditWorkId > 0) { state.EditWorkId = props.EditWorkId; queryWork(); - }else{ + } else { formRef.value.resetFields(); resetForm(); } @@ -328,8 +351,12 @@ export default { // 新增任务 const updteHomeWork = () => { let obj = { - submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm"), - submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm"), + submitEndTime: dayjs(formState.choosedTime[1]).format( + "YYYY-MM-DD HH:mm" + ), + submitStartTime: dayjs(formState.choosedTime[0]).format( + "YYYY-MM-DD HH:mm" + ), workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "", @@ -339,9 +366,9 @@ export default { }; if (props.EditWorkId > 0) { updateWorkTaskUsing(obj) - .then(async(res) => { + .then(async (res) => { // console.log("添加成功", res); - await updateTask(res); + await updateTask(res); ctx.emit("changeData", false); closeDrawer(); }) @@ -351,9 +378,9 @@ export default { }); } else { createWorkTask(obj) - .then(async(res) => { + .then(async (res) => { console.log("添加成功", res); - await updateTask(res); + await updateTask(res); ctx.emit("changeData", false); closeDrawer(); }) @@ -369,12 +396,12 @@ export default { state.addLoading = true; queryWorkDetailById({ workId: props.EditWorkId }) .then((res) => { - console.log(res) - try{ - fileList.value = JSON.parse(res.data.data.workEnclosureAddress) - }catch(e){ - console.log(e) - fileList.value = [] + console.log(res); + try { + fileList.value = JSON.parse(res.data.data.workEnclosureAddress); + } catch (e) { + console.log(e); + fileList.value = []; } formState.workName = res.data.data.workName; formState.workRequirement = res.data.data.workRequirement; @@ -394,10 +421,10 @@ export default { state.EditWorkId = res.data.data.workId; } else { if (props.isLevel == 1) { - if(!props.isactive){ - message.destroy(); - return message.warning("请先选中关卡"); - } + if (!props.isactive) { + message.destroy(); + return message.warning("请先选中关卡"); + } let editObj1 = { chapterId: props.isactive, courseId: res.data.data.workId, @@ -576,7 +603,7 @@ export default { margin-bottom: 32px; .textarea { width: 400px; - + .ant-input { width: 100%; } diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8e1f08c6..f437ce06 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -32,7 +32,7 @@
@@ -51,13 +51,13 @@
- +
@@ -71,7 +71,7 @@
分钟 @@ -109,7 +109,7 @@
授课老师：
-
+
- -
支持图片格式为jpg/jpeg/png 图片最大为2MB
+
+ 支持图片格式为jpg/jpeg/png 图片最大为2MB +
@@ -174,7 +177,7 @@ />
- +
回放设置： @@ -191,15 +194,14 @@
- - +
直播说明： @@ -215,8 +217,7 @@ />
- - +
考勤设置： @@ -242,7 +243,9 @@ " v-model:value="inputV6" > - 分钟允许签到 + 分钟允许签到
直播开始后： @@ -258,7 +261,9 @@ " v-model:value="inputV7" > - 分钟允许签到 + 分钟允许签到
- - - + + diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 3e722bdf..d55921c6 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -63,6 +63,12 @@ 批量删除 + + + + 批量调整关卡 + +
+ + + \ No newline at end of file From d2d9992de9019cf6fd383a3fd860949d815a1cee Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 18:43:14 +0800 Subject: [PATCH 74/79] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 728 ++++++++++++----------- 1 file changed, 383 insertions(+), 345 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 3b375e58..81d6b4e6 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -20,7 +20,7 @@ />
-
+
@@ -41,24 +41,25 @@
-
-
- +
+ - + @select="stuStuOrgSelect" + > +
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
-
-
已选
- +
+
+
已选
+ +
+
- -
-
-
快速选人
-
-
-
- {{ item.realName }} -
-
-
-
-
-
+
+
快速选人
+
+
+
{{ item.realName }}
-
+
- -
- -
-
查看更多>
-
收起<
+
+
+
+ {{ item.realName }} +
+
+
- - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+
查看更多>
+
+
+
收起<
+
+ + + + + + + + + + + + + + + + + + + + + + + - -
受众关联
-
-
-
-
{{ item.audienceName }}
-
-
-
-
-
+ +
受众关联
+
+
+
+
{{ item.audienceName }}
+
+
+
+
+
{{ item.audienceName }}
-
+
+
+
- + +
+
+
查看更多>
+
+
+
收起<
+
+ + +
+
+ + {{ item.name }} + +
+
+
受众添加
+ + {{ item.audienceName }} + +
+
-->
@@ -304,9 +313,9 @@ const props = defineProps({ default: () => [] } }) -const person =ref(false) +const person = ref(false) // const dept =ref(false) -const group =ref(false) +const group = ref(false) const visiable = ref(false) const activeKey = ref(1) const stageVisible = ref(false) @@ -518,11 +527,11 @@ function AuditDel(i) { // function orgSelect(key, obj) { - // console.log(obj) - //request(ORG_CHILD_LIST, {orgId: null}).then(res => { - //console.log(res.result) - //}) - //} +// console.log(obj) +//request(ORG_CHILD_LIST, {orgId: null}).then(res => { +//console.log(res.result) +//}) +//} function onStuSelectChange(e, l) { stuSelectKeys.value = e @@ -613,13 +622,16 @@ watch(visiable, () => { orgSelectKeys.value = [] auditSelectKeys.value = [] stuData.value = [] + audienceName.value.keyword='' + audienceName.value.page=1 + audienceName.value.pageSize=10 selectsData.value = { stageId: '', studentList: [], deptList: [], groupList: [] } - + searchAudi() }) @@ -632,196 +644,222 @@ watch(visiable, () => { height: 40px; border-radius: 8px; } + .tableBox .ant-table-row .ant-table-cell { - height: 48px; - font-size: 12px; - font-weight: 400; - color: #4F5156; - line-height: 29px; - padding: 0px; + height: 48px; + font-size: 12px; + font-weight: 400; + color: #4F5156; + line-height: 29px; + padding: 0px; } -.tableBox .ant-table-thead tr th { - font-size: 12px; + +.tableBox .ant-table-thead tr th { + font-size: 12px; } -.ant-tabs-tabpane{ + +.ant-tabs-tabpane { height: 100%; } -.ant-tabs{ - overflow:visible; + +.ant-tabs { + overflow: visible; } + .right1 { border-left: 1px solid #f2f6fe; - width: 100%; - margin-left: 20px; + width: 100%; + margin-left: 20px; - .onerow { - display: flex; - justify-content: space-between; - align-items: center; - margin-right: 40px; - flex-wrap: wrap; - - width: 100%; - .onleft { - display: flex; - text-align: center; - .already { - color: rgba(51, 51, 51, 1); - font-size: 16px; - font-weight: 500; - margin-left: 32px; - white-space: nowrap; - // margin-bottom: 20px; - } - .count { - color: #4ea6ff; - font-size: 16px; - margin: 0 6px; - } - .peo { - color: rgba(51, 51, 51, 1); - font-size: 16px; - font-weight: 500; - } - } - .clbox { - margin-right: 50px; - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - width: 104px; - height: 32px; - border-radius: 4px; - background: #4ea6ff; - .colose { - width: 16px; - height: 16px; - // border-radius: 8px; - // background: #ffffff; - // position: relative; - background-image: url(../../assets/images/basicinfo/ch.png); - background-size: 100%; - margin-right: 4px; - } - .allclear { - color: rgba(255, 255, 255, 1); - font-size: 14px; - } - } - } - .selecteds { - display: flex; - flex-wrap: wrap; - margin-left: 32px; - .person{ - width:100%; - margin-top: 20px; - border-top: 1px solid #f2f6fe; - } - .chose { - width: 64px; - height: 24px; - margin-top: 25px; - margin-right: 25px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 2px; - border: 1px solid rgba(56, 139, 225, 1); - color: rgba(56, 139, 225, 1); - font-size: 12px; - position: relative; - .ch { - position: absolute; - width: 18px; - height: 18px; - background-image: url(../../assets/images/basicinfo/ch.png); - right: -8px; - top: -8px; - } - } - .ifsw{ - display:flex; - align-items:end; - justify-content: center; - color:#4ea6ff; - } - .sw{ - display:flex; - align-items:center; - justify-content: center; - text-align: justify; - color:#4ea6ff; - margin-top: 23px; - margin-left:10px; - } - .dept{ - width:100%; - margin-top: 30px; - border-top: 1px solid #f2f6fe; - } - .chose1 { - //width: 90px; - height: 24px; - margin-top: 25px; - margin-right: 25px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 2px; - border: 1px solid rgba(56, 139, 225, 1); - color: rgba(56, 139, 225, 1); - font-size: 12px; - position: relative; - .span{ - white-space:nowrap; - overflow:hidden; - text-overflow:ellipsis; - } - .ch1 { - position: absolute; - width: 18px; - height: 18px; - background-image: url(../../assets/images/basicinfo/ch.png); - right: -8px; - top: -8px; - } - - } - .group{ - width:100%; - margin-top: 30px; - border-top: 1px solid #f2f6fe; - } - .chose2 { - //width: 120px; - height: 24px; - margin-top: 25px; - margin-right: 25px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 2px; - border: 1px solid rgba(56, 139, 225, 1); - color: rgba(56, 139, 225, 1); - font-size: 12px; - position: relative; - .span{ - white-space:nowrap; - overflow:hidden; - text-overflow:ellipsis; - } - .ch2 { - position: absolute; - width: 18px; - height: 18px; - background-image: url(../../assets/images/basicinfo/ch.png); - right: -8px; - top: -8px; - } - - } - } + .onerow { + display: flex; + justify-content: space-between; + align-items: center; + margin-right: 40px; + flex-wrap: wrap; + + width: 100%; + + .onleft { + display: flex; + text-align: center; + + .already { + color: rgba(51, 51, 51, 1); + font-size: 16px; + font-weight: 500; + margin-left: 32px; + white-space: nowrap; + // margin-bottom: 20px; } + + .count { + color: #4ea6ff; + font-size: 16px; + margin: 0 6px; + } + + .peo { + color: rgba(51, 51, 51, 1); + font-size: 16px; + font-weight: 500; + } + } + + .clbox { + margin-right: 50px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + width: 104px; + height: 32px; + border-radius: 4px; + background: #4ea6ff; + + .colose { + width: 16px; + height: 16px; + // border-radius: 8px; + // background: #ffffff; + // position: relative; + background-image: url(../../assets/images/basicinfo/ch.png); + background-size: 100%; + margin-right: 4px; + } + + .allclear { + color: rgba(255, 255, 255, 1); + font-size: 14px; + } + } + } + + .selecteds { + display: flex; + flex-wrap: wrap; + margin-left: 32px; + + .person { + width: 100%; + margin-top: 20px; + border-top: 1px solid #f2f6fe; + } + + .chose { + width: 64px; + height: 24px; + margin-top: 25px; + margin-right: 25px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 2px; + border: 1px solid rgba(56, 139, 225, 1); + color: rgba(56, 139, 225, 1); + font-size: 12px; + position: relative; + + .ch { + position: absolute; + width: 18px; + height: 18px; + background-image: url(../../assets/images/basicinfo/ch.png); + right: -8px; + top: -8px; + } + } + + .ifsw { + display: flex; + align-items: end; + justify-content: center; + color: #4ea6ff; + } + + .sw { + display: flex; + align-items: center; + justify-content: center; + text-align: justify; + color: #4ea6ff; + margin-top: 23px; + margin-left: 10px; + } + + .dept { + width: 100%; + margin-top: 30px; + border-top: 1px solid #f2f6fe; + } + + .chose1 { + //width: 90px; + height: 24px; + margin-top: 25px; + margin-right: 25px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 2px; + border: 1px solid rgba(56, 139, 225, 1); + color: rgba(56, 139, 225, 1); + font-size: 12px; + position: relative; + + .span { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .ch1 { + position: absolute; + width: 18px; + height: 18px; + background-image: url(../../assets/images/basicinfo/ch.png); + right: -8px; + top: -8px; + } + + } + + .group { + width: 100%; + margin-top: 30px; + border-top: 1px solid #f2f6fe; + } + + .chose2 { + //width: 120px; + height: 24px; + margin-top: 25px; + margin-right: 25px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 2px; + border: 1px solid rgba(56, 139, 225, 1); + color: rgba(56, 139, 225, 1); + font-size: 12px; + position: relative; + + .span { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .ch2 { + position: absolute; + width: 18px; + height: 18px; + background-image: url(../../assets/images/basicinfo/ch.png); + right: -8px; + top: -8px; + } + + } + } +} \ No newline at end of file From 127039cc6139c57a192327fad1814f2a9231604c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 18:48:10 +0800 Subject: [PATCH 75/79] =?UTF-8?q?--=20=E5=8F=97=E4=BC=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 1107 +++++++++------------- 1 file changed, 472 insertions(+), 635 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index d4fd1f07..81d6b4e6 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -1,221 +1,144 @@ \ No newline at end of file From 6c8045ff599979eafc7b25a0f7826a17a4fd0276 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 19:33:57 +0800 Subject: [PATCH 78/79] -- bug --- src/views/projectcenter/ProjectAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index ead2234a..5066e198 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -461,7 +461,6 @@ export default { } const createProject = async () => { - state.loading = true console.log("保存", state.projectInfo); if (!validate(state.projectInfo, errorMsgs)) { return; @@ -485,6 +484,7 @@ export default { } state.projectInfo.type = 3; state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0; + state.loading = true api.createProject(state.projectInfo).then((res) => { state.loading = false state.projectInfo.projectId || From 207a453c279992cf4d423d4778da54d1091eeb9d Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 20 Dec 2022 21:38:58 +0800 Subject: [PATCH 79/79] -- bug --- src/api/method.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' }