From 876a2dfcd9c1e6669b04e87000297589be49ceaa Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 11:38:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat=EF=BC=9A=E7=BC=96=E8=BE=91=E7=9A=84?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=92=8C=E4=B8=8A=E4=BC=A0=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2=E6=97=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/taskpage/picture8.png | Bin 0 -> 3892 bytes src/views/projectcenter/TaskPage.vue | 108 +++++++++++++++++++----- 2 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 src/assets/images/taskpage/picture8.png diff --git a/src/assets/images/taskpage/picture8.png b/src/assets/images/taskpage/picture8.png new file mode 100644 index 0000000000000000000000000000000000000000..cdc3f46b199de0d2a211acd8f72257bd419971d2 GIT binary patch literal 3892 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 + +
+
+ +
+
+ +
+
+ +
+
+ 创建任务 +
+
点击创建项目任务
+
+ -
@@ -730,7 +750,9 @@ - Content of Tab Pane 3 + + Content of Tab Pane 3 +
排行榜
@@ -866,7 +888,7 @@
-
编辑11
+
编辑
项目名称：
@@ -1178,7 +1200,7 @@ >编辑
-
+
直播封面：
-
- - avatar -
- - -
Upload
-
- +
+
+ + + 添加图片 +
@@ -2133,6 +2142,8 @@ export default { }; const edit_exit = () => { state.edit_hs = false; + state.radioV1 = ""; + state.radioV2 = ""; }; const cloradio1 = (value) => { if (value != "") { @@ -2988,6 +2999,46 @@ export default { border-top: 0px; } } + .taskbox { + width: 412px; + height: 160px; + border-radius: 10px; + position: relative; + margin-left: 68px; + margin-bottom: 40px; + margin-top: 32px; + cursor: pointer; + .leftt { + position: absolute; + top: 18px; + left: 0; + } + .photo { + position: absolute; + top: 42px; + left: 37px; + } + .rightt { + position: absolute; + top: 69px; + right: 26px; + } + .centerbox { + position: absolute; + top: 52px; + left: 145px; + font-size: 20px; + font-weight: 700; + //line-height: 36px; + } + .centermain { + color: rgba(135, 139, 146, 1); + font-size: 14px; + position: absolute; + left: 144px; + bottom: 49px; + } + } .stage { display: flex; height: 49px; @@ -3731,6 +3782,19 @@ export default { margin-right: 5px; } } + .lodalimg{ + width:120px; + height:120px; + border:1px dashed #387DF7; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + .lodalimg{ + display: flex; + white-space: nowrap; + } + } .kqszbox { .qdqtbox { margin-left: 5px; From 5cc956e608e3816223ef2ec717d25b3635f23d40 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 11:49:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E9=9A=90=E8=97=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 42c81a65..b2ba6a66 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -422,7 +422,10 @@
From be3467e00b92d43358fe559bffb21fdc66adba1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Sat, 22 Oct 2022 11:54:39 +0800 Subject: [PATCH 3/4] =?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/ProjectManage.vue | 528 +++++++++++++++++++--- 1 file changed, 476 insertions(+), 52 deletions(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 49c82cfc..947cf3c7 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -107,6 +107,28 @@
+ +
- + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要复制此路径吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否结束项目 +
（项目结束后学员将无法继续学习，此操作不可逆）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此项目吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要存为模板吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 是否撤回项目 +
（项目撤回后学员进度保留，发布后可继续学习）
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ @@ -867,6 +1040,16 @@ export default { estabish: false, doublepro: false, doublesonpro: false, + copyModal: false, //复制弹窗 + closeCopy: false, //复制弹窗关闭图标 + stopModal: false, //停用弹窗 + closeStop: false, //停用弹窗关闭图标 + deleteModal: false, //删除弹窗 + closeDelete: false, //删除弹窗关闭图标 + startModal: false, //启用弹窗 + closeStart: false, //启用弹窗关闭图标 + backModal: false, //撤回弹窗 + closeBack: false, //撤回弹窗关闭图标 ProjOwnervisible: false, ProjPvisible: false, }); @@ -946,7 +1129,9 @@ export default { 基础信息 -
存为模板
+
{ + showStartModal(); + }}>存为模板
@@ -988,7 +1173,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
) : value.state === "已结束" ? ( @@ -1028,8 +1215,12 @@ export default {
- 复制 - 删除 + { + showCopyModal(); + }}>复制 + { + showDeleteModal(); + }}>删除
) : (
@@ -1087,10 +1278,14 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
 @@ -1136,7 +1331,9 @@ export default { 创建班级 - 复制 + { + showCopyModal(); + }}>复制 ) : item.state === "已结束" ? (
@@ -1175,8 +1372,12 @@ export default {
- 复制 - 删除 + { + showCopyModal(); + }}>复制 + { + showDeleteModal(); + }}>删除 ) : (
@@ -1231,13 +1432,19 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1282,7 +1489,9 @@ export default { - 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1342,8 +1557,12 @@ export default {
- 复制 - 复制 + { + showCopyModal(); + }}>复制 + { + showCopyModal(); + }}>复制
-
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1400,7 +1623,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
结束
+
{ + showStopModal(); + }}>结束
 -
撤回
+
{ + showBackModal(); + }}>撤回
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1476,13 +1707,19 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
 -
删除
+
{ + showDeleteModal(); + }}>删除
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1527,7 +1764,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1587,7 +1832,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
删除
+
{ + showDeleteModal(); + }}>删除
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1647,7 +1900,9 @@ export default {
- 复制 + { + showCopyModal(); + }}>复制
-
撤回
+
{ + showBackModal(); + }}>撤回
 -
