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/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/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/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/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();
- }}
- >
- 结束
-
-
-
- 基础信息
-
-
) : (
)}
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 29414735..2ea70ee9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -15,25 +15,39 @@
添加阶段
-
-
-
{{ item.tit }}
-
{{ item.name }}
-
-
-

-

-
-
+
+
+
+
{{ element.tit }}
+
{{ element.name }}
+
+
+

+

+
+
+
+
@@ -207,7 +221,10 @@
@@ -221,7 +238,10 @@
@@ -235,7 +255,10 @@
@@ -248,7 +271,10 @@
投票
@@ -297,8 +323,155 @@
条
-->
-
-
+
+
+
任务名称
+
必修/选修
+
时长
+
+ 操作
+
+
+
+
+
+
+
+
+
+
+
+ {{ element.lei }}
+
+
+
+
+ {{ element.creater }}
+
+
+
+ {{ element.cretime }}分钟
+
+
+
+
+
+