From 3910b2af42f62ccd0e29de86c22e553d3b143a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 17 Oct 2022 15:24:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E6=A6=82=E8=A7=88(=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE),=E5=88=9B=E5=BB=BA=E5=A4=9A=E5=B1=82=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE,=E5=88=9B=E5=BB=BA=E5=A4=9A=E5=B1=82=E5=AD=90?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 392 +++++++++++++++++++++- src/views/projectcenter/TaskPage.vue | 263 +++++++++++++-- 2 files changed, 624 insertions(+), 31 deletions(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 29106947..45a04780 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -139,7 +139,7 @@
单层子项目
-
+
@@ -185,7 +185,7 @@
不包含子项目，直接填写项目基础信息后创建任务
-
+
@@ -197,6 +197,205 @@
+ +
+ +
+
+ 创建多层项目 +
+
+ +
+
+
+
+
+ +
+
项目名称:
+
+ +
+
+
+
+ +
+
分类:
+
+ +
+
+
+
+ +
+
项目经理:
+
+ +
+
+
+
+ +
+
资源归属:
+
+ +
+
+
+ 取消 + 确定 +
+
+ +
+ + +
+ +
+
+ 创建多层项目 +
+
+ +
+
+
+
+ 项目归属： + 管理者进阶 +
+
+
+ +
+
子项目名称:
+
+ +
+
+
+
+ +
+
分类:
+
+ +
+
+
+
+ +
+
子项目经理:
+
+ +
+
+
+
+ +
+
资源归属:
+
+ +
+
+
+ 取消 + 确定 +
+
+ +
+
+ diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 45a04780..29acaa1d 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -133,12 +133,12 @@
-
+
单层子项目
-
+
@@ -912,7 +912,7 @@ export default {
- 创建班级 + 创建班级
- 创建班级 + 创建班级 复制
) : item.state === "已结束" ? ( diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue new file mode 100644 index 00000000..0f5291e3 --- /dev/null +++ b/src/views/projectcenter/SonProject.vue @@ -0,0 +1,528 @@ + + + + From 5c42377389755a27467940e6c72efaf853b067fd Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 17 Oct 2022 18:09:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AE=A1=E7=90=86=E6=8A=BD=E5=B1=89=20=E9=9D=A2?= =?UTF-8?q?=E6=8E=88=E7=AE=A1=E7=90=86=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/FaceManage.vue | 556 ++++++++ src/components/drawers/TimeManage.vue | 473 +++++++ src/views/learningpath/LearningPath.vue | 38 - src/views/projectcenter/TaskPage.vue | 1684 ++++++++++++++--------- 4 files changed, 2063 insertions(+), 688 deletions(-) create mode 100644 src/components/drawers/FaceManage.vue create mode 100644 src/components/drawers/TimeManage.vue diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue new file mode 100644 index 00000000..28053dfa --- /dev/null +++ b/src/components/drawers/FaceManage.vue @@ -0,0 +1,556 @@ + + + + + \ No newline at end of file diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue new file mode 100644 index 00000000..8c6a31fa --- /dev/null +++ b/src/components/drawers/TimeManage.vue @@ -0,0 +1,473 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 650997b4..c55c4d9a 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -354,12 +354,6 @@ export default { width: 100, align: "center", className: "h", - // ellipsis: true, - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text, record) => { - // console.log(text, record); - // return {text.text}; - // }, }, { title: "路径图名称", @@ -411,38 +405,6 @@ export default { key: "opacation", width: 200, align: "center", - // scopedSlots: { customRender: "action" }, //引入的插槽 - // customRender: (text) => { - // console.log(text); - // return ( - //
- //
- // - // 发布 - // - // 编辑 - // - // 关卡 - // - - //
- // 授权 - //
- //
- //
- - //
- // 更多 - //
- //
- //
- //
- //
- // ); - // }, }, ]; return columns; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 13b078b1..eeefd42d 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file From b1f7d5fc342ad816dcc28b34958f23badcf23407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 17 Oct 2022 18:28:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E5=AD=A6=E5=91=98=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 175 ++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 2 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index dec6a136..c58e46a7 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -340,7 +340,55 @@
- Content of Tab Pane 3 + +
+
+ + 学员管理 + +
+
+
小组名称：
+ +
+
+
+ + 搜索 +
+
+ + 重置 +
+
+
+
+
+ + 创建小组 +
+
+ + 随机分组 +
+
+
+
+
+
+
好好学习小组
+
...
+
+
+
+
+ +
+
+ + +
+ Content of Tab Pane 3 Content of Tab Pane 3 Content of Tab Pane 3 @@ -414,7 +462,8 @@ export default { checked: false, checked1: true, checked2: false, - activeKey: '1', + activeKey: '3', + activeKey1: '9', }); const showModal = () => { state.pubproject = true; @@ -1059,5 +1108,127 @@ export default { } } } + .content3 { + margin-top: 20px; + .ant-tabs-tab-btn { + font-size: 18px; + font-weight: 700; + } + .group { + display: flex; + justify-content: space-between; + .groupleft { + display: flex; + align-items: center; + margin-left: 32px; + .groupname { + color: #000000; + font-size: 14px; + } + .ant-input { + height: 40px; + } + } + .groupright { + display: flex; + .btn1 { + width: 100px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16px; + border: 1px solid #409EFF; + border-radius: 8px; + background: #409EFF; + cursor: pointer; + .btn1text { + color: #FFFFFF; + margin-left: 5px; + font-size: 14px; + } + } + .btn2 { + width: 100px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 32px; + border: 1px solid #409EFF; + border-radius: 8px; + cursor: pointer; + background: #FFFFFF; + .btn2text { + color: #409EFF; + margin-left: 5px; + font-size: 14px; + } + } + } + } + .second2 { + display: flex; + margin: 30px 0 0 32px; + .btn1 { + width: 130px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 16px; + border: 1px solid #409EFF; + border-radius: 8px; + background: #409EFF; + cursor: pointer; + .btn1text { + color: #FFFFFF; + margin-left: 5px; + font-size: 14px; + } + } + .btn2 { + width: 130px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 32px; + border: 1px solid #409EFF; + border-radius: 8px; + cursor: pointer; + background: #FFFFFF; + .btn2text { + color: #409EFF; + margin-left: 5px; + font-size: 14px; + } + } + } + .groupmain { + display: flex; + margin-left: 32px; + .groupbox { + width: 264px; + height: 181px; + display: flex; + justify-content: center; + border: 1px solid #E9E9E9; + box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.0500); + margin-top: 16px; + margin-right: 20px; + .grouptitle { + display: flex; + justify-content: space-betwwen; + border-bottom: 1px solid rgba(232, 232, 232, 1); + .goodgruop { + color: rgba(0, 0, 0, 0.8500); + font-size: 16px; + line-height: 36px; + } + } + } + } + } } \ No newline at end of file From 445d9e693ddbe4f0fd3dc8f04485b83eaf227421 Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 17 Oct 2022 18:47:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9A=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 2635 ++++++++++++-------------- 1 file changed, 1192 insertions(+), 1443 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 07d723ec..b9552ddc 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,1506 +1,1255 @@ + + import { reactive, toRefs } from "vue"; + import TimeManage from "../../components/drawers/TimeManage"; + import FaceManage from "../../components/drawers/FaceManage"; + export default { + name:"taskPage", + components: { TimeManage, FaceManage }, + setup(){ + const state = reactive({ + visible: false, //时间管理 + FaceVisivle: true, //面授管理 + pubproject: false, + checked: false, + checked1: true, + checked2: false, + activeKey: '3', + activeKey1: '9', + }); + const showModal = () => { + state.pubproject = true; + }; + const closeModal = () => { + state.pubproject = false; + }; + //新增 + const showTime = () => { + console.log("点击管理"); + state.visible = true; + }; + //新增 + const showFace = () => { + //面授管理的抽屉 + // console.log("点击管理"); + state.FaceVisivle = true; + }; + return { + ...toRefs(state), + showModal, + closeModal, + showTime, + showFace, + }; + }, + } + \ No newline at end of file + + \ No newline at end of file