From 4e7c1e07119da3828406163447cf4a47906b1451 Mon Sep 17 00:00:00 2001 From: dongwug Date: Thu, 3 Nov 2022 18:21:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=95=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=8A=95=E7=A5=A8=E8=B0=83=E7=94=A8=E5=88=B7=E6=96=B0=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddEval.vue | 10 ++++++++-- src/components/drawers/AddInvist.vue | 7 +++++++ src/views/projectcenter/TaskAdd.vue | 15 +++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 88767997..d9ba6590 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -248,8 +248,14 @@ export default { projectTaskId: 0, stageId: 3, type: 10, - }, - ); + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + ctx.emit("changeData",false); + }) + .catch((err) => { + console.log(err); + }); }) .catch((err) => { console.log("创建失败", err); diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index e3ea4e2c..aac2ce44 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -215,6 +215,13 @@ export default { projectTaskId: 0, stageId: 3, type: 11, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + ctx.emit("changeData",false); + }) + .catch((err) => { + console.log(err); }); }) .catch((err) => { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 8926290a..7ec71844 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -215,7 +215,8 @@
- +
@@ -229,7 +230,8 @@
- +
@@ -242,7 +244,8 @@
投票
- +
@@ -970,8 +973,8 @@ export default { .getTask(obj) .then((res) => { if (res.status == 200) { - console.log("22222", res.data.data.stageList[0].taskList); - let arr = res.data.data.stageList[1].taskList; + console.log("22222", res.data.data.stageList); + let arr = res.data.data.stageList[4].taskList; getTableData(arr); } }) @@ -983,7 +986,7 @@ export default { //数据变化 const updateTableData = (data) => { console.log("添加数据", data); - getTask(); + getTask(data); }; //删除直播 From 4ee4fa0a0b4157f169132897f31ce6f0ec14d321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Thu, 3 Nov 2022 18:38:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=90=8E=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 6 ++++++ src/components/drawers/AddDiscuss.vue | 2 +- src/views/projectcenter/TaskAdd.vue | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index aeaebb45..d0193b61 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -360,6 +360,7 @@ export default { }) .then((res) => { console.log("调用项目添加接口后", res.data); + ctx.emit("changeData", false); //重新获取任务列表 // apiTask.getTask({ projectId: 28 }); // router.push("/taskadd"); @@ -408,6 +409,11 @@ export default { .contentMain { display: flex; justify-content: space-between; + .ant-input { + height: 88px; + width: 384px; + border-radius: 8px; + } .ant-picker { border-radius: 8px; } diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 7d7563a3..56a53e9d 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -143,7 +143,6 @@ export default { state.textV1 = ""; message.success("创建成功"); ctx.emit("update:adddiscussVisible", false); - //ctx.emit("changeData","传的参数"); //console.log("discussName",obj.discussName); apiTask .addTask({ @@ -158,6 +157,7 @@ export default { }) .then((res) => { console.log("调用项目添加接口后", res.data); + ctx.emit("changeData",false); //重新获取任务列表 // apiTask.getTask({ projectId: 28 }); // router.push("/taskadd"); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index e4b1e732..273f7261 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -207,7 +207,7 @@
- +
@@ -855,6 +855,8 @@ export default { ? "外链" : value.type == 8 ? "讨论" + : value.type == 9 + ? "活动" : value.type == 10 ? "测评" : value.type == 11 From da7bd83c0e1453220b008adcb4332f15ca5122ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Thu, 3 Nov 2022 18:45:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectManage.vue | 258 +++++++++++++++------- 1 file changed, 176 insertions(+), 82 deletions(-) diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index a60311c5..5fc73e92 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1355,10 +1355,13 @@ export default { // options={state.projectNameList} dropdownClassName="tabledropdown" > + + + {/* 基础信息 - {/* +
{ showStartModal(); @@ -1367,6 +1370,24 @@ export default { 存为模版
*/} + +
{ + showCopyModal(); + }} + > + 复制 +
+ + +
{ + showDeleteModal(); + }} + > + 删除 +
+ @@ -1422,13 +1443,46 @@ export default { { - showCopyModal(); - }} + // onClick={() => { + // showCopyModal(); + // }} > - 复制 - + +
+ + + + {/* + + 基础信息 + + +
{ + showStartModal(); + }} + > + 存为模版 +
+ */} + +
{ + showCopyModal(); + }} + > + 复制 +
+ + + +
) : value.record.status === -1 ? (
@@ -1482,20 +1536,53 @@ export default {
{ - showCopyModal(); - }} + // onClick={() => { + // showCopyModal(); + // }} > - 复制 - - { - showDeleteModal(); - }} - > - 删除 +
+ + + + {/* + + 基础信息 + + +
{ + showStartModal(); + }} + > + 存为模版 +
+ */} + +
{ + showCopyModal(); + }} + > + 复制 +
+ + +
{ + showDeleteModal(); + }} + > + 删除 +
+ + +
) : (
@@ -1603,7 +1690,7 @@ export default { - ) : value.record.status === 1 ? ( + ) : value.record.status === 1 ? (
查看
@@ -1657,14 +1744,26 @@ export default { 创建班级 - { - showCopyModal(); - }} - > - 复制 - +
+ + +
{ + showCopyModal(); + }} + > + 复制 +
+ + + +
+
) : value.record.status === -1 ? (
@@ -1718,20 +1817,38 @@ export default {
{ - showCopyModal(); - }} + > - 复制 - - { - showDeleteModal(); - }} - > - 删除 +
+ + +
{ + showCopyModal(); + }} + > + 复制 +
+ + +
{ + showDeleteModal(); + }} + > + 删除 +
+ + +
+ +
) : (
@@ -1827,11 +1944,8 @@ export default { ) : ( { - showCopyModal(); - }} + > - 复制 )}
@@ -1873,7 +1987,7 @@ export default { 基础信息 - ) : value.record.status === "进行中" ? ( + ) : value.record.status ===1|| value.record.status == 1 && Number(value.record.beginTime) > Math.ceil(new Date().getTime / 1000) ? ( + +
{ + showCopyModal(); + }} + > + 复制 +
+
{ showStartModal(); @@ -1927,6 +2050,15 @@ export default { 存为模版
+ +
{ + showCopyModal(); + }} + > + 复制 +
+
{ @@ -1940,44 +2072,6 @@ export default { 基础信息 - ) : value.record.status === "未开始" ? ( - - -
{ - showStartModal(); - }} - > - 存为模版 -
- - -
{ - // showDeleteModal(); - }} - > - 撤回 -
- - -
{ - // showDeleteModal(); - }} - > - 结束 -
- - - 基础信息 - - ) : (
)} From 2d683472c17fb629df801f7406b465ecce489bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=99=93=E9=B8=BD?= Date: Thu, 3 Nov 2022 21:10:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8B=96=E6=8B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/OpenPages.vue | 13 +- src/views/learningpath/LevelAddDetail.vue | 10 +- src/views/projectcenter/TaskAdd.vue | 275 +++++++++++++++++++--- 3 files changed, 259 insertions(+), 39 deletions(-) diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index 02374b62..09209b3e 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -4,8 +4,9 @@ v-model="openList" chosenClass="chosen" forceFallback="true" - group="people" - animation="1000" + ghostClass="ghost" + group="openPage" + animation="500" @start="onStart" @end="onEnd" :list="openList" @@ -121,5 +122,13 @@ export default { .close:hover { background: rgba(220, 220, 220, 1); } + + .chosen { + // background-color: pink; + } + .ghost { + // background-color: red; + opacity: 0; + } } diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 3c059db9..dc8aa688 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -238,7 +238,10 @@
测评
- +
@@ -770,7 +773,7 @@ export default { value1: "", value2: "", selectedRowKeys: [], - edit:false, //是否点击编辑 + edit: false, //是否点击编辑 gqxy_hs: true, isactive: 0, projectChecked: null, //项目单选框 @@ -865,6 +868,7 @@ export default { }; }); }; + const getDetail = (index) => { GetRouterDetail(92) .then((res) => { @@ -1009,7 +1013,7 @@ export default {
{ + onClick={() => { state.edit = true; state.addevalvisible = true; }} diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 273f7261..ac0efd84 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -15,25 +15,39 @@
添加阶段
-
-
-
{{ item.tit }}
-
{{ item.name }}
-
-
- - -
-
+ +
@@ -207,7 +221,10 @@
- +
@@ -221,8 +238,10 @@
- +
@@ -236,8 +255,10 @@
- +
@@ -250,8 +271,10 @@
投票
- +
@@ -300,8 +323,155 @@ 条 --> -
- +
+
+ + +
类型
+
+
任务名称
+
必修/选修
+
时长
+
+ 操作 +
+
+ + + +