From 2bf6c525a849eb88e0afea9221bfb5ea28266012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Sat, 22 Oct 2022 10:44:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF-=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2?= =?UTF-8?q?=E6=A8=AA=E5=90=91=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 325 +++++++++++++++------------ 1 file changed, 187 insertions(+), 138 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 14a8544d..46b66500 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -208,153 +208,194 @@ - -
-
-
任务大纲
- - - - 编辑 - -
-
- - - -
编辑 + +
+
+ + + -
-
- +
+ +
+
+
+ +
+
+
+
「{{ item.course }}」
+
{{ item.name }}
+
-
-
「{{ item.course }}」
-
{{ item.name }}
-
-
-
-
- {{ item.classify }} -
-
-
-
开始时间
-
{{ item.beginTime }}
-
-
-
- {{ item.complete }}/{{ item.total }}人 -
-
- - {{ item.percent }}% +
+ {{ item.classify }} +
-
-
-
- 学员 +
+
开始时间
+
{{ item.beginTime }}
-
- 考勤 +
+
+ {{ item.complete }}/{{ item.total }}人 +
+
+ + {{ item.percent }}% +
-
+
+ 学员 +
+
+ 考勤 +
+
+ 二维码 +
+
- 二维码 -
-
- 管理 + item.course === '调研' || + item.course === '投票' || + item.course === '活动' + ? showTime(item.course, item.name) + : item.course === '考试' || item.course === '测评' + ? showTest(item.course, item.name) + : item.course === '面授' + ? showFace(item.course) + : item.course === '作业' + ? showWork(item.course) + : null + " + > + 管理 +
-
- - + + +
+
- -
@@ -2461,7 +2502,6 @@ export default { background-color: #edf0f5; } .content { - //display: flex; //margin: 0 37px; .ant-tabs-top > .ant-tabs-nav::before, .ant-tabs-bottom > .ant-tabs-nav::before, @@ -2695,10 +2735,15 @@ export default { } } .taskSyllabus { + // flex: 1; + overflow-x: scroll; + .ant-collapse { border: 0px; background-color: rgba(255, 255, 255, 0); + min-width: 1040px; } + .ant-collapse-content > .ant-collapse-content-box { padding-top: 0px; padding-bottom: 0px; @@ -2746,12 +2791,15 @@ export default { } .course { //width: 100%; + flex-shrink: 0; + margin-right: 24px; + display: flex; flex-wrap: wrap; align-items: center; padding: 25px 0px; margin-left: 22px; - margin-right: 24px; + //margin: 0 12px; border: 1px solid #f2f6fc; border-top: 0px; @@ -2768,12 +2816,13 @@ export default { //position: absolute; color: #4f5156; font-size: 16px; + margin-left: 4px; } .icontext { //positipn: absolute; color: #999ba3; font-size: 14px; - margin-left: 8px; + margin-left: 12px; width: 83px; } } From c5d7b8801109496e6e4f26a61420813921988a78 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 10:54:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=9D=A2=E6=8E=88=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/TaskFaceIn.vue | 354 ++++++++++++++++++++++++++ src/views/projectcenter/TaskPage.vue | 11 +- 2 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 src/components/drawers/TaskFaceIn.vue diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue new file mode 100644 index 00000000..babf1784 --- /dev/null +++ b/src/components/drawers/TaskFaceIn.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 14a8544d..97e02bcd 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -212,7 +212,7 @@
任务大纲
- + + +
@@ -1163,6 +1165,7 @@ import StuAdd from "../../components/drawers/StuAdd"; import ImportStu from "../../components/drawers/ImportStu"; import SeeStu from "../../components/drawers/SeeStu"; import ChangeGroup from "../../components/drawers/ChangeGroup"; +import TaskImpStu from "../../components/drawers/TaskFaceIn"; export default { name: "taskPage", components: { @@ -1179,6 +1182,7 @@ export default { ImportStu, SeeStu, ChangeGroup, + TaskImpStu, }, setup() { const state = reactive({ @@ -1361,6 +1365,7 @@ export default { valueDate: "", //排行榜输入日期 noticeChecked: true, noticeContent: "请输入要发布的公告", + TaskFaceImpStuvisible: false, //批量面授报名 //进度排行表 jindutabledata: [ @@ -1829,6 +1834,9 @@ export default { const closeModal2 = () => { state.stugroup = false; }; + const showFaceIn = () => { + state.TaskFaceImpStuvisible = true; + }; //新增 const showTime = (course, name) => { console.log("点击管理"); @@ -1908,6 +1916,7 @@ export default { showImportStu, showSeeStu, showChangeGroup, + showFaceIn, }; }, }; From 570024e06cfc7bb22f92debed34c8b68f4244189 Mon Sep 17 00:00:00 2001 From: songwc Date: Sat, 22 Oct 2022 11:09:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E9=9D=A2=E6=8E=88=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 940acbca..3e3cb32e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -209,19 +209,20 @@ -
-
-
任务大纲
- - - - 编辑 - -
-
+
+
+
+
任务大纲
+ + + + 编辑 + +
+