结束
+
{ + showStopModal(); + }}>结束
 -
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1722,7 +1983,9 @@ export default { {value.state === "草稿" ? ( 发布 ) : ( - 复制 + { + showCopyModal(); + }}>复制 )}
{value.state === "草稿" ? ( @@ -1733,19 +1996,23 @@ export default { dropdownClassName="tabledropdown" > -
复制
+
{ + showCopyModal(); + }}>复制
{ - console.log("点击了"); - }} + showDeleteModal(); + }} > 删除
-
存为模板
+
{ + showStartModal(); + }}>存为模板
 基础信息 @@ -1759,19 +2026,23 @@ export default { dropdownClassName="tabledropdown" > -
存为模板
+
{ + showStartModal(); + }}>存为模板
{ - console.log("点击了"); - }} + showStopModal(); + }} > 结束
-
撤回
+
{ + showBackModal(); + }}>撤回
 基础信息 @@ -1785,13 +2056,15 @@ export default { dropdownClassName="tabledropdown" > -
存为模板
+
{ + showStartModal(); + }}>存为模板
{ - console.log("点击了"); - }} + showDeleteModal(); + }} > 删除
@@ -1841,6 +2114,36 @@ export default { const closeModal3 = () => { state.doublesonpro = false; }; + const showCopyModal = () => { + state.copyModal = true; + }; + const closeCopyModal = () => { + state.copyModal = false; + }; + const showStopModal = () => { + state.stopModal = true; + }; + const closeStopModal = () => { + state.stopModal = false; + }; + const showDeleteModal = () => { + state.deleteModal = true; + }; + const closeDeleteModal = () => { + state.deleteModal = false; + }; + const showStartModal = () => { + state.startModal = true; + }; + const closeStartModal = () => { + state.startModal = false; + }; + const showBackModal = () => { + state.backModal = true; + }; + const closeBackModal = () => { + state.backModal = false; + }; const showProjOwner = () => { state.ProjOwnervisible = true; }; @@ -1860,6 +2163,16 @@ export default { closeModal2, showModal3, closeModal3, + showCopyModal, + closeCopyModal, + showStopModal, + closeStopModal, + showDeleteModal, + closeDeleteModal, + showStartModal, + closeStartModal, + showBackModal, + closeBackModal, getTableDate, showProjOwner, showProjPrower, @@ -2315,4 +2628,115 @@ export default { } } } +.CopyModal { + .ant-modal { + width: 424px !important; + height: 258px !important; + .ant-modal-content { + width: 424px !important; + height: 258px !important; + .ant-modal-body { + width: 424px !important; + height: 258px !important; + padding: 0 !important; + .delete { + z-index: 999; + width: 424px; + height: 258px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + border-radius: 4px; + // position: absolute; + // left: 50%; + // top: 10%; + // transform: translate(-50%, -50%); + .del_header { + position: absolute; + width: calc(100%); + height: 68px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } + .del_main { + width: 100%; + position: relative; + .header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; + .icon { + width: 16px; + height: 16px; + margin-right: 10px; + background-image: url(@/assets/images/coursewareManage/QR.png); + background-size: 100% 100%; + } + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } + .body { + width: 100%; + margin: 34px auto 56px auto; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + // background-color: red; + position: relative; + .back { + position: absolute; + top: 30px; + font-size: 12px; + font-weight: 400; + color: #666666; + } + } + .del_btnbox { + display: flex; + margin: 30px auto; + justify-content: center; + .del_btn { + width: 100px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + + flex-shrink: 0; + cursor: pointer; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + .btn1 { + border: 1px solid rgba(64, 158, 255, 1); + color: #4ea6ff; + margin-right: 14px; + } + .btn2 { + background-color: #4ea6ff; + color: #ffffff; + } + } + } + } + } + } + } +} From 02f57f4b62573353c9d16e45a05d94e1ea9761b9 Mon Sep 17 00:00:00 2001 From: dongwug Date: Sat, 22 Oct 2022 14:10:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=20=E6=93=8D=E4=BD=9C=E5=88=A0=E9=99=A4=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=20=E6=93=8D=E4=BD=9C=E6=9F=A5=E7=9C=8B=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=20=E9=A1=B9=E7=9B=AE=E7=A7=AF=E5=88=86=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/windows/DelWins.vue | 161 +++++++++++++ src/views/projectcenter/TaskPage.vue | 337 ++++++++++++++++++++++++++- 2 files changed, 497 insertions(+), 1 deletion(-) create mode 100644 src/components/windows/DelWins.vue diff --git a/src/components/windows/DelWins.vue b/src/components/windows/DelWins.vue new file mode 100644 index 00000000..57667bb1 --- /dev/null +++ b/src/components/windows/DelWins.vue @@ -0,0 +1,161 @@ + + + + \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index b2ba6a66..4e0789ef 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -820,7 +820,57 @@
- Content of Tab Pane 3 + +
+
+ + + + + + +
+
+
+ 规则 +
+
+
编辑
+
+
+
+
+ 当前设计下，学员可以获得 + + 积分 +
+
+ 完成【必修/选修】获得 + + 积分
+
+ 优秀学员可获得 + + 积分
+
+
+
+ + +
+
排行榜
@@ -1464,6 +1514,39 @@
+ +
+ +
+
+
+
+
+ 提示 +
+
+
+ 您确定要删除此课程吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+