diff --git a/package-lock.json b/package-lock.json
index f9476b22..379ccd42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14906,9 +14906,9 @@
 			}
 		},
 		"dayjs": {
-			"version": "1.11.5",
-			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
-			"integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+			"version": "1.11.6",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz",
+			"integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="
 		},
 		"debug": {
 			"version": "4.3.4",
@@ -19007,6 +19007,11 @@
 				"websocket-driver": "^0.7.4"
 			}
 		},
+		"sortablejs": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz",
+			"integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w=="
+		},
 		"source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
@@ -19775,6 +19780,21 @@
 				}
 			}
 		},
+		"vuedraggable": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
+			"integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+			"requires": {
+				"sortablejs": "1.14.0"
+			},
+			"dependencies": {
+				"sortablejs": {
+					"version": "1.14.0",
+					"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
+					"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+				}
+			}
+		},
 		"vuex": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz",
diff --git a/package.json b/package.json
index ec2d5ef6..7f47e397 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,10 @@
 		"element-plus": "^2.2.17",
 		"jquery": "^3.6.1",
 		"qs": "^6.11.0",
+		"sortablejs": "^1.15.0",
 		"vue": "^3.2.13",
 		"vue-router": "^4.0.3",
+		"vuedraggable": "^4.1.0",
 		"vuex": "^4.0.0"
 	},
 	"devDependencies": {
diff --git a/src/App.vue b/src/App.vue
index b6b111f7..7ab55e6d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -75,7 +75,7 @@ export default defineComponent({
     flex: 1 1 auto;
     // flex-shrink: 0;
     display: flex;
-    overflow-y: scroll;
+    overflow-y: auto;
     // display: flex;
     // flex: 1 1 auto;
     width: calc(100% - 40px);
diff --git a/src/api/index.js b/src/api/index.js
index ca3a832a..b0db5ad7 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-07 17:06:45
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-07 20:11:23
+ * @FilePath: /fe-manage/src/api/index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import http from "./config";
 // import qs from 'qs';
 
@@ -37,35 +45,15 @@ import http from "./config";
 
 // 接口-请求
 
-// 创建编辑单层项目
-export const createProject = (obj) => http.post('/admin/project/edit', {
-	"attach": obj.attach,
-	"beginTime": obj.beginTime,
-	"boeFlag": obj.boeFlag,
-	"category": obj.category,
-	"courseSyncFlag": obj.courseSyncFlag,
-	"endTime": obj.endTime,
-	"level": obj.level,
-	"manager": obj.manager,
-	"managerId": obj.managerId,
-	"name": obj.name,
-	"notice": obj.notice,
-	"noticeFlag": obj.noticeFlag,
-	"picUrl": obj.picUrl,
-	"remark": obj.remark,
-	"sourceBelongId": obj.sourceBelongId,
-	"status": obj.status,
-	"systemId": obj.systemId,
-	"templateId": obj.templateId,
-	"type": obj.type
-})
-
-// 创建多层项目
-export const createStoreyProject = () => http.post('/admin/project/edit', {
-
-})
+// 创建编辑单层项目（type=3）/ 多层项目（type=1）/ 多层子项目（type=2）
+export const createProject = (obj) => http.post('/admin/project/edit', obj)
 
 // 获取项目列表
-export const getProjectList = () => http.post('/admin/project/list', {
+export const getProjectList = (obj) => http.post('/admin/project/list', obj)
 
-})
\ No newline at end of file
+// 获取项目详情信息（包含阶段及任务列表）
+export const getProjectDetail = (obj) => http.get('/admin/project/detail', { params: obj })
+//发布项目
+export const releaseProject=(obj)=>http.post('/admin/project/publish',obj)
+//获取项目学员
+export const projectStudent=(obj)=>http.post('/admin/project/studentList',obj)
\ No newline at end of file
diff --git a/src/api/index1.js b/src/api/index1.js
index 6141767f..16e7ee9d 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-04 22:45:31
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-06 16:48:50
+ * @FilePath: /fe-manage/src/api/index1.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import http from "./config";
 import qs from 'qs';
 
@@ -40,25 +48,35 @@ export const uploadFile = (obj) => http.post('/test/testRequest', qs.stringify({
 // 接口-请求
 
 //创建学习路径
-export const createLearnPath = (obj) => http.post('/admin/router/edit', obj, {
-	headers: {
-		'token': '123'
-	}
-});
+export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
 // 获取学习路径图列表
 export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
-//删除学习路径图
-export const deleteLearnPath = (obj) => http.post('/admin/router/handle', obj, {
-	headers: {
-		'token': '123'
-	}
-});
+//学习路径图的发布、停用、删除
+export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
 
 //获取关卡
 export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
 
 //新建或编辑关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+//获取学员列表
+export const getStudent = (obj) => http.post('/admin/router/studentList', obj);
+//获取路径图详情-包含关卡及任务列表
+export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
+	params: {
+		routerId: routerId,
+	}
+});
+//添加学员
+export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
+
+
+//项目基础信息-----------------------------------
+//项目积分榜单
+export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj);
+//排行榜
+export const billboard = (obj) => http.post('/admin/project/billboard', obj);
+//项目基础信息-----------------------------------
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index 50e8a8e3..f76de0b9 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -1,5 +1,5 @@
 import http from "./config";
-// import qs from 'qs';
+import qs from 'qs';
 
 /**
  * 接口传参数方式（get）
@@ -46,8 +46,12 @@ export const fileUp = (data) =>
   });
 
 //删除测评信息
-export const deleteEvaluationById = (obj) =>
-  http.post("/evaluation/deleteEvaluationById", { params: obj });
+export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvaluationById', { params: obj }, {
+    header: {
+        'token': '123',
+    }
+})
+
 
 //根据ID获取测评信息详情
 export const queryEvaluationDetailById = (obj) =>
diff --git a/src/api/indexExam.js b/src/api/indexExam.js
index fc9a30af..727dd42c 100644
--- a/src/api/indexExam.js
+++ b/src/api/indexExam.js
@@ -8,7 +8,10 @@ export const createExamination = (obj) => http.post('/examination/createExaminat
 // 根据Id删除考试信息
 export const deleteExaminationById = (obj) => http.post('/examination/deleteExaminationById',obj);
 // 根据ID获取考试信息详情
-export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj);
+export const queryExaminationDetailById = (obj) => http.post('/examination/queryExaminationDetailById',obj,{headers: {
+	'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+}
+});
 // 创建考试信息接口
 export const updateExamination = (obj) => http.post('/examination/updateExamination',obj);
 
diff --git a/src/api/indexExternalChain.js b/src/api/indexExternalChain.js
index 9de46f42..6bc219d3 100644
--- a/src/api/indexExternalChain.js
+++ b/src/api/indexExternalChain.js
@@ -1,19 +1,39 @@
 import http from "./config";
 
 //创建外链接口
-export const createExternalChain = (obj) => http.post('/link/createLinks', obj)
+export const createExternalChain = (obj) => http.post('/link/createLinks', obj, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //外链信息删除接口
-export const deleteLink = (obj) => http.post('/link/deleteLink', { params: obj })
+export const deleteLink = (obj) => http.post('/link/deleteLink', { params: obj }, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //获取外链详细信息接口
-export const getLink = (obj) => http.post('/link/getOne', { params: obj })
+export const getLink = (obj) => http.post('/link/getOne', obj)
 
 // 更新外链数据
-export const updateLinks = (obj) => http.post('/link/updateLinks', obj)
+export const updateLinks = (obj) => http.post('/link/updateLinks', obj, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //修改为必修的接口
-export const updateToCompulsory = (obj) => http.post('/link/updateToCompulsory', { params: obj })
+export const updateToCompulsory = (obj) => http.post('/link/updateToCompulsory', { params: obj }, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //修改为选修的接口
-export const updateToElective = (obj) => http.post('/link/updateToElective', { params: obj })
\ No newline at end of file
+export const updateToElective = (obj) => http.post('/link/updateToElective', { params: obj }, {
+  headers: {
+    'token': '123'
+  }
+})
\ No newline at end of file
diff --git a/src/api/indexInvist.js b/src/api/indexInvist.js
index 550a5803..31bb417f 100644
--- a/src/api/indexInvist.js
+++ b/src/api/indexInvist.js
@@ -43,13 +43,15 @@ export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseM
 //删除评估信息
 export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj })
 
-
 //根据ID获取评估信息详情
 export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj })
 
 //修改评估信息
 export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj)
 
+//获取全部评估信息接口
+export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)
+
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js
index 39e22fcd..4cfe5d58 100644
--- a/src/api/indexLevel.js
+++ b/src/api/indexLevel.js
@@ -1,8 +1,12 @@
 import http from "./config";
 
-//新建或编辑关卡
-export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, {
-    headers: {
-        'token': '123'
-    }
-});
\ No newline at end of file
+//新建关卡
+export const editChapter = (obj) => http.post('/admin/router/editChapter', obj);
+//编辑关卡
+export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj);
+
+//删除任务
+export const deleteTask = (obj) => http.delete('/admin/router/deleteTask',{params: obj});
+
+//移动任务到关卡
+export const moveTask = (obj) => http.post('/admin/router/moveTask',obj);
diff --git a/src/api/indexLiveBroadcast.js b/src/api/indexLiveBroadcast.js
index ef05e98e..1f5bb7a6 100644
--- a/src/api/indexLiveBroadcast.js
+++ b/src/api/indexLiveBroadcast.js
@@ -4,10 +4,22 @@ import http from "./config";
 export const getLiveBroadcastInfor = (obj) => http.get('/liveBroadcast', { params: obj })
 
 //创建直播接口
-export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj)
+export const createLiveBroadcast = (obj) => http.post('/liveBroadcast/createLiveBroadcast', obj, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //直播信息删除接口
-export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj)
+export const deleteLiveBroadcast = (obj) => http.post('/liveBroadcast/deleteLiveBroadcast', obj, {
+  headers: {
+    'token': '123'
+  }
+})
 
 //直播信息修改接口
-export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj)
\ No newline at end of file
+export const updateLiveBroadcastMessage = (obj) => http.post('/liveBroadcast/updateLiveBroadcastMessage', obj, {
+  headers: {
+    'token': '123'
+  }
+})
\ No newline at end of file
diff --git a/src/api/indexMovetask.js b/src/api/indexMovetask.js
new file mode 100644
index 00000000..a0fee2ca
--- /dev/null
+++ b/src/api/indexMovetask.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+//移动任务到阶段
+export const moveTask = (obj) => http.post('/admin/project/moveTask',obj)
\ No newline at end of file
diff --git a/src/api/indexStage.js b/src/api/indexStage.js
new file mode 100644
index 00000000..1e6a2587
--- /dev/null
+++ b/src/api/indexStage.js
@@ -0,0 +1,4 @@
+import http from "./config";
+
+//添加阶段
+export const editStage = (obj) => http.post('/admin/project/editStage', obj);
\ No newline at end of file
diff --git a/src/api/indexStudy.js b/src/api/indexStudy.js
new file mode 100644
index 00000000..d948affb
--- /dev/null
+++ b/src/api/indexStudy.js
@@ -0,0 +1,3 @@
+import http from "./config";
+//路径图删除任务
+export const deleteStudyTask = (obj) => http.delete('/admin/router/deleteTask', { params: obj })
\ No newline at end of file
diff --git a/src/api/indexTask.js b/src/api/indexTask.js
new file mode 100644
index 00000000..534f95e7
--- /dev/null
+++ b/src/api/indexTask.js
@@ -0,0 +1,14 @@
+import http from "./config";
+
+
+// 获取路径图详情-包含关卡及任务列表
+export const GetRouterDetail = (routerId) => http.get(`/admin/router/detail?routerId=${routerId}`)
+
+// 新建或编辑阶段任务
+export const ProjectEditTask = (obj) => http.post('/admin/project/editTask',obj)
+// 新建或编辑关卡任务
+export const RouterEditTask = (obj) => http.post('/admin/router/editTask',obj)
+// 删除关卡任务
+export const RouterDeleteTask = (obj) => http.post('/admin/router/deleteTask',obj);
+// 删除项目任务
+export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask',obj);
\ No newline at end of file
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index 07b87987..dd8001d2 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -1,13 +1,14 @@
 import http from "./config";
-
 //获取任务列表
-export const getTask = (obj) =>
-  http.get(
-    "/admin/project/detail",
-    { params: obj },
-    {
-      headers: {
-        token: "123",
-      },
-    }
-  );
+export const getTask = (obj) => http.get('/admin/project/detail', { params: obj }, {
+  headers: {
+    'token': '123'
+  }
+})
+
+//项目里的新建或编辑阶段任务
+export const addTask = (obj) => http.post('/admin/project/editTask', obj)
+
+
+//项目里的删除任务
+export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { params: obj })
diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index e69de29b..fd1a7437 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -0,0 +1,81 @@
+import http from "./config";
+import qs from 'qs';
+
+
+/**
+ * 接口传参数方式（get）
+ * axios.get('/user', {
+ *  params: {
+ *      id: 12345，
+ *     name: user
+ *  }
+ * }).then(res => console.log(res))
+ *
+ * 接口传参三种方式（post/put/patch）
+ *
+ * 1.'Content-Type'= 'multipart/form-data'，传参格式为 formData。
+ * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
+ * （request的Header:'Content-Type'= 'multipart/form-data'）
+ * var formData=new FormData();
+ * formData.append('user',123456);formData.append('pass',12345678);
+ * axios.post("/notice",formData).then()
+ *
+ * 2.'Content-Type'= 'application/x-www-form-urlencoded'，传参格式为 query 形式,使用$qs.stringify。
+ * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
+ * （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'）
+ * let data = {"code":"1234","name":"yyyy"};
+ * axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then()
+ *
+ * 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。
+ * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'）
+ * （request的Header:'Content-Type'= 'application/json;charset=UTF-8'）
+ * let data = {"code":"1234","name":"yyyy"}
+ * axios.post(`${this.$url}/test/testRequest`,data).then()
+ *
+ */
+//  , {
+//     header: {
+//         'token': '123',
+//     }
+// }
+
+// 接口-请求
+
+//基础票数上传接口
+export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj)
+
+//创建题干信息接口
+export const createOptionMessage = (obj) => http.post('/vote/createOptionMessage', obj)
+
+//投票信息创建接口
+export const createVote = (obj) => http.post('/vote/createVote', obj)
+
+//删除投票信息
+export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj })
+
+//删除题干信息接口
+export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', { params: obj })
+
+//删除题选项息接口
+export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj })
+
+//修改投票信息接口
+export const editVote = (obj) => http.post('/vote/editVote', obj)
+
+//根据题干ID获取题干信息
+export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj })
+
+//修改题干信息接口
+export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj);
+
+//上传组件
+export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj }));
+
+
+// 测试方法
+// import * as api from '../../api/index'
+// api.getLearnPath({}).then(res => {
+// 	console.log(res)
+// }).catch(err => {
+// 	console.log(err)
+// })
diff --git a/src/api/indexWork.js b/src/api/indexWork.js
index 2bff6660..af189946 100644
--- a/src/api/indexWork.js
+++ b/src/api/indexWork.js
@@ -9,8 +9,11 @@ export const createWorkTask = (obj) =>
 // 删除作业信息接口
 export const deleteWorkTask = (obj) => http.post("/work/deleteWorkTask", obj);
 // 根据ID获取作业信息详情
-export const queryWorkDetailById = (obj) =>
-  http.post("/work/queryWorkDetailById", obj);
+export const queryWorkDetailById = (obj) => http.post('/work/queryWorkDetailById',obj,{
+	headers: {
+		'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+	}
+});
 // 修改作业信息接口
 export const updateWorkTaskUsing = (obj) =>
   http.post("/work/updateWorkTask", obj);
diff --git a/src/api/method.js b/src/api/method.js
index ca7d2367..21d43e0c 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -1,3 +1,4 @@
+
 function formatNumber(n) {
 	n = n.toString();
 	return n[1] ? n : "0" + n;
@@ -161,8 +162,12 @@ function autoComma(number) {
 		return 0;
 	}
 }
+const commonData={
+	timeout:50
+}
 export {
 	toDate,
 	getWeek,
 	autoComma,
+	commonData,
 }
\ No newline at end of file
diff --git a/src/api/storage.js b/src/api/storage.js
new file mode 100644
index 00000000..b274231f
--- /dev/null
+++ b/src/api/storage.js
@@ -0,0 +1,51 @@
+/**
+ * 封装操作localstorage本地存储的方法
+ */
+export const storage = {
+	//存储
+	set(key, value) {
+		localStorage.setItem(key, JSON.stringify(value))
+	},
+	//取出数据
+	get(key) {
+		const value = localStorage.getItem(key)
+		if (value && value != "undefined" && value != "null") {
+			return JSON.parse(value)
+		}
+	},
+	// 删除数据
+	remove(key) {
+		localStorage.removeItem(key)
+	},
+	// 获取所有数据
+	getAllStorage() {
+		return JSON.parse(window.localStorage.getItem() || "{}")
+	},
+	// 删除所有数据
+	removeAllLocalStorage() {
+		window.localStorage.clear()
+		return { message: "ok" }
+	}
+};
+
+/**
+ * 封装操作sessionStorage本地存储的方法
+ */
+export const sessionStorage = {
+	//存储
+	set(key, value) {
+		window.sessionStorage.setItem(key, JSON.stringify(value))
+	},
+	//取出数据
+	get(key) {
+		const value = window.sessionStorage.getItem(key)
+		if (value && value != "undefined" && value != "null") {
+			return JSON.parse(value)
+		}
+		return null
+	},
+	// 删除数据
+	remove(key) {
+		window.sessionStorage.removeItem(key)
+	}
+}
\ No newline at end of file
diff --git a/src/assets/images/notSelect.png b/src/assets/images/notSelect.png
new file mode 100644
index 00000000..33d633a6
Binary files /dev/null and b/src/assets/images/notSelect.png differ
diff --git a/src/assets/images/select.png b/src/assets/images/select.png
new file mode 100644
index 00000000..70d9089e
Binary files /dev/null and b/src/assets/images/select.png differ
diff --git a/src/assets/images/selectAll.png b/src/assets/images/selectAll.png
new file mode 100644
index 00000000..d796f599
Binary files /dev/null and b/src/assets/images/selectAll.png differ
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index bbe805e6..09f462c8 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -345,14 +345,14 @@ textarea {
   .drawerMain {
     min-width: 700px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     height: 100%;
 
     .contentMain {
       flex: 1;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
 
   }
@@ -376,7 +376,7 @@ textarea {
   .drawerMain {
     min-width: 700px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
   }
@@ -392,7 +392,7 @@ textarea {
   .ant-modal {
     height: calc(100% - 200px);
     background-color: rgba(255, 255, 255, 1);
-    // overflow-y: scroll;
+    // overflow-y: auto;
     min-width: 900px;
     max-width: 1300px;
     padding: 0;
@@ -428,7 +428,7 @@ textarea {
     .modalMain {
       height: 0px;
       flex: 1 1 auto;
-      overflow-y: scroll;
+      overflow-y: auto;
       margin-top: 7px;
       margin: 0px 52px;
 
@@ -437,4 +437,18 @@ textarea {
   }
 }
 
-//弹窗--------------------------------------------------------
\ No newline at end of file
+//弹窗--------------------------------------------------------
+
+//loading--------------------------------------------------------
+.aeLoading {
+  width: 100%;
+  height: 100%;
+background: rgba(0, 0, 0, 0.2);
+display: flex;
+align-items: center;
+justify-content: center;
+position: absolute;
+left: 0;
+top:0,
+}
+//loading--------------------------------------------------------
\ No newline at end of file
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 2e84c237..2abfc972 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -33,7 +33,10 @@ export default {
         // console.log("监听路由");
         console.log("new:" + n + ",old:" + o);
 
-        if (n === "/learningpath" || n === "/LearningPath") {
+        if (
+          n.indexOf("/learningpath") !== -1 ||
+          n.indexOf("/LearningPath") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
@@ -42,25 +45,28 @@ export default {
             },
           ];
         }
-        if (n === "/leveladd" || n === "/LevelAdd") {
+        if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
             },
           ];
         }
-        if (n === "/leveladddetail" || n === "/LevelAddDetail") {
+        if (
+          n.indexOf("/leveladddetail") !== -1 ||
+          n.indexOf("/LevelAddDetail") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
               href: "/leveladd",
             },
             {
@@ -68,14 +74,17 @@ export default {
             },
           ];
         }
-        if (n === "/levelcheck" || n === "/LevelCheck") {
+        if (
+          n.indexOf("/levelcheck") !== -1 ||
+          n.indexOf("/LevelCheck") !== -1
+        ) {
           state.list = [
             {
               name: "学习路径",
               href: "/learningpath",
             },
             {
-              name: "关卡",
+              name: "管理",
               href: "/leveladd",
             },
             {
@@ -83,7 +92,10 @@ export default {
             },
           ];
         }
-        if (n === "/projectmanage" || n === "/ProjectManage") {
+        if (
+          n.indexOf("/projectmanage") !== -1 ||
+          n.indexOf("/ProjectManage") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -96,7 +108,10 @@ export default {
             },
           ];
         }
-        if (n === "/projectadd" || n === "/ProjectAdd") {
+        if (
+          n.indexOf("/projectadd") !== -1 ||
+          n.indexOf("/ProjectAdd") !== -1
+        ) {
           state.list = [
             {
               name: "项目",
@@ -107,7 +122,7 @@ export default {
             },
           ];
         }
-        if (n === "/taskpage" || n === "/TaskPage") {
+        if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -118,7 +133,7 @@ export default {
             },
           ];
         }
-        if (n === "/taskadd" || n === "/TaskAdd") {
+        if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) {
           state.list = [
             {
               name: "项目",
@@ -135,7 +150,10 @@ export default {
             },
           ];
         }
-        if (n === "/templatelibrary" || n === "/TemplateLibrary") {
+        if (
+          n.indexOf("/templatelibrary") !== -1 ||
+          n.indexOf("/TemplateLibrary") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -145,7 +163,10 @@ export default {
             },
           ];
         }
-        if (n === "/libraryadd" || n === "/LibraryAdd") {
+        if (
+          n.indexOf("/libraryadd") !== -1 ||
+          n.indexOf("/LibraryAdd") !== -1
+        ) {
           state.list = [
             {
               name: "项目中心",
@@ -159,7 +180,10 @@ export default {
             },
           ];
         }
-        if (n === "/coursemanage" || n === "/CourseManage") {
+        if (
+          n.indexOf("/coursemanage") !== -1 ||
+          n.indexOf("/CourseManage") !== -1
+        ) {
           state.list = [
             {
               name: "课程库",
@@ -172,7 +196,10 @@ export default {
             },
           ];
         }
-        if (n === "/coursewaremanage" || n === "/CoursewareManage") {
+        if (
+          n.indexOf("/coursewaremanage") !== -1 ||
+          n.indexOf("/CoursewareManage") !== -1
+        ) {
           state.list = [
             {
               name: "课程库",
@@ -182,7 +209,10 @@ export default {
             },
           ];
         }
-        if (n === "/researchmanage" || n === "/ResearchManage") {
+        if (
+          n.indexOf("/researchmanage") !== -1 ||
+          n.indexOf("/ResearchManage") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -191,7 +221,10 @@ export default {
             },
           ];
         }
-        if (n === "/managepage" || n === "/ManagePage") {
+        if (
+          n.indexOf("/managepage") !== -1 ||
+          n.indexOf("/ManagePage") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -204,7 +237,10 @@ export default {
           ];
         }
 
-        if (n === "/researchadd" || n === "/ResearchAdd") {
+        if (
+          n.indexOf("/researchadd") !== -1 ||
+          n.indexOf("/ResearchAdd") !== -1
+        ) {
           state.list = [
             {
               name: "评估管理",
@@ -217,14 +253,20 @@ export default {
           ];
         }
 
-        if (n === "/certificatecenter" || n === "/CertificateCenter") {
+        if (
+          n.indexOf("/certificatecenter") !== -1 ||
+          n.indexOf("/CertificateCenter") !== -1
+        ) {
           state.list = [
             {
               name: "证书中心",
             },
           ];
         }
-        if (n === "/systemmanage" || n === "/SystemManage") {
+        if (
+          n.indexOf("/systemmanage") !== -1 ||
+          n.indexOf("/SystemManage") !== -1
+        ) {
           state.list = [
             {
               name: "系统管理",
diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index 6b3f37dd..f8c24091 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -1,111 +1,122 @@
 <template>
-  <div class="openPages">
-    <div
-      v-for="(value, index) in openList"
-      :key="index"
-      style="position: relative"
-    >
-      <router-link
-        :to="value.href"
-        class="openItems"
-        :style="{ background: value.active ? '#f5f7fa' : '' }"
-      >
-        <div
-          :style="{
-            color: value.active
-              ? 'rgba(64, 158, 255, 1)'
-              : 'rgba(135, 139, 146, 1)',
-          }"
-        >
-          {{ value.pagename }}
-        </div>
-      </router-link>
-      <div class="close" @click.stop="closePage(value)">
-        <img src="../assets/images/openPages/close.png" />
-      </div>
-    </div>
-  </div>
+	<div class="openPages">
+		<draggable v-model="openList" chosenClass="chosen" forceFallback="true" ghostClass="ghost" group="openPage"
+			animation="500" @start="onStart" @end="onEnd" style="display: flex">
+			<template #item="{ element }">
+				<div style="position: relative">
+					<router-link :to="element.href" class="openItems" :style="{ background: element.active ? '#f5f7fa' : '' }">
+						<div :style="{
+							color: element.active
+								? 'rgba(64, 158, 255, 1)'
+								: 'rgba(135, 139, 146, 1)',
+						}">
+							{{ element.pagename }}
+						</div>
+					</router-link>
+					<div class="close" @click.stop="closePage(element)">
+						<img src="../assets/images/openPages/close.png" />
+					</div>
+				</div>
+			</template>
+		</draggable>
+	</div>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
 import { useStore } from "vuex";
 import { useRouter } from "vue-router";
+import draggable from "vuedraggable";
 export default {
-  name: "OpenPages",
-  setup() {
-    const store = useStore();
-    const $router = useRouter();
-    const state = reactive({
-      openList: store.state.openpages,
-    });
+	name: "OpenPages",
+	components: {
+		draggable,
+	},
+	setup() {
+		const store = useStore();
+		const $router = useRouter();
+		const state = reactive({
+			openList: store.state.openpages,
+		});
 
-    const closePage = (value) => {
-      console.log("点击关闭页面", value, state.openList);
-      state.openList.map((item, key) => {
-        if (item.href === value.href) {
-          if (state.openList.length === 1) {
-            if (state.openList[0].href !== "/learningpath") {
-              state.openList.splice(key, 1);
-            }
-            $router.push({ path: "/learningpath" });
-          } else {
-            if (value.active) {
-              if (key === state.openList.length - 1) {
-                $router.push({ path: state.openList[key - 1].href });
-              } else {
-                $router.push({ path: state.openList[key + 1].href });
-              }
-            }
-            state.openList.splice(key, 1);
-          }
-        }
-      });
-      store.commit("chengeOpenpages", state.openList);
-    };
-    return {
-      ...toRefs(state),
-      closePage,
-    };
-  },
+		const closePage = (value) => {
+			console.log("点击关闭页面", value, state.openList);
+			state.openList.map((item, key) => {
+				if (item.href === value.href) {
+					if (state.openList.length === 1) {
+						if (state.openList[0].href !== "/learningpath") {
+							state.openList.splice(key, 1);
+						}
+						$router.push({ path: "/learningpath" });
+					} else {
+						if (value.active) {
+							if (key === state.openList.length - 1) {
+								$router.push({ path: state.openList[key - 1].href });
+							} else {
+								$router.push({ path: state.openList[key + 1].href });
+							}
+						}
+						state.openList.splice(key, 1);
+					}
+				}
+			});
+			store.commit("chengeOpenpages", state.openList);
+		};
+		return {
+			...toRefs(state),
+			closePage,
+		};
+	},
 };
 </script>
-<style scoped lang="scss">
+<style lang="scss">
 .openPages {
-  width: 100%;
-  // height: 50px;
-  display: flex;
-  background-color: rgba(255, 255, 255, 1);
-  box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);
-  overflow-x: auto;
-  .openItems {
-    width: 272px;
-    // min-width: 250px;
-    height: 50px;
-    border: 1px solid #edf2fa;
-    border-left: 0px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 36px;
-    cursor: pointer;
-    flex-shrink: 0;
-  }
-  .close {
-    width: 16px;
-    height: 16px;
-    border-radius: 8px;
+	width: 100%;
+	// height: 50px;
+	display: flex;
+	background-color: rgba(255, 255, 255, 1);
+	box-shadow: 0px 8px 8px 0px rgba(118, 136, 166, 0.1);
+	overflow-x: auto;
 
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    top: 17px;
-    right: 27px;
-  }
-  .close:hover {
-    background: rgba(220, 220, 220, 1);
-  }
+	.openItems {
+		width: 272px;
+		// min-width: 250px;
+		height: 50px;
+		border: 1px solid #edf2fa;
+		border-left: 0px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 16px;
+		font-weight: 400;
+		line-height: 36px;
+		cursor: pointer;
+		flex-shrink: 0;
+	}
+
+	.close {
+		width: 16px;
+		height: 16px;
+		border-radius: 8px;
+
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		top: 17px;
+		right: 27px;
+	}
+
+	.close:hover {
+		background: rgba(220, 220, 220, 1);
+	}
+
+	.chosen {
+		// background-color: pink;
+	}
+
+	.ghost {
+		// background-color: red;
+		opacity: 0;
+	}
 }
 </style>
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index cf548d5e..51b8fb33 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -709,7 +709,7 @@ export default {
       .drawerMain {
         min-width: 600px;
         margin: 0px 32px 0px 32px;
-        // overflow-x: scroll;
+        // overflow-x: auto;
         display: flex;
         flex-direction: column;
         height: 100%;
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 53a2f6fe..030878b3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加活动</div>
+        <div v-if="edit" class="headerTitle">编辑活动</div>
+        <div v-else class="headerTitle">添加活动</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -71,6 +72,12 @@
           </div>
           <div class="main_item">
             <div class="signbox">
+            <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
@@ -218,6 +225,8 @@
 <script>
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexActivity";
+import * as apiTask from "../../api/indexTaskadd";
+import { RouterEditTask } from "@/api/indexTask"
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method.js";
 const rowSelection = ref({
@@ -245,8 +254,33 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudiscuss: {
+      type: Boolean,
+      default: false,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    edit: {
+      type: Boolean,
+      default: false,
+    }
   },
   setup(props, ctx) {
+    //console.log("学习路径",props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
@@ -261,6 +295,7 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:addactiveVisible", false);
+      ctx.emit("update:edit", false);
       state.radioV1 = "";
       state.inputV1 = "";
       state.inputV2 = "";
@@ -283,10 +318,26 @@ export default {
 
     //创建活动
     const createActivity = () => {
-      if(!state.inputV1) return message.warning("请输入活动名称");
-      if(!state.inputV2) return message.warning("请输入活动时长");
-      if(!state.textV1) return message.warning("请输入活动公告");
-      if(!state.inputV3) return message.warning("请输入活动地址");
+      if(!state.inputV1){
+        message.destroy();
+        return message.warning("请输入活动名称");
+      } 
+      if(!state.textV1){
+        message.destroy();
+        return message.warning("请输入活动公告");
+      } 
+      if(!state.time){
+        message.destroy();
+        return message.warning("请输入活动时间");
+      } 
+      if(!state.inputV2){
+        message.destroy();
+        return message.warning("请输入活动时长");
+      } 
+      if(!state.inputV3){
+        message.destroy();
+        return message.warning("请输入活动地址");
+      } 
       let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
       let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
       let obj = {
@@ -310,8 +361,7 @@ export default {
       };
       api
         .createActivity(obj)
-        .then((res) => {
-          setTimeout(() => {
+        .then((res) => {          
             console.log("创建成功", res);
             message.success("创建成功");
             state.radioV1 = "";
@@ -325,12 +375,54 @@ export default {
             state.textV2 = "";
             state.time = "";
             ctx.emit("update:addactiveVisible", false);
-          }, 1000);
+            console.log("学习路径",props.isStudiscuss);
+            if(props.isStudiscuss){
+              let editObj1 = {
+              chapterId:props.isactive,
+              courseId: 0,
+              duration: obj.activityDuration,
+              flag: true,
+              name: obj.activityName,
+              routerId: props.routerId,
+              routerTaskId: 0,
+              type: 9,
+            }
+              RouterEditTask(editObj1).then(res => {
+              console.log("新增关卡任务成功",res);
+              closeDrawer();
+            }).catch(err => {
+              console.log("新增关卡任务失败",err);
+            })
+            }else{
+              apiTask
+              .addTask({
+                courseId: 0,
+                duration: obj.activityDuration,
+                flag: true,
+                name: obj.activityName,
+                projectId: props.projectId,
+                projectTaskId: 0,
+                stageId: props.chooseStageId,
+                type: 9,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+            }
+            
         })
         .catch((err) => {
           console.log("创建失败",err);
         })
     };
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -354,6 +446,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -365,6 +458,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 a77c6c06..e13afc92 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -3,13 +3,13 @@
     :visible="adddiscussVisible"
     class="drawerStyle addrefDrawer"
     width="80%"
-    title="添加讨论"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">
-        <div class="headerTitle">添加讨论</div>
+      <div class="header">        
+        <div v-if="edit" class="headerTitle">编辑讨论</div>
+        <div v-else class="headerTitle">添加讨论</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -57,7 +57,7 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1">允许讨论</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1">允许评论</a-checkbox>
             </div>
           </div>
         </div>
@@ -67,11 +67,16 @@
         <button class="btn2" @click="createDiscuss">确定</button>
       </div>
     </div>
+     <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+    <a-spin :spinning="addLoading" tip="添加中..." />
+  </div>
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexDiscuss";
+import * as apiTask from "../../api/indexTaskadd";
+import { RouterEditTask } from "@/api/indexTask"
 import { message } from "ant-design-vue";
 const rowSelection = ref({
   checkStrictly: false,
@@ -98,26 +103,61 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    isStudiscuss: {
+      type: Boolean,
+      default: false,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    editDiscussId: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
+    console.log("学习路径",props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
       textV1: "",
       checkedC1: "",
+      addLoading:false,
     });
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
+      ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.textV1 = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    
-    //创建讨论
+
+    //创建讨论（项目任务列表）
     const createDiscuss = () => {
-      if(!state.inputV1) return message.warning("请输入讨论名称");
+      if (!state.inputV1) {
+        message.destroy();
+        return message.warning("请输入讨论名称");
+      }
+      state.addLoading=true
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
@@ -125,27 +165,92 @@ export default {
         createTime: "", //创建时间
         createUser: 0, //创建人
         discussFlag: "", //活动逻辑删除标识
-        discussId: 0, //讨论Id
+        discussId: props.editDiscussId == null ? 0 : props.editDiscussId, //讨论Id
         discussTag: "", //是否必修的标识
         updateTime: "", //更新时间
         updateUser: 0, //更新人
         projectId: 0, //项目id
       };
-      api
+      if(props.edit){
+        //console.log("编辑");
+        console.log("props.editDiscussId",props.editDiscussId)
+        
+        let obj = {
+         discussId: props.editDiscussId,
+        }
+        console.log(obj)
+        api
+          .getDiscussDetail(obj)
+          .then((res) => {
+            console.log("获取成功",res.data);
+          })
+          .catch((err) => {
+            console.log("获取失败",err.data);
+          })
+       
+      }else{
+        api
         .createDiscuss(obj)
         .then((res) => {
-          setTimeout(() => {
-            console.log("创建成功", res);
-            state.inputV1 = "";
-            state.textV1 = "";
-            message.success("创建成功");
-            ctx.emit("update:adddiscussVisible", false);
-          }, 1000);
-          
-        })
+          console.log("创建成功", res);
+          state.inputV1 = "";
+          state.textV1 = "";
+         
+          //console.log("discussName",obj.discussName);
+          console.log("学习路径",props.isStudiscuss);
+          if(props.isStudiscuss){
+            let editObj1 = {
+              chapterId:props.isactive,
+              courseId: res.data.data.discussId,
+              duration: 0,
+              flag: true,
+              name: obj.discussName,
+              routerId: props.routerId,
+              routerTaskId: 0,
+              type: 8,
+            }
+            RouterEditTask(editObj1).then(res => {
+              console.log("新增关卡任务成功",res);
+              setTimeout(()=>{
+                 message.success("创建成功");
+          ctx.emit("update:adddiscussVisible", false);
+                closeDrawer();
+              state.addLoading=false
+              },1000)
+            }).catch(err => {
+              console.log("新增关卡任务失败",err);
+            })
+          }else{
+            console.log("项目添加讨论");
+            apiTask
+            .addTask({
+              courseId: res.data.data.discussId,
+              duration: 0,
+              flag: true,
+              name: obj.discussName,
+              projectId: props.projectId,
+              projectTaskId: 0,
+              stageId: props.chooseStageId,
+              type: 8,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后", res.data);
+              ctx.emit("changeData",false);
+              //重新获取任务列表
+              // apiTask.getTask({ projectId: 28 });
+              // router.push("/taskadd");
+              state.addLoading=false
+            })
+            .catch((err) => {
+              console.log(err);
+            });
+          }
+         })
         .catch((err) => {
           console.log("创建失败", err);
         });
+      }
+      
     };
     return {
       ...toRefs(state),
@@ -157,7 +262,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -169,6 +274,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -236,15 +342,15 @@ export default {
             }
             .ant-input-textarea-show-count {
               position: relative;
-        }
-        .ant-input-textarea-show-count::after {
+            }
+            .ant-input-textarea-show-count::after {
               position: absolute;
               right: 10px;
               bottom: 0px;
-        } 
-        .ant-input {
-          border-radius: 8px;
-        }
+            }
+            .ant-input {
+              border-radius: 8px;
+            }
           }
         }
       }
@@ -279,6 +385,6 @@ export default {
       }
     }
   }
+
 }
 </style>
-  
\ No newline at end of file
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 80639dde..2f3ea0c4 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加测评</div>
+        <div v-if="edit" class="headerTitle">编辑测评</div>
+        <div v-else class="headerTitle">添加测评</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -90,6 +91,9 @@
                   <div class="ant-upload-text">Upload</div>
                 </div>
               </a-upload>
+              <span style="padding-bottom: 20px; color: #878b92"
+                >图片格式为JPG/PNG 图片大小不可超过1MB</span
+              >
             </div>
           </div>
         </div>
@@ -99,15 +103,20 @@
         <button class="btn2" @click="createEvalText">确定</button>
       </div>
     </div>
+    <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+      <a-spin :spinning="addLoading" tip="添加中..." />
+    </div> -->
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, toRefs, ref } from "vue";
-import { useRouter } from "vue-router";
+// import { useRouter } from "vue-router";
 import * as api from "../../api/indexEval";
+import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method";
-const router = useRouter();
+import { RouterEditTask } from "@/api/indexTask";
+// const router = useRouter();
 export default {
   name: "AddEval",
   // components: {
@@ -117,6 +126,34 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    learn: {
+      type: Number,
+      default: 0,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    EditEvalId: {
+      type: Number,
+      default: 147,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -132,17 +169,18 @@ export default {
       currentPage: 1, //当前页
       tableDataTotal: -1, //学习路径列表总数
       pageSize: 10, //每页10条数据
+      // addLoading:false,
     });
 
     const closeDrawer = () => {
       ctx.emit("update:addevalVisible", false);
+      ctx.emit("update:edit", false);
       state.inputV1 = "";
       state.inputV2 = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-
     //上传组件
     function getBase64(img, callback) {
       const reader = new FileReader();
@@ -187,39 +225,18 @@ export default {
       return isJpgOrPng && isLt2M;
     };
 
-    // const getTableDate = (tableData) => {
-    //   let data = tableData;
-    //   let array = [];
-    //   data.map((value, index) => {
-    //     let obj = {
-    //       id: value.routerId,
-    //       number: (state.currentPage - 1) * state.pageSize + index + 1,
-    //       manager: value.name ? value.name : "-",
-    //       state:
-    //         value.status === 0
-    //           ? "草稿"
-    //           : value.status === 1
-    //           ? "已发布"
-    //           : value.status === -1
-    //           ? "已停用"
-    //           : "-",
-    //       creater: value.createName ? value.createName : "-",
-    //       pubtime: value.publishTime
-    //         ? toDate(value.publishTime, "Y-M-D h:m:s")
-    //         : "-",
-    //       cretime: value.createTime
-    //         ? toDate(value.createTime, "Y-M-D h:m:s")
-    //         : "-",
-    //       remark: value.remark ? value.remark : "-",
-    //     };
-    //     array.push(obj);
-    //   });
-    //   state.tableData = array;
-    // };
 
-    //创建测评信息
+
+    //创建或编辑测评信息
     const createEvalText = () => {
-      if (!state.inputV1) return message.info("请输入测评名称");
+      if (!state.inputV1) {
+        message.destroy();
+        return message.info("请输入测评名称");
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.info("请选择测评");
+      }
       if (state.time != undefined) {
         state.endTimes = toDate(
           new Date(state.time[0].$d).getTime() / 1000,
@@ -237,8 +254,8 @@ export default {
         createUser: 0,
         evaluationEndTime: state.endTimes,
         evaluationFlag: "",
-        evaluationId: "",
-        evaluationPictureAddress: state.picUrl,
+        evaluationId: 0,
+        evaluationPictureAddress: "",
         evaluationStartTime: state.startTimes,
         evaluationTag: "",
         evaluationTypeId: 0,
@@ -246,120 +263,112 @@ export default {
         updateTime: "",
         updateUser: 0,
       };
-      api
-        .createEvaluation(obj)
-        .then((res) => {
-          setTimeout(() => {
+      let objedit = {
+        createTime: "",
+        createUser: 0,
+        evaluationEndTime: "",
+        evaluationFlag: "",
+        evaluationId: props.EditEvalId == null ? 0 : props.EditEvalId,
+        evaluationName: state.inputV1,
+        evaluationPictureAddress: "",
+        evaluationStartTime: "",
+        evaluationTag: "",
+        evaluationTypeId: 0,
+        evaluationTypeName: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      let queryobj = {
+        evaluationId:props.EditEvalId
+      }
+      console.log(queryobj,'ssssssssss');
+      if (props.edit == false) {
+        api
+          .createEvaluation(obj)
+          .then((res) => {
             console.log("创建成功", res);
             message.success("创建成功");
+            closeDrawer();
+            //渲染到项目列表            
+            if (props.learn == 0)
+              apitaskadd
+                .addTask({
+                  courseId: res.data.data.evaluationId,
+                  duration: 0,
+                  flag: true,
+                  name: obj.evaluationName,
+                  projectId: props.projectId,
+                  projectTaskId: 0,
+                  stageId: props.chooseStageId,
+                  type: 10,
+                })
+                .then((res) => {
+                  console.log("调用项目添加接口后", res.data);
+                  //自定义事件给父组件传值
+                  ctx.emit("changeData", false);
+                  //重新获取任务列表
+                  // apiTask.getTask({ projectId: 28 });
+                  // router.push("/taskadd");
+                })
+                .catch((err) => {
+                  console.log(err);
+                });
+            //渲染到学历路径
+            else {
+              let editObj1 = {
+                chapterId: props.isactive,
+                courseId:  res.data.data.evaluationId,
+                duration: 0,
+                flag: true,
+                name: obj.evaluationName,
+                routerId: props.routerId,
+                routerTaskId: 0,
+                type: 10,
+              };
+              RouterEditTask(editObj1)
+            }
+          })
+          .catch((err) => {
+            console.log("创建失败", err);
             // state.createLoading = false;
-            router.push("/leveladd");
-            // getLearnPath();
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("创建失败", err);
-          // state.createLoading = false;
-        });
+          });
+      }
+      else {
+        api
+          .queryEvaluationDetailById(queryobj)
+          .then((res) => {
+              setTimeout(() => {
+                console.log("获取成功", res,objedit.evaluationId);
+                message.success("获取成功");
+                
+              }, 1000);
+            })
+            .catch((err) => {
+              console.log("获取失败", err);
+            });
+          api
+            .updateEvaluation(objedit)
+            .then((res) => {
+              setTimeout(() => {
+                console.log("修改成功", res);
+                message.success("修改成功");
+              }, 1000);
+            })
+            .catch((err) => {
+              console.log("修改失败", err);
+              // state.createLoading = false;
+              //重新获取列表
+              // getTask();
+            });
+        }
     };
 
-    // //获取学习路径列表
-    // const getEvalPath = () => {
-    //   let obj = {
-    //     pageNo: state.currentPage,
-    //     pageSize: state.pageSize,
-    //   };
-    //   api
-    //     .queryEvaluationDetailById(obj)
-    //     .then((res) => {
-    //       if (res.status === 200) {
-    //         console.log("获取任务列表数据", res.data.data);
-    //         let arr = res.data.data.rows;
-    //         if (
-    //           arr.length === 0 &&
-    //           res.data.data.total > 0 &&
-    //           state.currentPage > 1
-    //         ) {
-    //           state.currentPage = state.currentPage - 1;
-    //           getEvalPath();
-    //         }
-    //         getTableDate(arr);
-    //         state.tableDataTotal = Number(res.data.data.total);
-    //       }
-    //     })
-    //     .catch((err) => {
-    //       console.log("获取学习路径失败", err);
-    //     });
-    // };
-    // //翻页 需要去pa里绑定 @change="changePagination"
-    // const changePagination = (page) => {
-    //   state.currentPage = page;
-    //   getEvalPath();
-    //   // console.log("翻页", page, pageSize);
-    // };
-    // //删除评估
-    // const deleteEvalPath = () => {
-    //   let obj = {
-    //     routerId: state.deletePathId,
-    //     type: -2,
-    //   };
-    //   api
-    //     .deleteEvaluationById(obj)
-    //     .then((res) => {
-    //       console.log("删除成功", res);
-    //       message.success("删除成功");
-    //       // state.deleteModal = false;
-    //       getEvalPath();
-    //     })
-    //     .catch((err) => {
-    //       console.log("删除失败", err);
-    //     });
-    // };
-    // //编辑评估
-    // const editEvalPath = () => {
-    //   if (!state.pathName) return message.info("请输入路径图名称");
-    //   // if (!state.organizationSelectName) return message.info("请选择归属组织");
-    //   // state.createLoading = true;
-    //   let obj = {
-    //     routerId: state.editPathId,
-    //     name: state.pathName,
-    //     picUrl: "",
-    //     remark: state.pathIntro,
-    //     status: 0,
-    //   };
-    //   api
-    //     .updateEvaluation(obj)
-    //     .then((res) => {
-    //       setTimeout(() => {
-    //         console.log("修改成功", res);
-    //         message.success("修改成功");
-    //         // state.createLoading = false;
-    //         // state.currentPage = 1;
-    //         // state.out1 = false;
-    //         // router.push("/leveladd");
-    //         getEvalPath();
-    //       }, 1000);
-    //     })
-    //     .catch((err) => {
-    //       console.log("修改失败", err);
-    //       // state.createLoading = false;
-    //     });
-    // };
-    // onMounted(() => {
-    //   // console.log("执行");
-    //   getEvalPath();
-    // });
-
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      //增删改查
+      //增改
       createEvalText,
-      // getEvalPath,
-      // changePagination,
-      // deleteEvalPath,
-      // editEvalPath,
       //上传组件
       fileList,
       loading,
@@ -370,7 +379,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -382,6 +391,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -509,4 +519,3 @@ export default {
   }
 }
 </style>
-  
\ No newline at end of file
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 412dfb7a..cd42ca90 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -380,6 +380,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddGroup.vue b/src/components/drawers/AddGroup.vue
index 9179fc1d..0606e0a7 100644
--- a/src/components/drawers/AddGroup.vue
+++ b/src/components/drawers/AddGroup.vue
@@ -104,7 +104,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index f1fb1d21..a571428d 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -1,116 +1,78 @@
 <template>
-  <a-drawer
-    :visible="addhomeworkVisible"
-    class="drawerStyle addhomeworkDrawer"
-    width="80%"
-    title="添加作业"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="addhomeworkVisible" class="drawerStyle addhomeworkDrawer" width="80%" placement="right"
+    @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加作业</div>
-        <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
-        />
+        <div class="headerTitle">{{ EditWorkId ? '编辑' : '添加' }}作业</div>
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
-      <div class="contentMain">
-        <div class="main_left">
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+      <a-form ref="formRef" name="custom-validation" :model="formState" :rules="rules" v-bind="layout"
+        @finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
+        <div class="contentMain">
+          <div class="main_left">
+
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="作业名称" name="workName">
+                  <a-input v-model:value="formState.workName" style="width: 424px; height: 32px;margin-left: 35px;"
+                    placeholder="请输入作业名称" autocomplete="off" />
+                </a-form-item>
+
               </div>
-              <span style="margin-right: 3px">作业名称：</span>
             </div>
-            <div class="btnbox">
-              <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 32px"
-                placeholder="请输入作业名称"
-                maxlength="20"
-              />
+            <div class="main_item2">
+              <a-form-item has-feedback label="作业要求" name="workRequirement">
+                <a-textarea v-model:value="formState.workRequirement" placeholder="请输入作业要求" autocomplete="off"
+                  allow-clear style="margin-left: 35px" maxlength="150" />
+              </a-form-item>
             </div>
-          </div>
-          <div class="main_item2">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item has-feedback label="提交时间" name="choosedTime">
+                  <a-range-picker style="width: 424px;margin-left: 35px;" v-model:value="formState.choosedTime"
+                    format="YYYY-MM-DD" :placeholder="['      开始时间', '        结束时间']" />
+                </a-form-item>
               </div>
-              <span style="margin-right: 3px">作业要求：</span>
             </div>
-            <div class="textarea">
-              <a-textarea
-                v-model:value="textV1"
-                placeholder="请输入作业名称"
-                allow-clear
-                maxlength="150"
-              />
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">提交时间：</span>
-            </div>
-            <div class="btnbox">
-              <a-range-picker
-              style="width: 424px"
-              v-model:value="choosedTime"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
-            </div>
-          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/enclosure.png"
-                  alt=""
-                />
+            <div class="main_item">
+              <div class="signbox">
+                <div class="sign">
+                  <img src="@/assets/images/coursewareManage/enclosure.png" alt="" />
+                </div>
+                <span style="margin-right: 3px">附件：</span>
+              </div>
+              <div class="btnbox">
+                <a-upload v-model:file-list="fileList" name="file" action="/api/file/upload" @change="handleChange">
+                  <button class="xkbtn" type="button">上传附件</button>
+                </a-upload>
               </div>
-              <span style="margin-right: 3px">附件：</span>
             </div>
-            <div class="btnbox">
-              <a-upload
-                v-model:file-list="fileList"
-                name="file"
-                action="/api/file/upload"
-                :headers="headers"
-                @change="handleChange"
-              >
-              <button class="xkbtn">上传附件</button>
-            </a-upload>
-            </div>
-          </div>
-          <div class="main_item" style="margin-top:-25px;">
-            <div class="signbox">
-            </div>
-            <div class="btnbox">
-              <span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
+            <div class="main_item" style="margin-top:-25px;">
+              <div class="signbox">
+              </div>
+              <div class="btnbox">
+                <span style="color:#999999;">支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip</span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="addHomework">确定</button>
-      </div>
+        <div class="main_btns">
+          <a-button class="btn1" @click="closeDrawer">取消</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button>
+        </div>
+      </a-form>
+
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-import {message} from"ant-design-vue";
-import {createWorkTask} from "@/api/indexWork"
-import  dayjs from 'dayjs';
+import { reactive, ref } from "vue";
+import { message } from "ant-design-vue";
+import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing } from "@/api/indexWork";
+import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
+import { storage } from "../../api/storage";
+import dayjs from 'dayjs';
 
 const rowSelection = ref({
   checkStrictly: false,
@@ -137,13 +99,106 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
+      type: Number,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
-    const state = reactive({
-      inputV1: "",
-      textV1:"",
-      choosedTime:[],
+    const formState = reactive({
+      workName: '',
+      workRequirement: '',
+      choosedTime: '',
     });
+    const formRef = ref();
+    const state = reactive({
+      routerId: storage.get("routerId") ? JSON.parse(storage.get("routerId")) : null,
+    })
+
+    let checkWorkName = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业名称');
+      }
+    };
+
+    let checkWorkRequirement = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业要求');
+      }
+    };
+
+    let checkTime = async (_rule, value) => {
+      if (!value.length) {
+        return Promise.reject('请选择时间');
+      }
+    };
+
+    const rules = {
+      workName: [{
+        required: true,
+        validator: checkWorkName,
+        trigger: 'change',
+      }],
+      workRequirement: [{
+        required: true,
+        validator: checkWorkRequirement,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkTime,
+        trigger: 'change',
+      }],
+    };
+    // const layout = {
+    //   labelCol: {
+    //     span: 4,
+    //   },
+    //   wrapperCol: {
+    //     span: 14,
+    //   },
+    // };
+    const handleFinish = values => {
+      console.log(values);
+      updateWork(props.workId)
+    };
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
     const handleChange = info => {
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList);
@@ -158,49 +213,153 @@ export default {
 
     const fileList = ref([]);
     const closeDrawer = () => {
+      resetForm();
+      fileList.value = [];
+      formState.choosedTime = '';
       ctx.emit("update:addhomeworkVisible", false);
+      ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
+      if (props.addhomeworkVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, 
+        queryWork()
+      }
       console.log("state", bool);
     };
-    const addHomework = () => {
-      if(state.choosedTime.length && state.inputV1 && state.textV1){
-        createWorkTask({
-          "createTime": "",
-          "createUser": 0,
-          "submitEndTime": dayjs(state.choosedTime[1]).format("YYYY-MM-DD"),
-          "submitStartTime": dayjs(state.choosedTime[0]).format("YYYY-MM-DD"),
-          "updateTime": "",
-          "updateUser": 0,
-          "workEnclosureAddress": "",
-          "workFlag": "",
-          "workId": 0,
-          "workName": state.inputV1,
-          "workRequirement": state.textV1,
-          "workTag": ""
-          }).then((res)=>{
-        message.success(`添加成功${res}`)
-        ctx.emit("update:addhomeworkVisible", false);
-      }).catch((err)=>{
-        message.error(`添加失败${err}`)
-      })
+
+    const updateWork = () => {
+
+      // 如果是关卡页面进入 ---------------------------------
+      if (props.isLevel) {
+        myRouterEditTask()
+      } else { // 任务页面进入------------------------------
+        if (props.edit) { // 编辑任务
+          myUpdateWorkTaskUsing()
+        } else {  // 创建任务
+          console.log('创建任务***************');
+          myCreateWorkTask()
+        }
       }
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
-    }
+    };
+
+        // 新增任务
+        const myCreateWorkTask = () => {
+          let obj = {
+            "createTime": "",
+            "createUser": 0,
+            "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+            "updateTime": "",
+            "updateUser": 0,
+            "workEnclosureAddress": "",
+            "workFlag": "",
+            "workId": 0,
+            "workName": formState.workName,
+            "workRequirement": formState.workRequirement,
+            "workTag": ""
+          }
+          createWorkTask(obj).then((res) => {
+            myProjectEditTask(res.data.data.workId);
+          }).catch((err) => {
+            message.error(`添加失败${err}`)
+          })
+        }
+        // 编辑任务
+        const myUpdateWorkTaskUsing = () => {
+          let editObj = {
+            "createTime": "",
+            "createUser": 0,
+            "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+            "updateTime": "",
+            "updateUser": 0,
+            "workEnclosureAddress": "",
+            "workFlag": "",
+            "workId": props.EditWorkId,
+            "workName": formState.workName,
+            "workRequirement": formState.workRequirement,
+            "workTag": ""
+          }
+          updateWorkTaskUsing(editObj).then((res) => {
+          console.log(res);
+          myProjectEditTask(res.data.data.workId)
+        }).catch((err) => {
+          message.error(`编辑失败${err}`)
+        })
+        }
+        // 查询任务
+        const queryWork = () => {
+          queryWorkDetailById({workId:props.EditWorkId}).then((res) => {
+            console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+            formState.workName = res.data.data.workName;
+            formState.workRequirement = res.data.data.workRequirement;
+            formState.choosedTime = [dayjs(res.data.data.submitStartTime, "YYYY-MM-DD"), dayjs(res.data.data.submitEndTime, "YYYY-MM-DD")]
+            console.log(res);
+          }).catch(() => {
+            message.error(`查询失败`)
+          })
+        };
+        // 新增编辑或新增项目任务
+        const myProjectEditTask = (workId) => {
+          let editObj = {
+          "courseId": workId,
+          "duration": 60,
+          "flag": true,
+          "name": formState.workName,
+          "projectId": props.projectId,
+          "projectTaskId":  props.projectTaskId || null,
+          "stageId": props.chooseStageId,
+          "type": 4
+        }
+        ProjectEditTask(editObj).then(res => {
+          console.log(` 编辑项目成功的打印 ${res}`);
+          message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
+          ctx.emit("changeData", false);
+          closeDrawer();
+        }).catch(err => {
+          message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
+          console.log(` 编辑项目失败的打印 ${err}`);
+        })
+
+        }
+        // 新增编辑或新增关卡任务
+        const myRouterEditTask = () => {
+          let editObj1 = {
+            "chapterId": 70,
+            "courseId": 0,
+            "duration": 0,
+            "flag": true,
+            "name": formState.workName,
+            "routerId": Number(storage.get('routerId')),
+            "routerTaskId": 0,
+            "type": 4
+          }
+
+          RouterEditTask(editObj1).then(res => {
+            console.log(` 编辑关卡成功的打印 ${res}`);
+            message.success(`${props.workId ? '编辑' : '新增'}关卡任务成功`)
+            closeDrawer();
+          }).catch(err => {
+            message.error(`${props.workId ? '编辑' : '新增'}关卡任务失败`)
+            console.log(` 编辑关卡失败的打印 ${err}`);
+          })
+        }
+
     return {
-      ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      addHomework,
       handleChange,
       fileList,
-      headers: {
-        "token":"123"
-      },
+      formState,
+      handleFinish,
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
+      updateWork,
+      state,
     };
   },
 };
@@ -209,6 +368,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addhomeworkDrawer {
   .drawerMain {
     .header {
@@ -217,6 +377,8 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -225,30 +387,37 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+
         .main_item {
           display: flex;
           align-items: center;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -261,28 +430,34 @@ export default {
             }
           }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 56px;
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -292,10 +467,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -312,7 +489,9 @@ export default {
         }
       }
     }
+
     .main_btns {
+      position: absolute;
       height: 72px;
       width: 100%;
       bottom: 0;
@@ -321,6 +500,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -330,6 +510,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;
@@ -344,3 +525,4 @@ export default {
   }
 }
 </style>
+
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 2e4118a0..61f36c1d 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加评估</div>
+        <div v-if="edit" class="headerTitle">编辑评估</div>
+        <div v-else class="headerTitle">添加评估</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -38,31 +39,28 @@
           </div>
           <div class="main_item2">
             <a-table
-                  style="border: 1px solid #f2f6fe"
-                  :columns="tableDataFunc()"
-                  :data-source="tableData"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
-                  :row-selection="{
-                    columnWidth: 30,
-                    selectedRowKeys: selectedRowKeys,
-                    onChange: onSelectChange,
-                  }"
-                />
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tableData"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              @expand="expandTable"
+              :pagination="false"
+              :row-selection="rowSelection"
+              filterMultiple:false
+            />
 
-                <div class="pa">
-                  <a-pagination
-                    showSizeChanger="true"
-                    showQuickJumper="true"
-                    hideOnSinglePage="true"
-                    :pageSize="pageSize"
-                    :current="currentPage"
-                    :total="tableDataTotal"
-                    class="pagination"
-                  />
-                </div>
+            <div class="pa">
+              <a-pagination
+                showSizeChanger="true"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -74,11 +72,12 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
-import { useRouter } from "vue-router";
+import { reactive, toRefs, onMounted } from "vue";
 import * as api from "../../api/indexInvist";
+import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-const router = useRouter();
+import { toDate } from "../../api/method";
+import { RouterEditTask } from "@/api/indexTask";
 export default {
   name: "AddInvist",
   // components: {
@@ -88,44 +87,43 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    learn: {
+      type: Number,
+      default: 0,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       time: undefined,
+      currentPage: 1,
+      pageSize: 10,
+      tableDataTotal: -1,
       tableData: [
-        {
-          key: 1,
-          name: "评估",
-          num: "2",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
-        {
-          key: 2,
-          name: "评估",
-          num: "8",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
-        {
-          key: 3,
-          name: "评估",
-          num: "5",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
-        {
-          key: 4,
-          name: "评估",
-          num: "20",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
+        // {
+        //   key: 1,
+        //   name: "评估",
+        //   num: "2",
+        //   creator: "管理员",
+        //   time: "2022-07-21 14:30:25",
+        // },
       ],
     });
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
+      ctx.emit("update:edit", false);
       state.inputV1 = "";
     };
     const afterVisibleChange = (bool) => {
@@ -138,7 +136,7 @@ export default {
           dataIndex: "name",
           // width: "30%",
           key: "name",
-          width: '150px',
+          width: "150px",
           align: "left",
           className: "classify",
 
@@ -163,26 +161,104 @@ export default {
           title: "题数",
           dataIndex: "num",
           key: "num",
-          width: '80px',
+          width: "80px",
           align: "center",
         },
         {
           title: "创建人",
           dataIndex: "creator",
           key: "creator",
-          width: '150px',
+          width: "150px",
           align: "center",
         },
         {
           title: "创建时间",
           dataIndex: "time",
           key: "time",
-          width: '200px',
+          width: "200px",
           align: "center",
         },
       ];
       return columns;
     };
+    const rowSelection = {
+      type: 'radio',
+      // onChange: (selectedRowKeys, selectedRows) => {
+      //   this.selectedRowKeys = selectedRowKeys
+      //   if (selectedRows.length > 1) {
+      //     //获取选中的数据的key
+      //     var selectNumber = this.selectedRowKeys[1]
+      //     //清空选中的key
+      //     this.selectedRowKeys = []
+      //     //选中的数据的key重新赋值给selectedRowKeys
+      //     this.selectedRowKeys.push(selectNumber)
+      //   }
+      // },
+      // getCheckboxProps: (record) => ({
+      //   // disabled: record.name === 'Disabled User',
+      //   // // Column configuration not to be checked
+      //   name: record.name,
+      // }),
+      onSelect: ( selectedRows, selected,selectedRowKeys) => {
+        console.log('selectedRowKeys',selectedRowKeys,'selectedRows', selectedRows, 'selected', selected)
+      }
+    };
+
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        // console.log("123", value);
+        let obj = {
+          // id: value.routerId,
+          key: index,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: value.createTime
+            ? toDate(new Date(value.createTime).getTime() / 1000, "Y-M-D h:m:s")
+            : "-",
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+    };
+    //获取全部评估信息接口
+    const getAllInvistText = () => {
+      let obj = {
+        assessmentName: "",
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        releaseStatus: "",
+        searchEndTime: "",
+        searchStartTime: "",
+      };
+      api
+        .queryAssessmentDetailList(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("获取全部评估信息", res.data.data);
+            let arr = res.data.data.rows;
+            if (
+              arr.length === 0 &&
+              res.data.data.total > 0 &&
+              state.currentPage > 1
+            ) {
+              state.currentPage = state.currentPage - 1;
+              getAllInvistText();
+            }
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+          // console.log("获取全部评估信息接口成功", res);
+          // message.success("获取全部评估信息接口成功");
+          // console.log(obj);
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
     //创建评估信息
     const createInvist = () => {
       let obj = {
@@ -203,25 +279,65 @@ export default {
       api
         .createAppraiseMessage(obj)
         .then((res) => {
-          setTimeout(() => {
-            console.log("创建成功", res);
-            message.success("创建成功");
-            // state.createLoading = false;
-            router.push("/leveladd");
-            // getLearnPath();
-          }, 1000);
+          console.log("创建成功", res);
+          message.success("创建成功");
+          closeDrawer();
+          getAllInvistText();
+          if (props.learn == 0)
+            apitaskadd
+              .addTask({
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.appraiseName,
+                projectId: props.projectId,
+                projectTaskId: 0,
+                stageId: props.chooseStageId,
+                type: 11,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                //自定义事件给父组件传值
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+          else {
+            let editObj1 = {
+              chapterId: 36,
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: obj.appraiseName,
+              routerId: 92,
+              routerTaskId: 0,
+              type: 11,
+            };
+            RouterEditTask(editObj1);
+          }
         })
         .catch((err) => {
           console.log("创建失败", err);
           // state.createLoading = false;
         });
     };
+
+    onMounted(() => {
+      // createInvist();
+      getAllInvistText();
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       tableDataFunc,
+      rowSelection,
       createInvist,
+      getAllInvistText,
     };
   },
 };
@@ -255,10 +371,10 @@ export default {
           display: flex;
           align-items: center;
           margin-bottom: 32px;
-          .fi_input{
+          .fi_input {
             margin-right: 20px;
           }
-          .btns{
+          .btns {
             margin-right: 20px;
             padding: 0px 26px 0px 26px;
             height: 38px;
@@ -311,12 +427,11 @@ export default {
               margin-left: 5px;
             }
           }
-
         }
         .main_item2 {
           .pa {
             width: 100%;
-            margin:15px auto;
+            margin: 15px auto;
             display: flex;
             justify-content: center;
           }
diff --git a/src/components/drawers/AddLevelAddStu.vue b/src/components/drawers/AddLevelAddStu.vue
index 4d29f924..87ef5560 100644
--- a/src/components/drawers/AddLevelAddStu.vue
+++ b/src/components/drawers/AddLevelAddStu.vue
@@ -1051,7 +1051,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 3385642e..4d2c4872 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -139,7 +139,7 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .AddLevelImpStu {
   .drawerMain {
     min-width: 450px;
@@ -164,7 +164,7 @@ export default {
       }
     }
     .main {
-      overflow: scroll;
+      overflow: auto;
       .minatitl {
         display: flex;
         .up1 {
@@ -419,4 +419,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 65cdc135..d7e04481 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -127,9 +127,10 @@
                   <div class="ant-upload-text">Upload</div>
                 </div>
               </a-upload>
+              <div class="tip">支持图片格式为jpg/jpeg/png 图片最大为2MB</div>
             </div>
           </div>
-          <div class="main_item">
+          <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
               <span style="margin-right: 3px">直播链接：</span>
             </div>
@@ -288,8 +289,10 @@
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexLiveBroadcast";
+import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
-
+import { RouterEditTask } from "@/api/indexTask";
+// import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
   reader.addEventListener("load", () => callback(reader.result));
@@ -301,50 +304,7 @@ const options1 = ref([
     label: "请选择状态",
   },
 ]);
-// const columns1 = [
-//   {
-//     title: "课程编号",
-//     width: "20%",
-//     dataIndex: "num",
-//     key: "num",
-//     align: "center",
-//   },
-//   {
-//     title: "名称",
-//     width: "20%",
-//     dataIndex: "name",
-//     key: "name",
-//     align: "center",
-//   },
-//   {
-//     title: "内容分类",
-//     width: "13%",
-//     dataIndex: "content",
-//     key: "content",
-//     align: "center",
-//   },
-//   {
-//     title: "授课教师",
-//     width: "13%",
-//     dataIndex: "teacher",
-//     key: "teacher",
-//     align: "center",
-//   },
-//   {
-//     title: "创建人",
-//     width: "13%",
-//     dataIndex: "creator",
-//     key: "creator",
-//     align: "center",
-//   },
-//   {
-//     title: "完成时间",
-//     width: "20%",
-//     dataIndex: "time",
-//     key: "time",
-//     align: "center",
-//   },
-// ];
+
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -370,8 +330,21 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudy: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
+    // const router = useRouter();
     const state = reactive({
       tableData1: [
         {
@@ -477,9 +450,11 @@ export default {
       checkedC1: "",
       checkedC2: true,
       playback: false,
+      obj: {}, //要传的obj数据
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
+      console.log(props, "props");
       state.radioV1 = "";
       state.playback = false;
       state.inputV6 = "";
@@ -528,7 +503,9 @@ export default {
     };
     const beforeUpload = (file) => {
       const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
+        file.type === "image/jpeg" ||
+        file.type === "image/png" ||
+        file.type === "image/jpg";
 
       if (!isJpgOrPng) {
         message.error("You can only upload JPG file!");
@@ -545,15 +522,25 @@ export default {
 
     //创建直播
     const createLiveBroadcast = () => {
-      if (!state.inputV1) return message.warning("请输入直播名称");
-      if (!state.time) return message.warning("请输入直播时间");
-      if (!state.inputV2) return message.warning("请输入直播时长");
+      if (!state.inputV1) {
+        message.destroy();
+        return message.warning("请输入直播名称");
+      }
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
+      }
+      if (!state.inputV2) {
+        message.destroy();
+        return message.warning("请输入直播时长");
+      }
       const regular = /^[+]{0,1}(\d+)$/;
       if (!regular.test(state.inputV2)) {
+        message.destroy();
         return message.warning("直播时长需大于0");
       }
 
-      // if (!state.inputV3) return message.info("请输入授课老师");
+      if (!state.inputV3) return message.warning("请输入授课老师");
       let check = state.checkedC2 * 1;
       // let startTime = state.time[0].$d;
       // let endTime = state.time[1].$d;
@@ -567,9 +554,11 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-      let obj = {
+
+      state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
+        assessmentId: 0,
         createTime: "",
         createUser: 0,
         // liveCover: state.fileList,//直播封面
@@ -591,15 +580,58 @@ export default {
         updateTime: "",
         updateUser: 0,
       };
+      let name = state.inputV1;
       api
-        .createLiveBroadcast(obj)
+        .createLiveBroadcast(state.obj)
         .then((res) => {
-          console.log(res.data.data, 1111);
-          console.log(state, 2222);
+          console.log("调用添加直播接口后", res.data.data);
+          // console.log(state, 2222);
           message.success("提交成功");
           closeDrawer();
 
-          // state = {}
+          if (props.isStudy == 1) {
+            console.log("hhhhh", name);
+            let objj = {
+              chapterId: 36,
+              courseId: 0,
+              duration: state.obj.liveDuration,
+              flag: true,
+              name: name,
+              routerId: 92,
+              routerTaskId: 0,
+              type: 6,
+            };
+            RouterEditTask(objj)
+              .then((res) => {
+                console.log(res, 11111);
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+          } else {
+            apiTask
+              .addTask({
+                courseId: 0,
+                duration: state.obj.liveDuration,
+                flag: true,
+                name: state.obj.liveName,
+                projectId: props.projectId,
+                projectTaskId: 0,
+                stageId: props.chooseStageId,
+                type: 6,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                //自定义事件给父组件传值
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+          }
         })
         .catch((err) => {
           console.log(err, 2222);
@@ -634,6 +666,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 746c63dc..a7b5e9bb 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -295,6 +295,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        flex-shrink: 0;
         .headerTitle {
           font-size: 18px;
           font-weight: 600;
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 8b782a28..28e78e79 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -3,19 +3,20 @@
     :visible="addrefVisible"
     class="drawerStyle addrefDrawer"
     width="80%"
-    title="添加外链"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加外链</div>
+        <div class="headerTitle">{{ title }}外链</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
       </div>
+      <a-form ref="formRef" name="custom-validation" :model="state" :rules="rules" v-bind="layout"
+        @finish="handleFinish" @validate="handleValidate" @finishFailed="handleFinishFailed">
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
@@ -69,6 +70,7 @@
           </div>
         </div>
       </div>
+      </a-form>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="createExternalChain">确定</button>
@@ -76,10 +78,13 @@
     </div>
   </a-drawer>
 </template>
-  <script>
-import { reactive, toRefs, ref } from "vue";
+<script>
+import { reactive, toRefs, ref, onMounted } from "vue";
 import * as api from "../../api/indexExternalChain";
+import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+//import { query } from "express";
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -105,23 +110,148 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudy: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    isRefEdit: {
+      type: Number,
+      default: null,
+    },
+    EditRefId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       inputV2: "",
       textV1: "",
+      title: null,
     });
     const closeDrawer = () => {
+      console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
+      ctx.emit("update:isRefEdit", 1);
+      console.log("props", props.routerId);
       state.inputV2 = "";
       state.inputV1 = "";
       state.textV1 = "";
     };
+    const updateRef = () => {
+        // 如果是关卡页面进入 ---------------------------------
+      if (props.isLevel) {
+        if(props.isRefEdit){
+          createExternalRef();
+
+        }else{
+          updateExternalRef();
+        }
+        console.log('关卡创建任务***************');
+      } else { // 任务页面进入------------------------------
+        if (props.isRefEdit) { // 编辑任务
+          console.log('编辑任务***************');
+          updateExternalChain();
+        } else {  // 创建任务
+          console.log('创建任务***************');
+          createExternalChain();
+        }
+      }
+       
+     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      queryRef();
     };
+    const handleFinish = values => {
+      console.log(values);
+      updateRef(props.workId)
+    };
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+    //创建外链
     const createExternalChain = () => {
+      if (!state.inputV1) return message.warning("请输入外链名称");
+      if (!state.inputV2) return message.warning("请输入链接");
+      let obj = {   
+        linkAddress: state.inputV2,
+        linkDescription: state.textV1,
+        linkId: props.EditRefId == null ? 0 : props.EditRefId,
+        linkName: state.inputV1, 
+      };
+      //编辑外链
+ 
+      api
+        .createExternalChain(obj)
+        .then((res) => {
+          console.log(res.data.data, "外链添加成功了");
+          message.success("提交成功");
+          closeDrawer();
+    
+          //项目的创建
+          apiTask
+            .addTask({
+              courseId: res.data.data.linkId,
+              duration: 0,
+              flag: true,
+              name: obj.linkName,
+              projectId: props.projectId,
+              projectTaskId: 0,
+              stageId: props.chooseStageId,
+              type: 7,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后111", res.data, 11111);
+              ctx.emit("changeData", false);
+              //重新获取任务列表
+              // apiTask.getTask({ projectId: 28 });
+              // router.push("/taskadd");
+            })
+            .catch((err) => {
+              console.log(err, 111111);
+            });
+          
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      
+    };
+    const updateExternalChain = () => {
+      if (!state.inputV1) return message.warning("请输入外链名称");
+      if (!state.inputV2) return message.warning("请输入链接");
+      let obj = {
+    
+        linkAddress: state.inputV2,
+        linkDescription: state.textV1,
+        linkId: props.EditRefId == null ? 0 : props.EditRefId,
+        linkName: state.inputV1,
+      
+      };
+    
+      //编辑外链
+      api
+        .updateLinks(obj)
+        .then((res) => {
+          console.log("编辑成功", res);
+          message.success("编辑成功");
+          closeDrawer();
+        })
+        .catch((err) => console.log(err));
+      
+    };
+    const createExternalRef = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
       if (!state.inputV2) return message.warning("请输入链接");
       let obj = {
@@ -130,34 +260,194 @@ export default {
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
         linkFlag: "",
-        linkId: 0,
+        linkId: props.EditRefId == null ? 0 : props.EditRefId,
         linkName: state.inputV1,
         linkTag: "",
         updateTime: "",
         updateUser: 0,
       };
-      api
-        .createExternalChain(obj)
-        .then((res) => {
-          console.log(res.data.data);
-          message.success("提交成功");
-          closeDrawer();
-        })
-        .catch((err) => {
-          console.log(err);
-        });
+    
+      //编辑外链
+      if (props.isRefEdit) {
+        api
+          .updateLinks(obj)
+          .then((res) => {
+            console.log("编辑成功", res);
+            message.success("编辑成功");
+            closeDrawer();
+          })
+          .catch((err) => console.log(err));
+      } else {
+        api
+          .createExternalChain(obj)
+          .then((res) => {
+            console.log(res.data.data, "外链添加成功了");
+            message.success("提交成功");
+            closeDrawer();
+            //学习路径的创建
+            if (props.isStudy == 1) {
+              let objj = {
+                chapterId: 36,
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.linkName,
+                routerId: 92,
+                routerTaskId: 0,
+                type: 7,
+              };
+              RouterEditTask(objj)
+                .then((res) => {
+                  console.log(res, 11111);
+                })
+                .catch((err) => {
+                  console.log(err, 1111);
+                });
+            } else {
+              //项目的创建
+              apiTask
+                .addTask({
+                  courseId: res.data.data.linkId,
+                  duration: 0,
+                  flag: true,
+                  name: obj.linkName,
+                  projectId: props.projectId,
+                  projectTaskId: 0,
+                  stageId: props.chooseStageId,
+                  type: 7,
+                })
+                .then((res) => {
+                  console.log("调用项目添加接口后111", res.data, 11111);
+                  ctx.emit("changeData", false);
+                  //重新获取任务列表
+                  // apiTask.getTask({ projectId: 28 });
+                  // router.push("/taskadd");
+                })
+                .catch((err) => {
+                  console.log(err, 111111);
+                });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
     };
+    const updateExternalRef = () => {
+      if (!state.inputV1) return message.warning("请输入外链名称");
+      if (!state.inputV2) return message.warning("请输入链接");
+      let obj = {
+        createUser: 0,
+        createTime: "",
+        linkAddress: state.inputV2,
+        linkDescription: state.textV1,
+        linkFlag: "",
+        linkId: props.EditRefId == null ? 0 : props.EditRefId,
+        linkName: state.inputV1,
+        linkTag: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+    
+      //编辑外链
+      if (props.isRefEdit) {
+        api
+          .updateLinks(obj)
+          .then((res) => {
+            console.log("编辑成功", res);
+            message.success("编辑成功");
+            closeDrawer();
+          })
+          .catch((err) => console.log(err));
+      } else {
+        api
+          .createExternalChain(obj)
+          .then((res) => {
+            console.log(res.data.data, "外链添加成功了");
+            message.success("提交成功");
+            closeDrawer();
+            //学习路径的创建
+            if (props.isStudy == 1) {
+              let objj = {
+                chapterId: 36,
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.linkName,
+                routerId: 92,
+                routerTaskId: 0,
+                type: 7,
+              };
+              RouterEditTask(objj)
+                .then((res) => {
+                  console.log(res, 11111);
+                })
+                .catch((err) => {
+                  console.log(err, 1111);
+                });
+            } else {
+              //项目的创建
+              apiTask
+                .addTask({
+                  courseId: res.data.data.linkId,
+                  duration: 0,
+                  flag: true,
+                  name: obj.linkName,
+                  projectId: props.projectId,
+                  projectTaskId: 0,
+                  stageId: props.chooseStageId,
+                  type: 7,
+                })
+                .then((res) => {
+                  console.log("调用项目添加接口后111", res.data, 11111);
+                  ctx.emit("changeData", false);
+                  //重新获取任务列表
+                  // apiTask.getTask({ projectId: 28 });
+                  // router.push("/taskadd");
+                })
+                .catch((err) => {
+                  console.log(err, 111111);
+                });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    };
+        // 查询任务
+    const queryRef = () => {
+      let p =new FormData;
+      p.append('linkId',props.EditRefId);
+      api
+      .getLink(p).then((res) => {
+       // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+        state.inputV1 = res.data.data.linkName;
+        state.inputV2 =res.data.data.linkAddress;
+        state.textV1 =res.data.data.linkDescription;
+        console.log("查询成功=====inputv1",state.inputV1);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
+    };
+    //不生效
+    onMounted(() => {
+      state.title = props.isRefEdit == 2 ? "编辑" : "添加";
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
       createExternalChain,
+      handleFinish,
+      handleFinishFailed,
+      updateRef,
     };
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -169,6 +459,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -295,5 +586,4 @@ export default {
     }
   }
 }
-</style>
-  
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index c65e9e46..a534386a 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -3,167 +3,150 @@
     :visible="addtestVisible"
     class="drawerStyle addtestDrawer"
     width="80%"
-    title="添加作业"
     placement="right"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加考试</div>
+        <div class="headerTitle">{{EditTestId ? "编辑" : "添加" }}考试</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
       </div>
+      <a-form
+            ref="formRef"
+            name="custom-validation"
+            :model="formState"
+            :rules="rules"
+            v-bind="layout"
+            @finish="handleFinish"
+            @validate="handleValidate"
+            @finishFailed="handleFinishFailed"
+          >
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试名称：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="作业名称" name="examinationName">
               <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 32px"
+                v-model:value="formState.examinationName"
+                style="width: 424px; height: 32px;margin-left: 35px;"
+                autocomplete="off"
                 placeholder="请输入考试名称"
-                maxlength="20"
-              />
+                maxlength="20"/>
+              </a-form-item>
             </div>
           </div>
           <div class="main_item2">
-            <div class="signbox">
-              <span style="margin-right: 3px">考试说明：</span>
-            </div>
-            <div class="textarea">
+            <a-form-item has-feedback label="考试说明" name="examinationExplain">
               <a-textarea
-                v-model:value="testV1"
+                v-model:value="formState.examinationExplain"
                 placeholder="请输入考试说明"
                 allow-clear
+                style="margin-left: 35px;"
                 maxlength="150"
               />
-            </div>
+            </a-form-item>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">选择考试：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="选择考试" name="choosedTest">
               <a-select
                 dropdownClassName="dropdown-style"
-                style="width: 424px"
+                style="width: 424px;margin-left: 35px;"
                 placeholder="请输入考试名称"
                 :options="options1"
-                v-model:value="choosedTest"
+                v-model:value="formState.choosedTest"
                 allowClear
                 showSearch
               />
+            </a-form-item>
+ 
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时间：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时间" name="choosedTime">
+
               <a-range-picker
-              v-model:value="testTime"
-                style="width: 424px"
+              v-model:value="formState.choosedTime"
+              format="YYYY-MM-DD"
+                style="width: 424px;margin-left: 35px;"
                 :placeholder="['      开始时间', '        结束时间']"
               />
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时长：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时长" name="examinationDuration">
+
               <a-input
-                v-model:value="inputV2"
-                style="width: 388px; height: 32px"
+                v-model:value="formState.examinationDuration"
+                type="number"
+                style="width: 388px; height: 32px;
+                margin-left: 35px;"
               />
-              <span style="margin-left: 5px">分钟</span>
+              
+            </a-form-item>
+            <span style="transform: translateY(-50%)">分钟</span>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试限制：</span>
-            </div>
             <div class="btnbox">
-              <span style="margin-right: 8px">允许重复考试</span>
+              <span style="margin-right: 43px">考试限制</span>
+              <a-form-item has-feedback label="允许重复考试" name="examinationLimit">
+
               <a-input-number
                 :min="-1" :precision="0"
-                v-model:value="inputV3"
-                style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                type="number"
+                v-model:value="formState.examinationLimit"
+                style="width: 88px; height: 32px;
+                border-radius: 8px;overflow: hidden;"
               />
               <span style="margin-left: 8px">次</span>
               <span style="margin-left: 24px; color: #999999"
-                >-1表示无限制</span
-              >
+                >-1表示无限制</span>
+            </a-form-item>
+              
+              
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示答案：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV1">
+              <a-form-item has-feedback label="显示答案" name="showAnswers">
+
+              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnswers">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示解析：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV2">
+              <a-form-item has-feedback label="显示解析" name="showAnalysis">
+
+              <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.showAnalysis">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">评分模式：</span>
-            </div>
             <div class="btnbox">
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV3">
+              <a-form-item has-feedback label="评分模式" name="scoringModel">
+
+                <a-radio-group style="margin-left: 35px;margin-right: 12px;" v-model:value="formState.scoringModel">
                   <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
                     >最高一次</a-radio
                   >
@@ -171,46 +154,54 @@
                     >最后一次</a-radio
                   >
                 </a-radio-group>
-              </div>
+              </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">及格线：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="及格线" name="passLine">
+
               <a-input
-                v-model:value="inputV4"
-                style="width: 88px; height: 32px"
+                v-model:value="formState.passLine"
+                type="number"
+                style="width: 88px; height: 32px;margin-left: 35px;"
               />
+            </a-form-item>
+
               <span style="margin-left: 8px">分</span>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">试题排列：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV4">
+              <a-form-item has-feedback label="作业要求" name="questionArrangement">
+
+              <a-radio-group
+              style="margin-right:12px;"
+              v-model:value="formState.questionArrangement">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
                 <a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="addTest">确定</button>
+        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" html-type="submit" >确定</a-button>
       </div>
+    </a-form>
     </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
-import {createExamination} from "@/api/indexExam"
+import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
+import { ProjectEditTask } from "@/api/indexTask"
+
 import  dayjs from 'dayjs';
 const rowSelection = ref({
   checkStrictly: false,
@@ -237,21 +228,158 @@ export default {
       type: Boolean,
       default: false,
     },
+    EditTestId: { // 要编辑的考试id
+      type: Number,
+      default: -1,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    edit: { //
+      type: Boolean,
+      default: null,
+    },
   },
   setup(props, ctx) {
-    const state = reactive({
-      inputV1: "",
-      inputV2: "",
-      inputV3: "",
-      inputV4: "60",
-      testV1: "",
-      radioV1: "",
-      radioV2: "",
-      radioV3: "",
-      radioV4: "",
-      choosedTest: "",
-      testTime:"",
+    const formState = reactive({
+      examinationName:'',
+      examinationDuration:"",
+      examinationLimit:"",
+      passLine:60,
+      examinationEndTime:"",
+      examinationExplain:"",
+      questionArrangement:1,
+      scoringModel:2,
+      showAnalysis:2,
+      showAnswers:2,
+      choosedTime:'',
     });
+    const formRef = ref();
+    let checkExaminationName = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入考试名称');
+      }
+    };
+    let checkExaminationExplain = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入考试说明');
+      }
+    };
+    let checkChoosedTest = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请选择考试');
+      }
+    };
+    let checkChoosedTime = async (_rule, value) => {
+      if (!value.length) {
+        return Promise.reject('请选择时间');
+      }
+    };
+    let checkExaminationDuration = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入考试时长');
+      }
+    };
+    let checkLimit = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入考试限制');
+      }
+    };
+    let checkShowAnswers = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkShowAnalysis = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkScoringModel = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkPassLine = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入及格线');
+      }
+    };
+    let checkQuestionArrangement = async (_rule, value) => {
+      if (!value) {
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    const rules = {
+      examinationName: [{
+        required: true,
+        validator: checkExaminationName,
+        trigger: 'change',
+      }],
+      examinationExplain: [{
+        validator: checkExaminationExplain,
+        trigger: 'change',
+      }],
+      choosedTest: [{
+        required: true,
+        validator: checkChoosedTest,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkChoosedTime,
+        trigger: 'change',
+      }],
+      examinationDuration: [{
+        required: true,
+        validator: checkExaminationDuration,
+        trigger: 'change',
+      }],
+      limit: [{
+        required: true,
+        validator: checkLimit,
+        trigger: 'change',
+      }],
+      showAnswers: [{
+        validator: checkShowAnswers,
+        trigger: 'change',
+      }],
+      showAnalysis: [{
+        validator: checkShowAnalysis,
+        trigger: 'change',
+      }],
+      scoringModel: [{
+        validator: checkScoringModel,
+        trigger: 'change',
+      }],
+      passLine: [{
+        required: true,
+        validator: checkPassLine,
+        trigger: 'change',
+      }],
+      questionArrangement: [{
+        validator: checkQuestionArrangement,
+        trigger: 'change',
+      }],
+    };
+
     const options1 = ref([
       {
         label:'math',
@@ -262,76 +390,178 @@ export default {
         value:'eng',
       },
     ])
-    const closeDrawer = () => {
-      ctx.emit("update:addtestVisible", false);
-      state.radioV1 = "";
-        state.radioV2 = "";
-        state.radioV3 = "";
-        state.radioV4 = "";
+    const handleFinish = values => {
+      console.log(values);
+      updateTest();
     };
-    const addTest = () => {
-      if(state.testTime.length
-      && state.inputV1&& state.inputV2&& state.inputV3&& state.inputV4
-      && state.radioV1&& state.radioV2&& state.radioV3
-      ){
-        createExamination({
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
+    const closeDrawer = () => {
+      resetForm();
+      formState.choosedTime = '';
+      ctx.emit("update:addtestVisible", false);
+      ctx.emit("update:edit", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log(props.edit);
+      if (props.addtestVisible && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, 
+        queryTest()
+      }
+      console.log("formState", bool);
+    };
+    const queryTest = () => {
+      console.log(props.EditTestId);
+      queryExaminationDetailById({examinationId:props.EditTestId}).then((res) => {
+        formState.examinationName = res.data.data.examinationName;
+        formState.workRequirement = res.data.data.workRequirement;
+        formState.examinationDuration = res.data.data.examinationDuration;
+        formState.examinationLimit = res.data.data.examinationLimit || -1;
+        formState.passLine = res.data.data.passLine;
+        formState.examinationExplain = res.data.data.examinationExplain;
+        formState.questionArrangement = res.data.data.questionArrangement || 1;
+        formState.scoringModel = res.data.data.scoringModel || 1;
+        formState.showAnalysis = res.data.data.showAnalysis || 1;
+        formState.showAnswers = res.data.data.showAnswers || 1;
+        if(res.data.data.examinationEndTime && res.data.data.examinationStartTime){
+          formState.choosedTime= [dayjs(res.data.data.examinationStartTime,"YYYY-MM-DD"),dayjs(res.data.data.examinationEndTime,"YYYY-MM-DD")]
+        } else { formState.choosedTime=[] }
+        console.log(res);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
+    }
+    const updateTest = () => {
+
+      // 如果是关卡页面进入 ---------------------------------
+      if (props.isLevel) {
+        //. 
+      } else {  // 从任务界面进入
+        if(props.edit) { // 编辑任务
+          myUpdateExamination()
+        }else { // 创建任务
+          myCreateExamination()
+        }
+      }
+
+
+    }
+    
+    const myUpdateExamination = () => {
+      let obj = {
             "createTime": "",
             "createUser": 0,
-            "examinationDuration": state.inputV2,
-            "examinationEndTime": dayjs(state.testTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": state.testV1,
+            "examinationDuration": formState.examinationDuration,
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "examinationExplain": formState.examinationExplain,
             "examinationFlag": "",
-            "examinationId": 0,
-            "examinationLimit": state.inputV3,
-            "examinationName": state.inputV1,
+            "examinationId":  props.EditTestId,
+            "examinationLimit": formState.examinationLimit,
+            "examinationName": formState.examinationName,
             "examinationPaperId": 0,
-            "examinationPaperName": state.choosedTest,
-            "examinationStartTime": dayjs(state.testTime[0]).format("YYYY-MM-DD"),
+            "examinationPaperName": formState.choosedTest,
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
             "examinationTag": "",
-            "passLine": state.inputV4,
-            "questionArrangement": state.radioV4,
-            "scoringModel": state.radioV3,
-            "showAnalysis": state.radioV2,
-            "showAnswers": state.radioV1,
+            "passLine": formState.passLine,
+            "questionArrangement": formState.questionArrangement,
+            "scoringModel": formState.scoringModel,
+            "showAnalysis": formState.showAnalysis,
+            "showAnswers": formState.showAnswers,
             "updateTime": "",
             "updateUser": 0
-          }).then((res)=>{
-        message.success(`添加成功${res}`)
-        ctx.emit("update:addtestVisible", false);
+      }
+      updateExamination(obj).then((res)=>{
+        console.log(res);
+        myProjectEditTask(res.data.data.examinationId)
+      }).catch(()=>{
+        message.error(`编辑失败`)
+      })
+
+    }
+    const myCreateExamination = () => {
+      let obj = {
+            "createTime": "",
+            "createUser": 0,
+            "examinationDuration": formState.examinationDuration,
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "examinationExplain": formState.examinationExplain,
+            "examinationFlag": "",
+            "examinationId":  0,
+            "examinationLimit": formState.examinationLimit,
+            "examinationName": formState.examinationName,
+            "examinationPaperId": 0,
+            "examinationPaperName": formState.choosedTest,
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+            "examinationTag": "",
+            "passLine": formState.passLine,
+            "questionArrangement": formState.questionArrangement,
+            "scoringModel": formState.scoringModel,
+            "showAnalysis": formState.showAnalysis,
+            "showAnswers": formState.showAnswers,
+            "updateTime": "",
+            "updateUser": 0
+      }
+      createExamination(obj).then((res)=>{
+        myProjectEditTask(res.data.data.examinationId)
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
-      }
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
     }
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-    };
+    const myProjectEditTask = (testId) => {
+      let editObj = {
+        "courseId": testId,
+        "duration": 50,
+        "flag": true,
+        "name": formState.examinationName,
+        "projectId": props.projectId,
+        "projectTaskId": props.projectTaskId || null,
+        "stageId": props.chooseStageId,
+        "type": 5
+      }
+       // 新增编辑或新增项目
+       ProjectEditTask(editObj).then(res => {
+        console.log(` 编辑项目成功的打印 ${res}`);
+        message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
+        ctx.emit("changeData", false);
+        closeDrawer();
+      }).catch(err => {
+        message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
+        console.log(` 编辑项目失败的打印 ${err}`);
+      })
+    }
+
     const cloradio1 = (value) => {
       if (value != "") {
-        state.radioV1 = "";
+        formState.showAnswers = "";
       }
     }
     const cloradio2 = (value) => {
       if (value != "") {
-        state.radioV2 = "";
+        formState.showAnalysis = "";
       }
     }
     const cloradio3 = (value) => {
       if (value != "") {
-        state.radioV3 = "";
+        formState.scoringModel = "";
       }
     }
     const cloradio4 = (value) => {
       if (value != "") {
-        state.radioV4 = "";
+        formState.questionArrangement = "";
       }
     }
     return {
-      ...toRefs(state),
+      formState,
       afterVisibleChange,
       closeDrawer,
       rowSelection,
@@ -339,8 +569,16 @@ export default {
       cloradio2,
       cloradio3,
       cloradio4,
-      addTest,
       options1,
+      handleFinish,
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
+      updateTest,
+      queryTest,
     };
   },
 };
@@ -357,6 +595,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index e6389232..cf784131 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加投票</div>
+        <div v-if="edit" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">添加投票</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -45,14 +46,18 @@
                   alt=""
                 />
               </div>
-              <span style="margin-right: 3px">创建投票：</span>
+              <span>创建投票：</span>
             </div>
-            <div class="btnbox" @click="showDrawerCreVote">
-              <button class="xkbtn">创建投票</button>
+            <div class="btnbox" >
+              <button class="xkbtn"  :style="{ display: creVote ? 'none' : 'block'}" @click="showDrawerCreVote">创建投票</button>
+              <button class="xkbtn"  :style="{ display: creVote ? 'block' : 'none'}" @click="showDrawerCreVote">编辑投票</button>
+              <div :style="{ display: creVote ? 'block' : 'none'}" ><div class="fileTigan" ><span style="color:#388be1 ;">传过来的name</span> <div class="delBox" @click="delBox()"></div></div></div>
+              
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <cre-vote v-model:crevoteVisible="crevotevisible" />
+              <cre-vote v-model:crevoteVisible="crevotevisible" 
+              @getData="changeVData"/>
             </div>
             <!-- 创建投票侧弹窗 -->
           </div>
@@ -98,14 +103,19 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="createVoteText()">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
-    <script>
+<script>
 import { reactive, toRefs, ref } from "vue";
 import CreVote from "../../components/drawers/CreVote.vue";
+import * as api from "../../api/indexVote";
+import * as apitaskadd from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { toDate } from "../../api/method";
+import { RouterEditTask } from "@/api/indexTask";
 const options1 = ref([
   {
     value: "value1",
@@ -128,6 +138,7 @@ const rowSelection = ref({
     console.log(selected, selectedRows, changeRows);
   },
 });
+
 export default {
   name: "AddVote",
   components: {
@@ -138,15 +149,39 @@ export default {
       type: Boolean,
       default: false,
     },
+    edit: {
+      type: Boolean,
+      default: false,
+    },
+    learn: {
+      type: Number,
+      default: 0,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       textV1: "",
+      creVote:false,
       crevotevisible: false,
+      time: undefined,
+      basevote: "",
+      endTimes: "",
+      startTimes: "",
+      ascriptionId:"",
+      voteStemId:"",
     });
     const closeDrawer = () => {
       ctx.emit("update:addvoteVisible", false);
+      ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -154,18 +189,121 @@ export default {
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
     };
+    const changeVData = (data) => {
+      console.log('111', data);
+      state.creVote = data.creVote
+      state.ascriptionId = data.ascriptionId
+      state.voteStemId = data.voteStemId
+      console.log('222',state.creVote);
+      console.log('333',state.ascriptionId);
+    }
+    const delBox = () => {
+      state.creVote = false;
+    }
+    //创建投票信息
+    const createVoteText = () => {
+      if (!state.inputV1) {
+        message.destroy();
+        return message.info("请输入投票名称");
+      }
+
+      if (state.basevote == "") {
+        state.basevote = 1;
+      }
+
+      if (state.time != undefined) {
+        state.endTimes = toDate(
+          new Date(state.time[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        state.startTimes = toDate(
+          new Date(state.time[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+      }
+
+      // if (state.crevotevisible = false) {
+      //   changeVData()
+      // };
+
+      let obj = {
+        baseVote: state.basevote,
+        createTime: "",
+        createUser: 0,
+        stem: "",
+        stemId: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteId: 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: "",
+      };
+      api
+        .createVote(obj)
+        .then((res) => {
+          console.log("创建成功", res);
+          message.success("创建成功");
+          closeDrawer();
+          if (props.learn == 0)
+          apitaskadd
+            .addTask({
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: obj.voteName,
+              projectId: props.projectId,
+              projectTaskId: 0,
+              stageId: props.chooseStageId,
+              type: 12,
+            })
+            .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                //自定义事件给父组件传值
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+            else {
+            let editObj1 = {
+              chapterId: 36,
+              courseId: 0,
+              duration: 0,
+              flag: true,
+              name: obj.voteName,
+              routerId: 92,
+              routerTaskId: 0,
+              type: 12,
+            };
+            RouterEditTask(editObj1)
+          }
+        })
+        .catch((err) => {
+          console.log("创建失败", err);
+        });
+    };
     return {
       ...toRefs(state),
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
+      changeVData,
       rowSelection,
       options1,
+      createVoteText,
+      delBox,
     };
   },
 };
 </script>
-    <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -177,6 +315,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -218,6 +357,23 @@ export default {
               border: 0;
               margin-right: 8px;
               color: #fff;
+              margin-right: 10px;
+            }
+            .fileTigan{
+              display: flex;
+              align-items: center;
+              padding: 3px 5px;
+              background-color: rgba(42, 103, 209, 0.4);
+              span{
+                margin-right: 5px;
+              }
+              .delBox{
+                width: 13px;
+                height: 13px;
+                background-image: url(@/assets/images/basicinfo/ch.png);
+                background-size: 100% 100%;
+                border-radius: 50%;
+              }
             }
           }
         }
@@ -304,4 +460,3 @@ export default {
   }
 }
 </style>
-    
\ No newline at end of file
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 52b2ce32..6447ff12 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -89,7 +89,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 1e35333f..0b32c086 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -223,7 +223,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/CheckStuMess.vue b/src/components/drawers/CheckStuMess.vue
index 34b824f3..70966a0b 100644
--- a/src/components/drawers/CheckStuMess.vue
+++ b/src/components/drawers/CheckStuMess.vue
@@ -78,7 +78,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index d3c43f77..f8f1cc35 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -17,87 +17,85 @@
         />
       </div>
       <div class="contentMain">
-        <div class="box" @click="showDrawerCreVote">
-          <button class="cjtpbtn">创建标题</button>
-        </div>
         <div class="main_item">
           <div class="signbox">
             <div class="sign">
               <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
             </div>
-            <span style="margin-right: 3px">题干：</span>
+            <span style="margin-right: 3px">投票名称</span>
           </div>
           <div class="btnbox">
             <a-input
               v-model:value="inputV1"
               style="width: 424px; height: 32px"
-              placeholder="请输入题干"
+              placeholder="请输入投票名称"
             />
           </div>
         </div>
-        <div class="main_item">
-          <div class="signbox">
-            <div class="sign">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+        <div class="box" @click="showDrawerCreVote">
+          <button class="cjtpbtn" @click="addQue()">创建题干</button>
+        </div>
+        <div class="queBox" v-for="(q, index) in questions" :key="index">
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">题干</span>
             </div>
-            <span style="margin-right: 3px">选项1：</span>
-          </div>
-          <div class="btnbox">
-            <a-input
-              v-model:value="inputV2"
-              style="width: 424px; height: 32px"
-            />
-            <a-button type="link">+ 上传图片</a-button>
-          </div>
-        </div>
-        <div class="main_item">
-          <div class="signbox">
-            <div class="sign">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+            <div class="btnbox">
+              <a-input
+                v-model:value="q.inputV"
+                style="width: 424px; height: 32px"
+                placeholder="请输入题干"
+              />
             </div>
-            <span style="margin-right: 3px">选项2：</span>
           </div>
-          <div class="btnbox">
-            <a-input
-              v-model:value="inputV3"
-              style="width: 424px; height: 32px"
-            />
-            <a-button type="link">+ 上传图片</a-button>
-            <a-button type="link">删除</a-button>
+          <div class="option" v-for="(o, index) in q.options" :key="index">
+            <div class="main_item">
+              <div class="signbox">
+                <div class="sign">
+                  <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                  />
+                </div>
+                <span style="margin-right: 3px">{{ o.title }}</span>
+              </div>
+              <div class="btnbox">
+                <a-input
+                  v-model:value="o.opvalue"
+                  style="width: 424px; height: 32px"
+                />
+                <a-button v-if="o.opvalue == ''" type="link"
+                  >+ 上传图片</a-button
+                >
+                <a-button v-else type="link">删除</a-button>
+              </div>
+            </div>
           </div>
-        </div>
-        <div class="main_item">
-          <div class="signbox"></div>
-          <div class="btnbox">
-            <div class="tjxxbtn"><div class="btntext">添加选项</div></div>
+          <div class="main_item">
+            <div class="signbox"></div>
+            <div class="btnbox" @click="addOpt(q.options)">
+              <div class="tjxxbtn"><div class="btntext">添加选项</div></div>
+            </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click="createQueTit">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
-const rowSelection = ref({
-  checkStrictly: false,
-  onChange: (selectedRowKeys, selectedRows) => {
-    console.log(
-      `selectedRowKeys: ${selectedRowKeys}`,
-      "selectedRows: ",
-      selectedRows
-    );
-  },
-  onSelect: (record, selected, selectedRows) => {
-    console.log(record, selected, selectedRows);
-  },
-  onSelectAll: (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows);
-  },
-});
+import { reactive, toRefs } from "vue";
+import * as api from "../../api/indexVote";
+import { message } from "ant-design-vue";
 export default {
   name: "CreVote",
   // components: {
@@ -111,20 +109,117 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
-      inputV2: "",
-      inputV3: "",
+      creVote: true,
+      questions: [
+        {
+          inputV: "",
+          options: [
+            {
+              title: "选项1",
+              opvalue: "",
+            },
+            {
+              title: "选项2",
+              opvalue: "",
+            },
+          ],
+        },
+      ],
     });
+
+    const addQue = () => {
+      state.questions.push({
+        inputV: "",
+        options: [
+          {
+            title: "选项1",
+            opvalue: "",
+          },
+          {
+            title: "选项2",
+            opvalue: "",
+          },
+        ],
+      });
+    };
+    const addOpt = (value) => {
+      console.log(value);
+      value.push({
+        title: "选项" + (value.length + 1 * 1),
+        opvalue: "",
+      });
+    };
+
     const closeDrawer = () => {
       ctx.emit("update:crevoteVisible", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+
+    const createQueTit = () => {
+      if (!state.questions[0].inputV) {
+        message.destroy();
+        return message.info("请输入题干");
+      }
+      // if (!state.questions.optins.opvalue) {
+      //   message.destroy();
+      //   return message.info("请输入选项");
+      // }
+      console.log(state.questions[0].inputV);
+      let obj = [
+        {
+          ascriptionId: 0,
+          createTime: "",
+          createUser: 0,
+          optionDetailList: [
+            {
+              createTime: "",
+              createUser: 0,
+              optionId: 0,
+              optionName: "",
+              optionOrderNum: "",
+              optionPictureAddress: "",
+              stem: "",
+              updateTime: "",
+              updateUser: 0,
+              voteStemId: 0,
+            },
+          ],
+          orderNumber: "",
+          updateTime: "",
+          updateUser: 0,
+          voteStemFlag: "",
+          voteStemId: 0,
+          voteStemName: "",
+        },
+      ];
+      api
+        .createOptionMessage(obj)
+        .then((res) => {
+          console.log("创建成功", res);
+          console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId);
+          console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId);
+          message.success("创建成功");
+          let stemData = {
+            creVote: state.creVote,
+            ascriptionId: res.data.data[0].ascriptionId,
+            voteStemId:res.data.data[0].voteStemId
+          };
+          ctx.emit("getData", stemData);
+          closeDrawer();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
+      addQue,
+      addOpt,
+      createQueTit,
     };
   },
 };
diff --git a/src/components/drawers/EntryScores.vue b/src/components/drawers/EntryScores.vue
index fef7f769..34cbbb56 100644
--- a/src/components/drawers/EntryScores.vue
+++ b/src/components/drawers/EntryScores.vue
@@ -82,7 +82,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" >
+<style scoped lang="scss">
 // .drawerStyle {
 //   .ant-drawer-content-wrapper {
 //     // max-width: 1000px;
@@ -99,7 +99,7 @@ export default {
   .drawerMain {
     min-width: 400px;
     margin: 0px 32px 0px 32px;
-    // overflow-x: scroll;
+    // overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -189,4 +189,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index a615ab51..48960ef2 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -385,7 +385,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" >
+<style lang="scss">
 // .drawerStyle {
 //   .ant-drawer-content-wrapper {
 //     // max-width: 1000px;
@@ -513,7 +513,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .noticebox {
@@ -820,4 +820,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue
index a5da82ea..f7c39cbd 100644
--- a/src/components/drawers/FaceStu.vue
+++ b/src/components/drawers/FaceStu.vue
@@ -722,7 +722,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/ManageRight.vue b/src/components/drawers/ManageRight.vue
index 3ff545b2..65bdbfc9 100644
--- a/src/components/drawers/ManageRight.vue
+++ b/src/components/drawers/ManageRight.vue
@@ -831,7 +831,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index cc142a0a..f10227a1 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -25,7 +25,7 @@
               placeholder="请输入姓名"
             />
           </div>
-          
+
           <div class="btns">
             <div class="btn btn1" style="margin-right: 20px">
               <div class="img1"></div>
@@ -67,18 +67,18 @@
         <div class="tableBox" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
             style="border: 1px solid #f2f6fe"
-                    :columns="tablecolumns"
-                    :data-source="tabledata"
-                    :loading="tableDataTotal === -1 ? true : false"
-                    expandRowByClick="true"
-                    :scroll="{ x: 900 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :row-selection="{
-                      columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys,
-                      onChange: onSelectChange,
-                    }"
+            :columns="tablecolumns"
+            :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            :scroll="{ x: 900 }"
+            @expand="expandTable"
+            :pagination="false"
+            :row-selection="{
+              columnWidth: 30,
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
           />
           <div class="pa">
             <a-pagination
@@ -104,11 +104,11 @@
         centered="true"
         :footer="null"
         wrapClassName="FacMa"
-       >
+      >
         <div class="head">
           <div class="inhead">
             <div class="left">
-              <img src="../../assets/images/coursewareManage/notice.png"/>
+              <img src="../../assets/images/coursewareManage/notice.png" />
               <div class="tis">提示</div>
             </div>
             <div class="right" @click="closeModal"></div>
@@ -123,7 +123,6 @@
       <stu-add v-model:Stuvisible="Stuvisible" />
     </div>
   </a-drawer>
-  
 </template>
 
 <script>
@@ -145,7 +144,7 @@ export default {
       name: null,
       showmodal: false,
       closable: false, //modal右上角的关闭按钮
-     
+
       pageSize: 10,
       currentPage: 1,
       tableDataTotal: 100,
@@ -279,12 +278,11 @@ export default {
     const showStuAdd = () => {
       state.Stuvisible = true;
     };
-    
 
     return {
       ...toRefs(state),
       closeDrawer,
-     
+
       showModal,
       closeModal,
       showStuAdd,
@@ -293,12 +291,12 @@ export default {
 };
 </script>
 
-<style  lang="scss" >
+<style lang="scss">
 .MemberList {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    //overflow-x: scroll;
+    //overflow-x: auto;
     display: flex;
     flex-direction: column;
 
@@ -388,7 +386,7 @@ export default {
           }
 
           .btn1 {
-            background: #409EFF;
+            background: #409eff;
 
             color: #ffffff;
           }
@@ -396,8 +394,8 @@ export default {
           .btn2 {
             background: #ffffff;
 
-            color: #409EFF;
-            border: 1px solid #409EFF;
+            color: #409eff;
+            border: 1px solid #409eff;
           }
         }
       }
@@ -441,7 +439,7 @@ export default {
         }
 
         .btn1 {
-          background: #409EFF;
+          background: #409eff;
 
           color: #ffffff;
         }
@@ -449,8 +447,8 @@ export default {
         .btn2 {
           background: #ffffff;
           margin-right: 20px;
-          color:#409EFF;
-          border: 1px solid #409EFF;
+          color: #409eff;
+          border: 1px solid #409eff;
         }
       }
 
@@ -519,11 +517,11 @@ export default {
 
         .ant-table-thead > tr > th {
           background-color: rgba(239, 244, 252, 1) !important;
-          color: rgba(0, 0, 0, 0.8500);
+          color: rgba(0, 0, 0, 0.85);
         }
 
         .ant-table-cell {
-          color: rgba(0, 0, 0, 0.6500);
+          color: rgba(0, 0, 0, 0.65);
         }
 
         .ant-table-selection-column {
@@ -545,11 +543,10 @@ export default {
         .ant-table-tbody
           > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
           > td {
-            
           background: #f6f9fd;
         }
         .ant-table-tbody > tr > td {
-            border-bottom: 1px solid rgba(240, 244, 254, 1);
+          border-bottom: 1px solid rgba(240, 244, 254, 1);
         }
         .pa {
           // left: 0;
@@ -599,4 +596,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index 4e765153..f2de47ca 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -78,17 +78,17 @@
                     }"
                   />
                   <div class="tableBox">
-                  <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize"
-                      :current="currentPage"
-                      :total="tableDataTotal"
-                      class="pagination"
-                    />
-                  </div>
+                    <div class="pa">
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize"
+                        :current="currentPage"
+                        :total="tableDataTotal"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -160,16 +160,16 @@
                     />
                     <div class="tableBox">
                       <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize1"
-                        :current="currentPage1"
-                        :total="tableDataTotal1"
-                        class="pagination"
-                      />
-                    </div>
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize1"
+                          :current="currentPage1"
+                          :total="tableDataTotal1"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -243,16 +243,16 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize2"
-                      :current="currentPage2"
-                      :total="tableDataTotal2"
-                      class="pagination"
-                    />
-                  </div>
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -306,8 +306,8 @@
     </div>
   </a-drawer>
 </template>
-  
-  <script>
+
+<script>
 import { reactive, toRefs } from "vue";
 export default {
   name: "OwnPower",
@@ -779,8 +779,8 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" >
+
+<style lang="scss">
 .ownpower {
   // .ant-drawer-content-wrapper {
   //   // max-width: 1000px;
@@ -794,7 +794,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -1003,25 +1003,25 @@ export default {
             //   align-items: center;
             //   margin-top: -2px;
             // }
-            .tableBox{
+            .tableBox {
               .pa {
-              // left: 0;
-              margin-top: 15px;
-              width: 100%;
-              // height: 20px;
-              // background-color: red;
-              display: flex;
-              justify-content: center;
-              // position: absolute;
-              // bottom: 20px;
-              .ant-pagination-item,
-              .ant-pagination-prev,
-              .ant-pagination-next,
-              .ant-pagination-options {
-                margin-bottom: 10px;
+                // left: 0;
+                margin-top: 15px;
+                width: 100%;
+                // height: 20px;
+                // background-color: red;
+                display: flex;
+                justify-content: center;
+                // position: absolute;
+                // bottom: 20px;
+                .ant-pagination-item,
+                .ant-pagination-prev,
+                .ant-pagination-next,
+                .ant-pagination-options {
+                  margin-bottom: 10px;
+                }
               }
             }
-            }
           }
 
           .tab2 {
@@ -1230,4 +1230,4 @@ export default {
     background-color: #4ea6ff !important;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/Ownership.vue b/src/components/drawers/Ownership.vue
index f7cf2d5d..2f8c229e 100644
--- a/src/components/drawers/Ownership.vue
+++ b/src/components/drawers/Ownership.vue
@@ -786,7 +786,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue
index dc14bc8f..db21a8f0 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -329,7 +329,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" >
+<style lang="scss">
 .me {
   .ant-modal-body {
     padding: 0px;
@@ -461,7 +461,7 @@ export default {
     // overflow: auto;
     min-width: 500px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -670,4 +670,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue
index 5c365471..ddd8406c 100644
--- a/src/components/drawers/ProMess.vue
+++ b/src/components/drawers/ProMess.vue
@@ -3,7 +3,7 @@
     :visible="Provisible"
     class="drawerStyle promess"
     placement="right"
-    width="50%"
+    width="70%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -17,12 +17,14 @@
       </div>
       <div class="main">
         <div class="one">
-            <span class="left">班级名称：</span>
-            <span class="right">产品经理管理-腾飞班1</span>
+          <span class="left">班级名称：</span>
+          <span class="right">产品经理管理-腾飞班1</span>
         </div>
         <div class="one second">
-            <span class="left">说明：</span>
-            <span class="right">班级说明，此班级为产品经理班级，其他岗位不要进入请大家按照规定时间进行任务学习</span>
+          <span class="left">说明：</span>
+          <span class="right"
+            >班级说明，此班级为产品经理班级，其他岗位不要进入请大家按照规定时间进行任务学习</span
+          >
         </div>
       </div>
       <div class="btnn">
@@ -30,7 +32,6 @@
       </div>
     </div>
   </a-drawer>
-  
 </template>
 
 <script>
@@ -63,7 +64,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" >
+<style scoped lang="scss">
 .promess {
   .ant-drawer-content-wrapper {
     // max-width: 1000px;
@@ -75,9 +76,9 @@ export default {
     }
   }
   .drawerMain {
-    min-width: 434px;
+    min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -101,13 +102,13 @@ export default {
         margin-top: 38px;
         margin-left: 53px;
         .left {
-            color: rgba(51, 51, 51, 1);
-            font-size: 14px;
+          color: rgba(51, 51, 51, 1);
+          font-size: 14px;
         }
         .right {
-            color: rgba(102, 102, 102, 1);
-            font-size: 14px;
-            margin-left: 12px;
+          color: rgba(102, 102, 102, 1);
+          font-size: 14px;
+          margin-left: 12px;
         }
       }
       .second {
@@ -137,4 +138,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index a802c8ff..78ac83f6 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -80,18 +80,17 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize"
-                      :current="currentPage"
-                      :total="tableDataTotal"
-                      class="pagination"
-                    />
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize"
+                        :current="currentPage"
+                        :total="tableDataTotal"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
-                  </div>
-
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -162,18 +161,17 @@
                     />
                     <div class="tableBox">
                       <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize1"
-                        :current="currentPage1"
-                        :total="tableDataTotal1"
-                        class="pagination"
-                      />
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize1"
+                          :current="currentPage1"
+                          :total="tableDataTotal1"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
-                    </div>
-
                   </div>
                 </div>
               </a-tab-pane>
@@ -246,18 +244,17 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize2"
-                      :current="currentPage2"
-                      :total="tableDataTotal2"
-                      class="pagination"
-                    />
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
-                  </div>
-
                 </div>
               </a-tab-pane>
             </a-tabs>
@@ -789,7 +786,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue
index 35e1b42c..949ad4e5 100644
--- a/src/components/drawers/ProjManagePower.vue
+++ b/src/components/drawers/ProjManagePower.vue
@@ -80,18 +80,17 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize"
-                      :current="currentPage"
-                      :total="tableDataTotal"
-                      class="pagination"
-                    />
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize"
+                        :current="currentPage"
+                        :total="tableDataTotal"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
-                  </div>
-
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -162,18 +161,17 @@
                     />
                     <div class="tableBox">
                       <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize1"
-                        :current="currentPage1"
-                        :total="tableDataTotal1"
-                        class="pagination"
-                      />
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize1"
+                          :current="currentPage1"
+                          :total="tableDataTotal1"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
-                    </div>
-
                   </div>
                 </div>
               </a-tab-pane>
@@ -246,18 +244,17 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize2"
-                      :current="currentPage2"
-                      :total="tableDataTotal2"
-                      class="pagination"
-                    />
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
-                  </div>
-
                 </div>
               </a-tab-pane>
             </a-tabs>
@@ -789,7 +786,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index 7ecd7d38..1bf31e58 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -59,16 +59,16 @@
         </div>
         <div class="tableBox">
           <div class="pa">
-          <a-pagination
-            showSizeChanger="true"
-            showQuickJumper="true"
-            hideOnSinglePage="true"
-            :pageSize="pageSize"
-            :current="currentPage"
-            :total="tableDataTotal"
-            class="pagination"
-          />
-        </div>
+            <a-pagination
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              :current="currentPage"
+              :total="tableDataTotal"
+              class="pagination"
+            />
+          </div>
         </div>
 
         <!-- <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
@@ -329,7 +329,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" >
+<style lang="scss">
 .me {
   .ant-modal-body {
     padding: 0px;
@@ -350,7 +350,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-x: scroll;
+    // overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -553,4 +553,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 8894e72d..a294a2b6 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -80,16 +80,16 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize"
-                      :current="currentPage"
-                      :total="tableDataTotal"
-                      class="pagination"
-                    />
-                  </div>
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize"
+                        :current="currentPage"
+                        :total="tableDataTotal"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -161,16 +161,16 @@
                     />
                     <div class="tableBox">
                       <div class="pa">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize1"
-                        :current="currentPage1"
-                        :total="tableDataTotal1"
-                        class="pagination"
-                      />
-                    </div>
+                        <a-pagination
+                          showSizeChanger="true"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize1"
+                          :current="currentPage1"
+                          :total="tableDataTotal1"
+                          class="pagination"
+                        />
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -244,16 +244,16 @@
                   />
                   <div class="tableBox">
                     <div class="pa">
-                    <a-pagination
-                      showSizeChanger="true"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize2"
-                      :current="currentPage2"
-                      :total="tableDataTotal2"
-                      class="pagination"
-                    />
-                  </div>
+                      <a-pagination
+                        showSizeChanger="true"
+                        showQuickJumper="true"
+                        hideOnSinglePage="true"
+                        :pageSize="pageSize2"
+                        :current="currentPage2"
+                        :total="tableDataTotal2"
+                        class="pagination"
+                      />
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -786,7 +786,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue
index 4695b352..0ba76354 100644
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -2,12 +2,13 @@
 <template>
   <div class="split"></div>
   <div class="contentscore">
-    <a-tabs v-model:activeKey="activeKeyScore">
+    <a-tabs v-model:activeKey="activeKeyScore" @change="tabsChange">
       <a-tab-pane key="1" tab="学员获取">
         <div class="group">
           <div class="groupleft">
             <div class="groupname" style="width: 42px">姓名：</div>
-            <a-input class="ant-input"
+            <a-input
+              class="ant-input"
               v-model:value="value"
               placeholder="请输入姓名"
             />
@@ -24,7 +25,7 @@
           </div>
         </div>
         <div class="tableBox" style="margin: 20px 32px 30px 32px">
-          <a-table 
+          <a-table
             style="border: 1px solid #f2f6fe"
             :columns="tablecolumnStu"
             :data-source="tabledataStu"
@@ -49,32 +50,39 @@
       <a-tab-pane key="2" tab="榜单" force-render>
         <div class="scorelist">
           <div class="grouprightscore">
-            <div class="sbutton" @click="stuValue = !stuValue">
-              <img v-if=stuValue src="../../assets/images/taskpage/stu0.png"/>
-              <img v-else src="../../assets/images/taskpage/stu.png"/>
-              <div :class="stuValue ? '' : 'btn1'">学员积分榜</div>
+            <div class="sbutton" @click="typeChange(1)">
+              <img
+                v-if="stuValue===2"
+                src="../../assets/images/taskpage/stu0.png"
+              />
+              <img v-else src="../../assets/images/taskpage/stu.png" />
+              <div :class="stuValue===2 ? '' : 'btn1'">学员积分榜</div>
             </div>
-            <div class="sbutton" @click="stuValue = !stuValue">
-              
-              <img v-if=stuValue src="../../assets/images/taskpage/group.png"/>
-              <img v-else src="../../assets/images/taskpage/group0.png"/>
-              <div :class="stuValue ? 'btn1' : ''">小组积分榜</div>
+            <div class="sbutton" @click="typeChange(2)">
+              <img
+                v-if="stuValue===2"
+                src="../../assets/images/taskpage/group.png"
+              />
+              <img v-else src="../../assets/images/taskpage/group0.png" />
+              <div :class="stuValue===2 ? 'btn1' : ''">小组积分榜</div>
             </div>
           </div>
           <div class="group" style="justify-content: center">
             <div class="groupleft">
               <div class="groupname">姓名：</div>
-            <a-input class="ant-input" style="width:152px"
-                v-model:value="value"
+              <a-input
+                class="ant-input"
+                style="width: 152px"
+                v-model:value="searchRankName"
                 placeholder="请输入姓名"
               />
             </div>
             <div class="groupright">
-              <div class="btn1" style="margin-left: 16px ;">
+              <div class="btn1" style="margin-left: 16px" @click="searchRank">
                 <img src="../../assets/images/courseManage/search0.png" />
                 <span class="btn1text">搜索</span>
               </div>
-              <div class="btn2">
+              <div class="btn2" @click="rankReset">
                 <img src="../../assets/images/courseManage/reset1.png" />
                 <span class="btn2text">重置</span>
               </div>
@@ -91,8 +99,9 @@
               <a-radio-button class="today" value="3">近一个月</a-radio-button>
             </a-radio-group>
           </div>
-          <div class="listdiv"> <div class="slist">
-              <a-list :data-source="stuValue ? datascoreg : datascore">
+          <div class="listdiv">
+            <div class="slist">
+              <a-list :data-source="stuValue ===1? datascoreg : datascore">
                 <template #renderItem="{ item }">
                   <div class="item">
                     <div v-if="item.id == 1" class="itemleft">
@@ -132,39 +141,55 @@
             <div class="groupright">
               <div class="spandiv"><span class="spantext">规则</span></div>
               <div v-if="edit" class="btns">
-                <div class="btn1" @click="edit=!edit">
-                <img src="../../assets/images/projectadd/edit1.png" />
-                <span class="btn1text">编辑</span>
-              </div>
-            
+                <div class="btn1" @click="edit = !edit">
+                  <img src="../../assets/images/projectadd/edit1.png" />
+                  <span class="btn1text">编辑</span>
+                </div>
               </div>
               <div v-else class="btns">
-                <div class="btn1" @click="edit=!edit">
-                <span class="btn1text">保存</span>
-              </div>
+                <div class="btn1" @click="edit = !edit">
+                  <span class="btn1text">保存</span>
+                </div>
               </div>
             </div>
 
             <div v-if="edit" class="pjcb_content">
               <div class="content content1">
-                <span>当前设计下，学员可以获得 </span><span class="scoretext">{{scoresum}}</span><span>积分</span>
+                <span>当前设计下，学员可以获得 </span
+                ><span class="scoretext">{{ scoresum }}</span
+                ><span>积分</span>
               </div>
               <div class="content content2">
-                <span>完成【必修/选修】获得 </span><span class="scoretext">{{score1}} </span><span>积分</span>
+                <span>完成【必修/选修】获得 </span
+                ><span class="scoretext">{{ score1 }} </span><span>积分</span>
               </div>
               <div class="content">
-                <span>优秀学员可获得 </span><span class="scoretext">{{score2}}</span><span>积分</span>
+                <span>优秀学员可获得 </span
+                ><span class="scoretext">{{ score2 }}</span
+                ><span>积分</span>
               </div>
             </div>
             <div v-else class="pjcb_content">
               <div class="content content1">
-                <span>当前设计下，学员可以获得 </span><span class="scoretext">{{scoresum}}</span><span>积分</span>
+                <span>当前设计下，学员可以获得 </span
+                ><span class="scoretext">{{ scoresum }}</span
+                ><span>积分</span>
               </div>
               <div class="content content2">
-                <span>完成【必修/选修】获得 </span><span ><a-input v-model:value="score1" :bordered="false" @change="getScore"/> </span><span>积分</span>
+                <span>完成【必修/选修】获得 </span
+                ><span
+                  ><a-input
+                    v-model:value="score1"
+                    :bordered="false"
+                    @change="getScore"
+                  /> </span
+                ><span>积分</span>
               </div>
-              <div class="content ">
-                <span>优秀学员可获得 </span><span ><a-input v-model:value="score2" :bordered="false" /></span><span>积分</span>
+              <div class="content">
+                <span>优秀学员可获得 </span
+                ><span
+                  ><a-input v-model:value="score2" :bordered="false" /></span
+                ><span>积分</span>
               </div>
             </div>
           </div>
@@ -178,12 +203,19 @@
 <script>
 import StuScoreDetail from "../../components/drawers/StuScoreDetail";
 import { reactive, toRefs } from "vue";
+import * as api from "../../api/index1";
 export default {
   name: "ProjectScore",
-  components:{
+  components: {
     StuScoreDetail,
   },
-  setup() {
+  props: {
+    projectId: {
+      type: Number,
+      default: null,
+    },
+  },
+  setup(props) {
     const state = reactive({
       tabledataStu: [
         {
@@ -194,7 +226,6 @@ export default {
           group: "好好学习",
           diploma: "0",
           operation: "查看",
-          
         },
         {
           key: 2,
@@ -204,7 +235,6 @@ export default {
           group: "天天向上",
           diploma: "0",
           operation: "查看",
-         
         },
         {
           key: 3,
@@ -214,7 +244,6 @@ export default {
           group: "好好学习",
           diploma: "0",
           operation: "查看",
-        
         },
         {
           key: 4,
@@ -224,7 +253,6 @@ export default {
           group: "天天向上",
           diploma: "0",
           operation: "查看",
-          
         },
       ],
 
@@ -336,15 +364,16 @@ export default {
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "请输入要发布的公告",
-      activeKeyScore: "1",
+      activeKeyScore: "2",
       stuName: "请输入姓名",
       todayvalue: "1",
       tableDataTotal: 30,
       stuValue: false,
-      Svisible:false,
-      score1:5,
-      score2:5,
-      edit:true,
+      Svisible: false,
+      score1: 5,
+      score2: 5,
+      edit: true,
+      searchRankName:null,//榜单搜索名称
     });
     const getTableData = () => {
       let datas = state.tabledataStu;
@@ -360,7 +389,7 @@ export default {
                 }}
               >
                 查看
-              </div>                
+              </div>
             </div>
           );
         }
@@ -368,139 +397,190 @@ export default {
       state.tabledataStu = datas;
     };
     getTableData();
-  
+
+    const tabsChange = (e) => {
+      if (e == 2) {
+        // console.log('获取项目积分-榜单')
+        scoreRank(1, 1);
+      }
+      rankReset()
+      state.todayvalue='1'
+      state.stuValue=1
+    };
+   
+   
+    //重置
+    const rankReset=()=>{
+        state.searchRankName=null  
+    }
+    // start -------榜单---------------榜单------------榜单------------------榜单---------
+    //学员积分还是小组积分
+     const typeChange = (num) => {
+      state.stuValue = num;
+      scoreRank(state.stuValue , state.todayvalue);
+    };
+    //选择时间
+    const changeday = (e) => {
+      state.todayvalue = e.target.value;
+      scoreRank(state.stuValue , state.todayvalue);
+    };
+     //搜索
+    const searchRank = () => {
+     scoreRank(state.stuValue , state.todayvalue)
+    };
+    //项目积分榜单
+    const scoreRank = (period, type) => {
+      console.log("projectId", props.projectId);
+      let obj = {
+        name: state.searchRankName,
+        pageNo: 1,
+        pageSize: 5,
+        period: Number(period),
+        projectId: props.projectId,
+        type: Number(type),
+      };
+      api
+        .scoreRank(obj)
+        .then((res) => {
+          console.log("获取项目积分-榜单", res);
+        })
+        .catch((err) => {
+          console.log("获取项目积分-榜单失败", err);
+        });
+    };
+    // end -----榜单----------------榜单----------------------榜单-----------榜单----------
     return {
       ...toRefs(state),
-     
+      typeChange,
+      changeday,
+      searchRank,
+      rankReset,
+      tabsChange,
+      scoreRank,
     };
   },
   computed: {
     // 计算属性的 getter
     scoresum: function () {
-        return Number(this.score1)+Number(this.score2);
-      }
-    }
+      return Number(this.score1) + Number(this.score2);
+    },
+  },
 };
 </script>
 <style lang="scss">
 .contentscore {
   margin-top: 20px;
   margin-bottom: 100px;
-  .ant-tabs-nav-wrap{
-    border-bottom:1px solid #ededed;
+  .ant-tabs-nav-wrap {
+    border-bottom: 1px solid #ededed;
   }
   .ant-tabs-tab-btn {
     font-size: 18px;
     font-weight: 700;
   }
   .ant-input {
-        border-radius: 8px;
-        width: 264px;
-        height: 40px;
-    }  
+    border-radius: 8px;
+    width: 264px;
+    height: 40px;
+  }
   .group {
+    display: flex;
+    justify-content: space-between;
+    .groupleft {
       display: flex;
-      justify-content: space-between;
-      .groupleft {
+      align-items: center;
+      margin-left: 32px;
+      .groupname {
+        height: 22px;
+        width: 42px;
+        color: #000000;
+        font-size: 14px;
+      }
+    }
+    .groupright {
+      display: flex;
+      .btn1 {
+        width: 100px;
+        height: 40px;
         display: flex;
         align-items: center;
-        margin-left: 32px;
-        .groupname {        
-          height: 22px;
-          width: 42px;
-          color: #000000;
+        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;
         }
-        
       }
-      .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;
-          }
-        }
-      }
-      
-    }
-  .tableBox {
-      .ant-table-selection-column {
-        padding: 0px !important;
-        // padding-left: 45px !important;
-      }
-
-      .ant-table-thead > tr > th {
-        background-color: rgba(239, 244, 252, 1) !important;
-        color: rgba(0, 0, 0, 0.8500);
-      }
-
-      .ant-table-cell {
-        color: rgba(0, 0, 0, 0.6500);
-      }
-
-      .ant-table-selection-column {
-        padding: 0 !important;
-      }
-
-      th.h {
-        background-color: #eff4fc !important;
-      }
-
-      
-      .ant-table-tbody
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-        > td {
-          
-        background: #f6f9fd;
-      }
-      .ant-table-tbody > tr > td {
-          border-bottom: 1px solid rgba(240, 244, 254, 1);
-          padding: 16px 16px;
-          .operation {
-          color: rgba(56, 125, 247, 1);
-          cursor: pointer;
-          }
-      }
-      .pa {
-        margin-top: 15px;
-        // height: 20px;
-        // background-color: red;
+      .btn2 {
+        width: 100px;
+        height: 40px;
         display: flex;
+        align-items: center;
         justify-content: center;
-        // bottom: 20px;
+        margin-right: 32px;
+        border: 1px solid #409eff;
+        border-radius: 8px;
+        cursor: pointer;
+        background: #ffffff;
+        .btn2text {
+          color: #409eff;
+          margin-left: 5px;
+          font-size: 14px;
+        }
       }
     }
+  }
+  .tableBox {
+    .ant-table-selection-column {
+      padding: 0px !important;
+      // padding-left: 45px !important;
+    }
+
+    .ant-table-thead > tr > th {
+      background-color: rgba(239, 244, 252, 1) !important;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .ant-table-cell {
+      color: rgba(0, 0, 0, 0.65);
+    }
+
+    .ant-table-selection-column {
+      padding: 0 !important;
+    }
+
+    th.h {
+      background-color: #eff4fc !important;
+    }
+
+    .ant-table-tbody
+      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      > td {
+      background: #f6f9fd;
+    }
+    .ant-table-tbody > tr > td {
+      border-bottom: 1px solid rgba(240, 244, 254, 1);
+      padding: 16px 16px;
+      .operation {
+        color: rgba(56, 125, 247, 1);
+        cursor: pointer;
+      }
+    }
+    .pa {
+      margin-top: 15px;
+      // height: 20px;
+      // background-color: red;
+      display: flex;
+      justify-content: center;
+      // bottom: 20px;
+    }
+  }
   .scorelist {
-    
     padding-bottom: 100px;
     padding-top: 50px;
     .grouprightscore {
@@ -522,7 +602,6 @@ export default {
       }
     }
     .radiobutton {
-     
       margin-top: 23px;
       margin-bottom: 23px;
       justify-content: center;
@@ -533,75 +612,75 @@ export default {
         height: 32px;
       }
     }
-    .listdiv{
-        display: flex;
-        justify-content: space-evenly;
-        text-align: center;
+    .listdiv {
+      display: flex;
+      justify-content: space-evenly;
+      text-align: center;
       .slist {
-      width: 736px;
-      background-color: #f5f8fc;
-      padding-left: 28px;
-      padding-right: 28px;
-      padding-bottom: 20px;
-      padding-top: 16px;
-      font-size: 18px;
+        width: 736px;
+        background-color: #f5f8fc;
+        padding-left: 28px;
+        padding-right: 28px;
+        padding-bottom: 20px;
+        padding-top: 16px;
+        font-size: 18px;
 
-      .item {
-        display: flex;
-        justify-content: space-evenly;
-        text-align: center;
-        border-bottom: none;
-        height: 56px;
-        align-items: center;
-        background-color: white;
-        border-radius: 21px;
-        margin-top: 10px;
-        .itemleft {
-          justify-content: center;
+        .item {
           display: flex;
+          justify-content: space-evenly;
+          text-align: center;
+          border-bottom: none;
+          height: 56px;
           align-items: center;
-          width: 150px;
-          .itemid {
-            font-size: 40px;
-            font-family: math;
-            font-style: italic;
-            font-weight: 700;
-            color: #409eff;
-            margin-left: 5px;
+          background-color: white;
+          border-radius: 21px;
+          margin-top: 10px;
+          .itemleft {
+            justify-content: center;
+            display: flex;
+            align-items: center;
+            width: 150px;
+            .itemid {
+              font-size: 40px;
+              font-family: math;
+              font-style: italic;
+              font-weight: 700;
+              color: #409eff;
+              margin-left: 5px;
+            }
+            .elseid {
+              font-size: 26px;
+              font-family: math;
+              font-weight: 500;
+              margin-left: 40px;
+            }
           }
-          .elseid {
-            font-size: 26px;
-            font-family: math;
-            font-weight: 500;
-            margin-left: 40px;
+          .itemcenter {
+            width: 300px;
+          }
+          .itemright {
+            width: 150px;
           }
-        }
-        .itemcenter {
-          width: 300px;
-        }
-        .itemright {
-          width: 150px;
         }
       }
     }
-    }
   }
   .projectscore {
-  .pjc_body {
-    margin-left: 34px;
-    margin-right: 34px;
-    .spandiv{
-      position: relative;
-      /* height: 100%; */
-      width: 40px;
-      .spantext{
-        position: absolute;
-        left: 0;
-        bottom: 0px;
+    .pjc_body {
+      margin-left: 34px;
+      margin-right: 34px;
+      .spandiv {
+        position: relative;
+        /* height: 100%; */
+        width: 40px;
+        .spantext {
+          position: absolute;
+          left: 0;
+          bottom: 0px;
+        }
       }
-      }
-    
-    .groupright {
+
+      .groupright {
         display: flex;
         justify-content: space-between;
         .btn1 {
@@ -639,34 +718,32 @@ export default {
           }
         }
       }
-    .pjcb_content {
-      border: 1px solid #409eff;
-      padding: 20px;
-      margin-top: 10px;
-      .ant-input{
+      .pjcb_content {
+        border: 1px solid #409eff;
+        padding: 20px;
+        margin-top: 10px;
+        .ant-input {
           width: 46px;
           font-size: 16px;
           color: #409eff;
         }
-      .scoretext{
-        color: #409eff;
-        font-size: 16px;
-        margin-left: 3px;
-        margin-right: 4px;
+        .scoretext {
+          color: #409eff;
+          font-size: 16px;
+          margin-left: 3px;
+          margin-right: 4px;
+        }
+        .pjcb_content :last-child {
+          margin-bottom: 0px;
+        }
+        .content {
+          align-items: center;
+          height: 50px;
+          display: flex;
+        }
+        margin-bottom: 130px;
       }
-      .pjcb_content :last-child {
-        margin-bottom: 0px;
-      }
-      .content {
-        align-items: center;
-        height: 50px;
-        display: flex;
-      }
-      margin-bottom: 130px;
     }
   }
 }
-}
-
-
 </style>
diff --git a/src/components/drawers/QueryRight.vue b/src/components/drawers/QueryRight.vue
index 3eeb7ef5..1de3a9cf 100644
--- a/src/components/drawers/QueryRight.vue
+++ b/src/components/drawers/QueryRight.vue
@@ -786,7 +786,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 36657360..ab8a693e 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -1,4 +1,4 @@
-  <template>
+<template>
   <a-drawer
     :visible="Seevisible"
     class="drawerStyle seestu"
@@ -69,174 +69,86 @@
           </div>
         </div>
         <div class="mainbox">
-          <div class="rowtitle" @click="changeDown">
-            <div class="titleimg">
+          <a-collapse v-model:activeKey="stageListActive">
+            <template #expandIcon="{ isActive }">
               <img
+                style="margin-right: 20px"
                 :src="
-                  showDown
+                  isActive
                     ? require('../../assets/images/studentimg/open.png')
                     : require('../../assets/images/studentimg/close.png')
                 "
               />
-            </div>
-            <div class="titletext">阶段1 腾飞班阶段1</div>
-          </div>
-          <div :style="{ display: showDown ? 'block' : 'none' }">
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
-                <div class="text2">如何成为一个产品经理</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
+              <div></div>
+            </template>
+            <a-collapse-panel
+              v-for="(value, index) in stageList"
+              :key="index"
+              :header="value.text"
+            >
+              <div
+                class="rowclass"
+                v-for="(item, key) in value.children"
+                :key="key"
+              >
+                <div class="leftclass">
+                  <div>
+                    <img
+                      :src="
+                        item.course === '在线'
+                          ? require('../../assets/images/leveladd/zai.png')
+                          : item.course === '面授'
+                          ? require('../../assets/images/leveladd/mian.png')
+                          : item.course === '案例'
+                          ? require('../../assets/images/leveladd/an.png')
+                          : item.course === '作业'
+                          ? require('../../assets/images/leveladd/zuo.png')
+                          : item.course === '考试'
+                          ? require('../../assets/images/leveladd/kao.png')
+                          : item.course === '直播'
+                          ? require('../../assets/images/leveladd/zhi.png')
+                          : item.course === '外链'
+                          ? require('../../assets/images/leveladd/wai.png')
+                          : item.course === '讨论'
+                          ? require('../../assets/images/leveladd/tao.png')
+                          : item.course === '活动'
+                          ? require('../../assets/images/leveladd/huo.png')
+                          : item.course === '测评'
+                          ? require('../../assets/images/leveladd/ce.png')
+                          : item.course === '调研'
+                          ? require('../../assets/images/leveladd/diao.png')
+                          : item.course === '投票'
+                          ? require('../../assets/images/leveladd/tou.png')
+                          : null
+                      "
+                    />
+                  </div>
+                  <div class="text1">{{ item.course }}</div>
+                  <div class="text2">{{ item.name }}</div>
                 </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
-                <div class="text1">直播</div>
-                <div class="text2">管理者播课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
+                <div class="alreadyclass">
+                  <div class="alimg">
+                    <img
+                      :src="
+                        item.complete === '已完成'
+                          ? require('../../assets/images/studentimg/complete.png')
+                          : require('../../assets/images/studentimg/notice.png')
+                      "
+                    />
+                  </div>
+                  <div class="altext">{{ item.complete }}</div>
                 </div>
-                <div class="altext">已完成</div>
               </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/mian.png" /></div>
-                <div class="text1">面授</div>
-                <div class="text2">管理面授课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/huo.png" /></div>
-                <div class="text1">活动</div>
-                <div class="text2">管理者活动</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
-                <div class="text1">作业</div>
-                <div class="text2">管理者作业</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="mainbox">
-          <div class="rowtitle" @click="changeDown1">
-            <div class="titleimg">
-              <img
-                :src="
-                  showDown1
-                    ? require('../../assets/images/studentimg/open.png')
-                    : require('../../assets/images/studentimg/close.png')
-                "
-              />
-            </div>
-            <div class="titletext">阶段2 腾飞班阶段2</div>
-          </div>
-          <div :style="{ display: showDown1 ? 'block' : 'none' }">
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
-                <div class="text2">如何成为一个产品经理</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
-                <div class="text1">直播</div>
-                <div class="text2">管理者播课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/mian.png" /></div>
-                <div class="text1">面授</div>
-                <div class="text2">管理面授课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/huo.png" /></div>
-                <div class="text1">活动</div>
-                <div class="text2">管理者活动</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
-                <div class="text1">作业</div>
-                <div class="text2">管理者作业</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-          </div>
+            </a-collapse-panel>
+          </a-collapse>
         </div>
       </div>
       <div class="btnn">
         <button class="btn2" @click="closeDrawer">关闭</button>
       </div>
     </div>
-  </a-drawer>
     <pro-mess v-model:Provisible="Provisible" />
+  </a-drawer>
 </template>
 
 <script>
@@ -253,9 +165,72 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-        Provisible: false,
-        showDown: true,
-        showDown1: false,
+      Provisible: false,
+      showDown: true,
+      showDown1: false,
+      stageList: [
+        {
+          text: "阶段1腾飞班阶段1",
+          children: [
+            {
+              course: "在线",
+              name: "如何成为一个产品经理",
+              complete: "已完成",
+            },
+            {
+              course: "直播",
+              name: "管理直播课",
+              complete: "已完成",
+            },
+            {
+              course: "面授",
+              name: "管理面授课",
+              complete: "未完成",
+            },
+            {
+              course: "活动",
+              name: "管理活动",
+              complete: "未完成",
+            },
+            {
+              course: "作业",
+              name: "管理者作业",
+              complete: "未完成",
+            },
+          ],
+        },
+        {
+          text: "阶段2腾飞班阶段2",
+          children: [
+            {
+              course: "考试",
+              name: "如何成为一个产品经理",
+              complete: "已完成",
+            },
+            {
+              course: "案例",
+              name: "如何成为一个产品经理",
+              complete: "已完成",
+            },
+            {
+              course: "外链",
+              name: "如何成为一个产品经理",
+              complete: "已完成",
+            },
+            {
+              course: "讨论",
+              name: "如何成为一个产品经理",
+              complete: "未完成",
+            },
+            {
+              course: "测评",
+              name: "如何成为一个产品经理",
+              complete: "未完成",
+            },
+          ],
+        },
+      ],
+      stageListActive: 0,
     });
     const closeDrawer = () => {
       ctx.emit("update:Seevisible", false);
@@ -286,7 +261,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" >
+<style lang="scss">
 .seestu {
   .ant-drawer-content-wrapper {
     // max-width: 1000px;
@@ -300,7 +275,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -399,24 +374,33 @@ export default {
         // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
-        border: 1px solid rgba(221, 238, 255, 1);
-        border-radius: 6px;
-        .rowtitle {
-          height: 56px;
-          background: rgba(240, 246, 252, 1);
+        //border: 1px solid rgba(221, 238, 255, 1);
+        //border-radius: 6px;
+        .ant-collapse {
+          background-color: #ffffff;
+          border: 0;
+        }
+        .ant-collapse-content > .ant-collapse-content-box {
+          padding: 0;
+          border: 0;
+        }
+        .ant-collapse > .ant-collapse-item {
+          border: 1px solid rgba(221, 238, 255, 1);
+          border-radius: 6px;
+          margin-bottom: 15px;
+          border-bottom: 0px;
+        }
+        .ant-collapse-content {
+          border-top: 0;
+        }
+        .ant-collapse-header {
           display: flex;
           align-items: center;
-          .titleimg {
-            width: 20px;
-            height: 20px;
-            margin-left: 23px;
-          }
-          .titletext {
-            color: rgba(51, 51, 51, 1);
-            font-size: 16px;
-            font-weight: 500;
-            margin-left: 16px;
-          }
+          height: 56px;
+          background-color: rgba(240, 246, 252, 1);
+          font-size: 16px;
+          color: rgba(51, 51, 51, 1);
+          font-weight: 500;
         }
         .rowclass {
           height: 81px;
@@ -480,4 +464,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/StuAdd.vue b/src/components/drawers/StuAdd.vue
index d3d9bbf4..cdb761cf 100644
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -1050,7 +1050,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    // overflow-y: scroll;
+    // overflow-y: auto;
     display: flex;
     flex-direction: column;
 
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index e3f181f0..5e5f424f 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -57,7 +57,6 @@
     <!-- 创建小组抽屉 -->
     <add-group v-model:Avisible="Avisible" />
   </a-drawer>
-  
 </template>
 
 <script>
@@ -76,7 +75,7 @@ export default {
     const state = reactive({
       Avisible: false,
       value1: "",
-      value2:"",
+      value2: "",
       value3: "",
     });
     const closeDrawer = () => {
@@ -120,7 +119,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue
index fa14b9bf..c55e492b 100644
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -129,12 +129,12 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .TaskFaceImpStu {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -353,4 +353,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index d2dbd1d7..a71722cc 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -365,7 +365,7 @@ export default {
   .drawerMain {
     min-width: 520px;
     margin: 0px 32px 0px 32px;
-    // overflow-x: scroll;
+    // overflow-x: auto;
     display: flex;
     flex-direction: column;
     position: relative;
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index f71b9c75..e15764a2 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -318,11 +318,11 @@ export default {
 //   }
 // }
 .TimeManage {
-  // overflow-x: scroll;
+  // overflow-x: auto;
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .noticebox {
diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 3df8b914..f068b7fa 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -17,73 +17,86 @@
       </div>
       <div class="main">
         <div class="onerow">
-            <div class="assname">评估名称：</div>
-            <div class="asscontent">产品经理面授课评估</div>
+          <div class="assname">评估名称：</div>
+          <div class="asscontent">产品经理面授课评估</div>
         </div>
         <div class="onerow" style="margin-top: 30px">
-            <div class="assname">评估说明：</div>
-            <div class="asscontent">-</div>
+          <div class="assname">评估说明：</div>
+          <div class="asscontent">-</div>
         </div>
         <div class="assessbox" style="margin-top: 30px">
-            <div class="box1">
-                <div class="asstype">评估类型：</div>
-                <div class="typename">单选</div>
+          <div class="box1">
+            <div class="asstype">评估类型：</div>
+            <div class="typename">单选</div>
+          </div>
+          <div class="box1" style="margin-left: 64px">
+            <div class="asstype">题干：</div>
+            <div style="color: rgba(153, 153, 153, 1); font-size: 14px">
+              这个课程你觉得对你有用吗？
             </div>
-            <div class="box1" style="margin-left: 64px">
-                <div class="asstype">题干：</div>
-                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">这个课程你觉得对你有用吗？</div>
+          </div>
+          <a-radio-group v-model:value="value">
+            <div class="box1" style="margin-left: 55px; margin-top: 20px">
+              <div class="asstype">选择1：</div>
+              <a-radio :value="1">有用</a-radio>
             </div>
-            <a-radio-group v-model:value="value">
-                <div class="box1" style="margin-left: 55px;margin-top: 20px">
-                    <div class="asstype">选择1：</div>
-                    <a-radio :value="1">有用</a-radio>
-                </div>
-                <div class="box1" style="margin-left: 55px;margin-top: 20px;margin-bottom: 30px">
-                    <div class="asstype">选择2：</div>
-                    <a-radio :value="2">没用</a-radio>
-                </div>
-            </a-radio-group>
-            
+            <div
+              class="box1"
+              style="margin-left: 55px; margin-top: 20px; margin-bottom: 30px"
+            >
+              <div class="asstype">选择2：</div>
+              <a-radio :value="2">没用</a-radio>
+            </div>
+          </a-radio-group>
         </div>
         <div class="assessbox" style="margin-top: 30px">
-            <div class="box1">
-                <div class="asstype">评估类型：</div>
-                <div class="typename">问答题</div>
+          <div class="box1">
+            <div class="asstype">评估类型：</div>
+            <div class="typename">问答题</div>
+          </div>
+          <div class="box1" style="margin-left: 64px">
+            <div class="asstype">标题：</div>
+            <div style="color: rgba(153, 153, 153, 1); font-size: 14px">
+              对这个课程有什么建议吗？
             </div>
-            <div class="box1" style="margin-left: 64px">
-                <div class="asstype">标题：</div>
-                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">对这个课程有什么建议吗？</div>
-            </div>
-            <div class="box1" style="margin-left: 64px;margin-top: 20px;margin-bottom: 30px">
-                <div class="asstype">描述：</div>
-                <div style="color: rgba(51, 51, 51, 1);font-size: 14px">希望以后这样的课程能够躲开，让我们多多了解！</div>
+          </div>
+          <div
+            class="box1"
+            style="margin-left: 64px; margin-top: 20px; margin-bottom: 30px"
+          >
+            <div class="asstype">描述：</div>
+            <div style="color: rgba(51, 51, 51, 1); font-size: 14px">
+              希望以后这样的课程能够躲开，让我们多多了解！
             </div>
+          </div>
         </div>
         <div class="assessbox" style="margin-top: 30px">
-            <div class="box1">
-                <div class="asstype">评估类型：</div>
-                <div class="typename">评分题</div>
+          <div class="box1">
+            <div class="asstype">评估类型：</div>
+            <div class="typename">评分题</div>
+          </div>
+          <div class="box1" style="margin-left: 64px">
+            <div class="asstype">标题：</div>
+            <div style="color: rgba(153, 153, 153, 1); font-size: 14px">
+              请给当前课程打分
             </div>
-            <div class="box1" style="margin-left: 64px">
-                <div class="asstype">标题：</div>
-                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">请给当前课程打分</div>
-            </div>
-            <div class="lastbox">
-                <div class="sorcetext">非常不满意</div>
-                <div class="sorcebox">
-                    <div class="numbox" >1</div>
-                    <div class="numbox">2</div>
-                    <div class="numbox">3</div>
-                    <div class="numbox">4</div>
-                    <div class="numbox">5</div>
-                    <div class="numbox">6</div>
-                    <div class="numbox">7</div>
-                    <div class="numbox">8</div>
-                    <div class="numbox1">9</div>
-                    <div class="numbox1">10</div>
-                </div>
-                <div class="sorcetext">非常满意</div>
+          </div>
+          <div class="lastbox">
+            <div class="sorcetext">非常不满意</div>
+            <div class="sorcebox">
+              <div class="numbox">1</div>
+              <div class="numbox">2</div>
+              <div class="numbox">3</div>
+              <div class="numbox">4</div>
+              <div class="numbox">5</div>
+              <div class="numbox">6</div>
+              <div class="numbox">7</div>
+              <div class="numbox">8</div>
+              <div class="numbox1">9</div>
+              <div class="numbox1">10</div>
             </div>
+            <div class="sorcetext">非常满意</div>
+          </div>
         </div>
       </div>
       <div class="btnn">
@@ -131,7 +144,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -160,13 +173,13 @@ export default {
         margin-top: 10px;
         margin-left: 10px;
         .assname {
-            font-size: 16px;
-            color: #333333;
-            font-weight: 500;
+          font-size: 16px;
+          color: #333333;
+          font-weight: 500;
         }
         .asscontent {
-            color: #999999;
-            font-size: 16px;
+          color: #999999;
+          font-size: 16px;
         }
       }
       .assessbox {
@@ -175,66 +188,65 @@ export default {
         display: flex;
         flex-direction: column;
         .box1 {
+          display: flex;
+          margin-top: 20px;
+          margin-left: 36px;
+          align-items: center;
+          .asstype {
+            color: rgba(51, 51, 51, 1);
+            font-size: 14px;
+            font-weight: 500;
+          }
+          .typename {
+            width: 80px;
+            height: 32px;
+            //margin-left: 10px;
+            border-radius: 4px;
+            border: 1px solid rgba(64, 158, 255, 1);
             display: flex;
-            margin-top: 20px;
-            margin-left: 36px;
+            justify-content: center;
             align-items: center;
-            .asstype {
-                color: rgba(51, 51, 51, 1);
-                font-size: 14px;
-                font-weight: 500;
-            }
-            .typename {
-                width: 80px;
-                height: 32px;
-                //margin-left: 10px;
-                border-radius: 4px;
-                border: 1px solid rgba(64, 158, 255, 1);
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                color: rgba(64, 158, 255, 1);
-                font-size: 14px;
-                background: rgba(64,158,255,0.1);
-            }
+            color: rgba(64, 158, 255, 1);
+            font-size: 14px;
+            background: rgba(64, 158, 255, 0.1);
+          }
         }
         .lastbox {
+          display: flex;
+          align-items: center;
+          margin-left: 30px;
+          .sorcetext {
+            color: rgba(153, 153, 153, 1);
+            font-size: 14px;
+          }
+          .sorcebox {
             display: flex;
-            align-items: center;
-            margin-left: 30px;
-            .sorcetext {
-                color: rgba(153, 153, 153, 1);
-                font-size: 14px;
+            .numbox {
+              width: 32px;
+              height: 32px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              background: rgba(64, 158, 255, 1);
+              color: #ffffff;
+              font-size: 14px;
+              border-radius: 4px;
+              margin: 20px 5px;
+              cursor: pointer;
             }
-            .sorcebox {
-                display: flex;
-                .numbox {
-                    width: 32px;
-                    height: 32px;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    background: rgba(64, 158, 255, 1);
-                    color: #FFFFFF;
-                    font-size: 14px;
-                    border-radius: 4px;
-                    margin: 20px 5px;
-                    cursor: pointer;
-                }
-                .numbox1 {
-                    width: 32px;
-                    height: 32px;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    border: 1px solid rgba(151, 151, 151, 0.29);
-                    color: rgba(0, 0, 0, 0.6500);
-                    margin: 20px 5px;
-                    cursor: pointer;
-                    border-radius: 4px;
-                }
+            .numbox1 {
+              width: 32px;
+              height: 32px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              border: 1px solid rgba(151, 151, 151, 0.29);
+              color: rgba(0, 0, 0, 0.65);
+              margin: 20px 5px;
+              cursor: pointer;
+              border-radius: 4px;
             }
-            
+          }
         }
       }
     }
diff --git a/src/components/drawers/WorkDetail.vue b/src/components/drawers/WorkDetail.vue
index d5256d52..33228d92 100644
--- a/src/components/drawers/WorkDetail.vue
+++ b/src/components/drawers/WorkDetail.vue
@@ -89,7 +89,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" >
+<style scoped lang="scss">
 // .drawerStyle {
 //   .ant-drawer-content-wrapper {
 //     // max-width: 1000px;
@@ -106,7 +106,7 @@ export default {
   .drawerMain {
     min-width: 450px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -238,4 +238,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index bd655f9b..9348356b 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -366,7 +366,7 @@ export default {
 };
 </script>
 
-<style  lang="scss" >
+<style lang="scss">
 // .drawerStyle {
 //   .ant-drawer-content-wrapper {
 //     // max-width: 1000px;
@@ -486,7 +486,7 @@ export default {
   .drawerMain {
     min-width: 550px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -675,4 +675,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/store/index.js b/src/store/index.js
index 677c4a6e..e58b00ac 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,6 +13,7 @@ export default createStore({
         ],
 
     assessmentName: "",
+    routerId: null,
   },
   getters: {},
   mutations: {
@@ -20,6 +21,10 @@ export default createStore({
       // console.log('list', list)
       state.openpages = list;
     },
+    chengeRouterId(state, routerId) {
+      // console.log('list', list)
+      state.routerId = routerId;
+    },
 
     SET_assessmentName(state, name) {
       state.assessmentName = name;
diff --git a/src/views/TestPage.vue b/src/views/TestPage.vue
index 7cdfd951..046eadf1 100644
--- a/src/views/TestPage.vue
+++ b/src/views/TestPage.vue
@@ -20,7 +20,6 @@ export default {
   name: "TestPage",
   setup() {
     const state = reactive({});
-
     return {
       ...toRefs(state),
     };
@@ -30,14 +29,10 @@ export default {
 $(document).ready(function () {
   var range = { x: 0, y: 0 }; //鼠标元素偏移量
   var lastPos = { x: 0, y: 0, x1: 0, y1: 0 }; //拖拽对象的四个坐标
-
   var tarPos = { x: 0, y: 0, x1: 0, y1: 0 }; //目标元素对象的坐标初始化
-
   var theDiv = null,
     move = false;
-
   var choose = false; //拖拽对象 拖拽状态 选中状态
-
   // var theDivId = 0;
   // var theDivHeight = 0;
   var theDivHalf = 0;
@@ -101,7 +96,6 @@ $(document).ready(function () {
       if (!choose) {
         return false;
       }
-
       if (!move) {
         //恢复对象的初始样式
 
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 1b1867e2..8b02c597 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -4,25 +4,21 @@
     <!-- 搜索框及按钮 -->
     <div class="filter">
       <div class="filterItems">
-        <div class="select">
-          <a-select
-            v-model:value="projectName"
-            style="width: 270px"
+        <div class="pathnameInp">
+          <a-input
+            v-model:value="pathnameSearch"
+            style="width: 270px; height: 40px; border-radius: 8px"
             placeholder="请输入路径名称"
-            :options="projectNameList"
-            @change="selectProjectName"
-            allowClear
-            showSearch
-          ></a-select>
+          />
         </div>
 
         <div class="select">
           <a-select
-            v-model:value="projectName"
+            v-model:value="statusValue"
             style="width: 270px"
             placeholder="请选择状态"
-            :options="projectNameList"
-            @change="selectProjectName"
+            :options="statusList"
+            @change="selectStatusClassify"
             allowClear
             showSearch
           ></a-select>
@@ -35,19 +31,20 @@
             style="width: 270px"
           /> -->
           <a-range-picker
-            v-model:value="value2"
+            v-model:value="searchdate"
             separator="至"
             :placeholder="['      开始时间', '        结束时间']"
+            @change="searchTimeChange"
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1">
             <div class="search"></div>
-            <div class="btnText">搜索</div>
+            <div class="btnText" @click="searchLearnPath">搜索</div>
           </div>
           <div class="btnn btn2">
             <div class="search"></div>
-            <div class="btnText">重置</div>
+            <div class="btnText" @click="resetLearnPath">重置</div>
           </div>
         </div>
       </div>
@@ -229,23 +226,13 @@
             <button class="samtn btn2" @click="createLearnPath">确定</button>
           </div>
         </div>
+        <div
+          class="aeLoading"
+          :style="{ display: lpLoading ? 'flex' : 'none' }"
+        >
+          <a-spin :spinning="lpLoading" tip="添加中..." />
+        </div>
       </div>
-      <!-- <div
-        style="
-          width: 300px;
-          height: 200px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          background:pink;
-          flex-shrink: 0;
-					position:absolute,
-					 z-index: 100;
-        "
-        v-if="true"
-      >
-        <a-spin :spinning="true" />
-      </div> -->
     </a-modal>
 
     <!-- 编辑路径弹窗 -->
@@ -401,21 +388,21 @@
       </div>
       <div class="modalMain">
         <div class="projectname">产品经理上升路径</div>
-        <div class="projecttime">
+        <!-- <div class="projecttime">
           <span class="timeti">路径时间：</span
           ><span class="timeme">2022/08/01-2022/08/30</span>
-        </div>
+        </div> -->
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">路径信息</div>
-            <div class="messagege">当前路径共0个阶段，0个任务</div>
+            <div class="messagege">当前路径共0个关卡，0个任务</div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
-            <div class="messagege1">路径共0名学员</div>
+            <div class="messagege1">路径共{{ routeStudentsNum }}名学员</div>
           </div>
         </div>
-        <div class="send">
+        <!-- <div class="send">
           <a-switch v-model:checked="checked" size="small" />
           <span class="sendtext">发送路径通知</span>
         </div>
@@ -426,10 +413,10 @@
           <a-checkbox v-model:checked="checkStu"
             ><span class="sendpeo">发给学员</span></a-checkbox
           >
-        </div>
+        </div> -->
         <div class="pubtn">
-          <a-button class="pubtn1" @click="closeModal">取消</a-button>
-          <a-button class="pubtn2" @click="closeModal">发布</a-button>
+          <a-button class="pubtn1" @click="closePub">取消</a-button>
+          <a-button class="pubtn2" @click="releaseLearnPath">发布</a-button>
         </div>
       </div>
     </a-modal>
@@ -484,10 +471,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+              <div class="btnText" @click="closeStopModal">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+              <div class="btnText" @click="stopLearnPath">确定</div>
             </div>
           </div>
         </div>
@@ -575,10 +562,10 @@
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
-              <div class="btnText" @click="delete_exit">取消</div>
+              <div class="btnText" @click="closeBackModal">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="delete_exit">确定</div>
+              <div class="btnText" @click="recallPath">确定</div>
             </div>
           </div>
         </div>
@@ -605,7 +592,8 @@ import QueryRight from "../../components/drawers/QueryRight";
 import ManageRight from "../../components/drawers/ManageRight";
 import * as api from "../../api/index1";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
+import { toDate, commonData } from "../../api/method";
+import { storage } from "../../api/storage";
 export default {
   name: "learningPath",
   components: { OwnerShip, PowerList, QueryRight, ManageRight },
@@ -613,28 +601,6 @@ export default {
   setup() {
     const router = useRouter();
     const state = reactive({
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
       out: false,
       out1: false,
       number: null,
@@ -692,6 +658,8 @@ export default {
 
       value1: "",
       value2: "",
+      //
+      //创建、编辑-------------------------
       pathName: "", //创建/编辑路径图名称
       organizationList: [
         {
@@ -722,6 +690,40 @@ export default {
       createLoading: false, //创建路径loading
       deletePathId: null, //删除路径id
       editPathId: null, //修改路径id
+      //搜索------------------------------
+      pathnameSearch: null, //搜索路径名称
+      statusList: [
+        {
+          id: 1,
+          value: "草稿",
+          label: "草稿",
+          classify: 0,
+        },
+        {
+          id: 2,
+          value: "已发布",
+          label: "已发布",
+          classify: 1,
+        },
+        {
+          id: 3,
+          value: "已停用",
+          label: "已停用",
+          classify: -1,
+        },
+      ],
+      statusValue: null, //状态
+      statusClassify: null, //选择状态类型
+      searchdate: null, //选择时间
+      startTime: null, //开始时间
+      endTime: null, //结束时间
+      //发布---------------
+      releasePathId: null, //发布路径id
+      routeStudentsNum: 0,
+      recallPathId: null, //撤回路径id
+      stopPathId: null, //停用路径id
+
+      lpLoading: false,
     });
 
     const selectProjectName = (value, index) => {
@@ -757,9 +759,58 @@ export default {
       console.log(id);
       state.learnPathBg2 = id;
     };
-    const showPub = () => {
+    //发布弹窗
+    const showPub = (routerId) => {
       state.pub = true;
+      state.releasePathId = routerId;
+      //获取学员总数
+      let obj = {
+        pageNo: 0,
+        pageSize: 0,
+        routerId: routerId,
+      };
+      api
+        .getStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data.data);
+            state.routeStudentsNum = res.data.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+        });
+      //获取学习路径详细信息
+      api
+        .getRouterDetail(routerId)
+        .then((res) => {
+          console.log("学习路径详情", res);
+        })
+        .catch((err) => {
+          console.log("学习路径详情获取错误", err);
+        });
     };
+    //确定发布
+    const releaseLearnPath = () => {
+      // console.log("state.releasePathId", state.releasePathId);
+      let obj = {
+        routerId: state.releasePathId,
+        type: 1,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.pub = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+
     const closePub = () => {
       state.pub = false;
     };
@@ -769,12 +820,34 @@ export default {
     const closeCopyModal = () => {
       state.copyModal = false;
     };
+    //显示停用窗口
     const showStopModal = () => {
       state.stopModal = true;
     };
+    //关闭停用窗口
     const closeStopModal = () => {
       state.stopModal = false;
     };
+    //确认停用
+    const stopLearnPath = () => {
+      let obj = {
+        routerId: state.stopPathId,
+        type: -1,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("停用成功", res);
+          message.destroy();
+          message.success("停用成功");
+          state.stopModal = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("停用失败", err);
+        });
+    };
+
     const showDeleteModal = () => {
       state.deleteModal = true;
     };
@@ -788,12 +861,35 @@ export default {
     const closeStartModal = () => {
       state.startModal = false;
     };
-    const showBackModal = () => {
+    //打开撤回弹窗
+    const showBackModal = (routerId) => {
       state.backModal = true;
+      state.recallPathId = routerId;
     };
+    //关闭撤回弹窗
     const closeBackModal = () => {
       state.backModal = false;
     };
+    //确定撤回
+    const recallPath = () => {
+      let obj = {
+        routerId: state.recallPathId,
+        type: 0,
+      };
+      api
+        .handleLearnPath(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          getLearnPath();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
+    };
+
     const showOwner = () => {
       state.Ownervisible = true;
     };
@@ -909,7 +1005,8 @@ export default {
                         style="cursor:pointer"
                         class="jc"
                         onClick={() => {
-                          showPub();
+                          // console.log("text.record.", text.record);
+                          showPub(text.record.id);
                         }}
                       >
                         发布
@@ -938,45 +1035,52 @@ export default {
                       <div
                         class="jc"
                         onClick={() => {
-                          state.out1 = true;
-                          state.pathName = text.record.manager;
-                          // state.pathBg = "";
-                          // state.organizationSelectName = null;
-                          // state.organizationSelectId = null;
-                          state.pathIntro = text.record.remark;
-                          state.editPathId = text.record.id;
+                          // state.out1 = true;
+                          // state.pathName = text.record.manager;
+                          // // state.pathBg = "";
+                          // // state.organizationSelectName = null;
+                          // // state.organizationSelectId = null;
+                          // state.pathIntro = text.record.remark;
+                          // state.editPathId = text.record.id;
                         }}
-                      >
-                        编辑
-                      </div>
-                    </div>
-                  ) : (
-                    <div></div>
-                  )}
-                  {text.record.state === "未发布" ? (
-                    <div class="fb">
-                      <div
-                        style="cursor:pointer"
-                        class="jc"
-                        onClick={() => {
-                          showCopyModal();
-                        }}
-                      >
-                        复制
-                      </div>
+                      ></div>
                     </div>
                   ) : (
                     <div></div>
                   )}
+                  {
+                    // 	text.record.state === "未发布" ? (
+                    //   <div class="fb">
+                    //     <div
+                    //       style="cursor:pointer"
+                    //       class="jc"
+                    //       onClick={() => {
+                    //         showCopyModal();
+                    //       }}
+                    //     >
+                    //       复制
+                    //     </div>
+                    //   </div>
+                    // ) : (
+                    //   <div></div>
+                    // )
+                  }
                 </div>
                 <div class="tableSelect">
-                  <router-link to="/leveladd">
-                    <div class="g1">管理</div>
-                  </router-link>
+                  <div
+                    class="g1"
+                    onClick={() => {
+                      router.push({
+                        path: "/leveladd",
+                      });
+                      storage.set("routerId", text.record.id);
+                    }}
+                  >
+                    管理
+                  </div>
                   <a-select
                     style="width: 50px;margin-top:2px;margin-left:25px"
                     value="授权"
-                    // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
                     <a-select-option value="权限名单" label="权限名单">
@@ -1022,7 +1126,6 @@ export default {
                     <a-select
                       style="width: 50px;margin-top:2px;margin-right:20px;"
                       value="更多"
-                      // options={state.projectNameList}
                       dropdownClassName="tabledropdown"
                     >
                       <a-select-option
@@ -1045,6 +1148,7 @@ export default {
                       >
                         <div
                           onClick={() => {
+                            state.stopPathId = text.record.id;
                             showStopModal();
                           }}
                         >
@@ -1075,7 +1179,6 @@ export default {
                       <a-select
                         style="width: 50px;margin-top:2px;margin-right:20px;"
                         value="更多"
-                        // options={state.projectNameList}
                         dropdownClassName="tabledropdown"
                       >
                         <a-select-option
@@ -1099,7 +1202,7 @@ export default {
                         >
                           <div
                             onClick={() => {
-                              showBackModal();
+                              showBackModal(text.record.id);
                             }}
                           >
                             撤回
@@ -1110,14 +1213,26 @@ export default {
                   ) : (
                     <div></div>
                   )}
-                  {text.record.state === "未发布" ? (
+                  {text.record.state === "已停用" ? (
                     <div>
                       <a-select
                         style="width: 50px;margin-top:2px;margin-right:20px;"
                         value="更多"
-                        // options={state.projectNameList}
                         dropdownClassName="tabledropdown"
                       >
+                        <a-select-option
+                          value="复制"
+                          label="复制"
+                          style="padding-left:35px"
+                        >
+                          <div
+                            onClick={() => {
+                              showCopyModal();
+                            }}
+                          >
+                            复制
+                          </div>
+                        </a-select-option>
                         <a-select-option
                           value="启用"
                           label="启用"
@@ -1166,9 +1281,16 @@ export default {
     };
     //创建学习路径图
     const createLearnPath = () => {
-      if (!state.pathName) return message.info("请输入路径图名称");
-      // if (!state.organizationSelectName) return message.info("请选择归属组织");
-      // state.createLoading = true;
+      if (!state.pathName) {
+        message.destroy();
+        return message.warning("请输入路径图名称");
+      }
+
+      // if (!state.organizationSelectName){
+      // 	 message.destroy();
+      // 	 return message.warning("请选择归属组织");
+      // }
+      state.lpLoading = true;
       let obj = {
         name: state.pathName,
         picUrl: "",
@@ -1178,14 +1300,30 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          setTimeout(() => {
-            console.log("创建成功", res);
-            message.success("创建成功");
-            // state.createLoading = false;
-            state.currentPage = 1;
-            router.push("/leveladd");
-            // getLearnPath();
-          }, 1000);
+          let chapterObj = {
+            name: "关卡一",
+            remark: "",
+            routerId: res.data.data.routerId,
+          };
+          //创建关卡
+          api
+            .editChapter(chapterObj)
+            .then((chapterRes) => {
+              console.log("关卡创建成功", chapterRes);
+              setTimeout(() => {
+                console.log("创建成功", res);
+                message.destroy();
+                message.success("创建成功");
+                state.lpLoading = false;
+                state.currentPage = 1;
+                router.push("/leveladd");
+                 storage.set("routerId", res.data.data.routerId);
+                // getLearnPath();
+              }, commonData.timeout);
+            })
+            .catch((chapterErr) => {
+              console.log("关卡创建失败", chapterErr);
+            });
         })
         .catch((err) => {
           console.log("创建失败", err);
@@ -1197,12 +1335,16 @@ export default {
       let obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
+        name: state.pathnameSearch,
+        status: state.statusClassify,
+        beginTime: state.startTime,
+        endTime: state.endTime,
       };
       api
         .getLearnPath(obj)
         .then((res) => {
           if (res.status === 200) {
-            console.log("获取路径列表数据", res.data.data);
+            // console.log("获取路径列表数据", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
@@ -1219,31 +1361,6 @@ export default {
         .catch((err) => {
           console.log("获取学习路径失败", err);
         });
-      // let getChapterObj = {
-      //   routerId: 0,
-      // };
-      // api
-      //   .getChapter(getChapterObj)
-      //   .then((res) => {
-      //     console.log("获取关卡数据", res);
-      //   })
-      //   .catch((err) => {
-      //     console.log("获取关卡数据失败", err);
-      //   });
-
-      // let editChapterObj = {
-      //   name: "测试关卡",
-      //   remark: "这是测试关卡说明",
-      //   routerId: 0,
-      // };
-      // api
-      //   .editChapter(editChapterObj)
-      //   .then((res) => {
-      //     console.log("添加测试关卡数据", res);
-      //   })
-      //   .catch((err) => {
-      //     console.log("添加测试关卡数据失败", err);
-      // 	});
     };
     //翻页
     const changePagination = (page) => {
@@ -1258,9 +1375,10 @@ export default {
         type: -2,
       };
       api
-        .deleteLearnPath(obj)
+        .handleLearnPath(obj)
         .then((res) => {
           console.log("删除成功", res);
+          message.destroy();
           message.success("删除成功");
           state.deleteModal = false;
           getLearnPath();
@@ -1271,8 +1389,15 @@ export default {
     };
     //编辑学习路径图
     const editLearnPath = () => {
-      if (!state.pathName) return message.info("请输入路径图名称");
-      // if (!state.organizationSelectName) return message.info("请选择归属组织");
+      if (!state.pathName) {
+        message.destroy();
+        return message.warning("请输入路径图名称");
+      }
+
+      // if (!state.organizationSelectName){
+      // 	 message.destroy();
+      // 	 return message.warning("请选择归属组织");
+      // }
       // state.createLoading = true;
       let obj = {
         routerId: state.editPathId,
@@ -1284,21 +1409,66 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-            // state.createLoading = false;
-            // state.currentPage = 1;
-            state.out1 = false;
-            // router.push("/leveladd");
-            getLearnPath();
-          }, 1000);
+          console.log("修改成功", res);
+          message.destroy();
+          message.success("修改成功");
+          // state.createLoading = false;
+          // state.currentPage = 1;
+          state.out1 = false;
+          // router.push("/leveladd");
+          getLearnPath();
+          // setTimeout(() => {
+          //   console.log("修改成功", res);
+          //   message.success("修改成功");
+          //   // state.createLoading = false;
+          //   // state.currentPage = 1;
+          //   state.out1 = false;
+          //   // router.push("/leveladd");
+          //   getLearnPath();
+          // }, 1000);
         })
         .catch((err) => {
           console.log("修改失败", err);
           // state.createLoading = false;
         });
     };
+    //选择状态
+    const selectStatusClassify = (e, v) => {
+      // console.log("eee", e, v);
+      state.statusValue = e;
+      state.statusClassify = v.classify;
+    };
+    //修改时间
+    const searchTimeChange = (e, date) => {
+      let startTime = date[0] + " 00:00:00";
+      let endTime = date[1] + " 23:59:59";
+      state.startTime = new Date(startTime).getTime() / 1000;
+      state.endTime = new Date(endTime).getTime() / 1000;
+      console.log("e", state.startTime, state.endTime);
+    };
+    //搜索学习路径
+    const searchLearnPath = () => {
+      state.currentPage = 1;
+      console.log(
+        "pathnameSearch",
+        state.pathnameSearch,
+        state.statusClassify,
+        state.startTime,
+        state.endTime
+      );
+      getLearnPath();
+    };
+    //重置学习路径
+    const resetLearnPath = () => {
+      state.currentPage = 1;
+      state.pathnameSearch = null;
+      state.statusValue = null;
+      state.statusClassify = null;
+      state.searchdate = null;
+      state.startTime = null;
+      state.endTime = null;
+      getLearnPath();
+    };
     onMounted(() => {
       // console.log("执行");
       getLearnPath();
@@ -1310,17 +1480,20 @@ export default {
       handleOut,
       handleOut1,
       showPub,
+      releaseLearnPath,
       closePub,
       showCopyModal,
       closeCopyModal,
       showStopModal,
       closeStopModal,
+      stopLearnPath,
       showDeleteModal,
       closeDeleteModal,
       showStartModal,
       closeStartModal,
       showBackModal,
       closeBackModal,
+      recallPath,
       showOwner,
       showPower,
       tableDataFunc,
@@ -1333,6 +1506,10 @@ export default {
       changePagination,
       deleteLearnPath,
       editLearnPath,
+      selectStatusClassify,
+      searchTimeChange,
+      searchLearnPath,
+      resetLearnPath,
     };
   },
 };
@@ -1837,6 +2014,10 @@ export default {
     .filterItems {
       display: flex;
       flex-wrap: wrap;
+      .pathnameInp {
+        margin-right: 20px;
+        margin-bottom: 20px;
+      }
       .select {
         margin-right: 20px;
         margin-bottom: 20px;
@@ -2023,6 +2204,7 @@ export default {
       .g1 {
         color: #4ea6ff;
         font-size: 14px;
+        cursor: pointer;
       }
     }
   }
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0c0c09ba..f5708800 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -42,6 +42,7 @@
         class="tab"
         v-model:activeKey="activeKey"
         size="large"
+        @change="changeTabs"
         :tabBarStyle="{ marginLeft: '10px' }"
       >
         <a-tab-pane key="1" tab="概览">
@@ -257,7 +258,7 @@
               </router-link>
             </div>
             <!-- 无数据显示快速创建 -->
-            <router-link to="/leveladddetail">
+            <router-link :to="{ path: '/leveladddetail' }">
               <div
                 class="taskbox"
                 style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
@@ -492,13 +493,10 @@
                 <button class="addd" @click="showImpStu">导入学员</button>
                 <div class="select">
                   <a-select
-                    v-model:value="projectName"
                     style="width: 130px"
-                    placeholder="更多操作"
+                    value="更多操作"
                     :options="projectNameListt"
                     @change="selectProjectName"
-                    allowClear
-                    showSearch
                   ></a-select>
                 </div>
               </div>
@@ -898,6 +896,11 @@ import TimeManage from "../../components/drawers/TimeManage";
 import TestManage from "../../components/drawers/TestManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import WorkManage from "../../components/drawers/WorkManage";
+// import { useRoute } from "vue-router";
+// import { useStore } from "vuex";
+import * as api from "../../api/index1";
+import { storage } from "../../api/storage";
+
 export default {
   name: "LevelAdd",
   components: {
@@ -913,7 +916,10 @@ export default {
   },
   methods: {},
   setup() {
+    // const routers = useRoute();
+    // const store = useStore();
     const state = reactive({
+      routerId: storage.get("routerId") ?JSON.parse(storage.get("routerId"))  : null, //学习路径页面传的学习路径id
       gatename: null, //关卡名称
       gatenamee: null, //学员管理关卡名称
       deleteAll: false, //批量删除学员弹窗
@@ -1115,7 +1121,7 @@ export default {
       pageSize: 10,
       visiblene: false,
       sh: false,
-      nodata: true,
+      nodata: false,
       closeDeleteAll: false,
       curLevel: "",
       taskSyllabusActive: 0,
@@ -1232,6 +1238,7 @@ export default {
         },
       ],
     });
+    // console.log("store", state.routerId);
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
       if (value === "批量删除") {
@@ -1441,6 +1448,33 @@ export default {
     const closehuodModal = () => {
       state.huodModal = false;
     };
+
+    const changeTabs = (e) => {
+      console.log("切换tabs", e, state.routerId);
+      //学员管理
+      if (e == 3) {
+        getStudent();
+      }
+    };
+    //学员管理------------------------------------------------
+    //获取学员列表
+    const getStudent = () => {
+      let obj = {
+        routerId: state.routerId,
+        pageNo: 1,
+        pageSize: 10,
+      };
+      api
+        .getStudent(obj)
+        .then((res) => {
+          console.log("获取学员列表", res);
+        })
+        .catch((err) => {
+          console.log("获取学员列表失败", err);
+        });
+    };
+
+    //学员管理------------------------------------------------
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1470,6 +1504,7 @@ export default {
       showhuodModal,
       closehuodModal,
       closezhibModal,
+      changeTabs,
     };
   },
 };
@@ -2807,6 +2842,10 @@ export default {
                 }
               }
             }
+            .ant-select-selection-item {
+              padding-left: 15px;
+              color: #4ea6ff;
+            }
           }
         }
         .talk {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index bee8fb92..e491e9d3 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -15,12 +15,49 @@
             v-for="item in level"
             :key="item.id"
           > -->
-          <div
+
+          <draggable
+            v-model="level"
+            chosenClass="chosen"
+            ghostClass="ghost"
+            forceFallback="true"
+            group="stage"
+            animation="500"
+          >
+            <template #item="{ element }">
+              <div
+                class="items"
+                :class="isactive == element.chapterId ? 'active' : ''"
+                @click="changebgc(element.chapterId)"
+              >
+                <div class="items1">
+                  <div class="boxs_left">
+                    <div class="script">
+                      <span style="font-size: 12px; color: #ffffff">说明</span>
+                    </div>
+                    <div class="imgIcon"></div>
+                  </div>
+                  <div class="boxs_right">
+                    <div class="imgIcon"></div>
+                  </div>
+                </div>
+                <div class="items2">
+                  <div class="nname">{{ element.name }}</div>
+                </div>
+                <!-- <div class="itemle">
+              <div class="tit">{{ item.remark }}</div>
+              <div class="name">{{ item.name }}</div>
+            </div> -->
+              </div>
+            </template>
+          </draggable>
+
+          <!-- <div
             class="items"
-            :class="isactive == index && isActive == true ? 'active' : ''"
+            :class="isactive == index ? 'active' : ''"
             @click="changebgc(index)"
             v-for="(item, index) in level"
-            :key="item.id"
+            :key="item.chapterId"
           >
             <div class="items1">
               <div class="boxs_left">
@@ -36,11 +73,8 @@
             <div class="items2">
               <div class="nname">{{ item.name }}</div>
             </div>
-            <!-- <div class="itemle">
-              <div class="tit">{{ item.tit }}</div>
-              <div class="name">{{ item.name }}</div>
-            </div> -->
-          </div>
+           
+          </div> -->
         </div>
       </div>
     </div>
@@ -60,6 +94,12 @@
       <div class="main">
         <div class="inma">
           <div class="name">
+            <div class="d" style="margin-top: 2px; margin-right: 2px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
             <div class="fir">关卡名称：</div>
             <div class="input">
               <a-input
@@ -72,6 +112,15 @@
             <div class="co">{{ value1.length }}/20</div>
           </div>
           <div class="name">
+            <div
+              class="d"
+              style="
+                width: 10px;
+                height: 10px;
+                margin-top: 2px;
+                margin-right: 2px;
+              "
+            ></div>
             <div class="fir">关卡说明：</div>
             <div class="input">
               <a-textarea
@@ -151,24 +200,40 @@
         </div>
         <div class="item">
           <div class="itcon">
-            <div class="img">
+            <div class="img" @click="showDrawerAddHomework">
               <img src="../../assets/images/leveladd/zuo.png" />
             </div>
             <div class="text">作业</div>
           </div>
-          <div class="lin"></div>
-        </div>
-        <div class="item">
-          <div class="itcon">
-            <div class="img">
-              <img src="../../assets/images/leveladd/kao.png" />
-            </div>
-            <div class="text">考试</div>
+          <!-- 添加作业侧弹窗 -->
+          <div>
+            <add-homework
+              flag="0"
+              :workId="editID"
+              v-model:addhomeworkVisible="addhomeworkvisible"
+            />
           </div>
           <div class="lin"></div>
         </div>
         <div class="item">
           <div class="itcon">
+            <div class="img" @click="showDrawerAddTest">
+              <img src="../../assets/images/leveladd/kao.png" />
+            </div>
+            <div class="text">考试</div>
+          </div>
+          <!-- 添加考试侧弹窗 -->
+          <div>
+            <add-test
+              :workId="editID"
+              @clearEditData="clearEditData"
+              v-model:addtestVisible="addtestvisible"
+            />
+          </div>
+          <div class="lin"></div>
+        </div>
+        <div class="item">
+          <div class="itcon" @click="showDrawerAddLive">
             <div class="img">
               <img src="../../assets/images/leveladd/zhi.png" />
             </div>
@@ -177,7 +242,7 @@
           <div class="lin"></div>
         </div>
         <div class="item">
-          <div class="itcon">
+          <div class="itcon" @click="showDrawerAddRef">
             <div class="img">
               <img src="../../assets/images/leveladd/wai.png" />
             </div>
@@ -185,7 +250,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddDiscuss">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tao.png" />
@@ -194,7 +259,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddActive">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/huo.png" />
@@ -203,34 +268,63 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddEval">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/ce.png" />
             </div>
             <div class="text">测评</div>
+            <!-- 添加测评侧弹窗 -->
+            <div>
+              <add-eval
+                v-model:addevalVisible="addevalvisible"
+                v-model:edit="edit"
+                v-model:learn="learn"
+                v-model:isactive="isactive"
+                v-model:routerId="routerId"
+              />
+            </div>
+            <!-- 添加测评侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddInvist">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/diao.png" />
             </div>
             <div class="text">评估</div>
+            <!-- 添加评估侧弹窗 -->
+            <div>
+              <add-invist
+                v-model:addinvistVisible="addinvistvisible"
+                v-model:edit="edit"
+                v-model:learn="learn"
+              />
+            </div>
+            <!-- 添加评估侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tou.png" />
             </div>
             <div class="text">投票</div>
+            <!-- 添加投票侧弹窗 -->
+            <div>
+              <add-vote
+                v-model:addvoteVisible="addvotevisible"
+                v-model:edit="edit"
+                v-model:learn="learn"
+              />
+            </div>
+            <!-- 添加投票侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img
@@ -249,7 +343,7 @@
               <span>任务列表</span>
             </div>
             <div class="tit_right">
-              <div class="btn btn1">
+              <div class="btn btn1" @click="moveTask">
                 <div class="btnText">移动到任务阶段</div>
               </div>
               <div class="btn btn2">
@@ -259,20 +353,170 @@
             </div>
           </div>
           <div class="tableBox">
-            <a-table
-              style="border: 1px solid #f2f6fe"
-              :columns="tableDataFunc()"
-              :data-source="tableData"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :pagination="false"
-              :row-selection="{
-                columnWidth: 30,
-                selectedRowKeys: selectedRowKeys,
-                onChange: onSelectChange,
-              }"
-            />
+            <div
+              style="
+                height: 50px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                background-color: #eff4fc;
+                font-size: 14px;
+                font-weight: 400;
+                color: #999ba3;
+                line-height: 36px;
+                border-bottom: 1px solid #f2f6fc;
+              "
+            >
+              <div
+                style="
+                  width: 87px;
+                  text-align: center;
+                  display: flex;
+                  margin-left: 46px;
+                "
+              >
+                <img
+                  style="
+                    width: 16px;
+                    height: 16px;
+                    cursor: pointer;
+                    margin-top: 12px;
+                  "
+                  :src="
+                    selectAll === 0
+                      ? require('../../assets/images/notSelect.png')
+                      : selectAll === 1
+                      ? require('../../assets/images/selectAll.png')
+                      : require('../../assets/images/select.png')
+                  "
+                  @click="selectRowAll"
+                />
+                <!-- <a-checkbox
+                    v-model:checked="selectAll"
+                    @change="selectRowAll"
+                  >
+                  </a-checkbox> -->
+                <div style="margin-top: 2px; margin-left: 8px">类型</div>
+              </div>
+              <div style="width: 120px; text-align: center">任务名称</div>
+              <div style="width: 120px; text-align: center">必修/选修</div>
+              <div style="width: 87px; text-align: center">时长</div>
+              <div style="width: 120px; text-align: center; margin-right: 20px">
+                操作
+              </div>
+            </div>
+            <draggable
+              v-model="tableData"
+              chosenClass="chosen"
+              ghostClass="ghost"
+              forceFallback="true"
+              group="task"
+              animation="500"
+              @start="onStart"
+              @end="onEnd"
+            >
+              <template #item="{ element }">
+                <div
+                  style="
+                    height: 50px;
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    border-bottom: 1px solid #f2f6fc;
+                    font-size: 14px;
+                    font-weight: 400;
+                    color: #4f5156;
+                    line-height: 36px;
+                  "
+                  class="tableRow"
+                >
+                  <div
+                    style="
+                      width: 87px;
+                      text-align: center;
+                      margin-left: 46px;
+                      position: relative;
+                    "
+                  >
+                    <div class="racona">
+                      <div
+                        class="img"
+                        style="
+                          cursor: pointer;
+                          margin-top: 2px;
+                          margin-right: 9px;
+                          position: absolute;
+                          left: -25px;
+                        "
+                      ></div>
+                      <a-checkbox
+                        :id="element.id"
+                        v-model:checked="element.checked"
+                        @change="changeRow"
+                      >
+                      </a-checkbox>
+                      <div style="margin-top: 2px; margin-left: 8px">
+                        {{ element.lei }}
+                      </div>
+                    </div>
+                  </div>
+                  <div style="width: 120px; text-align: center">
+                    {{ element.creater }}
+                  </div>
+                  <div style="width: 120px; text-align: center">
+                    <div class="opat">
+                      <div class="opacationt clearfix">
+                        <a-switch
+                          style="margin-left: -50px; margin-top: 3px"
+                          :checked="element.checked1"
+                          size="small"
+                          active-color="red"
+                          @click="changeCourseType(element.id)"
+                        />
+                        <div class="showt clearfix">
+                          <div
+                            class="bi"
+                            :style="{
+                              'z-index': element.checked1 ? 999 : 998,
+                            }"
+                          >
+                            必修
+                          </div>
+                          <div class="xuan">选修</div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="width: 87px; text-align: center">
+                    {{ element.cretime }}分钟
+                  </div>
+                  <div
+                    style="width: 120px; text-align: center; margin-right: 20px"
+                  >
+                    <div class="opa">
+                      <div class="opacation">
+                        <span
+                          style="
+                            color: #4ea6ff;
+                            margin-right: 25px;
+                            cursor: pointer;
+                          "
+                          @click="decideType(element.lei, element.courseId)"
+                        >
+                          编辑
+                        </span>
+                        <span
+                          style="color: #4ea6ff; cursor: pointer"
+                          @click="showDeleteModal(element.id)"
+                        >
+                          删除
+                        </span>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </draggable>
           </div>
           <!-- 无数据样式 -->
           <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
@@ -467,6 +711,26 @@
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
+    <!-- 添加讨论侧弹窗 -->
+    <div>
+      <add-discuss
+        v-model:adddiscussVisible="adddiscussvisible"
+        v-model:isStudiscuss="isStudiscuss"
+        v-model:isactive="isactive"
+        v-model:routerId="routerId"
+      />
+    </div>
+    <!-- 添加讨论侧弹窗 -->
+    <!-- 添加活动侧弹窗 -->
+    <div>
+      <add-active
+        v-model:addactiveVisible="addactivevisible"
+        v-model:isStudiscuss="isStudiscuss"
+        v-model:isactive="isactive"
+        v-model:routerId="routerId"
+      />
+    </div>
+    <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
     <a-modal
       v-model:visible="deleteAll"
@@ -497,6 +761,51 @@
         </div>
       </div>
     </a-modal>
+    <!-- 添加直播抽屉 -->
+    <add-live
+      v-model:addliveVisible="addlivevisible"
+      v-model:isStudy="isStudy"
+      v-model:isactive="isactive"
+      v-model:routerId="routerId"
+    />
+    <!-- 添加外链抽屉 -->
+    <add-ref
+      v-model:addrefVisible="addrefvisible"
+      v-model:isStudy="isStudy"
+      v-model:isactive="isactive"
+      v-model:routerId="routerId"
+    />
+    <!-- 是否确认删除任务弹窗 -->
+    <!-- 确认删除阶段弹窗 -->
+    <a-modal
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeConfirm"></div>
+          </div>
+          <div class="body">
+            <span>您确定要删除此任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeConfirm">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteLevelTask">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -504,72 +813,58 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
+import AddHomework from "../../components/drawers/AddHomework.vue";
+import AddTest from "../../components/drawers/AddTest.vue";
+import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
+import AddActive from "../../components/drawers/AddActive.vue";
+import AddEval from "../../components/drawers/AddEval.vue";
+import AddInvist from "../../components/drawers/AddInvist.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
+import AddLive from "../../components/drawers/AddLive.vue";
+import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
+import { GetRouterDetail } from "../../api/indexTask";
 import { message } from "ant-design-vue";
+import { storage } from "../../api/storage";
+import { deleteStudyTask } from "../../api/indexStudy";
+import draggable from "vuedraggable";
 export default {
   name: "LevelAddDetail",
   components: {
     AddStu,
     ImpStu,
+    AddHomework,
+    AddDiscuss,
+    AddActive,
+    AddTest,
+    AddEval,
+    AddInvist,
+    AddVote,
+    AddLive,
+    AddRef,
+    draggable,
   },
   setup() {
     const state = reactive({
+      routerId: storage.get("routerId")
+        ? JSON.parse(storage.get("routerId"))
+        : null,
       level: [
         {
-          id: "1",
-          tit: "关卡1关卡1关卡1关卡1关卡1关卡1",
-          name: "初级产品经理fewfewfwefwefe",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "关卡2",
-          name: "中级产品经理",
+          chapterId: "1",
+          remark: "关卡说明",
+          name: "默认关卡",
         },
       ],
+      isRefEdit: 1, //外链编辑
+      isLiveEdit: 1, //直播编辑
+      EditRefId: null, //要编辑的外链的id
+      EditLiveId: null, //要编辑的直播的id
       tableData: [
         {
           key: 1,
           lei: "在线",
+          routerTaskId: 0,
           // state: "已发布",
           creater: "管理者课程",
           // pubtime: "2022-07-20 14:00:03",
@@ -578,50 +873,6 @@ export default {
           checked1: false,
           checkedd: false,
         },
-        {
-          key: 2,
-          lei: "面授",
-          // state: "草稿",
-          creater: "管理者面授",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 3,
-          lei: "作业",
-          // state: "已停用",
-          creater: "管理者作业",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 4,
-          lei: "考试",
-          // state: "草稿",
-          creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 5,
-          lei: "案例",
-          // state: "草稿",
-          creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "-",
-          haspub: true,
-          checked1: true,
-          checkedd: false,
-        },
       ],
       tableData2: [
         {
@@ -797,27 +1048,54 @@ export default {
       visible: false,
       AddSvisible: false, //添加学员抽屉
       AddImpStuvisible: false, //导入学员抽屉
+      addlivevisible: false, //添加直播抽屉
+      addrefvisible: false, //添加外链抽屉
       modal: false,
       clos: false,
       stm_hs: false,
       deleteAll: false,
       closeDeleteAll: false,
+      deleteModal: false, // 删除弹窗
+      deleteID: "", // 要删除的任务的id
+      editID: "", // 要编辑的任务id
+      isStudy: 1,
+      cC: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
+      edit: false, //是否点击编辑
+      learn: 0,
       gqxy_hs: true,
-      isactive: -1,
-      isActive: false,
+      isactive: 0,
       projectChecked: null, //项目单选框
+      adddiscussvisible: false, //讨论抽屉
+      isStudiscuss: false,
+      addactivevisible: false, //活动抽屉
+      addhomeworkvisible: false,
+      addtestvisible: false,
+      addevalvisible: false,
+      addinvistvisible: false,
+      addvotevisible: false,
+      // 表示当前触发列表的id,用来发送编辑和删除
+      ListChoosedId: 0,
+      selectRow: [], //选择行
+      selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
-
-    //新建或编辑关卡
+    const showDrawerAddDiscuss = () => {
+      state.adddiscussvisible = true;
+      state.isStudiscuss = true;
+    };
+    const showDrawerAddActive = () => {
+      state.addactivevisible = true;
+      state.isStudiscuss = true;
+    };
+    //新建关卡
     const editChapter = () => {
-       if(!state.value1) return message.warning("请输入关卡名称");
+      if (!state.value1) return message.warning("请输入关卡名称");
       let obj = {
         name: state.value1,
         remark: state.value2,
-        routerId: 0,
+        routerId: state.routerId,
       };
       api
         .editChapter(obj)
@@ -836,10 +1114,90 @@ export default {
         .catch((err) => {
           console.log("创建失败", err);
         });
-    }
+    };
+
+    //编辑关卡
+    // const updateChapter = () => {
+    //   let obj = {
+    //     chapterId: state.updateChapterID,
+    //     name: "",
+    //     remark:"",
+    //     routerId: 0,
+    //   };
+    //   api
+    //     .updateChapter(obj)
+    //     .then((res) => {
+    //       console.log("修改成功",res);
+    //       message.success("修改成功");
+    //     })
+    //     .catch((err) => {
+    //       console.log("修改失败",err);
+    //     })
+    // };
     const showDrawer = () => {
       state.visible = true;
     };
+    // 作业和考试的抽屉
+    const showDrawerAddHomework = () => {
+      state.addhomeworkvisible = true;
+      state.ListChoosedId = 0;
+    };
+    const showDrawerAddTest = () => {
+      state.addtestvisible = true;
+      state.ListChoosedId = 0;
+    };
+    //测试评估投票抽屉
+    const showDrawerAddEval = () => {
+      state.addevalvisible = true;
+      state.learn = 1;
+    };
+    const showDrawerAddInvist = () => {
+      state.addinvistvisible = true;
+      state.learn = 1;
+    };
+    const showDrawerAddVote = () => {
+      state.addvotevisible = true;
+      state.learn = 1;
+    };
+
+    // tableData数据赋值方法
+    const dataAssignment = (id) => {
+      console.log(state.level);
+      for (let i = 0; i < state.level.length; i++) {
+        if (state.level[i].chapterId === id) {
+          let array = [];
+          state.level[i].taskList.forEach((element) => {
+            let obj = {
+              id: element.routerTaskId,
+              key: element.routerTaskId,
+              lei: checkType(element.type),
+              creater: element.name,
+              cretime: element.duration,
+              checked1: element.flag,
+              routerTaskId: element.routerTaskId,
+              courseId: element.courseId,
+            };
+            array.push(obj);
+          });
+          state.tableData = array;
+        }
+      }
+    };
+    const getDetail = (index) => {
+      GetRouterDetail(state.routerId)
+        .then((res) => {
+          state.level = res.data.data.chapterList;
+          console.log(state.level);
+          if (index == 0 && state.level.length > 0) {
+            dataAssignment(state.level[0].chapterId);
+            state.isactive = state.level[0].chapterId;
+          }
+          state.deleteModal = false;
+        })
+        .catch((err) => {
+          message.error(err);
+        });
+    };
     const closeDrawer = () => {
       state.visible = false;
     };
@@ -860,119 +1218,145 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-    const tableDataFunc = () => {
-      const columns = [
-        {
-          title: "类型",
-          dataIndex: "state",
-          // width: "30%",
-          key: "state",
-          width: 60,
-          align: "left",
-          className: "classify",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="racona">
-                <div
-                  class="img"
-                  style={{ cursor: "pointer" }}
-                  onClick={() => {
-                    console.log("点击了");
-                  }}
-                ></div>
-                <span> {text.record.lei}</span>
-
-                {/**
-								<div class="img"></div>
-                <a-checkbox class="ch" checked={text.record.checkedd}>
-                  {text.record.lei}
-                </a-checkbox>
-*/}
-              </div>
-            );
-          },
-        },
-        {
-          title: "任务名称",
-          dataIndex: "creater",
-          // width: "30%",
-          key: "creater",
-          width: 200,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "必修/选修",
-          dataIndex: "pubtime",
-          key: "pubtime",
-          // width: 100,
-          align: "center",
-          className: "h",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="opat">
-                <div class="opacationt clearfix">
-                  <a-switch
-                    style="margin-left:-50px;margin-top:3px"
-                    checked={text.record.checked1}
-                    size="small"
-                    active-color="red"
-                    onClick={() => {
-                      console.log("点击了");
-                      text.record.checked1 = !text.record.checked1;
-                    }}
-                  />
-                  <div class="showt clearfix">
-                    <div
-                      class="bi"
-                      style={
-                        text.record.checked1 ? "z-index:999" : "z-index:998"
-                      }
-                    >
-                      必修
-                    </div>
-                    <div class="xuan">选修</div>
-                  </div>
-                </div>
-              </div>
-            );
-          },
-        },
-        {
-          title: "时长",
-          dataIndex: "cretime",
-          key: "cretime",
-          // width: 100,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "操作",
-          className: "h",
-          dataIndex: "opacation",
-          key: "opacation",
-          // width: 100,
-          align: "center",
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: () => {
-            return (
-              <div class="opa">
-                <div class="opacation">
-                  <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
-                    编辑
-                  </span>
-                  <span style="color:#4EA6FF;cursor:pointer">删除</span>
-                </div>
-              </div>
-            );
-          },
-        },
+    // const tableDataFunc = () => {
+    //   const columns = [
+    //     {
+    //       title: "类型",
+    //       dataIndex: "state",
+    //       // width: "30%",
+    //       key: "state",
+    //       width: 60,
+    //       align: "left",
+    //       className: "classify",
+    //       scopedSlots: { customRender: "action" }, //引入的插槽
+    //       customRender: (text) => {
+    //         // console.log(text.record.checked1);
+    //         return (
+    //           <div class="racona">
+    //             <div
+    //               class="img"
+    //               style={{ cursor: "pointer" }}
+    //               onClick={() => {
+    //                 console.log("点击了");
+    //               }}
+    //             ></div>
+    //             <span> {text.record.lei}</span>
+    //           </div>
+    //         );
+    //       },
+    //     },
+    //     {
+    //       title: "任务名称",
+    //       dataIndex: "creater",
+    //       // width: "30%",
+    //       key: "creater",
+    //       width: 200,
+    //       align: "center",
+    //       className: "h",
+    //     },
+    //     {
+    //       title: "必修/选修",
+    //       dataIndex: "pubtime",
+    //       key: "pubtime",
+    //       // width: 100,
+    //       align: "center",
+    //       className: "h",
+    //       scopedSlots: { customRender: "action" }, //引入的插槽
+    //       customRender: (text) => {
+    //         // console.log(text.record.checked1);
+    //         return (
+    //           <div class="opat">
+    //             <div class="opacationt clearfix">
+    //               <a-switch
+    //                 style="margin-left:-50px;margin-top:3px"
+    //                 checked={text.record.checked1}
+    //                 size="small"
+    //                 active-color="red"
+    //                 onClick={() => {
+    //                   console.log("点击了");
+    //                   text.record.checked1 = !text.record.checked1;
+    //                 }}
+    //               />
+    //               <div class="showt clearfix">
+    //                 <div
+    //                   class="bi"
+    //                   style={
+    //                     text.record.checked1 ? "z-index:999" : "z-index:998"
+    //                   }
+    //                 >
+    //                   必修
+    //                 </div>
+    //                 <div class="xuan">选修</div>
+    //               </div>
+    //             </div>
+    //           </div>
+    //         );
+    //       },
+    //     },
+    //     {
+    //       title: "时长",
+    //       dataIndex: "cretime",
+    //       key: "cretime",
+    //       // width: 100,
+    //       align: "center",
+    //       className: "h",
+    //     },
+    //     {
+    //       title: "操作",
+    //       className: "h",
+    //       dataIndex: "opacation",
+    //       key: "opacation",
+    //       // width: 100,
+    //       align: "center",
+    //       scopedSlots: { customRender: "action" }, //引入的插槽
+    //       customRender: (e) => {
+    //         return (
+    //           <div class="opa">
+    //             <div class="opacation">
+    //               <span
+    //                 style="color:#4EA6FF;margin-right:25px;cursor:pointer"
+    //                 onClick={() => {
+    //                   console.log("编辑id", e.record.routerTaskId);
+    //                   console.log("编辑类型", e.record.lei);
+    //                   state.editID = e.record.routerTaskId;
+    //                   //state.addhomeworkvisible = true;
+    //                 }}
+    //               >
+    //                 编辑
+    //               </span>
+    //               <span
+    //                 style="color:#4EA6FF;cursor:pointer"
+    //                 onClick={() => {
+    //                   showDeleteModal(e.record.routerTaskId);
+    //                 }}
+    //               >
+    //                 删除
+    //               </span>
+    //             </div>
+    //           </div>
+    //         );
+    //       },
+    //     },
+    //   ];
+    //   return columns;
+    // };
+    const checkType = (index) => {
+      let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
       ];
-      return columns;
+      return typeRules[index];
     };
     const tableDataFunc2 = () => {
       const columns = [
@@ -990,13 +1374,6 @@ export default {
             return (
               <div class="racona">
                 <span> {text.record.name}</span>
-
-                {/**
-								<div class="img"></div>
-                <a-checkbox class="ch" checked={text.record.checkedd}>
-                  {text.record.lei}
-                </a-checkbox>
-*/}
               </div>
             );
           },
@@ -1158,15 +1535,18 @@ export default {
       document.getElementsByTagName("main")[0].style.background =
         "rgb(245, 247, 250,1)";
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
+      getDetail(0);
     });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
       document.getElementsByTagName("main")[0].style.boxShadow =
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
-    const changebgc = (index) => {
-      state.isactive = index;
-      state.isActive = !state.isActive;
+    const changebgc = (chapterId) => {
+      state.isactive = chapterId;
+      state.selectRow = []; //选择行
+      state.selectAll = 0; //0：未选择，1：全选，2：部分选择
+      dataAssignment(chapterId);
     };
     const gqxy_hShow = () => {
       state.gqxy_hs = !state.gqxy_hs;
@@ -1176,10 +1556,162 @@ export default {
     };
     const delete_exit = () => {
       state.deleteAll = false;
+      deletecTaskAll();
+    };
+    const showDeleteModal = (id) => {
+      state.deleteID = id;
+      console.log(id);
+      state.deleteModal = true;
+    };
+    const closeConfirm = () => {
+      state.deleteModal = false;
+      state.deleteID = "";
+      state.editID = "";
+    };
+    const deleteLevelTask = () => {
+      deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>
+        console.log("删除成功", res)
+      );
+      // RouterDeleteTask(state.listChoosedId)
+      //   .then((res) => {
+      //     console.log(`删除成功${res}`);
+      //     message.success("删除成功");
+      //   })
+      //   .catch((err) => {
+      //     console.log(`删除失败${err}`);
+      //   });
+    };
+
+    const showDrawerAddLive = () => {
+      state.addlivevisible = true;
+    };
+    const showDrawerAddRef = () => {
+      state.addrefvisible = true;
+    };
+
+    const closeDeleteModel = () => {
+      state.deleteModal = false;
+      state.deleteID = "";
+    };
+    // 子组件触发的清空 editid 事件
+    const clearEditData = () => {
+      state.editID = "";
+      getDetail(0);
+    };
+
+    //选择单个任务
+    const changeRow = (e) => {
+      //selectRow:已经选择的任务的id数组
+      let arr = state.selectRow;
+      if (e.target.checked) {
+        arr.push(e.target.id);
+      } else {
+        arr.map((value, index) => {
+          if (value == e.target.id) {
+            arr.splice(index, 1);
+          }
+        });
+      }
+      state.selectRow = arr;
+      //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
+      if (arr.length !== 0) {
+        if (arr.length === state.tableData.length) {
+          state.selectAll = 1;
+        } else {
+          state.selectAll = 2;
+        }
+      } else {
+        state.selectAll = 0;
+      }
+      console.log("state.selectRow", state.selectRow, state.selectAll);
+    };
+    //全选任务或全不选任务
+    const selectRowAll = () => {
+      let arr = state.tableData;
+      let array = [];
+      if (state.selectAll === 0 || state.selectAll === 2) {
+        arr.map((value) => {
+          // console.log("value", value, index);
+          value.checked = true;
+          array.push(value.id);
+          // if (value == e.target.id) {
+          //   arr.splice(index, 1);
+          // }
+          state.selectAll = 1;
+        });
+      } else {
+        array = [];
+        arr.map((value) => {
+          // console.log("value", value, index);
+          value.checked = false;
+          state.selectAll = 0;
+        });
+      }
+      state.tableData = arr;
+      state.selectRow = array;
+    };
+    //批量删除任务
+    const deletecTaskAll = () => {
+      let arr = state.selectRow;
+      console.log("选择的行信息", arr);
+      arr.map((value) => {
+        let obj = {
+          routerTaskIds: value,
+        };
+        console.log("value", value);
+        api
+          .deleteTask(obj)
+          .then((res) => {
+            console.log(res);
+            message.destroy();
+            message.success("批量删除成功");
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      });
+    };
+    //移动任务到关卡
+    const moveTask = () => {
+      let obj = {
+        chapterId: state.isactive,
+        routerTaskIdList: state.selectRow,
+      };
+      api
+        .moveTask(obj)
+        .then((res) => {
+          console.log("移动成功", res);
+          message.destroy();
+          message.success("移动成功");
+        })
+        .catch((err) => {
+          console.log("移动失败", err);
+        });
+    };
+    //打开编辑外链的弹窗
+    const showEditRefDrawer = (id) => {
+      state.addrefvisible = true;
+      state.isRefEdit = 2;
+      state.EditRefId = id;
+    };
+    //打开编辑直播的弹窗
+    const showEditLiveDrawer = (id) => {
+      state.addlivevisible = true;
+      state.isLiveEdit = 2;
+      state.EditLiveId = id;
+    };
+    //编辑的按钮
+    const decideType = (type, id) => {
+      console.log(type, id);
+      if (type == "外链") {
+        showEditRefDrawer(id);
+      } else if (type == "直播") {
+        showEditLiveDrawer(id);
+      }
     };
     return {
       ...toRefs(state),
-      tableDataFunc,
+      // tableDataFunc,
       tableDataFunc2,
       showDrawer,
       closeDrawer,
@@ -1194,14 +1726,147 @@ export default {
       gqxy_hShow,
       showDeleteALLModal,
       delete_exit,
+      closeConfirm,
       drawertableColumns,
       editChapter,
+      // updateChapter,
+      showDrawerAddHomework,
+      showDrawerAddTest,
+      showDrawerAddEval,
+      showDrawerAddInvist,
+      showDrawerAddVote,
+      deleteLevelTask,
+      showDrawerAddLive,
+      showDrawerAddRef,
+      closeDeleteModel,
+      clearEditData,
+      showDrawerAddDiscuss,
+      showDrawerAddActive,
+      selectRowAll,
+      changeRow,
+      deletecTaskAll,
+      moveTask,
+      showDeleteModal,
+      showEditRefDrawer,
+      showEditLiveDrawer,
+      decideType,
     };
   },
 };
 </script>
 
 <style lang="scss">
+.ConfirmModal {
+  .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: 40px;
+            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;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
 .clearfix:after,
 .clearfix:before {
   content: " ";
@@ -1321,9 +1986,9 @@ export default {
                 width: 100px;
                 height: 40px;
                 border-radius: 4px;
-                border: 1px solid #409EFF;
+                border: 1px solid #409eff;
                 font-size: 14px;
-                color: #409EFF;
+                color: #409eff;
                 cursor: pointer;
                 background: #ffffff;
                 margin-right: 20px;
@@ -1336,7 +2001,7 @@ export default {
                 color: #fff;
                 cursor: pointer;
                 border: 0;
-                background: #409EFF;
+                background: #409eff;
               }
             }
           }
@@ -1480,6 +2145,13 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center;
+        .chosen {
+          // background-color: pink;
+        }
+        .ghost {
+          // background-color: red;
+          opacity: 0 !important;
+        }
         .items {
           width: 171px;
           // height: 83px;
@@ -1539,7 +2211,7 @@ export default {
         }
         .active {
           opacity: 1;
-          transition: all 0.5s;
+          // transition: all 0.5s;
         }
       }
     }
@@ -1764,6 +2436,14 @@ export default {
         .tableBox {
           margin-top: 21px;
           margin-bottom: 20px;
+          .chosen {
+            background-color: #f2f6fc;
+            opacity: 1;
+          }
+          .ghost {
+            // background-color: red;
+            opacity: 0;
+          }
           .classify {
             margin-left: 10px !important;
             padding-left: 9px !important;
@@ -2177,6 +2857,7 @@ export default {
         display: flex;
         margin-left: 10px;
         height: 23px;
+        position: relative;
         .bi {
           // margin-top: 10px;
           width: 63px;
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue
index af9fbaf7..369f8e5f 100644
--- a/src/views/projectcenter/ClassAdd.vue
+++ b/src/views/projectcenter/ClassAdd.vue
@@ -1,536 +1,1061 @@
 <!---- 创建班级页面 --->
 <template>
-  <div class="projectAdd">
-    <div class="header">
-      <span class="title">创建/编辑班级</span>
-      <router-link to="/projectmanage" class="goback">
-        <span class="return"></span
-        ><span class="returntext">返回</span></router-link
-      >
-    </div>
-    <div class="content">
-      <div class="main">
-      <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目归属</div>
-          </div>
-          <div class="in">
-            <div style="color: #C7CBD2;font-size: 14px;margin-left: 15px">管理者进阶/管理者进阶-腾飞班</div>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">班级名称</div>
-          </div>
-
-          <div class="in">
-            <a-input class="ant-input1" v-model:value="valueE" placeholder="请输入班级名称" show-count :maxlength="30"/>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :value="classifySelect"
-              placeholder="四个养成"
-              style="width: 100%"
-              :options="classifyList"
-              allowClear
-              showSearch
-            ></a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">封面图</div>
-          </div>
-          <div
-            class="box"
-            style="
+	<div class="projectAdd">
+		<div class="header">
+			<span class="title">创建/编辑班级</span>
+			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
+				<span class="return"></span><span class="returntext">返回</span>
+			</div>
+		</div>
+		<div class="content">
+			<div class="main">
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目归属</div>
+					</div>
+					<div class="in">
+						<div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+							{{ projectAscription }}
+						</div>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">班级名称</div>
+					</div>
+					<div class="in">
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">分类</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
+							@change="classificationChange" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">封面图</div>
+					</div>
+					<div class="box" style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
               border-radius: 5px;
               cursor: pointer;
-            "
-          >
-            <div class="box1"></div>
-            <div class="box2"></div>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目时间</div>
-          </div>
+              position: relative;
+              overflow: hidden;
+            ">
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
+							<img style="
+                  width: 100px;
+                  height: 100px;
+                  margin-bottom: 4px;
+                  margin-right: 4px;
+                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
+							<div v-else>
+								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
+								<!-- <plus-outlined v-else></plus-outlined> -->
+								<div class="box1"></div>
+								<div class="box2"></div>
+								<!-- <div class="ant-upload-text"></div> -->
+							</div>
+						</a-upload>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">子项目时间</div>
+					</div>
 
-          <div class="in">
-            <a-range-picker
-              separator="至"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目经理</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :value="classifySelect"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList"
-              allowClear
-              showSearch
-            ></a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">资源归属</div>
-          </div>
+					<div class="in">
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
+							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">子项目经理</div>
+					</div>
+					<div class="in">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
+							@change="classificationChange1" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">资源归属</div>
+					</div>
 
-          <div class="in">
-            <a-input v-model:value="valueE" placeholder="自动带出 可修改" />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">项目说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="valuei"
-              style="height: 80px"
-              placeholder="请输入项目说明"
-              show-count :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-radio v-model:checked="checked"
-              ><span
-                style="
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
+							@change="classificationChange2" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname" style="margin-top: 13px">项目说明</div>
+					</div>
+					<div class="in">
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname">同步学习记录</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目级别</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">培训体系</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">是否BOEU实施</div>
-          </div>
-          <div class="in">
-            <a-radio v-model:checked="checked"
-              ><span
-                style="
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目级别</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">培训体系</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">是否BOEU实施</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >BOEU实施</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox" style="margin-top: 8px">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">附件</div>
-          </div>
-          <div class="filebox">
-            <div style="cursor: pointer">
-              <img
-                class="fileimg"
-                src="../../assets/images/projectadd/enclosure.png"
-              />
-              <span class="filetext">上传附件</span>
-            </div>
-            <div class="support">
-              支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="template">
-        <div class="name">
-          <div class="inname" style="width: 50px">模板</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-model:value="value1"
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            ></a-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="footer">
-      <div class="btn">
-        <a-button
-          type="primary"
-          style="width: 100px; height: 40px; border-radius: 8px"
-          >确认</a-button
-        >
-        <a-button
-          type="primary"
-          ghost
-          style="
-            width: 100px;
-            height: 40px;
-            margin-left: 14px;
-            border-radius: 8px;
-          "
-          >取消</a-button
-        >
-      </div>
-    </div>
-  </div>
+                ">BOEU实施</span></a-radio>
+					</div>
+				</div>
+				<!-- <div class="name name2">
+					<div class="namebox" style="margin-top: 8px">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">附件</div>
+					</div>
+					<div class="filebox">
+						<div>
+							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
+							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
+								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
+								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
+								<span v-else class="filetext">上传附件</span>
+							</a-upload>
+						</div>
+						<div class="support">
+							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
+						</div>
+					</div>
+				</div> -->
+			</div>
+			<div class="template">
+				<div class="name">
+					<div class="inname" style="width: 50px">模版</div>
+					<div class="in select" style="margin-left: 2px">
+						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+						<a-select v-else :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="footer">
+			<div class="btn">
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
+				<a-button @click="backPage" class="btn2">取消</a-button>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, ref } from "vue";
+import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
+import dayjs from 'dayjs';
+import * as api from "../../api/index";
+import { toDate } from '../../api/method'
+
 export default {
-  name: "sonProject",
-  setup() {
-    const state = reactive({
-      classifyList: [
-        {
-          id: 1,
-          name: "分类一",
-          label: "分类一",
-        },
-        {
-          id: 2,
-          name: "分类二",
-          label: "分类二",
-        },
-        {
-          id: 3,
-          name: "分类三",
-          label: "分类三",
-        },
-        {
-          id: 4,
-          name: "分类四",
-          label: "分类四",
-        },
-      ],
-      classifySelect: null,
-      classifySelectId: null,
-    });
-    return {
-      ...toRefs(state),
-    };
-  },
+	name: "projectAdd",
+	setup() {
+		// 编辑页面跳转过来时候，自动填充表格
+		const routers = useRoute();
+		const router = useRouter();
+		const isEdit = ref(false);
+		let peojectID = "";
+		let paraentID = "";
+
+		const state = reactive({
+			classifySelect: null,
+			classifySelectId: null,
+			checked: false,
+			checked1: false,
+			valueE: null,
+			valueE1: null,
+			valueE2: null,
+			classifySelect1: [],
+			classifySelect2: [],
+			classifySelect3: [],
+			classifySelect4: [],
+			rangevalue: [],
+			projectAscription: "",
+		});
+
+		if (routers.query.name==undefined) {
+			router.push({
+					path: "/projectmanage"
+				});
+		}
+
+		peojectID = routers.query.projectId;
+		state.projectAscription = routers.query.name;
+
+		if (routers.query.edit!==undefined) {
+			isEdit.value = true;
+			// 需要编辑
+			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
+				if (res.status == 200 && res.data.code == 200) {
+					let info = res.data.data.projectInfo;
+					console.log(info)
+					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+					projectName.value = info.name;
+					state.classifySelect = classifyList.value[1]; // info.category
+					imageUrl.value = info.picUrl;
+
+					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
+					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
+					state.rangevalue = [
+						dayjs(start, 'YYYY/MM/DD'),
+						dayjs(end, 'YYYY/MM/DD'),
+					];
+
+					let manageName = info.manager.split(",");
+					let manageValue = info.managerId.split(",");
+					let optionsManage = []
+					for (let i = 0; i < manageName.length; i++) {
+						let obj = {
+							label: manageName[i],
+							value: manageValue[i]
+						}
+						optionsManage.push(obj)
+					}
+					console.log(optionsManage)
+					state.classifySelect1 = optionsManage;
+					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
+					remark.value = info.remark;
+					state.checked = info.boeFlag ? info.boeFlag : false;
+					state.classifySelect3 = classifyList3.value[info.level];
+					state.classifySelect4 = classifyList4.value[info.systemId - 1];
+					state.checked1 = info.boeFlag ? info.boeFlag : false;
+					// fileList1.value = info.attach.split(",");
+
+					projectType = 1;
+					picUrl  = info.picUrl; 
+					beginTime = Number(info.beginTime/1000);
+					endTime   = Number(info.endTime/1000);
+					manager   = info.manager;
+					managerId  = info.managerId;
+					sourceBelongIdC  = Number(info.sourceBelongId);
+					courseSyncFlag  = info.courseSyncFlag; 
+					levels  = info.level;
+					systemid = info.systemId;
+					boeFlag = info.boeFlag;
+					paraentID = Number(info.parentId);
+				}
+			}).catch(err => { console.log(err) })
+		} else {
+			paraentID = Number(routers.query.projectId);
+		}
+		
+		const backPage = () => {
+			setTimeout(() => {
+				router.push({
+					path: "/projectmanage"
+				});
+			}, 400);
+		}
+		
+		
+
+		const projectName = ref("");
+
+		const classifyList = ref([
+			{ value: 1, label: "管理者" },
+			{ value: 2, label: "领军者" },
+			{ value: 3, label: "产业人" },
+		]);
+
+		let projectType = "";
+
+		const classificationChange = (value) => {
+			console.log(`selected ${value}`);
+			projectType = value;
+		};
+
+		function getBase64(img, callback) {
+			const reader = new FileReader();
+			reader.addEventListener("load", () => callback(reader.result));
+			reader.readAsDataURL(img);
+		}
+
+		const fileList = ref([]);
+		const fileList1 = ref([]);
+		const loading = ref(false);
+		const imageUrl = ref("");
+		let picUrl = "";
+
+		const handleChange = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log("上传图片返回的信息 %o", info);
+				picUrl = info.file.response.data;
+				// Get this url from response in real world.
+				getBase64(info.file.originFileObj, (base64Url) => {
+					imageUrl.value = base64Url;
+					loading.value = false;
+				});
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
+
+		let uplodaFileCount = false;
+
+		let attach = "";
+		let attachData = "";
+		const handleChange1 = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log(
+					"上传附件返回的信息 %o",
+					info,
+					info.fileList.length,
+					uplodaFileCount
+				);
+
+				let attachStr = "";
+				attachData = info.fileList;
+				for (let i = 0; i < attachData.length; i++) {
+					if (attachData.length - 1 == i) {
+						attachStr += attachData[i].response.data;
+					} else {
+						attachStr += attachData[i].response.data + ",";
+					}
+				}
+				console.log(attachStr);
+				attach = attachStr;
+
+				if (info.fileList.length > 5) {
+					uplodaFileCount = true;
+				} else {
+					uplodaFileCount = false;
+				}
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
+
+		const beforeUpload = (file) => {
+			const isJpgOrPng =
+				file.type === "image/jpeg" || file.type === "image/png";
+			if (!isJpgOrPng) {
+				message.error("You can only upload JPG file!");
+			}
+			const isLt2M = file.size / 1024 / 1024 < 1;
+			if (!isLt2M) {
+				message.error("Image must smaller than 1MB!");
+			}
+			return isJpgOrPng && isLt2M;
+		};
+
+		const beforeUpload1 = () => {
+			return new Promise((resovle, reject) => {
+				if (uplodaFileCount) {
+					message.info("上传文件数量已达最大数量");
+					return reject(false);
+				}
+				return resovle(true);
+			});
+		};
+
+		let beginTime = "";
+		let endTime = "";
+		const dateFormatList = ['YYYY/MM/DD'];
+
+		const onRangeChange = (value, dateString) => {
+			console.log("Selected Time: ", value);
+			// 项目时间选择函数
+			console.log("Formatted Selected Time: ", dateString);
+			console.log(
+				"Formatted Selected TimeStamp",
+				new Date(dateString[0]).getTime()
+			);
+			beginTime = new Date(dateString[0]).getTime() / 1000;
+			endTime = new Date(dateString[1]).getTime() / 1000;
+		};
+
+		// 项目经理 后续接口调用
+		const classifyList1 = ref([
+			{ value: 1, label: "李俊国" },
+			{ value: 2, label: "将小米" },
+			{ value: 3, label: "刘孟君" },
+		]);
+
+		let manager = "";
+		let managerId = "";
+		const classificationChange1 = (key, options) => {
+			console.log(`selected ${key}`, options);
+			let mstr = "";
+			let midstr = "";
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ",";
+					mstr += classifyList1.value[i].label + ",";
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr);
+			state.classifySelect1 = options;
+			let newoptions = [];
+			for (let i = 0; i < state.classifySelect1.length; i++) {
+				if (state.classifySelect1[i].value) {
+					newoptions.push(state.classifySelect1[i])
+				}
+			}
+			state.classifySelect1 = newoptions;
+			manager = mstr;
+			managerId = midstr;
+		};
+
+		// 资源归属 sourceBelongId 后续给接口
+		const classifyList2 = ref([
+			{ value: 1, label: "项目一" },
+			{ value: 2, label: "项目二" },
+			{ value: 3, label: "项目三" },
+		]);
+
+		let sourceBelongIdC = '';
+		const classificationChange2 = (key) => {
+			console.log(`selected ${key}`, classifyList2);
+			sourceBelongIdC = key;
+		};
+
+		// 项目级别
+		const classifyList3 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let levels = "";
+		const classificationChange3 = (key) => {
+			console.log(`selected ${key}`, classifyList3);
+			levels = key;
+		};
+
+		// 培训体系
+		const classifyList4 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let systemid = "";
+		const classificationChange4 = (key) => {
+			console.log(`selected ${key}`, classifyList4);
+			systemid = key;
+		};
+
+		// 模版
+		const classifyList5 = ref([
+			{ value: 1, label: "模版一" },
+			{ value: 2, label: "模版二" },
+			{ value: 3, label: "模版三" },
+			{ value: 4, label: "模版四" },
+		]);
+		const classificationChange5 = (key) => {
+			console.log(`selected ${key}`, classifyList5);
+		};
+
+		// 项目说明
+		const remark = ref("");
+
+		let courseSyncFlag = 0;
+		const changeChecked = () => {
+			console.log(state.checked);
+			state.checked ? (state.checked = false) : (state.checked = true);
+			courseSyncFlag = state.checked ? 1 : 0;
+		};
+
+		let boeFlag = 0;
+		const changeChecked1 = () => {
+			console.log(state.checked1);
+			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+			boeFlag = state.checked1 ? 1 : 0;
+		};
+
+		const removeFile = (file) => {
+			const index = fileList1.value.indexOf(file);
+			const newFileList = fileList1.value.slice();
+			newFileList.splice(index, 1);
+			fileList1.value = newFileList;
+
+			let attachStr = "";
+			if (newFileList.length == 0) {
+				attachStr = "";
+			}
+			for (let i = 0; i < fileList1["value"].length; i++) {
+				console.log(fileList1["value"][i].response.data);
+				if (fileList1["value"].length - 1 == i) {
+					attachStr += fileList1["value"][i].response.data;
+				} else {
+					attachStr += fileList1["value"][i].response.data + ",";
+				}
+			}
+			attach = attachStr;
+		};
+
+		const errorMsgs = {
+			name: "请输入项目名称",
+			category: "请选择项目分类",
+			picUrl: "请上传项目封面图",
+			beginTime: "请选择项目开始时间",
+			endTime: "请选择项目结束时间",
+			manager: "请选择项目经理",
+			managerId: "请选择项目经理",
+			sourceBelongId: "请选择资源归属",
+			level: "请填写项目级别",
+			systemId: "请填写项目培训体系",
+			boeFlag: "请选择是否BOE实施"
+		};
+		
+		const createProject = () => {
+			console.log('我是否要编辑项目', isEdit.value)
+			if (isEdit.value) {
+				console.log('我要编辑项目', peojectID)
+				let obj = {
+					projectId: Number(peojectID),
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 0,
+					parentId: paraentID,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+
+				console.log(obj);
+
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("编辑成功");
+							setTimeout(() => {
+								router.push({
+									path: "/projectmanage"
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("编辑失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("编辑失败，请检查当前网络状态。");
+					});
+
+			} else {
+				let obj = {
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 10,
+					parentId: paraentID,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+				console.log("提交的数据格式 %o", obj);
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("创建成功");
+							setTimeout(() => {
+								router.push({
+									path: "/taskpage",
+									query: { id: res.data.data.projectId },
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("创建失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("创建失败，请检查当前网络状态。");
+					});
+			}
+		};
+
+		return {
+			...toRefs(state),
+			projectName,
+			classifyList,
+			classificationChange,
+			classificationChange1,
+			classificationChange2,
+			classificationChange3,
+			classificationChange4,
+			classificationChange5,
+			fileList,
+			fileList1,
+			loading,
+			imageUrl,
+			handleChange,
+			handleChange1,
+			beforeUpload,
+			beforeUpload1,
+			onRangeChange,
+			classifyList1,
+			classifyList2,
+			classifyList3,
+			classifyList4,
+			classifyList5,
+			remark,
+			changeChecked,
+			changeChecked1,
+			uplodaFileCount,
+			createProject,
+			removeFile,
+
+			isEdit,
+			backPage,
+			dateFormatList,
+		};
+	},
 };
 </script>
 <style lang="scss">
 .projectAdd {
-  width: 100%;
-  // height: inherit;
-  // flex: 1;
-  // flex-shrink: 0;
-  // overflow-y: scroll;
+	width: 100%;
+	// height: inherit;
+	// flex: 1;
+	// flex-shrink: 0;
+	// overflow-y: auto;
 
-  .header {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    .title {
-      color: #000000;
-      font-size: 18px;
-      //line-height: 36px;
-      padding-top: 30px;
-      padding-left: 37px;
-      //font-weight: 500;
-    }
-    .goback {
-      padding-right: 70px;
-      //padding-top: 37px;
-      position: relative;
-      .return {
-        display: inline-block;
-        width: 42px;
-        height: 42px;
-        margin-top: 17px;
-        margin-right: 10px;
-        background-image: url("../../assets/images/projectadd/return.png");
-      }
-      .returntext {
-        display: inline-block;
-        position: absolute;
-        top: 27px;
-        color: #4ea6ff;
-        font-size: 14px;
-      }
-    }
-  }
-  .content {
-    display: flex;
-    .main {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: left;
-      border-right: 1px solid rgba(153, 155, 163, 0.3);
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
-        //height: 40px;
-        // border: 1px solid black;
-        .namebox {
-          width: 120px;
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-          flex-shrink: 0;
-          .nameimg {
-            width: 10px;
-            height: 10px;
-          }
-        }
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
-        .box {
-          position: relative;
-          margin-left: 14px;
-          .box1 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            width: 50px;
-            margin-left: -25px;
-            margin-top: -5px;
-            border-top: 2px solid rgba(78, 166, 255, 1);
-          }
-          .box2 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            height: 50px;
-            //margin-left: -5px;
-            margin-top: -25px;
-            border-left: 2px solid rgba(78, 166, 255, 1);
-          }
-        }
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-        }
-        .in {
-          margin-left: 14px;
-          flex: 1;
-          // .ant-radio-wrapper {
-          // }
-          .ant-input-textarea-show-count {
-              position: relative;
-              height: 88px;
-            }
-            .ant-input-textarea-show-count::after {
-              position: absolute;
-              right: 10px;
-              bottom: 0px;
-            } 
-          .ant-input {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-          .ant-input1 {
-                border-radius: 5px;
-                width: 100%;
-            .ant-input {
-                height: 30px;               
-            }
-          }
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
-        .filebox {
-          margin-left: 14px;
-          flex: 1;
-          .fileimg {
-            width: 15px;
-            height: 15px;
-            margin-right: 6px;
-          }
-          .filetext {
-            font-size: 14px;
-            font-weight: 400;
-            color: #4ea6ff;
-            line-height: 36px;
-          }
-          .support {
-            font-size: 14px;
-            font-weight: 400;
-            color: #999ba3;
-            line-height: 36px;
-            //margin-top: 8px;
-            word-break: break-all;
-          }
-        }
-      }
-      .name2 {
-        display: flex;
-        align-items: flex-start;
-        .ant-input-textarea {
-            .ant-input {
-                height: 88px;
-            }
-        }
-      }
-    }
-    .template {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: right;
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
-        height: 40px;
-        // border: 1px solid black;
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-          width: 65px;
-        }
-        .in {
-          margin-left: 14px;
-          width: 81%;
-          .ant-input {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
-      }
-    }
-  }
-  .footer {
-    width: 100%;
-    margin-top: 31px;
-    margin-bottom: 14px;
-    padding-bottom: 20px;
-    .btn {
-      display: flex;
-      justify-content: center;
-    }
-    .text {
-      color: rgba(153, 155, 163, 1);
-      font-size: 14px;
-      margin-left: 223px;
-    }
-  }
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+
+		.title {
+			color: #000000;
+			font-size: 18px;
+			//line-height: 36px;
+			padding-top: 30px;
+			padding-left: 37px;
+			//font-weight: 500;
+		}
+
+		.goback {
+			padding-right: 70px;
+			//padding-top: 37px;
+			position: relative;
+
+			.return {
+				display: inline-block;
+				width: 42px;
+				height: 42px;
+				margin-top: 17px;
+				margin-right: 10px;
+				background-image: url("../../assets/images/projectadd/return.png");
+			}
+
+			.returntext {
+				display: inline-block;
+				position: absolute;
+				top: 27px;
+				color: #4ea6ff;
+				font-size: 14px;
+			}
+		}
+	}
+
+	// 修改 antd upload 样式
+	.ant-upload {
+		border-width: 0px;
+	}
+
+	.content {
+		display: flex;
+
+		.main {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: left;
+			border-right: 1px solid rgba(153, 155, 163, 0.3);
+
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
+
+				//height: 40px;
+				// border: 1px solid black;
+				.namebox {
+					width: 120px;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					flex-shrink: 0;
+
+					.nameimg {
+						width: 10px;
+						height: 10px;
+					}
+				}
+
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
+
+				.box {
+					position: relative;
+					margin-left: 14px;
+
+					.box1 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						width: 50px;
+						margin-left: -25px;
+						margin-top: -5px;
+						border-top: 2px solid rgba(78, 166, 255, 1);
+					}
+
+					.box2 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						height: 50px;
+						//margin-left: -5px;
+						margin-top: -25px;
+						border-left: 2px solid rgba(78, 166, 255, 1);
+					}
+				}
+
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+				}
+
+				.in {
+					margin-left: 14px;
+					flex: 1;
+
+					// .ant-radio-wrapper {
+					// }
+					.ant-input-textarea-show-count {
+						position: relative;
+						height: 88px;
+					}
+
+					.ant-input-textarea-show-count::after {
+						position: absolute;
+						right: 10px;
+						bottom: 0px;
+					}
+
+					.ant-input {
+						border-radius: 8px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+
+					.ant-input-affix-wrapper {
+						padding: 0 11px;
+						border-radius: 8px;
+					}
+
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
+
+				.filebox {
+					margin-left: 14px;
+					flex: 1;
+
+					.fileimg {
+						width: 15px;
+						height: 15px;
+						margin-right: 6px;
+					}
+
+					.filetext {
+						font-size: 14px;
+						font-weight: 400;
+						color: #4ea6ff;
+						line-height: 36px;
+					}
+
+					.support {
+						font-size: 14px;
+						font-weight: 400;
+						color: #999ba3;
+						line-height: 36px;
+						margin-top: 8px;
+						word-break: break-all;
+					}
+				}
+			}
+
+			.name2 {
+				display: flex;
+				align-items: flex-start;
+
+				.ant-input-textarea {
+					.ant-input {
+						height: 88px;
+					}
+				}
+			}
+		}
+
+		.template {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: right;
+
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
+				height: 40px;
+
+				// border: 1px solid black;
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
+
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+					width: 65px;
+				}
+
+				.in {
+					margin-left: 14px;
+					width: 81%;
+
+					.ant-input {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer {
+		width: 100%;
+		margin-top: 31px;
+		margin-bottom: 14px;
+		padding-bottom: 20px;
+
+		.btn {
+			display: flex;
+			justify-content: center;
+
+			.btn1 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				background: #409eff;
+				color: #ffffff;
+				margin-right: 14px;
+			}
+
+			.btn2 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				border: 1px solid #409eff;
+				background: #ffffff;
+				color: #409eff;
+			}
+		}
+
+		.text {
+			color: rgba(153, 155, 163, 1);
+			font-size: 14px;
+			margin-left: 223px;
+		}
+	}
 }
 </style>
+
+
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5fcfc04b..e21cafdd 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -1,68 +1,44 @@
 <!---- 创建项目页面 --->
 <template>
-  <div class="projectAdd">
-    <div class="header">
-      <span class="title">创建/编辑单层项目</span>
-      <router-link to="/projectmanage" class="goback">
-        <span class="return"></span><span class="returntext">返回</span>
-      </router-link>
-    </div>
-    <div class="content">
-      <div class="main">
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目名称</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="projectName"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect"
-              placeholder="四个养成"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-            >
-            </a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">封面图</div>
-          </div>
-          <div
-            class="box"
-            style="
+	<div class="projectAdd">
+		<div class="header">
+			<span class="title">创建/编辑单层项目</span>
+			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
+				<span class="return"></span><span class="returntext">返回</span>
+			</div>
+		</div>
+		<div class="content">
+			<div class="main">
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目名称</div>
+					</div>
+					<div class="in">
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">分类</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
+							@change="classificationChange" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">封面图</div>
+					</div>
+					<div class="box" style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -70,819 +46,1044 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            "
-          >
-            <a-upload
-              v-model:file-list="fileList"
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              action="/api/file/upload"
-              :before-upload="beforeUpload"
-              @change="handleChange"
-            >
-              <img
-                style="
+            ">
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
+							<img style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                "
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
-              />
-              <div v-else>
-                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
-                <!-- <plus-outlined v-else></plus-outlined> -->
-                <div class="box1"></div>
-                <div class="box2"></div>
-                <!-- <div class="ant-upload-text"></div> -->
-              </div>
-            </a-upload>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目时间</div>
-          </div>
+                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
+							<div v-else>
+								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
+								<!-- <plus-outlined v-else></plus-outlined> -->
+								<div class="box1"></div>
+								<div class="box2"></div>
+								<!-- <div class="ant-upload-text"></div> -->
+							</div>
+						</a-upload>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目时间</div>
+					</div>
 
-          <div class="in">
-            <a-range-picker
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-              @change="onRangeChange"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目经理</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              :value="classifySelect1"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-            >
-            </a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">资源归属</div>
-          </div>
+					<div class="in">
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
+							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目经理</div>
+					</div>
+					<div class="in">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
+							@change="classificationChange1" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">资源归属</div>
+					</div>
 
-          <div class="in">
-            <a-input v-model:value="valueE" placeholder="自动带出 可修改" />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">项目说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-radio @click="changeChecked" v-model:checked="checked"
-              ><span
-                style="
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
+							@change="classificationChange2" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname" style="margin-top: 13px">项目说明</div>
+					</div>
+					<div class="in">
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname">同步学习记录</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目级别</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE1"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">培训体系</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE2"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">是否BOEU实施</div>
-          </div>
-          <div class="in">
-            <a-radio @click="changeChecked1" v-model:checked="checked1"
-              ><span
-                style="
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目级别</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">培训体系</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">是否BOEU实施</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >BOEU实施</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox" style="margin-top: 8px">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">附件</div>
-          </div>
-          <div class="filebox">
-            <div>
-              <img
-                v-if="fileList1.length < 6"
-                class="fileimg"
-                src="../../assets/images/projectadd/enclosure.png"
-              />
-              <a-upload
-                :disabled="fileList1.length > 5"
-                :before-upload="beforeUpload1"
-                v-model:file-list="fileList1"
-                @remove="removeFile"
-                name="file"
-                action="/api/file/upload"
-                :headers="headers"
-                @change="handleChange1"
-              >
-                <!-- <a-button> -->
-                <!-- <upload-outlined></upload-outlined> -->
-                <span v-if="fileList1.length > 5" class="filetext"
-                  >上传数量已经达到最大值</span
-                >
-                <span v-else class="filetext">上传附件</span>
-                <!-- </a-button> -->
-              </a-upload>
-            </div>
-            <div class="support">
-              支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="template">
-        <div class="name">
-          <div class="inname" style="width: 50px">模板</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-model:value="value1"
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            >
-            </a-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="footer">
-      <div class="btn">
-        <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定</a-button
-        >
-        <a-button class="btn2">取消</a-button>
-      </div>
-    </div>
-  </div>
+                ">BOEU实施</span></a-radio>
+					</div>
+				</div>
+				<!-- <div class="name name2">
+					<div class="namebox" style="margin-top: 8px">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">附件</div>
+					</div>
+					<div class="filebox">
+						<div>
+							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
+							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
+								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
+								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
+								<span v-else class="filetext">上传附件</span>
+							</a-upload>
+						</div>
+						<div class="support">
+							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
+						</div>
+					</div>
+				</div> -->
+			</div>
+			<div class="template">
+				<div class="name">
+					<div class="inname" style="width: 50px">模版</div>
+					<div class="in select" style="margin-left: 2px">
+						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+						<a-select v-else :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="footer">
+			<div class="btn">
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
+				<a-button @click="backPage" class="btn2">取消</a-button>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
+import dayjs from 'dayjs';
 import * as api from "../../api/index";
+import { storage } from '../../api/storage';
+import { toDate } from '../../api/method'
 
 export default {
-  name: "projectAdd",
-  setup() {
-    const state = reactive({
-      classifySelect: null,
-      classifySelectId: null,
-      checked: false,
-      checked1: false,
-      valueE: null,
-      valueE1: null,
-      valueE2: null,
-    });
+	name: "projectAdd",
+	setup() {
+		// 编辑页面跳转过来时候，自动填充表格
+		const routers = useRoute();
+		const isEdit = ref(false);
+		let peojectID = "";
 
-    const projectName = ref("");
+		if (routers.query.projectId) {
+			storage.set("projectAddId", routers.query.projectId);
+			isEdit.value = true;
+			peojectID = routers.query.projectId;
+			// 需要编辑
+			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
+				if (res.status == 200 && res.data.code == 200) {
+					let info = res.data.data.projectInfo;
+					console.log(info)
+					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+					projectName.value = info.name;
+					state.classifySelect = classifyList.value[1]; // info.category
+					imageUrl.value = info.picUrl;
 
-    const classifyList = ref([
-      { value: 1, label: "管理者" },
-      { value: 2, label: "领军者" },
-      { value: 3, label: "产业人" },
-    ]);
+					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
+					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
+					state.rangevalue = [
+						dayjs(start, 'YYYY/MM/DD'),
+						dayjs(end, 'YYYY/MM/DD'),
+					];
 
-    let projectType = "";
+					let manageName = info.manager.split(",");
+					let manageValue = info.managerId.split(",");
+					let optionsManage = []
+					for (let i = 0; i < manageName.length; i++) {
+						let obj = {
+							label: manageName[i],
+							value: manageValue[i]
+						}
+						optionsManage.push(obj)
+					}
+					console.log(optionsManage)
+					state.classifySelect1 = optionsManage;
+					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
+					remark.value = info.remark;
+					state.checked = info.boeFlag ? info.boeFlag : false;
+					state.classifySelect3 = classifyList3.value[info.level];
+					state.classifySelect4 = classifyList4.value[info.systemId - 1];
+					state.checked1 = info.boeFlag ? info.boeFlag : false;
+					// fileList1.value = info.attach.split(",");
 
-    const classificationChange = (value) => {
-      console.log(`selected ${value}`);
-      projectType = value;
-    };
+					projectType = 1;
+					picUrl  = info.picUrl; 
+					beginTime = Number(info.beginTime/1000);
+					endTime   = Number(info.endTime/1000);
+					manager   = info.manager;
+					managerId  = info.managerId;
+					sourceBelongIdC  = Number(info.sourceBelongId);
+					courseSyncFlag  = info.courseSyncFlag; 
+					levels  = info.level;
+					systemid = info.systemId;
+					boeFlag = info.boeFlag;
+				}
+			}).catch(err => { console.log(err) })
+		} else {
+			if (storage.get("projectAddId")) {
+				isEdit.value = true;
+				peojectID = storage.get("projectAddId");
+				// 需要编辑
+				api.getProjectDetail({ projectId: storage.get("projectAddId") }).then(res => {
+					if (res.status == 200 && res.data.code == 200) {
+						let info = res.data.data.projectInfo;
+						console.log("我是从本地存储获取的id", info)
+						projectName.value = info.name;
+					state.classifySelect = classifyList.value[1]; // info.category
+					imageUrl.value = info.picUrl;
 
-    function getBase64(img, callback) {
-      const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
-      reader.readAsDataURL(img);
-    }
+					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
+					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
+					state.rangevalue = [
+						dayjs(start, 'YYYY/MM/DD'),
+						dayjs(end, 'YYYY/MM/DD'),
+					];
 
-    const fileList = ref([]);
-    const fileList1 = ref([]);
-    const loading = ref(false);
-    const imageUrl = ref("");
-    let picUrl = "";
+					let manageName = info.manager.split(",");
+					let manageValue = info.managerId.split(",");
+					let optionsManage = []
+					for (let i = 0; i < manageName.length; i++) {
+						let obj = {
+							label: manageName[i],
+							value: manageValue[i]
+						}
+						optionsManage.push(obj)
+					}
+					console.log(optionsManage)
+					state.classifySelect1 = optionsManage;
+					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
+					remark.value = info.remark;
+					state.checked = info.boeFlag ? info.boeFlag : false;
+					state.classifySelect3 = classifyList3.value[info.level];
+					state.classifySelect4 = classifyList4.value[info.systemId - 1];
+					state.checked1 = info.boeFlag ? info.boeFlag : false;
 
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info);
-        picUrl = info.file.response.data;
-        // Get this url from response in real world.
-        getBase64(info.file.originFileObj, (base64Url) => {
-          imageUrl.value = base64Url;
-          loading.value = false;
-        });
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
+					projectType = 1;
+					picUrl  = info.picUrl; 
+					beginTime = Number(info.beginTime/1000);
+					endTime   = Number(info.endTime/1000);
+					manager   = info.manager;
+					managerId  = info.managerId;
+					sourceBelongIdC  = Number(info.sourceBelongId);
+					courseSyncFlag  = info.courseSyncFlag; 
+					levels  = info.level;
+					systemid = info.systemId;
+					boeFlag = info.boeFlag;
+					}
+				}).catch(err => { console.log(err) })
+			}
+		}
 
-    let uplodaFileCount = false;
+		const backPage = () => {
+			storage.remove("projectAddId");
+			setTimeout(() => {
+				router.push({
+					path: "/projectmanage"
+				});
+			}, 400);
+		}
 
-    let attach = "";
-    let attachData = "";
-    const handleChange1 = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log(
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
-        );
+		const router = useRouter();
+		const state = reactive({
+			classifySelect: null,
+			classifySelectId: null,
+			checked: false,
+			checked1: false,
+			valueE: null,
+			valueE1: null,
+			valueE2: null,
+			classifySelect1: [],
+			classifySelect2: [],
+			classifySelect3: [],
+			classifySelect4: [],
+			rangevalue: []
+		});
 
-        let attachStr = "";
-        attachData = info.fileList;
-        for (let i = 0; i < attachData.length; i++) {
-          if (attachData.length - 1 == i) {
-            attachStr += attachData[i].response.data;
-          } else {
-            attachStr += attachData[i].response.data + ",";
-          }
-        }
-        console.log(attachStr);
-        attach = attachStr;
+		const projectName = ref("");
 
-        if (info.fileList.length > 5) {
-          uplodaFileCount = true;
-        } else {
-          uplodaFileCount = false;
-        }
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
+		const classifyList = ref([
+			{ value: 1, label: "管理者" },
+			{ value: 2, label: "领军者" },
+			{ value: 3, label: "产业人" },
+		]);
 
-    const beforeUpload = (file) => {
-      const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
-      if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
-      }
-      return isJpgOrPng && isLt2M;
-    };
+		let projectType = "";
 
-    const beforeUpload1 = () => {
-      return new Promise((resovle, reject) => {
-        if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
-          return reject(false);
-        }
-        return resovle(true);
-      });
-    };
+		const classificationChange = (value) => {
+			console.log(`selected ${value}`);
+			projectType = value;
+		};
 
-    let beginTime = "";
-    let endTime = "";
-    const onRangeChange = (value, dateString) => {
-      console.log("Selected Time: ", value);
-      // 项目时间选择函数
-      console.log("Formatted Selected Time: ", dateString);
-      console.log(
-        "Formatted Selected TimeStamp",
-        new Date(dateString[0]).getTime()
-      );
-      beginTime = new Date(dateString[0]).getTime();
-      endTime = new Date(dateString[1]).getTime();
-    };
+		function getBase64(img, callback) {
+			const reader = new FileReader();
+			reader.addEventListener("load", () => callback(reader.result));
+			reader.readAsDataURL(img);
+		}
 
-    // 项目经理 后续接口调用
-    const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
-    ]);
+		const fileList = ref([]);
+		const fileList1 = ref([]);
+		const loading = ref(false);
+		const imageUrl = ref("");
+		let picUrl = "";
 
-    let manager = "";
-    let managerId = "";
-    const classificationChange1 = (key) => {
-      console.log(`selected ${key}`);
-      console.log(classifyList1.value[key - 1].label);
-      manager = String(classifyList1.value[key - 1].label);
-      managerId = String(key);
-    };
+		const handleChange = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log("上传图片返回的信息 %o", info);
+				picUrl = info.file.response.data;
+				// Get this url from response in real world.
+				getBase64(info.file.originFileObj, (base64Url) => {
+					imageUrl.value = base64Url;
+					loading.value = false;
+				});
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
 
-    // 资源归属 sourceBelongId 后续给接口
+		let uplodaFileCount = false;
 
-    // 项目说明
-    const remark = ref("");
+		let attach = "";
+		let attachData = "";
+		const handleChange1 = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log(
+					"上传附件返回的信息 %o",
+					info,
+					info.fileList.length,
+					uplodaFileCount
+				);
 
-    let courseSyncFlag = 0;
-    const changeChecked = () => {
-      console.log(state.checked);
-      state.checked ? (state.checked = false) : (state.checked = true);
-      courseSyncFlag = state.checked ? 1 : 0;
-    };
+				let attachStr = "";
+				attachData = info.fileList;
+				for (let i = 0; i < attachData.length; i++) {
+					if (attachData.length - 1 == i) {
+						attachStr += attachData[i].response.data;
+					} else {
+						attachStr += attachData[i].response.data + ",";
+					}
+				}
+				console.log(attachStr);
+				attach = attachStr;
 
-    let boeFlag = 0;
-    const changeChecked1 = () => {
-      console.log(state.checked1);
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-      boeFlag = state.checked1 ? 1 : 0;
-    };
+				if (info.fileList.length > 5) {
+					uplodaFileCount = true;
+				} else {
+					uplodaFileCount = false;
+				}
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
 
-    const removeFile = (file) => {
-      const index = fileList1.value.indexOf(file);
-      const newFileList = fileList1.value.slice();
-      newFileList.splice(index, 1);
-      fileList1.value = newFileList;
+		const beforeUpload = (file) => {
+			const isJpgOrPng =
+				file.type === "image/jpeg" || file.type === "image/png";
+			if (!isJpgOrPng) {
+				message.error("You can only upload JPG file!");
+			}
+			const isLt2M = file.size / 1024 / 1024 < 1;
+			if (!isLt2M) {
+				message.error("Image must smaller than 1MB!");
+			}
+			return isJpgOrPng && isLt2M;
+		};
 
-      let attachStr = "";
-      if (newFileList.length == 0) {
-        attachStr = "";
-      }
-      for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
-        if (fileList1["value"].length - 1 == i) {
-          attachStr += fileList1["value"][i].response.data;
-        } else {
-          attachStr += fileList1["value"][i].response.data + ",";
-        }
-      }
-      attach = attachStr;
-    };
+		const beforeUpload1 = () => {
+			return new Promise((resovle, reject) => {
+				if (uplodaFileCount) {
+					message.info("上传文件数量已达最大数量");
+					return reject(false);
+				}
+				return resovle(true);
+			});
+		};
 
-    const errorMsgs = {
-      name: "请输入项目名称",
-      type: "请选择项目分类",
-      picUrl: "请上传项目封面图",
-      beginTime: "请选择项目开始时间",
-      endTime: "请选择项目结束时间",
-      manager: "请选择项目经理",
-      managerId: "请选择项目经理",
-      sourceBelongId: "请选择资源归属",
-      level: "请填写项目级别",
-      systemId: "请填写项目培训体系",
-      boeFlag: "请选择是否BOE实施",
-      attach: "请上传附件",
-    };
+		let beginTime = "";
+		let endTime = "";
+		const dateFormatList = ['YYYY/MM/DD'];
 
-    const createProject = () => {
-      let obj = {
-        name: projectName["value"],
-        type: projectType,
-        picUrl: picUrl,
-        beginTime: beginTime,
-        endTime: endTime,
-        manager: manager,
-        managerId: managerId,
-        sourceBelongId: 11,
-        remark: remark["value"],
-        courseSyncFlag: courseSyncFlag,
-        level: 3,
-        systemId: 4,
-        boeFlag: boeFlag,
-        attach: attach,
-        templateId: 10,
+		const onRangeChange = (value, dateString) => {
+			console.log("Selected Time: ", value);
+			// 项目时间选择函数
+			console.log("Formatted Selected Time: ", dateString);
+			console.log(
+				"Formatted Selected TimeStamp",
+				new Date(dateString[0]).getTime()
+			);
+			beginTime = new Date(dateString[0]).getTime() / 1000;
+			endTime = new Date(dateString[1]).getTime() / 1000;
+		};
 
-        category: 0,
-        notice: "",
-        noticeFlag: 0,
-        status: 0,
-      };
-      console.log("提交的数据格式 %o", obj);
-      for (let i in errorMsgs) {
-        console.log(obj[i]);
-        if (obj[i] === "") {
-          message.destroy();
-          message.warning(errorMsgs[i]);
-          return;
-        }
-      }
+		// 项目经理 后续接口调用
+		const classifyList1 = ref([
+			{ value: 1, label: "李俊国" },
+			{ value: 2, label: "将小米" },
+			{ value: 3, label: "刘孟君" },
+		]);
 
-      api
-        .createProject(obj)
-        .then((res) => {
-          console.log(res);
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
+		let manager = "";
+		let managerId = "";
+		const classificationChange1 = (key, options) => {
+			console.log(`selected ${key}`, options);
+			let mstr = "";
+			let midstr = "";
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ",";
+					mstr += classifyList1.value[i].label + ",";
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr);
+			state.classifySelect1 = options;
+			let newoptions = [];
+			for (let i = 0; i < state.classifySelect1.length; i++) {
+				if (state.classifySelect1[i].value) {
+					newoptions.push(state.classifySelect1[i])
+				}
+			}
+			state.classifySelect1 = newoptions;
+			manager = mstr;
+			managerId = midstr;
+		};
 
-    return {
-      ...toRefs(state),
-      projectName,
-      classifyList,
-      classificationChange,
-      classificationChange1,
-      fileList,
-      fileList1,
-      loading,
-      imageUrl,
-      handleChange,
-      handleChange1,
-      beforeUpload,
-      beforeUpload1,
-      onRangeChange,
-      classifyList1,
-      remark,
-      changeChecked,
-      changeChecked1,
-      uplodaFileCount,
-      createProject,
-      removeFile,
-    };
-  },
+		// 资源归属 sourceBelongId 后续给接口
+		const classifyList2 = ref([
+			{ value: 1, label: "项目一" },
+			{ value: 2, label: "项目二" },
+			{ value: 3, label: "项目三" },
+		]);
+
+		let sourceBelongIdC = '';
+		const classificationChange2 = (key) => {
+			console.log(`selected ${key}`, classifyList2);
+			sourceBelongIdC = key;
+		};
+
+		// 项目级别
+		const classifyList3 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let levels = "";
+		const classificationChange3 = (key) => {
+			console.log(`selected ${key}`, classifyList3);
+			levels = key;
+		};
+
+		// 培训体系
+		const classifyList4 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let systemid = "";
+		const classificationChange4 = (key) => {
+			console.log(`selected ${key}`, classifyList4);
+			systemid = key;
+		};
+
+		// 模版
+		const classifyList5 = ref([
+			{ value: 1, label: "模版一" },
+			{ value: 2, label: "模版二" },
+			{ value: 3, label: "模版三" },
+			{ value: 4, label: "模版四" },
+		]);
+		const classificationChange5 = (key) => {
+			console.log(`selected ${key}`, classifyList5);
+		};
+
+		// 项目说明
+		const remark = ref("");
+
+		let courseSyncFlag = 0;
+		const changeChecked = () => {
+			console.log(state.checked);
+			state.checked ? (state.checked = false) : (state.checked = true);
+			courseSyncFlag = state.checked ? 1 : 0;
+		};
+
+		let boeFlag = 0;
+		const changeChecked1 = () => {
+			console.log(state.checked1);
+			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+			boeFlag = state.checked1 ? 1 : 0;
+		};
+
+		const removeFile = (file) => {
+			const index = fileList1.value.indexOf(file);
+			const newFileList = fileList1.value.slice();
+			newFileList.splice(index, 1);
+			fileList1.value = newFileList;
+
+			let attachStr = "";
+			if (newFileList.length == 0) {
+				attachStr = "";
+			}
+			for (let i = 0; i < fileList1["value"].length; i++) {
+				console.log(fileList1["value"][i].response.data);
+				if (fileList1["value"].length - 1 == i) {
+					attachStr += fileList1["value"][i].response.data;
+				} else {
+					attachStr += fileList1["value"][i].response.data + ",";
+				}
+			}
+			attach = attachStr;
+		};
+
+		const errorMsgs = {
+			name: "请输入项目名称",
+			category: "请选择项目分类",
+			picUrl: "请上传项目封面图",
+			beginTime: "请选择项目开始时间",
+			endTime: "请选择项目结束时间",
+			manager: "请选择项目经理",
+			managerId: "请选择项目经理",
+			sourceBelongId: "请选择资源归属",
+			level: "请填写项目级别",
+			systemId: "请填写项目培训体系",
+			boeFlag: "请选择是否BOE实施"
+		};
+		
+		const createProject = () => {
+			console.log('我是否要编辑项目', isEdit.value)
+			if (isEdit.value) {
+				console.log('我要编辑项目', peojectID)
+				let obj = {
+					projectId: Number(peojectID),
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 0,
+					parentId: 0,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+
+				console.log(obj);
+
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("编辑成功");
+							setTimeout(() => {
+								router.push({
+									path: "/projectmanage"
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("编辑失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("编辑失败，请检查当前网络状态。");
+					});
+
+			} else {
+				let obj = {
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 10,
+					parentId: 0,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+				console.log("提交的数据格式 %o", obj);
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("创建成功");
+							setTimeout(() => {
+								router.push({
+									path: "/taskpage",
+									query: { id: res.data.data.projectId },
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("创建失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("创建失败，请检查当前网络状态。");
+					});
+			}
+		};
+
+		return {
+			...toRefs(state),
+			projectName,
+			classifyList,
+			classificationChange,
+			classificationChange1,
+			classificationChange2,
+			classificationChange3,
+			classificationChange4,
+			classificationChange5,
+			fileList,
+			fileList1,
+			loading,
+			imageUrl,
+			handleChange,
+			handleChange1,
+			beforeUpload,
+			beforeUpload1,
+			onRangeChange,
+			classifyList1,
+			classifyList2,
+			classifyList3,
+			classifyList4,
+			classifyList5,
+			remark,
+			changeChecked,
+			changeChecked1,
+			uplodaFileCount,
+			createProject,
+			removeFile,
+
+			isEdit,
+			backPage,
+			dateFormatList,
+		};
+	},
 };
 </script>
 <style lang="scss">
 .projectAdd {
-  width: 100%;
-  // height: inherit;
-  // flex: 1;
-  // flex-shrink: 0;
-  // overflow-y: scroll;
+	width: 100%;
+	// height: inherit;
+	// flex: 1;
+	// flex-shrink: 0;
+	// overflow-y: auto;
 
-  .header {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
 
-    .title {
-      color: #000000;
-      font-size: 18px;
-      //line-height: 36px;
-      padding-top: 30px;
-      padding-left: 37px;
-      //font-weight: 500;
-    }
+		.title {
+			color: #000000;
+			font-size: 18px;
+			//line-height: 36px;
+			padding-top: 30px;
+			padding-left: 37px;
+			//font-weight: 500;
+		}
 
-    .goback {
-      padding-right: 70px;
-      //padding-top: 37px;
-      position: relative;
+		.goback {
+			padding-right: 70px;
+			//padding-top: 37px;
+			position: relative;
 
-      .return {
-        display: inline-block;
-        width: 42px;
-        height: 42px;
-        margin-top: 17px;
-        margin-right: 10px;
-        background-image: url("../../assets/images/projectadd/return.png");
-      }
+			.return {
+				display: inline-block;
+				width: 42px;
+				height: 42px;
+				margin-top: 17px;
+				margin-right: 10px;
+				background-image: url("../../assets/images/projectadd/return.png");
+			}
 
-      .returntext {
-        display: inline-block;
-        position: absolute;
-        top: 27px;
-        color: #4ea6ff;
-        font-size: 14px;
-      }
-    }
-  }
+			.returntext {
+				display: inline-block;
+				position: absolute;
+				top: 27px;
+				color: #4ea6ff;
+				font-size: 14px;
+			}
+		}
+	}
 
-  // 修改 antd upload 样式
-  .ant-upload {
-    border-width: 0px;
-  }
+	// 修改 antd upload 样式
+	.ant-upload {
+		border-width: 0px;
+	}
 
-  .content {
-    display: flex;
+	.content {
+		display: flex;
 
-    .main {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: left;
-      border-right: 1px solid rgba(153, 155, 163, 0.3);
+		.main {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: left;
+			border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
 
-        //height: 40px;
-        // border: 1px solid black;
-        .namebox {
-          width: 120px;
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-          flex-shrink: 0;
+				//height: 40px;
+				// border: 1px solid black;
+				.namebox {
+					width: 120px;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					flex-shrink: 0;
 
-          .nameimg {
-            width: 10px;
-            height: 10px;
-          }
-        }
+					.nameimg {
+						width: 10px;
+						height: 10px;
+					}
+				}
 
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
 
-        .box {
-          position: relative;
-          margin-left: 14px;
+				.box {
+					position: relative;
+					margin-left: 14px;
 
-          .box1 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            width: 50px;
-            margin-left: -25px;
-            margin-top: -5px;
-            border-top: 2px solid rgba(78, 166, 255, 1);
-          }
+					.box1 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						width: 50px;
+						margin-left: -25px;
+						margin-top: -5px;
+						border-top: 2px solid rgba(78, 166, 255, 1);
+					}
 
-          .box2 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            height: 50px;
-            //margin-left: -5px;
-            margin-top: -25px;
-            border-left: 2px solid rgba(78, 166, 255, 1);
-          }
-        }
+					.box2 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						height: 50px;
+						//margin-left: -5px;
+						margin-top: -25px;
+						border-left: 2px solid rgba(78, 166, 255, 1);
+					}
+				}
 
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-        }
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+				}
 
-        .in {
-          margin-left: 14px;
-          flex: 1;
+				.in {
+					margin-left: 14px;
+					flex: 1;
 
-          // .ant-radio-wrapper {
-          // }
-          .ant-input-textarea-show-count {
-            position: relative;
-            height: 88px;
-          }
+					// .ant-radio-wrapper {
+					// }
+					.ant-input-textarea-show-count {
+						position: relative;
+						height: 88px;
+					}
 
-          .ant-input-textarea-show-count::after {
-            position: absolute;
-            right: 10px;
-            bottom: 0px;
-          }
+					.ant-input-textarea-show-count::after {
+						position: absolute;
+						right: 10px;
+						bottom: 0px;
+					}
 
-          .ant-input {
-            border-radius: 8px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
+					.ant-input {
+						border-radius: 8px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
 
-          .ant-input-affix-wrapper {
-            padding: 0 11px;
-            border-radius: 8px;
-          }
+					.ant-input-affix-wrapper {
+						padding: 0 11px;
+						border-radius: 8px;
+					}
 
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
 
-        .filebox {
-          margin-left: 14px;
-          flex: 1;
+				.filebox {
+					margin-left: 14px;
+					flex: 1;
 
-          .fileimg {
-            width: 15px;
-            height: 15px;
-            margin-right: 6px;
-          }
+					.fileimg {
+						width: 15px;
+						height: 15px;
+						margin-right: 6px;
+					}
 
-          .filetext {
-            font-size: 14px;
-            font-weight: 400;
-            color: #4ea6ff;
-            line-height: 36px;
-          }
+					.filetext {
+						font-size: 14px;
+						font-weight: 400;
+						color: #4ea6ff;
+						line-height: 36px;
+					}
 
-          .support {
-            font-size: 14px;
-            font-weight: 400;
-            color: #999ba3;
-            line-height: 36px;
-            margin-top: 8px;
-            word-break: break-all;
-          }
-        }
-      }
+					.support {
+						font-size: 14px;
+						font-weight: 400;
+						color: #999ba3;
+						line-height: 36px;
+						margin-top: 8px;
+						word-break: break-all;
+					}
+				}
+			}
 
-      .name2 {
-        display: flex;
-        align-items: flex-start;
+			.name2 {
+				display: flex;
+				align-items: flex-start;
 
-        .ant-input-textarea {
-          .ant-input {
-            height: 88px;
-          }
-        }
-      }
-    }
+				.ant-input-textarea {
+					.ant-input {
+						height: 88px;
+					}
+				}
+			}
+		}
 
-    .template {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: right;
+		.template {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: right;
 
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
-        height: 40px;
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
+				height: 40px;
 
-        // border: 1px solid black;
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
+				// border: 1px solid black;
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
 
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-          width: 65px;
-        }
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+					width: 65px;
+				}
 
-        .in {
-          margin-left: 14px;
-          width: 81%;
+				.in {
+					margin-left: 14px;
+					width: 81%;
 
-          .ant-input {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
+					.ant-input {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
 
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
-      }
-    }
-  }
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
+			}
+		}
+	}
 
-  .footer {
-    width: 100%;
-    margin-top: 31px;
-    margin-bottom: 14px;
-    padding-bottom: 20px;
+	.footer {
+		width: 100%;
+		margin-top: 31px;
+		margin-bottom: 14px;
+		padding-bottom: 20px;
 
-    .btn {
-      display: flex;
-      justify-content: center;
+		.btn {
+			display: flex;
+			justify-content: center;
 
-      .btn1 {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 100px;
-        height: 40px;
-        border-radius: 8px;
-        background: #409eff;
-        color: #ffffff;
-        margin-right: 14px;
-      }
+			.btn1 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				background: #409eff;
+				color: #ffffff;
+				margin-right: 14px;
+			}
 
-      .btn2 {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 100px;
-        height: 40px;
-        border-radius: 8px;
-        border: 1px solid #409eff;
-        background: #ffffff;
-        color: #409eff;
-      }
-    }
+			.btn2 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				border: 1px solid #409eff;
+				background: #ffffff;
+				color: #409eff;
+			}
+		}
 
-    .text {
-      color: rgba(153, 155, 163, 1);
-      font-size: 14px;
-      margin-left: 223px;
-    }
-  }
+		.text {
+			color: rgba(153, 155, 163, 1);
+			font-size: 14px;
+			margin-left: 223px;
+		}
+	}
 }
 </style>
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index f33c592a..085f353d 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1,60 +1,92 @@
 <!-- 项目页面 -->
 <template>
-	<div class="projectManage">
-		<!-- 搜索框及按钮 -->
-		<div class="filter">
-			<div class="filterItems">
-				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请输入项目名称" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
-				</div>
-				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请输入项目经理" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
-				</div>
-				<div class="select">
-					<a-select v-model:value="projectName" style="width: 270px" placeholder="请选择状态" :options="projectNameList"
-						@change="selectProjectName" allowClear showSearch></a-select>
-				</div>
-				<div class="select">
-					<a-date-picker v-model="selectTime" type="date" placeholder="创建时间" style="width: 270px" />
-				</div>
-				<div style="display: flex;margin-bottom: 20px">
-					<div class="btnn btn1">
-						<div class="search"></div>
-						<div class="btnText">搜索</div>
-					</div>
-					<div class="btn btn2">
-						<div class="search"></div>
-						<div class="btnText">重置</div>
-					</div>
-				</div>
-
-			</div>
-			<div class="btns">
-				<div class="btn btn3" @click="showModal1">
-					<div class="search"></div>
-					<div class="btnText">创建项目</div>
-				</div>
-			</div>
-		</div>
-		<!-- 搜索框及按钮 -->
-		<!-- 表格 -->
-		<div class="tableBox">
-			<a-table :columns="columns" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false"
-				:scroll="{ x: 700 }" @expand="expandTable" :pagination="{
-					showSizeChanger: true,
-					showQuickJumper: true,
-					hideOnSinglePage: true,
-					pageSizeOptions: [],
-					pageSize: pageSize,
-					current: currentPage,
-					total: tableDataTotal,
-					onChange: (page, pageSize) => {
-						currentPage = page;
-					},
-				}">
-				<!-- <template #bodyCell="{ column }">
+  <div class="projectManage">
+    <!-- 搜索框及按钮 -->
+    <div class="filter">
+      <div class="filterItems">
+        <div class="select">
+          <a-input
+            v-model:value="sProjectName"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目名称"
+            @change="sProjectNameChange"
+            allowClear
+            showSearch
+          >
+          </a-input>
+        </div>
+        <div class="select">
+          <a-input
+            v-model:value="sProjectOrder"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目经理"
+            @change="sProjectOrderChange"
+            allowClear
+            showSearch
+          >
+          </a-input>
+        </div>
+        <div class="select">
+          <a-input
+            v-model:value="sProjectCreate"
+            style="width: 270px; height: 40px; border-radius: 8px"
+            placeholder="请输入项目创建人"
+            @change="sProjectCreateChange"
+            allowClear
+            showSearch
+          >
+          </a-input>
+        </div>
+        <div class="select">
+          <a-select
+            v-model:value="sProjectState"
+            style="width: 270px"
+            placeholder="请选择状态"
+            :options="sProjectStateList"
+            @change="sProjectStateChange"
+            allowClear
+            showSearch
+          ></a-select>
+        </div>
+        <div class="select">
+          <a-date-picker
+            v-model:value="sProjectTime"
+            @change="sProjectTimeChange"
+            type="date"
+            placeholder="创建时间"
+            style="width: 270px"
+          />
+        </div>
+        <div style="display: flex; margin-bottom: 20px">
+          <div class="btnn btn1">
+            <div class="search"></div>
+            <div class="btnText" v-on:click="searchSubmit">搜索</div>
+          </div>
+          <div class="btn btn2">
+            <div class="search"></div>
+            <div class="btnText" v-on:click="searchReset">重置</div>
+          </div>
+        </div>
+      </div>
+      <div class="btns">
+        <div class="btn btn3" @click="showModal1">
+          <div class="search"></div>
+          <div class="btnText">创建项目</div>
+        </div>
+      </div>
+    </div>
+    <!-- 搜索框及按钮 -->
+    <!-- 表格 -->
+    <div class="tableBox">
+      <a-table
+        :columns="columns"
+        :data-source="tableData"
+        :loading="tableDataTotal === -1 ? true : false"
+        :scroll="{ x: 700 }"
+        @expand="expandTable"
+        :pagination="false"
+      >
+        <!-- <template #bodyCell="{ column }">
           <template v-if="column.key === 'operation'">
             <div class="operation">
               <span>编辑</span>
@@ -68,3083 +100,3750 @@
             </div>
           </template>
         </template> -->
-			</a-table>
-		</div>
-		<!-- 表格 -->
-		<!-- 无项目 -->
-		<div class="tableBox" style="display: none">
-			<div class="taskbox" @click="showModal1" style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)">
-				<div class="leftt">
-					<img src="../../assets/images/taskpage/left2.png" />
-				</div>
-				<div class="photo">
-					<img src="../../assets/images/projectadd/nopro.png" />
-				</div>
-				<div class="rightt">
-					<img src="../../assets/images/taskpage/right2.png" />
-				</div>
-				<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
-					创建项目
-				</div>
-				<div class="centermain">点击创建项目任务</div>
-			</div>
-		</div>
-		<!-- 创建子项目弹窗 -->
-		<div>
-			<a-modal v-model:visible="sonproject" :title="null" @ok="closeModal" :footer="null" :closable="false"
-				wrapClassName="sonproject" width="764px" height="356px">
-				<div class="modalHeader" style="
+      </a-table>
+      <div class="tableBox">
+        <div class="pa">
+          <a-pagination
+            v-if="tableDataTotal > 10"
+            showSizeChanger="true"
+            showQuickJumper="true"
+            hideOnSinglePage="true"
+            :pageSize="pageSize"
+            v-model:current="currentPage"
+            :total="tableDataTotal"
+            class="pagination"
+            @change="changePagination"
+          />
+        </div>
+      </div>
+    </div>
+    <!-- 表格 -->
+    <!-- 无项目 -->
+    <div class="tableBox" style="display: none">
+      <div
+        class="taskbox"
+        @click="showModal1"
+        style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+      >
+        <div class="leftt">
+          <img src="../../assets/images/taskpage/left2.png" />
+        </div>
+        <div class="photo">
+          <img src="../../assets/images/projectadd/nopro.png" />
+        </div>
+        <div class="rightt">
+          <img src="../../assets/images/taskpage/right2.png" />
+        </div>
+        <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
+          创建项目
+        </div>
+        <div class="centermain">点击创建项目任务</div>
+      </div>
+    </div>
+    <!-- 创建子项目弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="sonproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="sonproject"
+        width="764px"
+        height="356px"
+      >
+        <div
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          ">
-					<div class="headerLeft" style="margin-left: 32px">
-						<span class="headerLeftText" style="font-size: 16px">请选择项目类别</span>
-					</div>
-					<div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-						<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-					</div>
-				</div>
-				<div class="modalMain">
-					<router-link to="/sonproject" class="taskbox" style="
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+              >请选择项目类别</span
+            >
+          </div>
+          <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div
+            @click="createChildProject"
+            class="taskbox"
+            style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
-            ">
-						<div class="leftt">
-							<img src="../../assets/images/taskpage/left2.png" />
-						</div>
-						<div class="photo">
-							<img src="../../assets/images/taskpage/picture4.png" />
-						</div>
-						<div class="rightt">
-							<img src="../../assets/images/taskpage/right2.png" />
-						</div>
-						<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
-							单层子项目
-						</div>
-					</router-link>
-					<div class="taskbox" @click="showModal3" style="
+            "
+          >
+            <div class="leftt">
+              <img src="../../assets/images/taskpage/left2.png" />
+            </div>
+            <div class="photo">
+              <img src="../../assets/images/taskpage/picture4.png" />
+            </div>
+            <div class="rightt">
+              <img src="../../assets/images/taskpage/right2.png" />
+            </div>
+            <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
+              单层子项目
+            </div>
+          </div>
+          <div
+            class="taskbox"
+            @click="showModal3"
+            style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
-            ">
-						<div class="leftt">
-							<img src="../../assets/images/taskpage/left1.png" />
-						</div>
-						<div class="photo">
-							<img src="../../assets/images/taskpage/picture5.png" />
-						</div>
-						<div class="rightt">
-							<img src="../../assets/images/taskpage/right1.png" />
-						</div>
-						<div class="centerbox" style="color: rgba(255, 182, 78, 1)">
-							多层子项目
-						</div>
-					</div>
-				</div>
-			</a-modal>
-		</div>
-		<!-- 创建子项目弹窗 -->
-		<!-- 创建项目弹窗 -->
-		<div>
-			<div>
-				<a-modal v-model:visible="estabish" :title="null" @ok="closeModal1" :footer="null" :closable="false"
-					wrapClassName="estabish" width="638px" height="468px">
-					<div class="modalHeader" style="
+            "
+          >
+            <div class="leftt">
+              <img src="../../assets/images/taskpage/left1.png" />
+            </div>
+            <div class="photo">
+              <img src="../../assets/images/taskpage/picture5.png" />
+            </div>
+            <div class="rightt">
+              <img src="../../assets/images/taskpage/right1.png" />
+            </div>
+            <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
+              多层子项目
+            </div>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 创建子项目弹窗 -->
+    <!-- 创建项目弹窗 -->
+    <div>
+      <div>
+        <a-modal
+          v-model:visible="estabish"
+          :title="null"
+          @ok="closeModal1"
+          :footer="null"
+          :closable="false"
+          wrapClassName="estabish"
+          width="638px"
+          height="468px"
+        >
+          <div
+            class="modalHeader"
+            style="
               width: 100%;
               height: 68px;
               display: flex;
               align-items: center;
               justify-content: space-between;
-            ">
-						<div class="headerLeft" style="margin-left: 32px">
-							<span class="headerLeftText" style="font-size: 16px">请选择项目类别</span>
-						</div>
-						<div style="cursor: pointer; margin-right: 32px" @click="closeModal1">
-							<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-						</div>
-					</div>
-					<div class="modalMain">
-						<router-link to="/projectadd">
-							<div class="taskbox" style="
+            "
+          >
+            <div class="headerLeft" style="margin-left: 32px">
+              <span class="headerLeftText" style="font-size: 16px"
+                >请选择项目类别</span
+              >
+            </div>
+            <div
+              style="cursor: pointer; margin-right: 32px"
+              @click="closeModal1"
+            >
+              <img
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
+              />
+            </div>
+          </div>
+          <div class="modalMain">
+            <router-link to="/projectadd">
+              <div
+                class="taskbox"
+                style="
                   background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
-                ">
-								<div class="leftt">
-									<img src="../../assets/images/taskpage/left2.png" />
-								</div>
-								<div class="photo">
-									<img src="../../assets/images/taskpage/picture6.png" />
-								</div>
-								<div class="rightt">
-									<img src="../../assets/images/taskpage/right2.png" />
-								</div>
-								<div class="centerbox" style="color: rgba(78, 166, 255, 1)">
-									单层项目
-								</div>
-								<div class="centermain">
-									不包含子项目，直接填写项目基础信息后创建任务
-								</div>
-							</div>
-						</router-link>
-						<div class="taskbox" @click="showModal2" style="
+                "
+              >
+                <div class="leftt">
+                  <img src="../../assets/images/taskpage/left2.png" />
+                </div>
+                <div class="photo">
+                  <img src="../../assets/images/taskpage/picture6.png" />
+                </div>
+                <div class="rightt">
+                  <img src="../../assets/images/taskpage/right2.png" />
+                </div>
+                <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
+                  单层项目
+                </div>
+                <div class="centermain">
+                  不包含子项目，直接填写项目基础信息后创建任务
+                </div>
+              </div>
+            </router-link>
+            <div
+              class="taskbox"
+              @click="showModal2"
+              style="
                 margin-bottom: 40px;
                 background: linear-gradient(180deg, #e5f6ec 0%, #eef9f3 100%);
-              ">
-							<div class="leftt">
-								<img src="../../assets/images/taskpage/left3.png" />
-							</div>
-							<div class="photo">
-								<img src="../../assets/images/taskpage/picture7.png" />
-							</div>
-							<div class="rightt">
-								<img src="../../assets/images/taskpage/right3.png" />
-							</div>
-							<div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
-								多层项目
-							</div>
-							<div class="centermain1">
-								包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务
-							</div>
-						</div>
-					</div>
-				</a-modal>
-			</div>
-		</div>
-		<!-- 创建项目弹窗 -->
-		<!-- 创建多层项目弹窗 -->
-		<div>
-			<a-modal v-model:visible="doublepro" :title="null" @ok="closeModal2" :footer="null" :closable="false"
-				wrapClassName="doublepro" width="624px" height="476px">
-				<div class="modalHeader" style="
+              "
+            >
+              <div class="leftt">
+                <img src="../../assets/images/taskpage/left3.png" />
+              </div>
+              <div class="photo">
+                <img src="../../assets/images/taskpage/picture7.png" />
+              </div>
+              <div class="rightt">
+                <img src="../../assets/images/taskpage/right3.png" />
+              </div>
+              <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
+                多层项目
+              </div>
+              <div class="centermain1">
+                包含子项目，分为多层子项目和单层子项目，多层子项目可创建班级，通过班级填写基础信息并创建任务
+              </div>
+            </div>
+          </div>
+        </a-modal>
+      </div>
+    </div>
+    <!-- 创建项目弹窗 -->
+    <!-- 创建多层项目弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="doublepro"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublepro"
+        width="624px"
+        height="476px"
+      >
+        <div
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          ">
-					<div class="headerLeft" style="margin-left: 32px">
-						<span class="headerLeftText" style="font-size: 16px">创建多层项目</span>
-					</div>
-					<div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-						<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-					</div>
-				</div>
-				<div class="modalMain">
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">项目名称:</div>
-						<div class="in">
-							<a-input v-model:value="value1" show-count :maxlength="30" placeholder="请输入项目名称"
-								style="border-radius: 8px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">分类:</div>
-						<div class="in">
-							<a-select v-model:value="value2" placeholder="四个养成" :options="classifyList" @change="classificationChange"
-								style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">项目经理:</div>
-						<div class="in">
-							<a-select v-model:value="value3" placeholder="请选择项目经理" :options="classifyList1"
-								@change="classificationChange1" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">资源归属:</div>
-						<div class="in">
-							<a-input v-model:value="value5" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="pubtn">
-						<a-button class="pubtn1" @click="closeModal2">取消</a-button>
-						<a-button class="pubtn2" @click="createStoreyProject">确定</a-button>
-					</div>
-				</div>
-			</a-modal>
-		</div>
-		<!-- 创建多层项目弹窗 -->
-		<!-- 创建多层子项目弹窗 -->
-		<div>
-			<a-modal v-model:visible="doublesonpro" :title="null" @ok="closeModal3" :footer="null" :closable="false"
-				wrapClassName="doublesonpro" width="624px" height="476px">
-				<div class="modalHeader" style="
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+              >创建多层项目</span
+            >
+          </div>
+          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="value1"
+                show-count
+                :maxlength="30"
+                placeholder="请输入项目名称"
+                style="border-radius: 8px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="value2"
+                placeholder="四个养成"
+                :options="classifyList"
+                @change="classificationChange"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目经理:</div>
+            <div class="in">
+              <a-select
+                v-model:value="value3"
+                mode="multiple"
+                placeholder="请选择项目经理"
+                :options="classifyList1"
+                @change="classificationChange1"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="value5"
+                placeholder="请选择资源归属"
+                :options="classifyList5"
+                @change="classificationChange5"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="createStoreyProject"
+              >确定</a-button
+            >
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 创建多层项目弹窗 -->
+    <!-- 编辑多层项目弹窗 - start -->
+    <div>
+      <a-modal
+        v-model:visible="eddoublepro"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublepro"
+        width="624px"
+        height="476px"
+      >
+        <div
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-          ">
-					<div class="headerLeft" style="margin-left: 32px">
-						<span class="headerLeftText" style="font-size: 16px">创建多层子项目</span>
-					</div>
-					<div style="cursor: pointer; margin-right: 32px" @click="closeModal3">
-						<img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
-					</div>
-				</div>
-				<div class="modalMain">
-					<div style="margin-left: 40px; margin-top: 40px">
-						<span style="color: #000000; font-size: 14px">项目归属：</span>
-						<span style="color: #999999; font-size: 14px; margin-left: 10px">管理者进阶</span>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">子项目名称:</div>
-						<div class="in">
-							<a-input v-model:value="value5" placeholder="请输入项目名称" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">分类:</div>
-						<div class="in">
-							<a-select v-model:value="value6" placeholder="四个养成" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">子项目经理:</div>
-						<div class="in">
-							<a-input v-model:value="value7" placeholder="自动带出 可编辑" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="name">
-						<div class="star" style="margin-top: -4px">
-							<img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
-						</div>
-						<div class="inname">资源归属:</div>
-						<div class="in">
-							<a-input v-model:value="value8" style="border-radius: 8px; height: 40px" />
-						</div>
-					</div>
-					<div class="pubtn">
-						<a-button class="pubtn1" @click="closeModal3">取消</a-button>
-						<a-button class="pubtn2" @click="closeModal3">确定</a-button>
-					</div>
-				</div>
-			</a-modal>
-		</div>
-		<!-- 创建多层子项目弹窗 -->
-		<!-- 复制路径弹窗 -->
-		<a-modal v-model:visible="copyModal" :footer="null" :closable="closeCopy" wrapClassName="CopyModal" centered="true">
-			<div class="delete">
-				<div class="del_header"></div>
-				<div class="del_main">
-					<div class="header">
-						<div class="icon"></div>
-						<span>提示</span>
-						<div class="close_exit" @click="closeCopyModal"></div>
-					</div>
-					<div class="body">
-						<span>您确定要复制此路径吗</span>
-					</div>
-					<div class="del_btnbox">
-						<div class="del_btn btn1">
-							<div class="btnText" @click="delete_exit">取消</div>
-						</div>
-						<div class="del_btn btn2">
-							<div class="btnText" @click="delete_exit">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</a-modal>
-		<!-- 结束项目弹窗 -->
-		<a-modal v-model:visible="stopModal" :footer="null" :closable="closeStop" wrapClassName="CopyModal" centered="true">
-			<div class="delete">
-				<div class="del_header"></div>
-				<div class="del_main">
-					<div class="header">
-						<div class="icon"></div>
-						<span>提示</span>
-						<div class="close_exit" @click="closeStopModal"></div>
-					</div>
-					<div class="body">
-						<span>是否结束项目</span>
-						<div class="back">
-							（项目结束后学员将无法继续学习，此操作不可逆）
-						</div>
-					</div>
-					<div class="del_btnbox">
-						<div class="del_btn btn1">
-							<div class="btnText" @click="delete_exit">取消</div>
-						</div>
-						<div class="del_btn btn2">
-							<div class="btnText" @click="delete_exit">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</a-modal>
-		<!-- 删除项目弹窗 -->
-		<a-modal v-model:visible="deleteModal" :footer="null" :closable="closeDelete" wrapClassName="CopyModal"
-			centered="true">
-			<div class="delete">
-				<div class="del_header"></div>
-				<div class="del_main">
-					<div class="header">
-						<div class="icon"></div>
-						<span>提示</span>
-						<div class="close_exit" @click="closeDeleteModal"></div>
-					</div>
-					<div class="body">
-						<span>您确定要删除此项目吗</span>
-					</div>
-					<div class="del_btnbox">
-						<div class="del_btn btn1">
-							<div class="btnText" @click="delete_exit">取消</div>
-						</div>
-						<div class="del_btn btn2">
-							<div class="btnText" @click="delete_exit">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</a-modal>
-		<!-- 存为模板弹窗 -->
-		<a-modal v-model:visible="startModal" :footer="null" :closable="closeStart" wrapClassName="CopyModal"
-			centered="true">
-			<div class="delete">
-				<div class="del_header"></div>
-				<div class="del_main">
-					<div class="header">
-						<div class="icon"></div>
-						<span>提示</span>
-						<div class="close_exit" @click="closeStartModal"></div>
-					</div>
-					<div class="body">
-						<span>您确定要存为模板吗</span>
-					</div>
-					<div class="del_btnbox">
-						<div class="del_btn btn1">
-							<div class="btnText" @click="delete_exit">取消</div>
-						</div>
-						<div class="del_btn btn2">
-							<div class="btnText" @click="delete_exit">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</a-modal>
-		<!-- 撤回路径弹窗 -->
-		<a-modal v-model:visible="backModal" :footer="null" :closable="closeBack" wrapClassName="CopyModal" centered="true">
-			<div class="delete">
-				<div class="del_header"></div>
-				<div class="del_main">
-					<div class="header">
-						<div class="icon"></div>
-						<span>提示</span>
-						<div class="close_exit" @click="closeBackModal"></div>
-					</div>
-					<div class="body">
-						<span>是否撤回项目</span>
-						<div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
-					</div>
-					<div class="del_btnbox">
-						<div class="del_btn btn1">
-							<div class="btnText" @click="delete_exit">取消</div>
-						</div>
-						<div class="del_btn btn2">
-							<div class="btnText" @click="delete_exit">确定</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</a-modal>
-		<!-- 归属权抽屉 -->
-		<proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
-		<!-- 授权名单抽屉 -->
-		<proj-power-list v-model:ProjPvisible="ProjPvisible" />
-		<!-- 查看权抽屉 -->
-		<proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
-		<!-- 管理权抽屉 -->
-		<proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
-	</div>
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+              >编辑多层项目</span
+            >
+          </div>
+          <div
+            style="cursor: pointer; margin-right: 32px"
+            @click="closeeditModal2"
+          >
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="edvalue1"
+                @change="edclassificationChangeName"
+                show-count
+                :maxlength="30"
+                placeholder="请输入项目名称"
+                style="border-radius: 8px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="edvalue2"
+                placeholder="四个养成"
+                :options="classifyList"
+                @change="edclassificationChange"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目经理:</div>
+            <div class="in">
+              <a-select
+                v-model:value="edvalue3"
+                mode="multiple"
+                placeholder="请选择项目经理"
+                :options="classifyList1"
+                @change="edclassificationChange1"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="edvalue5"
+                placeholder="请选择资源归属"
+                :options="classifyList5"
+                @change="edclassificationChange5"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeeditModal2">取消</a-button>
+            <a-button class="pubtn2" @click="editStoreyProject">确定</a-button>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 编辑多层项目弹窗 - end -->
+    <!-- 创建多层子项目弹窗 -->
+    <div>
+      <a-modal
+        v-model:visible="doublesonpro"
+        :title="null"
+        @ok="closeModal3"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublesonpro"
+        width="624px"
+        height="476px"
+      >
+        <div
+          class="modalHeader"
+          style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+              >创建多层子项目</span
+            >
+          </div>
+          <div style="cursor: pointer; margin-right: 32px" @click="closeModal3">
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div style="margin-left: 40px; margin-top: 40px">
+            <span style="color: #000000; font-size: 14px">项目归属：</span>
+            <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
+              currentProjectName
+            }}</span>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">子项目名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="value6"
+                placeholder="请输入项目名称"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="value7"
+                @change="classificationChange2"
+                :options="classifyList2"
+                placeholder="四个养成"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">子项目经理:</div>
+            <div class="in">
+              <a-select
+                v-model:value="value8"
+                mode="multiple"
+                @change="classificationChange3"
+                :options="classifyList3"
+                placeholder="自动带出 可编辑"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="value9"
+                @change="classificationChange4"
+                :options="classifyList4"
+                placeholder="请选择资源归属"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeModal3">取消</a-button>
+            <a-button class="pubtn2" @click="createChildsProject"
+              >确定</a-button
+            >
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 创建多层子项目弹窗 -->
+    <!-- 编辑多层子项目弹窗 start-->
+    <div>
+      <a-modal
+        v-model:visible="eddoublesonpro"
+        :title="null"
+        @ok="closeModal3"
+        :footer="null"
+        :closable="false"
+        wrapClassName="doublesonpro"
+        width="624px"
+        height="476px"
+      >
+        <div
+          class="modalHeader"
+          style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+              >编辑多层子项目</span
+            >
+          </div>
+          <div
+            style="cursor: pointer; margin-right: 32px"
+            @click="closeeditModal3"
+          >
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div style="margin-left: 40px; margin-top: 40px">
+            <span style="color: #000000; font-size: 14px">项目归属：</span>
+            <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
+              currentEdProjectName
+            }}</span>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">子项目名称:</div>
+            <div class="in">
+              <a-input
+                v-model:value="edvalue6"
+                @change="edclassificationChange6"
+                placeholder="请输入项目名称"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="edvalue7"
+                @change="edclassificationChange2"
+                :options="classifyList2"
+                placeholder="四个养成"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">子项目经理:</div>
+            <div class="in">
+              <a-select
+                v-model:value="edvalue8"
+                mode="multiple"
+                @change="edclassificationChange3"
+                :options="classifyList3"
+                placeholder="自动带出 可编辑"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in select">
+              <a-select
+                v-model:value="edvalue9"
+                @change="edclassificationChange4"
+                :options="classifyList4"
+                placeholder="请选择资源归属"
+                style="border-radius: 8px; height: 40px"
+              />
+            </div>
+          </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeeditModal3">取消</a-button>
+            <a-button class="pubtn2" @click="editChildsProject">确定</a-button>
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 编辑多层子项目弹窗 end -->
+    <!-- 复制路径弹窗 -->
+    <a-modal
+      v-model:visible="copyModal"
+      :footer="null"
+      :closable="closeCopy"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeCopyModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要复制此路径吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 结束项目弹窗 -->
+    <a-modal
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeStopModal"></div>
+          </div>
+          <div class="body">
+            <span>是否结束项目</span>
+            <div class="back">
+              （项目结束后学员将无法继续学习，此操作不可逆）
+            </div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 删除项目弹窗 -->
+    <a-modal
+      v-model:visible="deleteModal"
+      :footer="null"
+      :closable="closeDelete"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeDeleteModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要删除此项目吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 存为模版弹窗 -->
+    <a-modal
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeStartModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要存为模版吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 发布弹窗 -->
+    <a-modal
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
+        <div class="headerLeft" style="margin-left: 32px">
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/pub.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
+          >
+        </div>
+        <div
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
+        >
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
+          />
+        </div>
+      </div>
+      <div class="modalMain">
+        <div class="projectname">产品经理上升路径</div>
+        <!-- <div class="projecttime">
+          <span class="timeti">路径时间：</span
+          ><span class="timeme">2022/08/01-2022/08/30</span>
+        </div> -->
+        <div class="projectbox">
+          <div class="promessage">
+            <div class="messageme">项目信息</div>
+            <div class="messagege">当前项目共0个阶段，0个任务</div>
+          </div>
+          <div class="stumessage">
+            <div class="messageme1">学员信息</div>
+            <div class="messagege1">项目共{{ projectStudentsNum }}名学员</div>
+          </div>
+        </div>
+        <!-- <div class="send">
+          <a-switch v-model:checked="checked" size="small" />
+          <span class="sendtext">发送路径通知</span>
+        </div>
+        <div class="ckb">
+          <a-checkbox v-model:checked="checkedTeacher"
+            ><span class="sendpeo">发给老师</span></a-checkbox
+          >
+          <a-checkbox v-model:checked="checkStu"
+            ><span class="sendpeo">发给学员</span></a-checkbox
+          >
+        </div> -->
+        <div class="pubtn">
+          <a-button class="pubtn1" @click="closeProjectPub">取消</a-button>
+          <a-button class="pubtn2" @click="releaseProject">发布</a-button>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 撤回路径弹窗 -->
+    <a-modal
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeBackModal"></div>
+          </div>
+          <div class="body">
+            <span>是否撤回项目</span>
+            <div class="back">（项目撤回后学员进度保留，发布后可继续学习）</div>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!-- 归属权抽屉 -->
+    <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
+    <!-- 授权名单抽屉 -->
+    <proj-power-list v-model:ProjPvisible="ProjPvisible" />
+    <!-- 查看权抽屉 -->
+    <proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
+    <!-- 管理权抽屉 -->
+    <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
+  </div>
 </template>
 <script>
 import { reactive, toRefs, onMounted, ref } from "vue";
+import { message } from "ant-design-vue";
+import { useRouter } from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import ProjManageShip from "../../components/drawers/ProjManagePower";
-const columns = [
-	{
-		title: "项目名称",
-		dataIndex: "projectName",
-		key: "projectName",
-		width: 280,
-		// align: "center",
-		ellipsis: true,
-		// scopedSlots: { customRender: "action" }, //引入的插槽
-		// customRender: (text, record) => {
-		//   console.log(text, record);
-		//   return <span>{text.text}</span>;
-		// },
-	},
-	{
-		title: "项目经理",
-		dataIndex: "manager",
-		key: "manager",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "状态",
-		dataIndex: "state",
-		// width: "30%",
-		key: "state",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "创建人",
-		dataIndex: "creater",
-		// width: "30%",
-		key: "creater",
-		width: 100,
-		align: "center",
-	},
-	{
-		title: "创建时间",
-		dataIndex: "time",
-		key: "time",
-		width: 180,
-		align: "center",
-	},
-	{
-		title: "操作",
-		dataIndex: "operation",
-		key: "operation",
-		width: 300,
-		align: "center",
-		fixed: "right",
-	},
-];
-
+import * as api from "../../api/index";
+import { toDate } from "../../api/method";
+import { storage } from "../../api/storage";
 export default {
-	name: "projectManage",
-	components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip },
-	setup() {
-		const state = reactive({
-			value6: "",
-			value7: "",
-			value8: "",
-			projectNameList: [
-				{
-					id: 1,
-					value: "项目一",
-					label: "项目一",
-				},
-				{
-					id: 2,
-					value: "项目二",
-					label: "项目二",
-				},
-				{
-					id: 3,
-					value: "项目三",
-					label: "项目三",
-				},
-				{
-					id: 4,
-					value: "项目四",
-					label: "项目四",
-				},
-			],
-			projectName: null,
-			selectTime: null,
+  name: "projectManage",
+  components: { ProjOwnerShip, ProjPowerList, ProjCheckShip, ProjManageShip },
+  setup() {
+    const state = reactive({
+      projectName: null,
+      selectTime: null,
+      sonproject: false,
+      estabish: false,
+      doublepro: false,
+      eddoublepro: false,
+      eddoublesonpro: false,
+      doublesonpro: false,
+      copyModal: false, //复制弹窗
+      closeCopy: false, //复制弹窗关闭图标
+      stopModal: false, //停用弹窗
+      closeStop: false, //停用弹窗关闭图标
+      deleteModal: false, //删除弹窗
+      closeDelete: false, //删除弹窗关闭图标
+      startModal: false, //启用弹窗
+      closeStart: false, //启用弹窗关闭图标
+      projectPub: false, //发布弹窗
+      backModal: false, //撤回弹窗
+      closeBack: false, //撤回弹窗关闭图标
+      ProjOwnervisible: false,
+      ProjPvisible: false,
+      ProjCheckvisible: false,
+      ProjManagevisible: false,
 
-			tableData: [
-				{
-					key: 1,
-					projectName:
-						"管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1管理者进阶1",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "1-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "草稿",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "1-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "草稿",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 2,
-					projectName: "管理者进阶2",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					hasChildren: true,
-				},
-				{
-					key: 3,
-					projectName: "管理者进阶3",
-					manager: "黄华  刘俊",
-					state: "进行中",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					hasChildren: true,
-					children: [
-						{
-							key: "3-1",
-							projectName: "管理者进阶35",
-							manager: "黄华  刘俊",
-							state: "已结束",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-						},
-						{
-							key: "3-2",
-							projectName: "管理者进阶36",
-							manager: "黄华  刘俊",
-							state: "草稿",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-						},
-					],
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶4",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶5",
-					manager: "黄华  刘俊",
-					state: "已结束",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "4-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "进行中",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "4-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "草稿",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 5,
-					projectName: "管理者进阶5",
-					manager: "黄华  刘俊",
-					state: "已结束",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-					children: [
-						{
-							key: "5-1",
-							projectName: "管理者进阶5",
-							manager: "黄华  刘俊",
-							state: "已结束",
-							creater: "毛继禹",
-							time: "2022-07-20 14:00:03",
-							children: [
-								{
-									key: "5-1-1",
-									projectName:
-										"管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7管理者进阶7",
-									manager: "黄华  刘俊",
-									state: "进行中",
-									creater: "毛继禹",
-									time: "2022-07-20 14:00:03",
-								},
-							],
-						},
-					],
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-				{
-					key: 4,
-					projectName: "管理者进阶",
-					manager: "黄华  刘俊",
-					state: "草稿",
-					creater: "毛继禹",
-					time: "2022-07-20 14:00:03",
-				},
-			],
-			currentPage: 1,
-			tableDataTotal: 20,
-			pageSize: 10,
-			sonproject: false,
-			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,
-			ProjCheckvisible: false,
-			ProjManagevisible: false,
-		});
-		// 数据接入 - start - 
-		// 项目分类
-		const classifyList = ref([
-			{ value: 1, label: '管理者' },
-			{ value: 2, label: '领军者' },
-			{ value: 3, label: '产业人' },
-		]);
+      currentProjectId: "",
+      currentProjectName: "",
+      currentEdProjectName: "",
 
-		const classifyList1 = ref([
-			{ value: 1, label: '李俊国' },
-			{ value: 2, label: '将小米' },
-			{ value: 3, label: '刘孟君' },
-		]);
+      currentEditChildrensProjectId: "",
+      dcProjectID: "",
+			projectStudentsNum:0,//发布弹窗-学员人数
+      releaseProjectId: null, //发布的项目id
+    });
+    // 数据接入 - start -
+    const router = useRouter();
+    // 搜索数据
+    const sProjectName = ref("");
+    const sProjectOrder = ref("");
+    const sProjectCreate = ref("");
+    const sProjectState = ref([]);
+    const sProjectTime = ref("");
 
-		const value1 = ref('');
-		const value2 = ref('');
-		const value3 = ref('');
-		const value4 = ref('');
-		const value5 = ref('');
+    const sProjectStateList = ref([
+      { value: 0, label: "草稿" },
+      { value: 1, label: "进行中" },
+      { value: 2, label: "未开始" },
+      { value: 3, label: "已结束" },
+    ]);
 
-		let type = '';
-		const classificationChange = (key) => {
-			console.log(`selected ${key}`);
-			console.log(classifyList.value[key - 1].label)
-			type = key;
-		}
+    let name = "";
+    const sProjectNameChange = (key) => {
+      console.log("项目名称", key.target.value);
+      name = key.target.value;
+    };
+    let managerid = "";
+    const sProjectOrderChange = (key) => {
+      console.log("项目经理", key.target.value);
+      managerid = key.target.value;
+    };
 
-		let manager = '';
-		let managerId = '';
+    let createpeople = "";
+    const sProjectCreateChange = (key) => {
+      console.log("项目创建人", key.target.value);
+      createpeople = key.target.value;
+    };
 
-		const classificationChange1 = (key) => {
-			console.log(`selected ${key}`);
-			console.log(classifyList1.value[key - 1].label)
-			manager = classifyList1.value[key - 1].label;
-			managerId = key;
-		}
+    let status = "";
+    const sProjectStateChange = (key) => {
+      console.log("项目状态", key);
+      status = key;
+    };
 
-		const createStoreyProject = () => {
-			// 接口需要传递的参数信息
-			let obj = {
-				"name": value1.value,
-				"type": type,
-				"manager": manager,
-				"managerId": managerId,
-				"sourceBelongId": value5.value
-			}
-			console.log(obj);
-			
-			// 创建成功 隐藏弹出框
-			state.doublepro = false;
-		}
+    let beginTime = "";
+    let endTime = "";
+    const sProjectTimeChange = (key, value) => {
+      console.log("项目时间", key);
+      console.log("项目时间", value);
+      console.log(new Date("2019-10-08 18:22:37").getTime());
+      beginTime = Math.ceil(
+        new Date(value + " " + "00:00:00").getTime() / 1000
+      );
+      endTime = Math.ceil(new Date(value + " " + "23:59:59").getTime() / 1000);
+    };
+
+    const searchReset = () => {
+      sProjectName.value = "";
+      sProjectOrder.value = "";
+      sProjectCreate.value = "";
+      sProjectState.value = null;
+      sProjectTime.value = null;
+      createpeople = "";
+      name = "";
+      beginTime = "";
+      endTime = "";
+      status = null;
+      managerid = "";
+      getTableDate();
+    };
+
+    const searchSubmit = () => {
+      const obj = {
+        pageNo: 1,
+        pageSize: 10,
+        beginTime: beginTime,
+        endTime: endTime,
+        status: status,
+        name: name,
+        manager: managerid,
+        createName: createpeople,
+      };
+      let searchList = [];
+      for (let i in obj) {
+        if (obj[i] !== "") {
+          if (obj[i] !== null) {
+            searchList.push(1);
+          } else {
+            searchList.push(0);
+          }
+        } else {
+          searchList.push(0);
+        }
+      }
+      if (searchList.toString().indexOf("1") == -1) {
+        message.destroy();
+        message.warning("请输入搜索条件后进行搜索");
+      }
+      console.log("搜索的数据筛选条件", obj, searchList.toString());
+
+      getTableDate(obj);
+    };
+
+    // 项目分类
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
+
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
+
+    const value1 = ref("");
+    const value2 = ref([]);
+    const value3 = ref([]);
+    const value4 = ref("");
+    const value5 = ref([]);
+
+    const edvalue1 = ref("");
+    const edvalue2 = ref([]);
+    const edvalue3 = ref([]);
+    const edvalue4 = ref("");
+    const edvalue5 = ref([]);
+
+    let edname = "";
+    const edclassificationChangeName = (key) => {
+      console.log(key);
+      edname = key.target.value;
+    };
+
+    let edcategory = 0;
+    const edclassificationChange = (key) => {
+      console.log(key);
+      edcategory = key;
+    };
+
+    let edmanage = "";
+    let edmanageid = "";
+    const edclassificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      edvalue3.value = options;
+      let newoptions = [];
+      for (let i = 0; i < edvalue3.value.length; i++) {
+        if (edvalue3.value[i].value) {
+          newoptions.push(edvalue3.value[i]);
+        }
+      }
+      edvalue3.value = newoptions;
+      edmanage = mstr;
+      edmanageid = midstr;
+    };
+
+    let edsource = "";
+    const edclassificationChange5 = (key) => {
+      console.log(key);
+      edsource = key;
+    };
+
+    const classifyList5 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
+
+    let sourceBelongId = 0;
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`);
+      sourceBelongId = key;
+    };
+
+    let type = "";
+    const classificationChange = (key) => {
+      console.log(`selected ${key}`);
+      console.log(classifyList.value[key - 1].label);
+      type = key;
+    };
+
+    let manager = "";
+    let managerId = "";
+
+    const classificationChange1 = (key) => {
+      console.log(`selected ${key}`, classifyList1);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      manager = mstr;
+      managerId = midstr;
+    };
+
+    // 创建多层项目
+    const createStoreyProject = () => {
+      // 接口需要传递的参数信息
+      const errorMsgs = {
+        name: "请输入项目名称",
+        category: "请选择项目分类",
+        manager: "请选择项目经理",
+        sourceBelongId: "请选择资源归属",
+      };
+
+      let obj = {
+        attach: "",
+        beginTime: 0,
+        boeFlag: 0,
+        category: type,
+        courseSyncFlag: 0,
+        endTime: 0,
+        level: 0,
+        manager: manager,
+        managerId: managerId,
+        name: value1.value,
+        notice: "",
+        noticeFlag: 0,
+        parentId: 0,
+        picUrl: "",
+        projectId: 0,
+        remark: "",
+        sourceBelongId: sourceBelongId,
+        status: 0,
+        systemId: 0,
+        templateId: 0,
+        type: 1,
+      };
+
+      console.log("创建多层项目提交的数据格式", obj);
+      for (let i in errorMsgs) {
+        console.log(obj[i]);
+        if (obj[i] === "" || obj[i] === undefined) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return;
+        }
+      }
+
+      api
+        .createProject(obj)
+        .then((res) => {
+          console.log(res);
+          if (res.status == 200 && res.data.code == 200) {
+            // 创建成功 隐藏弹出框
+            value1.value = "";
+            type = "";
+            manager = "";
+            managerId = "";
+            sourceBelongId = "";
+            value2.value = [];
+            value3.value = [];
+            value4.value = "";
+            value5.value = [];
+            state.doublepro = false;
+            message.destroy();
+            message.success("创建成功");
+            getTableDate();
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+          message.destroy();
+          message.error("创建失败，请检查当前网络状态。");
+        });
+    };
+    // 取消按钮 清空输入的数据
+    const closeModal2 = () => {
+      value1.value = "";
+      type = "";
+      manager = "";
+      managerId = "";
+      sourceBelongId = "";
+      value2.value = [];
+      value3.value = [];
+      value4.value = "";
+      value5.value = [];
+      state.doublepro = false;
+    };
+    console.log(edmanage, edmanageid);
+    // 编辑多层项目
+    const editStoreyProject = () => {
+      // 查询下项目信息
+      api
+        .getProjectDetail({ projectId: Number(state.dcProjectID) })
+        .then((res) => {
+          console.log(res);
+          let obj = {
+            attach: res.data.data.projectInfo.attach,
+            beginTime: Number(res.data.data.projectInfo.beginTime) / 1000,
+            boeFlag: res.data.data.projectInfo.boeFlag,
+            category: edcategory
+              ? edcategory
+              : res.data.data.projectInfo.category,
+            courseSyncFlag: res.data.data.projectInfo.courseSyncFlag,
+            endTime: Number(res.data.data.projectInfo.endTime) / 1000,
+            level: res.data.data.projectInfo.level,
+            manager: edmanage
+              ? edmanage.toString(",")
+              : res.data.data.projectInfo.manager,
+            managerId: edmanageid
+              ? edmanageid.toString(",")
+              : res.data.data.projectInfo.managerId,
+            name: edname ? edname : res.data.data.projectInfo.name,
+            notice: res.data.data.projectInfo.notice,
+            noticeFlag: res.data.data.projectInfo.noticeFlag,
+            parentId: res.data.data.projectInfo.parentId,
+            picUrl: res.data.data.projectInfo.picUrl,
+            projectId: state.dcProjectID
+              ? Number(state.dcProjectID)
+              : res.data.data.projectInfo.projectId,
+            remark: res.data.data.projectInfo.remark,
+            sourceBelongId: edsource
+              ? edsource
+              : res.data.data.projectInfo.sourceBelongId,
+            status: res.data.data.projectInfo.status,
+            systemId: res.data.data.projectInfo.systemId,
+            templateId: "",
+            type: res.data.data.projectInfo.type,
+          };
+          if (
+            obj.name !== "" ||
+            obj.category !== "" ||
+            obj.manager !== "" ||
+            obj.sourceBelongId !== ""
+          ) {
+            console.log("我需要编辑");
+            console.log(obj);
+            api
+              .createProject(obj)
+              .then((res) => {
+                console.log(res);
+                if (res.status == 200 && res.data.code == 200) {
+                  state.eddoublepro = false;
+                  message.destroy();
+                  message.success("编辑成功");
+                  getTableDate();
+                }
+              })
+              .catch((err) => {
+                console.log(err);
+                state.eddoublepro = false;
+                message.destroy();
+                message.error("编辑失败，请检查当前网络状态。");
+              });
+          } else {
+            state.eddoublepro = false;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+          state.eddoublepro = false;
+          message.destroy();
+          message.error("编辑失败，请检查当前网络状态。");
+        });
+    };
+
+    const closeeditModal2 = () => {
+      state.eddoublepro = false;
+    };
+
+    // 创建单层子项目 (需要传入多层项目的ProjectID)
+    const createChildProject = () => {
+      console.log(state.currentProjectId);
+      router.push({
+        path: "/sonproject",
+        query: {
+          projectId: state.currentProjectId,
+          name: state.currentProjectName,
+        },
+      });
+    };
+
+    // 创建多层子项目
+    const value6 = ref("");
+    const value7 = ref([]);
+    const value8 = ref([]);
+    const value9 = ref([]);
+
+    const classifyList2 = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
+
+    let categoryT = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`);
+      categoryT = key;
+    };
+
+    const classifyList3 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
+
+    let managerT = "";
+    let managerIdT = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`);
+      console.log(`selected ${key}`, classifyList3);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList3.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList3.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      managerT = mstr;
+      managerIdT = midstr;
+    };
+
+    const classifyList4 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
+
+    let sourceBelongIdT = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`);
+      sourceBelongIdT = key;
+    };
+
+    // 取消按钮 清空数据
+    const closeModal3 = () => {
+      value6.value = "";
+      categoryT = "";
+      managerT = "";
+      managerIdT = "";
+      sourceBelongIdT = "";
+      value7.value = [];
+      value8.value = [];
+      value9.value = [];
+      state.doublesonpro = false;
+    };
+
+    const createChildsProject = () => {
+      const errorMsgs = {
+        name: "请输入子项目名称",
+        category: "请选择子项目分类",
+        manager: "请选择子项目经理",
+        sourceBelongId: "请选择资源归属",
+      };
+
+      let obj = {
+        attach: "",
+        beginTime: 0,
+        boeFlag: 0,
+        category: categoryT,
+        courseSyncFlag: 0,
+        endTime: 0,
+        level: 0,
+        manager: managerT,
+        managerId: managerIdT,
+        name: value6.value,
+        notice: "",
+        noticeFlag: 0,
+        parentId: state.currentProjectId,
+        picUrl: "",
+        projectId: 0,
+        remark: "",
+        sourceBelongId: sourceBelongIdT,
+        status: 0,
+        systemId: 0,
+        templateId: 0,
+        type: 2,
+      };
+
+      console.log("创建多层子项目提交的数据格式", obj);
+      for (let i in errorMsgs) {
+        console.log(obj[i]);
+        if (obj[i] === "" || obj[i] === undefined) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return;
+        }
+      }
+
+      api
+        .createProject(obj)
+        .then((res) => {
+          console.log(res);
+          if (res.status == 200 && res.data.code == 200) {
+            value6.value = "";
+            categoryT = "";
+            managerT = "";
+            managerIdT = "";
+            sourceBelongIdT = "";
+            value7.value = [];
+            value8.value = [];
+            value9.value = [];
+            state.doublesonpro = false;
+            message.destroy();
+            message.success("创建成功");
+            getTableDate();
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+          message.destroy();
+          message.error("创建失败，请检查当前网络状态。");
+        });
+    };
+
+    // 编辑多层子项目
+    const edvalue6 = ref("");
+    const edvalue7 = ref([]);
+    const edvalue8 = ref([]);
+    const edvalue9 = ref("");
+
+    let editChildrensName = "";
+    const edclassificationChange6 = (key) => {
+      console.log(key);
+      editChildrensName = key.target.value;
+    };
+
+    let editChildrensCategory = "";
+    const edclassificationChange2 = (key) => {
+      console.log(key);
+      editChildrensCategory = key;
+    };
+
+    let editChildrensManege = "";
+    let editChildrensManegeId = "";
+
+    const edclassificationChange3 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      edvalue8.value = options;
+      let newoptions = [];
+      for (let i = 0; i < edvalue8.value.length; i++) {
+        if (edvalue8.value[i].value) {
+          newoptions.push(edvalue8.value[i]);
+        }
+      }
+      edvalue8.value = newoptions;
+      editChildrensManege = mstr;
+      editChildrensManegeId = midstr;
+    };
+
+    let editChildrensSource = "";
+    const edclassificationChange4 = (key) => {
+      console.log(key);
+      editChildrensSource = key;
+    };
+
+    // 编辑多层子项目
+    const editChildsProject = () => {
+      api
+        .getProjectDetail({
+          projectId: Number(state.currentEditChildrensProjectId),
+        })
+        .then((res) => {
+          let obj = {
+            attach: res.data.data.projectInfo.attach,
+            beginTime: Number(res.data.data.projectInfo.beginTime) / 1000,
+            boeFlag: res.data.data.projectInfo.boeFlag,
+            category: editChildrensCategory
+              ? Number(editChildrensCategory)
+              : res.data.data.projectInfo.category,
+            courseSyncFlag: res.data.data.projectInfo.courseSyncFlag,
+            endTime: Number(res.data.data.projectInfo.endTime) / 1000,
+            level: res.data.data.projectInfo.level,
+            manager: editChildrensManege
+              ? editChildrensManege.toString(",")
+              : res.data.data.projectInfo.manager,
+            managerId: editChildrensManegeId
+              ? editChildrensManegeId.toString(",")
+              : res.data.data.projectInfo.managerId,
+            name: editChildrensName
+              ? editChildrensName
+              : res.data.data.projectInfo.name,
+            notice: res.data.data.projectInfo.notice,
+            noticeFlag: res.data.data.projectInfo.noticeFlag,
+            parentId: res.data.data.projectInfo.parentId,
+            picUrl: res.data.data.projectInfo.picUrl,
+            projectId: state.currentEditChildrensProjectId
+              ? Number(state.currentEditChildrensProjectId)
+              : res.data.data.projectInfo.projectId,
+            remark: res.data.data.projectInfo.remark,
+            sourceBelongId: editChildrensSource
+              ? Number(editChildrensSource)
+              : res.data.data.projectInfo.sourceBelongId,
+            status: res.data.data.projectInfo.status,
+            systemId: res.data.data.projectInfo.systemId,
+            templateId: "",
+            type: res.data.data.projectInfo.type,
+          };
+          if (
+            obj.name !== "" ||
+            obj.manager !== "" ||
+            obj.category !== "" ||
+            obj.sourceBelongId !== ""
+          ) {
+            console.log("编辑多层子项目传递的参数", obj);
+            api
+              .createProject(obj)
+              .then((ress) => {
+                console.log(ress);
+                if (ress.status == 200 && ress.data.code == 200) {
+                  state.eddoublesonpro = false;
+                  message.destroy();
+                  message.success("编辑成功");
+                  getTableDate();
+                }
+              })
+              .catch((err) => {
+                console.log(err);
+                state.eddoublesonpro = false;
+                message.destroy();
+                message.error("编辑失败，请检查当前网络状态。");
+              });
+          } else {
+            state.eddoublesonpro = false;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+          state.eddoublesonpro = false;
+          message.destroy();
+          message.error("编辑失败，请检查当前网络状态。");
+        });
+    };
+
+    const closeeditModal3 = () => {
+      state.eddoublesonpro = false;
+    };
+
+    //确认发布项目
+    const releaseProject = () => {
+			console.log('点击发布')
+      let obj = {
+        projectId: state.releaseProjectId,
+      };
+      api
+        .releaseProject(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+					 message.destroy();
+          message.success("发布成功");
+					state.projectPub = false
+					getTableDate()
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
+    };
+    //发布弹窗
+    const showProjectPub = (projectId) => {
+      state.projectPub = true;
+      state.releaseProjectId = projectId;
+			console.log('projectId',projectId)
+			 //获取学员总数
+      let obj = {
+        pageNo: 0,
+        pageSize: 0,
+        projectId: projectId,
+      };
+			api.projectStudent(obj).then(res=>{
+ if (res.status === 200) {
+            console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total;
+          }
+			}).catch(err=>{
+console.log('获取学员人数失败',err)
+			})
+			//获取阶段及任务总数
+    };
+
+		//撤回
 
 
-		// 数据接入 - end - 
+    // 数据接入 - end -
 
+    onMounted(() => {
+      // console.log("执行");
+    });
+    const selectProjectName = (value, index) => {
+      console.log("value", value, index);
+    };
+    const expandTable = (e, a) => {
+      // console.log("惦记了");
+      console.log("e", e, a);
+    };
 
+    // 获取项目列表信息
+    let tableData = ref([]);
+    let currentPage = ref(1);
+    let tableDataTotal = ref("");
+    let pageSize = ref(10);
 
-
-		onMounted(() => {
-			// console.log("执行");
-		});
-		const selectProjectName = (value, index) => {
-			console.log("value", value, index);
-		};
-		const expandTable = (e, a) => {
-			// console.log("惦记了");
-			console.log("e", e, a);
-		};
-
-		const getTableDate = () => {
-			let data = state.tableData;
-			data.map((value) => {
-				if (value.children) {
-					//多层项目
-					value.operation =
-						value.state === "草稿" ? (
-							<div class="operation">
-								<span class="operation1">编辑</span>
-								<div class="tableSelect">
-									<a-select
-										style="width: 50px"
-										value="授权"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="权限名单" label="权限名单">
-											<div
-												onClick={() => {
-													showProjPrower();
-												}}
-											>
-												权限名单
-											</div>
-										</a-select-option>
-										<a-select-option value="归属权" label="归属权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjOwner();
-												}}
-											>
-												归属权
-											</div>
-										</a-select-option>
-										<a-select-option value="查看权" label="查看权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjCheck();
-												}}
-											>
-												查看权
-											</div>
-										</a-select-option>
-										<a-select-option value="管理权" label="管理权">
-											<div
-												onClick={() => {
-													showProjManage();
-												}}
-											>
-												管理权
-											</div>
-										</a-select-option>
-									</a-select>
-								</div>
-								<span
-									class="operation3"
-									style="cursor: pointer"
-									onClick={() => {
-										state.sonproject = true;
-									}}
-								>
-									创建子项目
-								</span>
-								<div class="tableSelect">
-									<a-select
-										style="width: 50px"
-										value="更多"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
+    const columns = ref([
+      {
+        title: "项目名称",
+        dataIndex: "name",
+        key: "name",
+        width: 280,
+        // align: "center",
+        ellipsis: true,
+        // scopedSlots: { customRender: "action" }, //引入的插槽
+        // customRender: (text, record) => {
+        //   console.log(text, record);
+        //   return <span>{text.text}</span>;
+        // },
+      },
+      {
+        title: "项目经理",
+        dataIndex: "manager",
+        key: "manager",
+        width: 100,
+        align: "center",
+      },
+      {
+        title: "状态",
+        dataIndex: "status",
+        // width: "30%",
+        key: "status",
+        width: 100,
+        align: "center",
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.status == 0
+                ? "草稿"
+                : value.record.status == 1 &&
+                  Number(value.record.beginTime) <
+                    Math.ceil(new Date().getTime / 1000)
+                ? "进行中"
+                : value.record.status == 1 &&
+                  Number(value.record.beginTime) >
+                    Math.ceil(new Date().getTime / 1000) &&
+                  value.record.type !== 1 &&
+                  value.record.type !== 2
+                ? "未开始"
+                : value.record.status == 2
+                ? "未开始"
+                : "已结束"}
+            </div>
+          );
+        },
+      },
+      {
+        title: "创建人",
+        dataIndex: "createName",
+        // width: "30%",
+        key: "createName",
+        width: 100,
+        align: "center",
+      },
+      {
+        title: "创建时间",
+        dataIndex: "createTime",
+        key: "createTime",
+        width: 180,
+        align: "center",
+        customRender: (value) => {
+          return <div>{toDate(value.record.createTime, "Y-M-D h:m:s")}</div>;
+        },
+      },
+      {
+        title: "操作",
+        dataIndex: "operation",
+        key: "operation",
+        width: 300,
+        align: "center",
+        fixed: "right",
+        customRender: (value) => {
+          // console.log("value", value.record.type, value.record.status);
+          return value.record.type === 1 ? (
+            value.record.status === 0 ? (
+              <div class="operation">
+                <span
+                  onClick={() => {
+                    state.eddoublepro = true;
+                    console.log("多层项目编辑");
+                    state.dcProjectID = value.record.projectId;
+                    edvalue1.value = value.record.name;
+                    {
+                      /* edvalue2.value =  classifyList[value.record.category] */
+                    }
+                    edvalue2.value = classifyList.value[0];
+                    edvalue3.value = value.record.manager.split();
+                    edvalue4.value = "1,2";
+                    edvalue5.value = classifyList5.value[0];
+                  }}
+                  style="cursor:pointer;"
+                  class="operation1"
+                >
+                  编辑
+                </span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                <span
+                  class="operation3"
+                  style="cursor: pointer"
+                  onClick={() => {
+                    state.currentProjectId = value.record.projectId;
+                    state.currentProjectName = value.record.name;
+                    state.sonproject = true;
+                  }}
+                >
+                  创建子项目
+                </span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    {/* 
 										<a-select-option value="基础信息" label="基础信息">
 											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
-										<a-select-option value="存为模板" label="存为模板">
+										<a-select-option value="存为模版" label="存为模版">
 											<div
 												onClick={() => {
 													showStartModal();
 												}}
 											>
-												存为模板
+												存为模版
 											</div>
-										</a-select-option>
-									</a-select>
-								</div>
-							</div>
-						) : value.state === "进行中" ? (
-							<div class="operation">
-								<span class="operation1">查看</span>
-								<div class="tableSelect">
-									<a-select
-										style="width: 50px"
-										value="授权"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="权限名单" label="权限名单">
-											<div
-												onClick={() => {
-													showProjPrower();
-												}}
-											>
-												权限名单
-											</div>
-										</a-select-option>
-										<a-select-option value="归属权" label="归属权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjOwner();
-												}}
-											>
-												归属权
-											</div>
-										</a-select-option>
-										<a-select-option value="查看权" label="查看权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjCheck();
-												}}
-											>
-												查看权
-											</div>
-										</a-select-option>
-										<a-select-option value="管理权" label="管理权">
-											<div
-												onClick={() => {
-													showProjManage();
-												}}
-											>
-												管理权
-											</div>
-										</a-select-option>
-									</a-select>
-								</div>
-								<span
-									class="operation3"
-									onClick={() => {
-										showCopyModal();
-									}}
-								>
-									复制
-								</span>
-								<span class="more"></span>
-							</div>
-						) : value.state === "已结束" ? (
-							<div class="operation">
-								<span class="operation1">查看</span>
-								<div class="tableSelect">
-									<a-select
-										style="width: 50px"
-										value="授权"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="权限名单" label="权限名单">
-											<div
-												onClick={() => {
-													showProjPrower();
-												}}
-											>
-												权限名单
-											</div>
-										</a-select-option>
-										<a-select-option value="归属权" label="归属权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjOwner();
-												}}
-											>
-												归属权
-											</div>
-										</a-select-option>
-										<a-select-option value="查看权" label="查看权">
-											<div
-												onClick={() => {
-													console.log("点击了111");
-													showProjCheck();
-												}}
-											>
-												查看权
-											</div>
-										</a-select-option>
-										<a-select-option value="管理权" label="管理权">
-											<div
-												onClick={() => {
-													showProjManage();
-												}}
-											>
-												管理权
-											</div>
-										</a-select-option>
-									</a-select>
-								</div>
-								<span
-									class="operation3"
-									onClick={() => {
-										showCopyModal();
-									}}
-								>
-									复制
-								</span>
-								<span
-									class="more"
-									onClick={() => {
-										showDeleteModal();
-									}}
-								>
-									删除
-								</span>
-							</div>
-						) : (
-							<div></div>
-						);
+										</a-select-option> */}
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : value.record.status === 1 ? (
+              <div class="operation">
+                <span class="operation1">查看</span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                <span
+                  class="operation3"
+                  // onClick={() => {
+                  // 	showCopyModal();
+                  // }}
+                ></span>
 
-					value.children.map((item) => {
-						if (item.children) {
-							//多层子项目
-							item.operation =
-								item.state === "草稿" ? (
-									<div class="operation">
-										<span class="operation1">编辑</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<router-link to="/classadd" class="operation3">
-											创建班级
-										</router-link>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="更多"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="复制" label="复制">
-													<div
-														onClick={() => {
-															showCopyModal();
-														}}
-													>
-														复制
-													</div>
-												</a-select-option>
-												<a-select-option value="删除" label="删除">
-													<div
-														onClick={() => {
-															showDeleteModal();
-														}}
-													>
-														删除
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-									</div>
-								) : item.state === "进行中" ? (
-									<div class="operation">
-										<span class="operation1">查看</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-
-										<router-link to="/classadd" class="operation3">
-											创建班级
-										</router-link>
-										<span
-											class="more"
-											onClick={() => {
-												showCopyModal();
-											}}
-										>
-											复制
-										</span>
-									</div>
-								) : item.state === "已结束" ? (
-									<div class="operation">
-										<span class="operation1">查看</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<span
-											class="operation3"
-											onClick={() => {
-												showCopyModal();
-											}}
-										>
-											复制
-										</span>
-										<span
-											class="more"
-											onClick={() => {
-												showDeleteModal();
-											}}
-										>
-											删除
-										</span>
-									</div>
-								) : (
-									<div></div>
-								);
-
-							item.children.map((a) => {
-								//班级
-								a.operation =
-									a.state === "草稿" ? (
-										<div class="operation">
-											<span class="operation1">编辑</span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="授权"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="权限名单" label="权限名单">
-														<div
-															onClick={() => {
-																showProjPrower();
-															}}
-														>
-															权限名单
-														</div>
-													</a-select-option>
-													<a-select-option value="归属权" label="归属权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjOwner();
-															}}
-														>
-															归属权
-														</div>
-													</a-select-option>
-													<a-select-option value="查看权" label="查看权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjCheck();
-															}}
-														>
-															查看权
-														</div>
-													</a-select-option>
-													<a-select-option value="管理权" label="管理权">
-														<div
-															onClick={() => {
-																showProjManage();
-															}}
-														>
-															管理权
-														</div>
-													</a-select-option>
-												</a-select>
-											</div>
-											<span class="operation3">发布</span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="更多"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="复制" label="复制">
-														<div
-															onClick={() => {
-																showCopyModal();
-															}}
-														>
-															复制
-														</div>
-													</a-select-option>
-													<a-select-option value="删除" label="删除">
-														<div
-															onClick={() => {
-																showDeleteModal();
-															}}
-														>
-															删除
-														</div>
-													</a-select-option>
-													<a-select-option value="存为模板" label="存为模板">
-														<div
-															onClick={() => {
-																showStartModal();
-															}}
-														>
-															存为模板
-														</div>
-													</a-select-option>
-													<a-select-option value="基础信息" label="基础信息">
-														<router-link to="/taskpage">基础信息</router-link>
-													</a-select-option>
-												</a-select>
-											</div>
-										</div>
-									) : a.state === "进行中" ? (
-										<div class="operation">
-											<span class="operation1"></span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="授权"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="权限名单" label="权限名单">
-														<div
-															onClick={() => {
-																showProjPrower();
-															}}
-														>
-															权限名单
-														</div>
-													</a-select-option>
-													<a-select-option value="归属权" label="归属权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjOwner();
-															}}
-														>
-															归属权
-														</div>
-													</a-select-option>
-													<a-select-option value="查看权" label="查看权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjCheck();
-															}}
-														>
-															查看权
-														</div>
-													</a-select-option>
-													<a-select-option value="管理权" label="管理权">
-														<div
-															onClick={() => {
-																showProjManage();
-															}}
-														>
-															管理权
-														</div>
-													</a-select-option>
-												</a-select>
-											</div>
-											<span
-												class="operation3"
-												onClick={() => {
-													showCopyModal();
-												}}
-											>
-												复制
-											</span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="更多"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="撤回" label="撤回">
-														<div
-															onClick={() => {
-																showBackModal();
-															}}
-														>
-															撤回
-														</div>
-													</a-select-option>
-													<a-select-option value="结束" label="结束">
-														<div
-															onClick={() => {
-																showStopModal();
-															}}
-														>
-															结束
-														</div>
-													</a-select-option>
-													<a-select-option value="存为模板" label="存为模板">
-														<div
-															onClick={() => {
-																showStartModal();
-															}}
-														>
-															存为模板
-														</div>
-													</a-select-option>
-													<a-select-option value="基础信息" label="基础信息">
-														<router-link to="/taskpage">基础信息</router-link>
-													</a-select-option>
-												</a-select>
-											</div>
-										</div>
-									) : a.state === "已结束" ? (
-										<div class="operation">
-											<span class="operation1"></span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="授权"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="权限名单" label="权限名单">
-														<div
-															onClick={() => {
-																showProjPrower();
-															}}
-														>
-															权限名单
-														</div>
-													</a-select-option>
-													<a-select-option value="归属权" label="归属权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjOwner();
-															}}
-														>
-															归属权
-														</div>
-													</a-select-option>
-													<a-select-option value="查看权" label="查看权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjCheck();
-															}}
-														>
-															查看权
-														</div>
-													</a-select-option>
-													<a-select-option value="管理权" label="管理权">
-														<div
-															onClick={() => {
-																showProjManage();
-															}}
-														>
-															管理权
-														</div>
-													</a-select-option>
-												</a-select>
-											</div>
-											<span
-												class="operation3"
-												onClick={() => {
-													showCopyModal();
-												}}
-											>
-												复制
-											</span>
-											<span
-												class="operation3"
-												onClick={() => {
-													showCopyModal();
-												}}
-											>
-												复制
-											</span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="更多"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="删除" label="删除">
-														<div
-															onClick={() => {
-																showDeleteModal();
-															}}
-														>
-															删除
-														</div>
-													</a-select-option>
-													<a-select-option value="存为模板" label="存为模板">
-														<div
-															onClick={() => {
-																showStartModal();
-															}}
-														>
-															存为模板
-														</div>
-													</a-select-option>
-													<a-select-option value="基础信息" label="基础信息">
-														<router-link to="/taskpage">基础信息</router-link>
-													</a-select-option>
-												</a-select>
-											</div>
-										</div>
-									) : a.state === "未开始" ? (
-										<div class="operation">
-											<span class="operation1"></span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="授权"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="权限名单" label="权限名单">
-														<div
-															onClick={() => {
-																showProjPrower();
-															}}
-														>
-															权限名单
-														</div>
-													</a-select-option>
-													<a-select-option value="归属权" label="归属权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjOwner();
-															}}
-														>
-															归属权
-														</div>
-													</a-select-option>
-													<a-select-option value="查看权" label="查看权">
-														<div
-															onClick={() => {
-																console.log("点击了111");
-																showProjCheck();
-															}}
-														>
-															查看权
-														</div>
-													</a-select-option>
-													<a-select-option value="管理权" label="管理权">
-														<div
-															onClick={() => {
-																showProjManage();
-															}}
-														>
-															管理权
-														</div>
-													</a-select-option>
-												</a-select>
-											</div>
-											<span
-												class="operation3"
-												onClick={() => {
-													showCopyModal();
-												}}
-											>
-												复制
-											</span>
-											<div class="tableSelect">
-												<a-select
-													style="width: 50px"
-													value="更多"
-													// options={state.projectNameList}
-													dropdownClassName="tabledropdown"
-												>
-													<a-select-option value="结束" label="结束">
-														<div
-															onClick={() => {
-																showStopModal();
-															}}
-														>
-															结束
-														</div>
-													</a-select-option>
-													<a-select-option value="撤回" label="撤回">
-														<div
-															onClick={() => {
-																showBackModal();
-															}}
-														>
-															撤回
-														</div>
-													</a-select-option>
-													<a-select-option value="存为模板" label="存为模板">
-														<div
-															onClick={() => {
-																showStartModal();
-															}}
-														>
-															存为模板
-														</div>
-													</a-select-option>
-													<a-select-option value="基础信息" label="基础信息">
-														<router-link to="/taskpage">基础信息</router-link>
-													</a-select-option>
-												</a-select>
-											</div>
-										</div>
-									) : (
-										<div></div>
-									);
-							});
-						} else {
-							//单层子项目
-							item.operation =
-								item.state === "草稿" ? (
-									<div class="operation">
-										<span class="operation1">编辑</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<span class="operation3">发布</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="更多"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="复制" label="复制">
-													<div
-														onClick={() => {
-															showCopyModal();
-														}}
-													>
-														复制
-													</div>
-												</a-select-option>
-												<a-select-option value="删除" label="删除">
-													<div
-														onClick={() => {
-															showDeleteModal();
-														}}
-													>
-														删除
-													</div>
-												</a-select-option>
-												<a-select-option value="存为模板" label="存为模板">
-													<div
-														onClick={() => {
-															showStartModal();
-														}}
-													>
-														存为模板
-													</div>
-												</a-select-option>
-												<a-select-option value="基础信息" label="基础信息">
-													<router-link to="/taskpage">基础信息</router-link>
-												</a-select-option>
-											</a-select>
-										</div>
-									</div>
-								) : item.state === "进行中" ? (
-									<div class="operation">
-										<span class="operation1"></span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<span
-											class="operation3"
-											onClick={() => {
-												showCopyModal();
-											}}
-										>
-											复制
-										</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="更多"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="撤回" label="撤回">
-													<div
-														onClick={() => {
-															showBackModal();
-														}}
-													>
-														撤回
-													</div>
-												</a-select-option>
-												<a-select-option value="结束" label="结束">
-													<div
-														onClick={() => {
-															showStopModal();
-														}}
-													>
-														结束
-													</div>
-												</a-select-option>
-												<a-select-option value="存为模板" label="存为模板">
-													<div
-														onClick={() => {
-															showStartModal();
-														}}
-													>
-														存为模板
-													</div>
-												</a-select-option>
-												<a-select-option value="基础信息" label="基础信息">
-													<router-link to="/taskpage">基础信息</router-link>
-												</a-select-option>
-											</a-select>
-										</div>
-									</div>
-								) : item.state === "已结束" ? (
-									<div class="operation">
-										<span class="operation1"></span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<span
-											class="operation3"
-											onClick={() => {
-												showCopyModal();
-											}}
-										>
-											复制
-										</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="更多"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="删除" label="删除">
-													<div
-														onClick={() => {
-															showDeleteModal();
-														}}
-													>
-														删除
-													</div>
-												</a-select-option>
-												<a-select-option value="结束" label="结束">
-													<div
-														onClick={() => {
-															showStopModal();
-														}}
-													>
-														结束
-													</div>
-												</a-select-option>
-												<a-select-option value="存为模板" label="存为模板">
-													<div
-														onClick={() => {
-															showStartModal();
-														}}
-													>
-														存为模板
-													</div>
-												</a-select-option>
-												<a-select-option value="基础信息" label="基础信息">
-													<router-link to="/taskpage">基础信息</router-link>
-												</a-select-option>
-											</a-select>
-										</div>
-									</div>
-								) : item.state === "未开始" ? (
-									<div class="operation">
-										<span class="operation1"></span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="授权"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="权限名单" label="权限名单">
-													<div
-														onClick={() => {
-															showProjPrower();
-														}}
-													>
-														权限名单
-													</div>
-												</a-select-option>
-												<a-select-option value="归属权" label="归属权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjOwner();
-														}}
-													>
-														归属权
-													</div>
-												</a-select-option>
-												<a-select-option value="查看权" label="查看权">
-													<div
-														onClick={() => {
-															console.log("点击了111");
-															showProjCheck();
-														}}
-													>
-														查看权
-													</div>
-												</a-select-option>
-												<a-select-option value="管理权" label="管理权">
-													<div
-														onClick={() => {
-															showProjManage();
-														}}
-													>
-														管理权
-													</div>
-												</a-select-option>
-											</a-select>
-										</div>
-										<span
-											class="operation3"
-											onClick={() => {
-												showCopyModal();
-											}}
-										>
-											复制
-										</span>
-										<div class="tableSelect">
-											<a-select
-												style="width: 50px"
-												value="更多"
-												// options={state.projectNameList}
-												dropdownClassName="tabledropdown"
-											>
-												<a-select-option value="撤回" label="撤回">
-													<div
-														onClick={() => {
-															showBackModal();
-														}}
-													>
-														撤回
-													</div>
-												</a-select-option>
-												<a-select-option value="结束" label="结束">
-													<div
-														onClick={() => {
-															showStopModal();
-														}}
-													>
-														结束
-													</div>
-												</a-select-option>
-												<a-select-option value="存为模板" label="存为模板">
-													<div
-														onClick={() => {
-															showStartModal();
-														}}
-													>
-														存为模板
-													</div>
-												</a-select-option>
-												<a-select-option value="基础信息" label="基础信息">
-													<router-link to="/taskpage">基础信息</router-link>
-												</a-select-option>
-											</a-select>
-										</div>
-									</div>
-								) : (
-									<div></div>
-								);
-						}
-					});
-				} else {
-					//单层项目
-					value.operation = (
-						<div class="operation">
-							{value.state === "草稿" ? (
-								<span class="operation1">编辑</span>
-							) : (
-								<span class="operation1"></span>
-							)}
-							<div class="tableSelect">
-								<a-select
-									style="width: 50px"
-									value="授权"
-									// options={state.projectNameList}
-									dropdownClassName="tabledropdown"
-								>
-									<a-select-option value="权限名单" label="权限名单">
-										<div
-											onClick={() => {
-												showProjPrower();
-											}}
-										>
-											权限名单
-										</div>
-									</a-select-option>
-									<a-select-option value="归属权" label="归属权">
-										<div
-											onClick={() => {
-												console.log("点击了111");
-												showProjOwner();
-											}}
-										>
-											归属权
-										</div>
-									</a-select-option>
-									<a-select-option value="查看权" label="查看权">
-										<div
-											onClick={() => {
-												console.log("点击了111");
-												showProjCheck();
-											}}
-										>
-											查看权
-										</div>
-									</a-select-option>
-									<a-select-option value="管理权" label="管理权">
-										<div
-											onClick={() => {
-												showProjManage();
-											}}
-										>
-											管理权
-										</div>
-									</a-select-option>
-								</a-select>
-							</div>
-
-							{value.state === "草稿" ? (
-								<span class="operation3">发布</span>
-							) : (
-								<span
-									class="operation3"
-									onClick={() => {
-										showCopyModal();
-									}}
-								>
-									复制
-								</span>
-							)}
-							<div class="tableSelect">
-								{value.state === "草稿" ? (
-									<a-select
-										style="width: 50px"
-										value="更多"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="复制" label="复制">
-											<div
-												onClick={() => {
-													showCopyModal();
-												}}
-											>
-												复制
-											</div>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    {/* 
+										<a-select-option value="基础信息" label="基础信息">
+											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
-										<a-select-option value="删除" label="删除">
-											<div
-												onClick={() => {
-													showDeleteModal();
-												}}
-											>
-												删除
-											</div>
-										</a-select-option>
-										<a-select-option value="存为模板" label="存为模板">
+										<a-select-option value="存为模版" label="存为模版">
 											<div
 												onClick={() => {
 													showStartModal();
 												}}
 											>
-												存为模板
+												存为模版
 											</div>
-										</a-select-option>
+										</a-select-option> */}
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : value.record.status === -1 ? (
+              <div class="operation">
+                <span class="operation1">查看</span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                <span
+                  class="operation3"
+                  // onClick={() => {
+                  // 	showCopyModal();
+                  // }}
+                ></span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    {/* 
 										<a-select-option value="基础信息" label="基础信息">
 											<router-link to="/taskpage">基础信息</router-link>
 										</a-select-option>
-									</a-select>
-								) : value.state === "进行中" ? (
-									<a-select
-										style="width: 50px"
-										value="更多"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="存为模板" label="存为模板">
+										<a-select-option value="存为模版" label="存为模版">
 											<div
 												onClick={() => {
 													showStartModal();
 												}}
 											>
-												存为模板
+												存为模版
 											</div>
-										</a-select-option>
-										<a-select-option value="结束" label="结束">
-											<div
-												onClick={() => {
-													showStopModal();
-												}}
-											>
-												结束
-											</div>
-										</a-select-option>
-										<a-select-option value="撤回" label="撤回">
-											<div
-												onClick={() => {
-													showBackModal();
-												}}
-											>
-												撤回
-											</div>
-										</a-select-option>
-										<a-select-option value="基础信息" label="基础信息">
+										</a-select-option> */}
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : (
+              <div></div>
+            )
+          ) : value.record.type === 2 ? (
+            value.record.status === 0 ? (
+              <div class="operation">
+                <span
+                  onClick={() => {
+                    console.log("多层子项目编辑", value);
+                    state.currentEdProjectName = value.record.paraentName;
+                    state.currentEditChildrensProjectId =
+                      value.record.projectId;
+                    state.eddoublesonpro = true;
+
+                    edvalue6.value = value.record.name;
+                    edvalue7.value = classifyList.value[0];
+                    edvalue8.value = value.record.manager.split();
+                    edvalue9.value = classifyList5.value[0];
+                  }}
+                  style="cursor:pointer;"
+                  class="operation1"
+                >
+                  编辑
+                </span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                <div
+                  onClick={() => {
+                    router.push({
+                      path: "/classadd",
+                      query: {
+                        projectId: value.record.projectId,
+                        name: value.record.name,
+                      },
+                    });
+                  }}
+                  style={{ cursor: "pointer" }}
+                  to="/classadd"
+                  class="operation3"
+                >
+                  创建班级
+                </div>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : value.record.status === 1 ? (
+              <div class="operation">
+                <span class="operation1">查看</span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+
+                <router-link to="/classadd" class="operation3">
+                  创建班级
+                </router-link>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : value.record.status === -1 ? (
+              <div class="operation">
+                <span class="operation1">查看</span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="授权"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="权限名单" label="权限名单">
+                      <div
+                        onClick={() => {
+                          showProjPrower();
+                        }}
+                      >
+                        权限名单
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="归属权" label="归属权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjOwner();
+                        }}
+                      >
+                        归属权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="查看权" label="查看权">
+                      <div
+                        onClick={() => {
+                          console.log("点击了111");
+                          showProjCheck();
+                        }}
+                      >
+                        查看权
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="管理权" label="管理权">
+                      <div
+                        onClick={() => {
+                          showProjManage();
+                        }}
+                      >
+                        管理权
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+                <span class="operation3"></span>
+                <div class="tableSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </div>
+            ) : (
+              <div></div>
+            )
+          ) : (
+            <div class="operation">
+              {value.record.status === 0 ? (
+                <span
+                  onClick={() => {
+                    console.log("单层子项目的编辑");
+                    console.log(value);
+
+                    {
+                      /* 判断是班级\单层项目\单层子项目 */
+                    }
+                    if (value.record.parentId == "0") {
+                      router.push({
+                        path: "/projectadd",
+                        query: {
+                          projectId: value.record.projectId,
+                          name: value.record.name,
+                        },
+                      });
+                    } else {
+                      if (value.record.isbj) {
+                        router.push({
+                          path: "/classadd",
+                          query: {
+                            projectId: value.record.projectId,
+                            name: value.record.paraentName,
+                            edit: 0,
+                          },
+                        });
+                      } else {
+                        router.push({
+                          path: "/sonproject",
+                          query: {
+                            projectId: value.record.projectId,
+                            name: value.record.paraentName,
+                            edit: 0,
+                          },
+                        });
+                      }
+                    }
+                  }}
+                  style="cursor:pointer;"
+                  class="operation1"
+                >
+                  编辑
+                </span>
+              ) : (
+                <span class="operation1"></span>
+              )}
+              <div class="tableSelect">
+                <a-select
+                  style="width: 50px"
+                  value="授权"
+                  // options={state.projectNameList}
+                  dropdownClassName="tabledropdown"
+                >
+                  <a-select-option value="权限名单" label="权限名单">
+                    <div
+                      onClick={() => {
+                        showProjPrower();
+                      }}
+                    >
+                      权限名单
+                    </div>
+                  </a-select-option>
+                  <a-select-option value="归属权" label="归属权">
+                    <div
+                      onClick={() => {
+                        console.log("点击了111");
+                        showProjOwner();
+                      }}
+                    >
+                      归属权
+                    </div>
+                  </a-select-option>
+                  <a-select-option value="查看权" label="查看权">
+                    <div
+                      onClick={() => {
+                        console.log("点击了111");
+                        showProjCheck();
+                      }}
+                    >
+                      查看权
+                    </div>
+                  </a-select-option>
+                  <a-select-option value="管理权" label="管理权">
+                    <div
+                      onClick={() => {
+                        showProjManage();
+                      }}
+                    >
+                      管理权
+                    </div>
+                  </a-select-option>
+                </a-select>
+              </div>
+              {value.record.status === 0 ? (
+                <span
+                  onClick={() => {
+                    showProjectPub(value.record.projectId);
+                  }}
+                  style="cursor:pointer"
+                  class="operation3"
+                >
+                  发布
+                </span>
+              ) : (
+                <span class="operation3"></span>
+              )}
+              <div class="tableSelect">
+                {value.record.status === 0 ? (
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="存为模版" label="存为模版">
+                      <div
+                        onClick={() => {
+                          showStartModal();
+                        }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                        onClick={() => {
+                          router.push({
+                            path: "/taskpage",
+                          });
+                          storage.set("projectId", value.record.projectId);
+                        }}
+                      >
+                        基础信息
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                ) : value.record.status === 1 ||
+                  (value.record.status == 1 &&
+                    Number(value.record.beginTime) >
+                      Math.ceil(new Date().getTime / 1000)) ? (
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="存为模版" label="存为模版">
+                      <a-select-option value="复制" label="复制">
+                        <div
+                          onClick={() => {
+                            showCopyModal();
+                          }}
+                        >
+                          复制
+                        </div>
+                      </a-select-option>
+                      <div
+                        onClick={() => {
+                          showStartModal();
+                        }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="结束" label="结束">
+                      <div
+                        onClick={() => {
+                          showStopModal();
+                        }}
+                      >
+                        结束
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="撤回" label="撤回">
+                      <div
+                        onClick={() => {
+                          showBackModal();
+                        }}
+                      >
+                        撤回
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                        onClick={() => {
+                          router.push({
+                            path: "/taskpage",
+                          });
+                          storage.set("projectId", value.record.projectId);
+                        }}
+                      >
+                        基础信息
+                      </div>
+                    </a-select-option>
+                  </a-select>
+                ) : value.record.status === -1 ? (
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="存为模版" label="存为模版">
+                      <div
+                        onClick={() => {
+                          showStartModal();
+                        }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="复制" label="复制">
+                      <div
+                        onClick={() => {
+                          showCopyModal();
+                        }}
+                      >
+                        复制
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          showDeleteModal();
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                        onClick={() => {
+                          router.push({
+                            path: "/taskpage",
+                          });
+                          storage.set("projectId", value.record.projectId);
+                        }}
+                      >
+                        基础信息
+                      </div>
+                      {/**
 											<router-link to="/taskpage">基础信息</router-link>
-										</a-select-option>
-									</a-select>
-								) : value.state === "已结束" || value.state === "未开始" ? (
-									<a-select
-										style="width: 50px"
-										value="更多"
-										// options={state.projectNameList}
-										dropdownClassName="tabledropdown"
-									>
-										<a-select-option value="存为模板" label="存为模板">
-											<div
-												onClick={() => {
-													showStartModal();
-												}}
-											>
-												存为模板
-											</div>
-										</a-select-option>
-										<a-select-option value="删除" label="删除">
-											<div
-												onClick={() => {
-													showDeleteModal();
-												}}
-											>
-												删除
-											</div>
-										</a-select-option>
-										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
-										</a-select-option>
-									</a-select>
-								) : (
-									<div></div>
-								)}
-							</div>
-						</div>
-					);
-				}
-			});
-			state.tableData = data;
-			console.log("tableData", state.tableData);
-		};
-		getTableDate();
+											*/}
+                    </a-select-option>
+                  </a-select>
+                ) : (
+                  <div></div>
+                )}
+              </div>
+            </div>
+          );
+        },
+      },
+    ]);
 
-		const showModal = () => {
-			state.sonproject = true;
-		};
-		const closeModal = () => {
-			state.sonproject = false;
-		};
+    const getTableDate = (pagedata) => {
+      let obj = {
+        pageNo: 1,
+        pageSize: 10,
+      };
+      api
+        .getProjectList(pagedata ? pagedata : obj)
+        .then((res) => {
+          console.log(res);
+          if (res.status == 200 && res.data.code == 200) {
+            tableDataTotal.value = Number(res.data.data.total);
+            let data = res.data.data.rows;
+            // let data = state.tableData;
+            console.log("1266", data);
+            data.map((value) => {
+              console.log("value %o", value);
+              if (value.type == 1) {
+                value.children = value.subList;
+                value.key = value.projectId;
 
-		const showModal1 = () => {
-			state.estabish = true;
-		};
-		const closeModal1 = () => {
-			state.estabish = false;
-		};
+                value.children.map((data) => {
+                  if (data.type == 2) {
+                    data.children = data.subList;
+                    data.key = data.projectId;
+                    // 传递给多层子项目项目归属名字
+                    data.paraentName = value.name;
+                    data.subList.map((data2) => {
+                      data2.paraentName = value.name + "/" + data.name;
+                      data2.isbj = "class";
+                    });
+                    console.log("lalallalaa", data);
+                  } else {
+                    data.paraentName = value.name;
+                  }
+                });
+              }
 
-		const showModal2 = () => {
-			state.doublepro = true;
-			state.estabish = false;
-		};
-		const closeModal2 = () => {
-			state.doublepro = false;
-		};
+              console.log("map-value", value.subList, value.children);
+            });
+            tableData.value = data;
+            console.log("tableData", tableData);
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+    getTableDate();
 
-		const showModal3 = () => {
-			state.doublesonpro = true;
-			state.sonproject = false;
-		};
-		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;
-		};
-		const showProjPrower = () => {
-			state.ProjPvisible = true;
-		};
-		const showProjCheck = () => {
-			state.ProjCheckvisible = true;
-		};
-		const showProjManage = () => {
-			state.ProjManagevisible = true;
-		};
-		return {
-			...toRefs(state),
-			columns,
-			selectProjectName,
-			expandTable,
-			showModal,
-			closeModal,
-			showModal1,
-			closeModal1,
-			showModal2,
-			closeModal2,
-			showModal3,
-			closeModal3,
-			showCopyModal,
-			closeCopyModal,
-			showStopModal,
-			closeStopModal,
-			showDeleteModal,
-			closeDeleteModal,
-			showStartModal,
-			closeStartModal,
-			showBackModal,
-			closeBackModal,
-			getTableDate,
-			showProjOwner,
-			showProjPrower,
-			showProjCheck,
-			showProjManage,
+    // 翻页
+    const changePagination = (page) => {
+      console.log(page);
+      currentPage.value = page;
+      let pagedata = {
+        pageNo: page,
+        pageSize: 10,
+      };
+      getTableDate(pagedata);
+      // getLearnPath();
+    };
 
-			createStoreyProject,
-			classifyList,
-			classifyList1,
-			classificationChange,
-			classificationChange1,
-			value1,
-			value2,
-			value3,
-			value4,
-			value5,
-		};
-	},
+    const showModal = () => {
+      state.sonproject = true;
+    };
+    const closeModal = () => {
+      state.sonproject = false;
+    };
+
+    const showModal1 = () => {
+      state.estabish = true;
+    };
+    const closeModal1 = () => {
+      state.estabish = false;
+    };
+
+    const showModal2 = () => {
+      state.doublepro = true;
+      state.estabish = false;
+    };
+
+    const showModal3 = () => {
+      state.doublesonpro = true;
+      state.sonproject = 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;
+    };
+    const showProjPrower = () => {
+      state.ProjPvisible = true;
+    };
+    const showProjCheck = () => {
+      state.ProjCheckvisible = true;
+    };
+    const showProjManage = () => {
+      state.ProjManagevisible = true;
+    };
+    const closeProjectPub = () => {
+      state.projectPub = false;
+    };
+    return {
+      ...toRefs(state),
+      selectProjectName,
+      expandTable,
+      showModal,
+      closeModal,
+      showModal1,
+      closeModal1,
+      showModal2,
+      closeModal2,
+      showModal3,
+      closeModal3,
+      showCopyModal,
+      closeCopyModal,
+      showStopModal,
+      closeStopModal,
+      showDeleteModal,
+      closeDeleteModal,
+      showStartModal,
+      closeStartModal,
+      showBackModal,
+      closeBackModal,
+      getTableDate,
+      showProjOwner,
+      showProjPrower,
+      showProjCheck,
+      showProjManage,
+      closeProjectPub,
+
+      tableData,
+      currentPage,
+      tableDataTotal,
+      pageSize,
+      columns,
+      createStoreyProject,
+      classifyList,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      changePagination,
+      value1,
+      value2,
+      value3,
+      value4,
+      value5,
+      value6,
+      value7,
+      value8,
+      value9,
+
+      edvalue1,
+      edvalue2,
+      edvalue3,
+      edvalue4,
+      edvalue5,
+      edvalue6,
+      edvalue7,
+      edvalue8,
+      edvalue9,
+
+      edclassificationChange2,
+      edclassificationChange3,
+      edclassificationChange4,
+      edclassificationChange6,
+
+      sProjectName,
+      sProjectOrder,
+      sProjectCreate,
+      sProjectState,
+      sProjectTime,
+      sProjectStateList,
+      sProjectNameChange,
+      sProjectOrderChange,
+      sProjectCreateChange,
+      sProjectStateChange,
+      sProjectTimeChange,
+      searchReset,
+      searchSubmit,
+      createChildProject,
+      createChildsProject,
+
+      editStoreyProject,
+      closeeditModal2,
+      edclassificationChangeName,
+      edclassificationChange,
+      edclassificationChange1,
+      edclassificationChange5,
+      editChildsProject,
+      closeeditModal3,
+      releaseProject,
+      showProjectPub,
+    };
+  },
 };
 </script>
-<style lang="scss">
+<style  lang="scss">
 .projectManage {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 
-	.filter {
-		margin-left: 38px;
-		margin-right: 38px;
-		margin-top: 30px;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
+  .filter {
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
 
-		.filterItems {
-			display: flex;
-			flex-wrap: wrap;
+    .filterItems {
+      display: flex;
+      flex-wrap: wrap;
 
-			.select {
-				margin-right: 20px;
-				margin-bottom: 20px;
-			}
+      .select {
+        margin-right: 20px;
+        margin-bottom: 20px;
+      }
 
-			.btn {
-				padding: 0px 26px 0px 26px;
-				height: 38px;
-				background: rgba(64, 158, 255, 0);
-				border-radius: 8px;
-				border: 1px solid rgba(64, 158, 255, 1);
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-right: 14px;
-				flex-shrink: 0;
-				cursor: pointer;
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: rgba(64, 158, 255, 0);
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
 
-				.search {
-					background-size: 100%;
-				}
+        .search {
+          background-size: 100%;
+        }
 
-				.btnText {
-					font-size: 14px;
-					font-weight: 400;
-					color: rgba(64, 158, 255, 1);
-					line-height: 36px;
-					margin-left: 5px;
-				}
-			}
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: rgba(64, 158, 255, 1);
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
 
-			.btnn {
-				padding: 0px 26px 0px 26px;
-				height: 38px;
-				background: #409EFF;
-				border-radius: 8px;
-				border: 1px solid rgba(64, 158, 255, 1);
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				margin-right: 14px;
-				flex-shrink: 0;
-				cursor: pointer;
+      .btnn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #409eff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
 
-				.search {
-					background-size: 100%;
-				}
+        .search {
+          background-size: 100%;
+        }
 
-				.btnText {
-					font-size: 14px;
-					font-weight: 400;
-					color: #FFFFFF;
-					line-height: 36px;
-					margin-left: 5px;
-				}
-			}
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
 
-			.btn1 {
-				.search {
-					width: 15px;
-					height: 17px;
-					background-image: url("../../assets/images/courseManage/search0.png");
-				}
-			}
+      .btn1 {
+        .search {
+          width: 15px;
+          height: 17px;
+          background-image: url("../../assets/images/courseManage/search0.png");
+        }
+      }
 
-			.btn2 {
-				.search {
-					width: 16px;
-					height: 18px;
-					background-image: url("../../assets/images/courseManage/reset1.png");
-				}
-			}
+      .btn2 {
+        .search {
+          width: 16px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/reset1.png");
+        }
+      }
 
-			.btn1:hover {
-				background: rgba(64, 158, 255, 0.76);
+      .btn1:hover {
+        background: rgba(64, 158, 255, 0.76);
 
-				.search {
-					background-image: url("../../assets/images/courseManage/search0.png");
-				}
+        .search {
+          background-image: url("../../assets/images/courseManage/search0.png");
+        }
 
-				.btnText {
-					color: #ffffff;
-				}
-			}
+        .btnText {
+          color: #ffffff;
+        }
+      }
 
-			.btn1:active {
-				background: #0982ff;
-			}
+      .btn1:active {
+        background: #0982ff;
+      }
 
-			.btn2:hover {
-				background: rgba(64, 158, 255, 0.1);
-			}
+      .btn2:hover {
+        background: rgba(64, 158, 255, 0.1);
+      }
 
-			.btn2:active {
-				background: rgba(64, 158, 255, 0.2);
-			}
-		}
+      .btn2:active {
+        background: rgba(64, 158, 255, 0.2);
+      }
+    }
 
-		.btns {
-			display: flex;
+    .btns {
+      display: flex;
 
-			// flex-wrap: wrap;
-			.btn {
-				padding: 0px 26px 0px 26px;
-				height: 38px;
-				background: #409EFF;
-				border-radius: 8px;
-				border: 1px solid rgba(64, 158, 255, 1);
-				display: flex;
-				align-items: center;
-				cursor: pointer;
-				justify-content: center;
-				margin-right: 14px;
-				flex-shrink: 0;
+      // flex-wrap: wrap;
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #409eff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        cursor: pointer;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
 
-				.search {
-					background-size: 100%;
-				}
+        .search {
+          background-size: 100%;
+        }
 
-				.btnText {
-					font-size: 14px;
-					font-weight: 400;
-					color: #FFFFFF;
-					line-height: 36px;
-					margin-left: 5px;
-				}
-			}
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
 
-			.btn3 {
-				margin-right: 0px;
+      .btn3 {
+        margin-right: 0px;
 
-				.search {
-					width: 17px;
-					height: 18px;
-					background-image: url("../../assets/images/courseManage/add0.png");
-				}
-			}
+        .search {
+          width: 17px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/add0.png");
+        }
+      }
 
-			.btn3:hover {
-				background: rgba(64, 158, 255, 0.76);
-			}
+      .btn3:hover {
+        background: rgba(64, 158, 255, 0.76);
+      }
 
-			.btn3:active {
-				background: #0982ff;
-			}
-		}
-	}
+      .btn3:active {
+        background: #0982ff;
+      }
+    }
+  }
 
-	.tableBox {
-		margin: 20px 38px 30px;
+  .tableBox {
+    margin: 20px 38px 30px;
 
-		.ant-table-thead>tr>th {
-			font-size: 14px;
-			font-weight: 400;
-			color: #999ba3;
-			line-height: 36px;
-			padding: 5px 16px;
-			background-color: #eff4fc;
-		}
-	}
+    .ant-table-thead > tr > th {
+      font-size: 14px;
+      font-weight: 400;
+      color: #999ba3;
+      line-height: 36px;
+      padding: 5px 16px;
+      background-color: #eff4fc;
+    }
+  }
 
-	.operation {
-		font-size: 14px;
-		font-weight: 400;
-		color: #4ea6ff;
+  .tableBox {
+    padding-bottom: 20px;
 
-		// line-height: 36px;
-		.operation1 {
-			margin-left: 21px;
-			width: 28px;
-			display: inline-block;
-		}
+    .pa {
+      // position: absolute;
+      // bottom: 20px;
+      // left: 0;
+      width: 100%;
+      // height: 20px;
+      // background-color: red;
+      display: flex;
+      justify-content: center;
+      // margin-bottom: 10px;
+      // position: absolute;
+      // bottom: -40px;
+    }
+  }
 
-		.operation3 {
-			margin-left: 21px;
-			width: 70px;
-			display: inline-block;
-			text-align: center;
-		}
+  .operation {
+    font-size: 14px;
+    font-weight: 400;
+    color: #4ea6ff;
 
-		.more {
-			width: 50px;
-			display: inline-block;
-			margin-left: 21px;
-			position: relative;
-			text-align: left;
+    // line-height: 36px;
+    .operation1 {
+      margin-left: 21px;
+      width: 28px;
+      display: inline-block;
+    }
 
-			// z-index: 99999;
-			.moreArrow {
-				width: 13px;
-				height: 7px;
-				display: inline-block;
-				background-image: url("../../assets/images/navtop/down.png");
-				background-size: 100%;
-				margin: 2px;
-				margin-left: 7px;
-			}
+    .operation3 {
+      margin-left: 21px;
+      width: 70px;
+      display: inline-block;
+      text-align: center;
+    }
 
-			.moreItems {
-				width: 80px;
-				padding: 5px;
-				display: none;
-				background: #ffffff;
-				box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
-				border-radius: 3px;
-				border: 0px solid #dcdcdc;
-				position: absolute;
-				left: 0px;
-				top: 28px;
-				z-index: 100;
-				text-align: center;
-			}
-		}
+    .more {
+      width: 50px;
+      display: inline-block;
+      margin-left: 21px;
+      position: relative;
+      text-align: left;
 
-		.more:hover .moreArrow {
-			background-image: url("../../assets/images/navtop/up.png");
-		}
+      // z-index: 99999;
+      .moreArrow {
+        width: 13px;
+        height: 7px;
+        display: inline-block;
+        background-image: url("../../assets/images/navtop/down.png");
+        background-size: 100%;
+        margin: 2px;
+        margin-left: 7px;
+      }
 
-		.more:hover .moreItems {
-			display: block;
-		}
-	}
+      .moreItems {
+        width: 80px;
+        padding: 5px;
+        display: none;
+        background: #ffffff;
+        box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
+        border-radius: 3px;
+        border: 0px solid #dcdcdc;
+        position: absolute;
+        left: 0px;
+        top: 28px;
+        z-index: 100;
+        text-align: center;
+      }
+    }
+
+    .more:hover .moreArrow {
+      background-image: url("../../assets/images/navtop/up.png");
+    }
+
+    .more:hover .moreItems {
+      display: block;
+    }
+  }
 }
 
 .doublesonpro {
-	.ant-modal {
-		.ant-modal-body {
-			.modalHeader {
-				background: linear-gradient(0deg,
-						rgba(78, 166, 255, 0) 0%,
-						rgba(78, 166, 255, 0.2) 100%);
-			}
+  .ant-modal {
+    .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
 
-			padding: 0;
+      padding: 0;
 
-			.modalMain {
-				display: flex;
-				flex-direction: column;
-				//align-items: center;
-				margin-left: 60px;
+      .modalMain {
+        display: flex;
+        flex-direction: column;
+        //align-items: center;
+        margin-left: 60px;
 
-				.name {
-					//width: 90%;
-					// background-color: lightcoral;
-					display: flex;
-					justify-content: right;
-					margin-top: 32px;
-					align-items: center;
-					height: 40px;
-					// border: 1px solid black;
+        .name {
+          //width: 90%;
+          // background-color: lightcoral;
+          display: flex;
+          justify-content: right;
+          margin-top: 32px;
+          align-items: center;
+          height: 40px;
+          // border: 1px solid black;
 
-					.inname {
-						color: #000000;
-						font-size: 14px;
-						margin-left: 7px;
-					}
+          .inname {
+            color: #000000;
+            font-size: 14px;
+            margin-left: 7px;
+          }
 
-					.in {
-						margin-left: 14px;
-						width: 80%;
+          .in {
+            margin-left: 14px;
+            width: 80%;
 
-						.ant-input {
-							border-radius: 5px;
-							// height: 120%;
-							width: 80%;
-							height: 30px;
-						}
+            .ant-input {
+              border-radius: 5px;
+              // height: 120%;
+              width: 80%;
+              height: 30px;
+            }
 
-						.ant-select {
-							border-radius: 5px;
-							// height: 120%;
-							width: 80%;
-							height: 40px;
+            .ant-select {
+              border-radius: 5px;
+              // height: 120%;
+              width: 80%;
+              height: 40px;
 
-							.ant-select-selector {
-								border-radius: 8px;
-								// height: 120%;
-								width: 100%;
-								height: 40px;
-							}
-						}
-					}
-				}
+              .ant-select-selector {
+                border-radius: 8px;
+                // height: 120%;
+                width: 100%;
+                height: 40px;
+              }
+            }
+          }
+        }
 
-				.pubtn {
-					display: flex;
-					justify-content: center;
-					margin-top: 25px;
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
 
-					//margin-bottom: 29px;
-					.pubtn1 {
-						width: 100px;
-						height: 40px;
-						margin-right: 16px;
-						margin-bottom: 29px;
-						border: 1px solid #409eff;
-						border-radius: 4px;
-						color: rgba(78, 166, 255, 1);
-						font-size: 14px;
-						//line-height: 36px;
-						align-items: center;
-						background: rgba(255, 255, 255, 1);
-					}
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
 
-					.pubtn2 {
-						width: 100px;
-						height: 40px;
-						margin-bottom: 29px;
-						border: 1px solid #409eff;
-						border-radius: 4px;
-						color: #ffffff;
-						font-size: 14px;
-						align-items: center;
-						//line-height: 36px;
-						background: #409eff;
-					}
-				}
-			}
-		}
-	}
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
 }
 
 .doublepro {
-	.ant-modal {
-		.ant-modal-body {
-			.modalHeader {
-				background: linear-gradient(0deg,
-						rgba(78, 166, 255, 0) 0%,
-						rgba(78, 166, 255, 0.2) 100%);
-			}
+  .ant-modal {
+    .ant-modal-body {
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
 
-			padding: 0;
+      padding: 0;
 
-			.modalMain {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
+      .modalMain {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
 
-				.name {
-					width: 78%;
-					// background-color: lightcoral;
-					display: flex;
-					justify-content: right;
-					margin-top: 32px;
-					align-items: center;
-					height: 40px;
-					// border: 1px solid black;
+        .name {
+          width: 78%;
+          // background-color: lightcoral;
+          display: flex;
+          justify-content: right;
+          margin-top: 32px;
+          align-items: center;
+          height: 40px;
+          // border: 1px solid black;
 
-					.inname {
-						color: #000000;
-						font-size: 14px;
-						margin-left: 7px;
-					}
+          .inname {
+            color: #000000;
+            font-size: 14px;
+            margin-left: 7px;
+          }
 
-					.in {
-						margin-left: 14px;
-						width: 81%;
+          .in {
+            margin-left: 14px;
+            width: 81%;
 
-						.ant-input {
-							border-radius: 5px;
-							// height: 120%;
-							width: 100%;
-							height: 30px;
-						}
+            .ant-input {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 30px;
+            }
 
-						.ant-select {
-							border-radius: 5px;
-							// height: 120%;
-							width: 100%;
-							height: 40px;
+            .ant-select {
+              border-radius: 5px;
+              // height: 120%;
+              width: 100%;
+              height: 40px;
 
-							.ant-select-selector {
-								border-radius: 8px;
-								// height: 120%;
-								width: 100%;
-								height: 40px;
-							}
-						}
-					}
-				}
+              .ant-select-selector {
+                border-radius: 8px;
+                // height: 120%;
+                width: 100%;
+                height: 40px;
+              }
+            }
+          }
+        }
 
-				.pubtn {
-					display: flex;
-					justify-content: center;
-					margin-top: 25px;
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
 
-					//margin-bottom: 29px;
-					.pubtn1 {
-						width: 100px;
-						height: 40px;
-						margin-right: 16px;
-						margin-bottom: 29px;
-						border: 1px solid #409eff;
-						border-radius: 4px;
-						color: rgba(78, 166, 255, 1);
-						font-size: 14px;
-						//line-height: 36px;
-						align-items: center;
-						background: rgba(255, 255, 255, 1);
-					}
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
 
-					.pubtn2 {
-						width: 100px;
-						height: 40px;
-						margin-bottom: 29px;
-						border: 1px solid #409eff;
-						border-radius: 4px;
-						color: #ffffff;
-						font-size: 14px;
-						align-items: center;
-						//line-height: 36px;
-						background: #409eff;
-					}
-				}
-			}
-		}
-	}
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
 }
 
 .sonproject {
-	.ant-modal {
-		.ant-modal-body {
-			padding: 0 !important;
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0 !important;
 
-			.modalHeader {
-				background: linear-gradient(0deg,
-						rgba(78, 166, 255, 0) 0%,
-						rgba(78, 166, 255, 0.2) 100%);
-			}
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
 
-			.modalMain {
-				display: flex;
-				justify-content: center;
-				margin-top: 48px;
+      .modalMain {
+        display: flex;
+        justify-content: center;
+        margin-top: 48px;
 
-				//margin-bottom: 40px;
-				.taskbox {
-					width: 310px;
-					height: 160px;
-					border-radius: 10px;
-					position: relative;
-					margin-bottom: 80px;
-					cursor: pointer;
+        //margin-bottom: 40px;
+        .taskbox {
+          width: 310px;
+          height: 160px;
+          border-radius: 10px;
+          position: relative;
+          margin-bottom: 80px;
+          cursor: pointer;
 
-					.leftt {
-						position: absolute;
-						top: 18px;
-						left: 0;
-					}
+          .leftt {
+            position: absolute;
+            top: 18px;
+            left: 0;
+          }
 
-					.photo {
-						position: absolute;
-						top: 44px;
-						left: 40px;
-					}
+          .photo {
+            position: absolute;
+            top: 44px;
+            left: 40px;
+          }
 
-					.rightt {
-						position: absolute;
-						top: 69px;
-						right: 26px;
-					}
+          .rightt {
+            position: absolute;
+            top: 69px;
+            right: 26px;
+          }
 
-					.centerbox {
-						position: absolute;
-						top: 66px;
-						left: 136px;
-						font-size: 20px;
-						font-weight: 700;
-						//line-height: 36px;
-					}
+          .centerbox {
+            position: absolute;
+            top: 66px;
+            left: 136px;
+            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;
-					}
-				}
-			}
-		}
-	}
+          .centermain {
+            color: rgba(135, 139, 146, 1);
+            font-size: 14px;
+            position: absolute;
+            left: 144px;
+            bottom: 49px;
+          }
+        }
+      }
+    }
+  }
 }
 
 .estabish {
-	.ant-modal {
-		.ant-modal-body {
-			padding: 0 !important;
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0 !important;
 
-			.modalHeader {
-				background: linear-gradient(0deg,
-						rgba(78, 166, 255, 0) 0%,
-						rgba(78, 166, 255, 0.2) 100%);
-			}
+      .modalHeader {
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
+      }
 
-			.modalMain {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin-top: 48px;
+      .modalMain {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        margin-top: 48px;
 
-				//margin-bottom: 40px;
-				.taskbox {
-					width: 438px;
-					height: 160px;
-					border-radius: 10px;
-					position: relative;
-					margin-bottom: 24px;
-					cursor: pointer;
+        //margin-bottom: 40px;
+        .taskbox {
+          width: 438px;
+          height: 160px;
+          border-radius: 10px;
+          position: relative;
+          margin-bottom: 24px;
+          cursor: pointer;
 
-					.leftt {
-						position: absolute;
-						top: 18px;
-						left: 0;
-					}
+          .leftt {
+            position: absolute;
+            top: 18px;
+            left: 0;
+          }
 
-					.photo {
-						position: absolute;
-						top: 44px;
-						left: 40px;
-					}
+          .photo {
+            position: absolute;
+            top: 44px;
+            left: 40px;
+          }
 
-					.rightt {
-						position: absolute;
-						top: 69px;
-						right: 26px;
-					}
+          .rightt {
+            position: absolute;
+            top: 69px;
+            right: 26px;
+          }
 
-					.centerbox {
-						position: absolute;
-						top: 42px;
-						left: 120px;
-						font-size: 20px;
-						font-weight: 500;
-						//line-height: 36px;
-					}
+          .centerbox {
+            position: absolute;
+            top: 42px;
+            left: 120px;
+            font-size: 20px;
+            font-weight: 500;
+            //line-height: 36px;
+          }
 
-					.centerbox1 {
-						position: absolute;
-						top: 32px;
-						left: 120px;
-						font-size: 20px;
-						font-weight: 500;
-						//line-height: 36px;
-					}
+          .centerbox1 {
+            position: absolute;
+            top: 32px;
+            left: 120px;
+            font-size: 20px;
+            font-weight: 500;
+            //line-height: 36px;
+          }
 
-					.centermain {
-						color: rgba(135, 139, 146, 1);
-						font-size: 14px;
-						line-height: 20px;
-						position: absolute;
-						width: 252px;
-						left: 120px;
-						top: 78px;
-					}
+          .centermain {
+            color: rgba(135, 139, 146, 1);
+            font-size: 14px;
+            line-height: 20px;
+            position: absolute;
+            width: 252px;
+            left: 120px;
+            top: 78px;
+          }
 
-					.centermain1 {
-						color: rgba(135, 139, 146, 1);
-						font-size: 14px;
-						line-height: 20px;
-						position: absolute;
-						width: 252px;
-						left: 120px;
-						top: 68px;
-					}
-				}
-			}
-		}
-	}
+          .centermain1 {
+            color: rgba(135, 139, 146, 1);
+            font-size: 14px;
+            line-height: 20px;
+            position: absolute;
+            width: 252px;
+            left: 120px;
+            top: 68px;
+          }
+        }
+      }
+    }
+  }
 }
 
 .CopyModal {
-	.ant-modal {
-		width: 424px !important;
-		height: 258px !important;
+  .ant-modal {
+    width: 424px !important;
+    height: 258px !important;
 
-		.ant-modal-content {
-			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;
+      .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;
+        .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%);
-					}
+          // 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;
+          .del_main {
+            width: 100%;
+            position: relative;
 
-						.header {
-							display: flex;
-							align-items: center;
-							padding-top: 20px;
-							padding-left: 26px;
-							font-size: 16px;
+            .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%;
-							}
+              .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%;
-							}
-						}
+              .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;
+            .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;
-							}
-						}
+              .back {
+                position: absolute;
+                top: 30px;
+                font-size: 12px;
+                font-weight: 400;
+                color: #666666;
+              }
+            }
 
-						.del_btnbox {
-							display: flex;
-							margin: 30px auto;
-							justify-content: center;
+            .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;
+              .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;
+                flex-shrink: 0;
+                cursor: pointer;
 
-								.btnText {
-									font-size: 14px;
-									font-weight: 400;
-									line-height: 40px;
-								}
-							}
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
+              }
 
-							.btn1 {
-								border: 1px solid rgba(64, 158, 255, 1);
-								color: #4ea6ff;
-								margin-right: 14px;
-							}
+              .btn1 {
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
+              }
 
-							.btn2 {
-								background-color: #4ea6ff;
-								color: #ffffff;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+              .btn2 {
+                background-color: #4ea6ff;
+                color: #ffffff;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.projectPub {
+  .ant-modal {
+    .ant-modal-body {
+      padding: 0;
+      .modalHeader {
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
+      }
+      .modalMain {
+        .projectname {
+          color: rgba(79, 81, 86, 1);
+          font-size: 14px;
+          line-height: 36px;
+          margin-left: 62px;
+          font-weight: 500;
+        }
+        .projecttime {
+          margin-left: 221px;
+          .timeti {
+            color: rgba(153, 155, 163, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+          .timeme {
+            color: rgba(79, 81, 86, 1);
+            font-size: 14px;
+            line-height: 36px;
+          }
+        }
+        .projectbox {
+          margin-top: 26px;
+          display: flex;
+          justify-content: center;
+          .promessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
+            );
+            border-radius: 10px;
+            margin-right: 7px;
+            .messageme {
+              color: rgba(255, 182, 78, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+          .stumessage {
+            width: 280px;
+            height: 110px;
+            background: linear-gradient(
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
+            );
+            border-radius: 10px;
+            .messageme1 {
+              color: rgba(78, 166, 255, 1);
+              font-size: 14px;
+              line-height: 36px;
+              margin-top: 17px;
+              margin-left: 30px;
+            }
+            .messagege1 {
+              color: rgba(153, 155, 163, 1);
+              font-size: 14px;
+              margin-left: 30px;
+            }
+          }
+        }
+        .send {
+          margin-top: 30px;
+          margin-left: 61px;
+          .sendtext {
+            margin-left: 11px;
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+        }
+        .ckb {
+          margin-top: 20px;
+          margin-left: 62px;
+          .sendpeo {
+            color: rgba(109, 117, 132, 1);
+            font-size: 14px;
+          }
+          .ant-checkbox-inner {
+            border-radius: 4px;
+          }
+        }
+        .pubtn {
+          display: flex;
+          justify-content: center;
+          margin-top: 25px;
+          //margin-bottom: 29px;
+          .pubtn1 {
+            width: 100px;
+            height: 40px;
+            margin-right: 16px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: rgba(78, 166, 255, 1);
+            font-size: 14px;
+            //line-height: 36px;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+          }
+          .pubtn2 {
+            width: 100px;
+            height: 40px;
+            margin-bottom: 29px;
+            border: 1px solid #409eff;
+            border-radius: 4px;
+            color: #ffffff;
+            font-size: 14px;
+            align-items: center;
+            //line-height: 36px;
+            background: #409eff;
+          }
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 0f5291e3..571946c0 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -1,528 +1,1061 @@
 <!---- 创建单层子项目页面 --->
 <template>
-  <div class="projectAdd">
-    <div class="header">
-      <span class="title">创建/编辑单层子项目</span>
-      <router-link to="/projectmanage" class="goback">
-        <span class="return"></span
-        ><span class="returntext">返回</span></router-link
-      >
-    </div>
-    <div class="content">
-      <div class="main">
-      <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目归属</div>
-          </div>
-          <div class="in">
-            <div style="color: #C7CBD2;font-size: 14px;margin-left: 15px">HRBP2.0</div>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">子项目名称</div>
-          </div>
-          <div class="in">
-            <div style="color: #C7CBD2;font-size: 14px;margin-left: 15px">HRBP2.0-band</div>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :value="classifySelect"
-              placeholder="四个养成"
-              style="width: 100%"
-              :options="classifyList"
-              allowClear
-              showSearch
-            ></a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">封面图</div>
-          </div>
-          <div
-            class="box"
-            style="
+	<div class="projectAdd">
+		<div class="header">
+			<span class="title">创建/编辑单层子项目</span>
+			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
+				<span class="return"></span><span class="returntext">返回</span>
+			</div>
+		</div>
+		<div class="content">
+			<div class="main">
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目归属</div>
+					</div>
+					<div class="in">
+						<div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+							{{ projectAscription }}
+						</div>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">子项目名称</div>
+					</div>
+					<div class="in">
+						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">分类</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
+							@change="classificationChange" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">封面图</div>
+					</div>
+					<div class="box" style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
               border-radius: 5px;
               cursor: pointer;
-            "
-          >
-            <div class="box1"></div>
-            <div class="box2"></div>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目时间</div>
-          </div>
+              position: relative;
+              overflow: hidden;
+            ">
+						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
+							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
+							<img style="
+                  width: 100px;
+                  height: 100px;
+                  margin-bottom: 4px;
+                  margin-right: 4px;
+                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
+							<div v-else>
+								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
+								<!-- <plus-outlined v-else></plus-outlined> -->
+								<div class="box1"></div>
+								<div class="box2"></div>
+								<!-- <div class="ant-upload-text"></div> -->
+							</div>
+						</a-upload>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">子项目时间</div>
+					</div>
 
-          <div class="in">
-            <a-range-picker
-              separator="至"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              show-time
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目经理</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :value="classifySelect"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList"
-              allowClear
-              showSearch
-            ></a-select>
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">资源归属</div>
-          </div>
+					<div class="in">
+						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
+							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">子项目经理</div>
+					</div>
+					<div class="in">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
+							@change="classificationChange1" allowClear showSearch>
+						</a-select>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">资源归属</div>
+					</div>
 
-          <div class="in">
-            <a-input v-model:value="valueE" placeholder="自动带出 可修改" />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">项目说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="valuei"
-              style="height: 80px"
-              placeholder="请输入项目说明"
-              show-count :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-radio v-model:checked="checked"
-              ><span
-                style="
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
+							@change="classificationChange2" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname" style="margin-top: 13px">项目说明</div>
+					</div>
+					<div class="in">
+						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
+					</div>
+				</div>
+				<div class="name name2">
+					<div class="namebox">
+						<div class="inname">同步学习记录</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">项目级别</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">培训体系</div>
-          </div>
-          <div class="in">
-            <a-input
-              v-model:value="valueE"
-              placeholder="集团级/组织级/现地级/部门级"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">是否BOEU实施</div>
-          </div>
-          <div class="in">
-            <a-radio v-model:checked="checked"
-              ><span
-                style="
+                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">项目级别</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">培训体系</div>
+					</div>
+					<div class="in select">
+						<a-select :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
+							placeholder="集团级/组织级/现地级/部门级" />
+					</div>
+				</div>
+				<div class="name">
+					<div class="namebox">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">是否BOEU实施</div>
+					</div>
+					<div class="in">
+						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                "
-                >BOEU实施</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox" style="margin-top: 8px">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">附件</div>
-          </div>
-          <div class="filebox">
-            <div style="cursor: pointer">
-              <img
-                class="fileimg"
-                src="../../assets/images/projectadd/enclosure.png"
-              />
-              <span class="filetext">上传附件</span>
-            </div>
-            <div class="support">
-              支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="template">
-        <div class="name">
-          <div class="inname" style="width: 50px">模板</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-model:value="value1"
-              placeholder="请选择模板"
-              :size="size"
-              style="width: 100%"
-              :options="options"
-            ></a-select>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="footer">
-      <div class="btn">
-        <a-button
-          type="primary"
-          style="width: 100px; height: 40px; border-radius: 8px"
-          >确认</a-button
-        >
-        <a-button
-          type="primary"
-          ghost
-          style="
-            width: 100px;
-            height: 40px;
-            margin-left: 14px;
-            border-radius: 8px;
-          "
-          >取消</a-button
-        >
-      </div>
-    </div>
-  </div>
+                ">BOEU实施</span></a-radio>
+					</div>
+				</div>
+				<!-- <div class="name name2">
+					<div class="namebox" style="margin-top: 8px">
+						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+						<div class="inname">附件</div>
+					</div>
+					<div class="filebox">
+						<div>
+							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
+							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
+								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
+								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
+								<span v-else class="filetext">上传附件</span>
+							</a-upload>
+						</div>
+						<div class="support">
+							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
+						</div>
+					</div>
+				</div> -->
+			</div>
+			<div class="template">
+				<div class="name">
+					<div class="inname" style="width: 50px">模版</div>
+					<div class="in select" style="margin-left: 2px">
+						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+						<a-select v-else :getPopupContainer="
+							(triggerNode) => {
+								return triggerNode.parentNode || document.body;
+							}
+						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
+							@change="classificationChange5">
+						</a-select>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="footer">
+			<div class="btn">
+				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
+				<a-button @click="backPage" class="btn2">取消</a-button>
+			</div>
+		</div>
+	</div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs, ref } from "vue";
+import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
+import dayjs from 'dayjs';
+import * as api from "../../api/index";
+import { toDate } from '../../api/method'
+
 export default {
-  name: "sonProject",
-  setup() {
-    const state = reactive({
-      classifyList: [
-        {
-          id: 1,
-          name: "分类一",
-          label: "分类一",
-        },
-        {
-          id: 2,
-          name: "分类二",
-          label: "分类二",
-        },
-        {
-          id: 3,
-          name: "分类三",
-          label: "分类三",
-        },
-        {
-          id: 4,
-          name: "分类四",
-          label: "分类四",
-        },
-      ],
-      classifySelect: null,
-      classifySelectId: null,
-    });
-    return {
-      ...toRefs(state),
-    };
-  },
+	name: "projectAdd",
+	setup() {
+		// 编辑页面跳转过来时候，自动填充表格
+		const routers = useRoute();
+		const router = useRouter();
+		const isEdit = ref(false);
+		let peojectID = "";
+		let paraentID = "";
+
+		const state = reactive({
+			classifySelect: null,
+			classifySelectId: null,
+			checked: false,
+			checked1: false,
+			valueE: null,
+			valueE1: null,
+			valueE2: null,
+			classifySelect1: [],
+			classifySelect2: [],
+			classifySelect3: [],
+			classifySelect4: [],
+			rangevalue: [],
+			projectAscription: "",
+		});
+
+		if (routers.query.name == undefined) {
+			router.push({
+				path: "/projectmanage"
+			});
+		}
+
+		peojectID = routers.query.projectId;
+		state.projectAscription = routers.query.name;
+
+		if (routers.query.edit !== undefined) {
+			isEdit.value = true;
+			// 需要编辑
+			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
+				if (res.status == 200 && res.data.code == 200) {
+					let info = res.data.data.projectInfo;
+					console.log(info)
+					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+					projectName.value = info.name;
+					state.classifySelect = classifyList.value[1]; // info.category
+					imageUrl.value = info.picUrl;
+
+					let start = toDate(info.beginTime / 1000, 'YYYY/MM/DD');
+					let end = toDate(info.endTime / 1000, 'YYYY/MM/DD');
+					state.rangevalue = [
+						dayjs(start, 'YYYY/MM/DD'),
+						dayjs(end, 'YYYY/MM/DD'),
+					];
+
+					let manageName = info.manager.split(",");
+					let manageValue = info.managerId.split(",");
+					let optionsManage = []
+					for (let i = 0; i < manageName.length; i++) {
+						let obj = {
+							label: manageName[i],
+							value: manageValue[i]
+						}
+						optionsManage.push(obj)
+					}
+					console.log(optionsManage)
+					state.classifySelect1 = optionsManage;
+					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
+					remark.value = info.remark;
+					state.checked = info.boeFlag ? info.boeFlag : false;
+					state.classifySelect3 = classifyList3.value[info.level];
+					state.classifySelect4 = classifyList4.value[info.systemId - 1];
+					state.checked1 = info.boeFlag ? info.boeFlag : false;
+					// fileList1.value = info.attach.split(",");
+
+					projectType = 1;
+					picUrl = info.picUrl;
+					beginTime = Number(info.beginTime / 1000);
+					endTime = Number(info.endTime / 1000);
+					manager = info.manager;
+					managerId = info.managerId;
+					sourceBelongIdC = Number(info.sourceBelongId);
+					courseSyncFlag = info.courseSyncFlag;
+					levels = info.level;
+					systemid = info.systemId;
+					boeFlag = info.boeFlag;
+					paraentID = Number(info.parentId);
+				}
+			}).catch(err => { console.log(err) })
+		} else {
+			paraentID = Number(routers.query.projectId);
+		}
+
+
+		const backPage = () => {
+			setTimeout(() => {
+				router.push({
+					path: "/projectmanage"
+				});
+			}, 400);
+		}
+
+
+
+		const projectName = ref("");
+
+		const classifyList = ref([
+			{ value: 1, label: "管理者" },
+			{ value: 2, label: "领军者" },
+			{ value: 3, label: "产业人" },
+		]);
+
+		let projectType = "";
+
+		const classificationChange = (value) => {
+			console.log(`selected ${value}`);
+			projectType = value;
+		};
+
+		function getBase64(img, callback) {
+			const reader = new FileReader();
+			reader.addEventListener("load", () => callback(reader.result));
+			reader.readAsDataURL(img);
+		}
+
+		const fileList = ref([]);
+		const fileList1 = ref([]);
+		const loading = ref(false);
+		const imageUrl = ref("");
+		let picUrl = "";
+
+		const handleChange = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log("上传图片返回的信息 %o", info);
+				picUrl = info.file.response.data;
+				// Get this url from response in real world.
+				getBase64(info.file.originFileObj, (base64Url) => {
+					imageUrl.value = base64Url;
+					loading.value = false;
+				});
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
+
+		let uplodaFileCount = false;
+
+		let attach = "";
+		let attachData = "";
+		const handleChange1 = (info) => {
+			if (info.file.status === "uploading") {
+				loading.value = true;
+				return;
+			}
+			if (info.file.status === "done") {
+				console.log(
+					"上传附件返回的信息 %o",
+					info,
+					info.fileList.length,
+					uplodaFileCount
+				);
+
+				let attachStr = "";
+				attachData = info.fileList;
+				for (let i = 0; i < attachData.length; i++) {
+					if (attachData.length - 1 == i) {
+						attachStr += attachData[i].response.data;
+					} else {
+						attachStr += attachData[i].response.data + ",";
+					}
+				}
+				console.log(attachStr);
+				attach = attachStr;
+
+				if (info.fileList.length > 5) {
+					uplodaFileCount = true;
+				} else {
+					uplodaFileCount = false;
+				}
+			}
+			if (info.file.status === "error") {
+				loading.value = false;
+				message.error("upload error");
+			}
+		};
+
+		const beforeUpload = (file) => {
+			const isJpgOrPng =
+				file.type === "image/jpeg" || file.type === "image/png";
+			if (!isJpgOrPng) {
+				message.error("You can only upload JPG file!");
+			}
+			const isLt2M = file.size / 1024 / 1024 < 1;
+			if (!isLt2M) {
+				message.error("Image must smaller than 1MB!");
+			}
+			return isJpgOrPng && isLt2M;
+		};
+
+		const beforeUpload1 = () => {
+			return new Promise((resovle, reject) => {
+				if (uplodaFileCount) {
+					message.info("上传文件数量已达最大数量");
+					return reject(false);
+				}
+				return resovle(true);
+			});
+		};
+
+		let beginTime = "";
+		let endTime = "";
+		const dateFormatList = ['YYYY/MM/DD'];
+
+		const onRangeChange = (value, dateString) => {
+			console.log("Selected Time: ", value);
+			// 项目时间选择函数
+			console.log("Formatted Selected Time: ", dateString);
+			console.log(
+				"Formatted Selected TimeStamp",
+				new Date(dateString[0]).getTime()
+			);
+			beginTime = new Date(dateString[0]).getTime() / 1000;
+			endTime = new Date(dateString[1]).getTime() / 1000;
+		};
+
+		// 项目经理 后续接口调用
+		const classifyList1 = ref([
+			{ value: 1, label: "李俊国" },
+			{ value: 2, label: "将小米" },
+			{ value: 3, label: "刘孟君" },
+		]);
+
+		let manager = "";
+		let managerId = "";
+		const classificationChange1 = (key, options) => {
+			console.log(`selected ${key}`, options);
+			let mstr = "";
+			let midstr = "";
+			for (let i = 0; i < key.length; i++) {
+				if (key.length - 1 !== i) {
+					midstr += key[i] + ",";
+					mstr += classifyList1.value[i].label + ",";
+				} else {
+					midstr += key[i];
+					mstr += classifyList1.value[i].label;
+				}
+			}
+			console.log(mstr, midstr);
+			state.classifySelect1 = options;
+			let newoptions = [];
+			for (let i = 0; i < state.classifySelect1.length; i++) {
+				if (state.classifySelect1[i].value) {
+					newoptions.push(state.classifySelect1[i])
+				}
+			}
+			state.classifySelect1 = newoptions;
+			manager = mstr;
+			managerId = midstr;
+		};
+
+		// 资源归属 sourceBelongId 后续给接口
+		const classifyList2 = ref([
+			{ value: 1, label: "项目一" },
+			{ value: 2, label: "项目二" },
+			{ value: 3, label: "项目三" },
+		]);
+
+		let sourceBelongIdC = '';
+		const classificationChange2 = (key) => {
+			console.log(`selected ${key}`, classifyList2);
+			sourceBelongIdC = key;
+		};
+
+		// 项目级别
+		const classifyList3 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let levels = "";
+		const classificationChange3 = (key) => {
+			console.log(`selected ${key}`, classifyList3);
+			levels = key;
+		};
+
+		// 培训体系
+		const classifyList4 = ref([
+			{ value: 1, label: "集团级" },
+			{ value: 2, label: "组织级" },
+			{ value: 3, label: "现地级" },
+			{ value: 4, label: "部门级" },
+		]);
+
+		let systemid = "";
+		const classificationChange4 = (key) => {
+			console.log(`selected ${key}`, classifyList4);
+			systemid = key;
+		};
+
+		// 模版
+		const classifyList5 = ref([
+			{ value: 1, label: "模版一" },
+			{ value: 2, label: "模版二" },
+			{ value: 3, label: "模版三" },
+			{ value: 4, label: "模版四" },
+		]);
+		const classificationChange5 = (key) => {
+			console.log(`selected ${key}`, classifyList5);
+		};
+
+		// 项目说明
+		const remark = ref("");
+
+		let courseSyncFlag = 0;
+		const changeChecked = () => {
+			console.log(state.checked);
+			state.checked ? (state.checked = false) : (state.checked = true);
+			courseSyncFlag = state.checked ? 1 : 0;
+		};
+
+		let boeFlag = 0;
+		const changeChecked1 = () => {
+			console.log(state.checked1);
+			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+			boeFlag = state.checked1 ? 1 : 0;
+		};
+
+		const removeFile = (file) => {
+			const index = fileList1.value.indexOf(file);
+			const newFileList = fileList1.value.slice();
+			newFileList.splice(index, 1);
+			fileList1.value = newFileList;
+
+			let attachStr = "";
+			if (newFileList.length == 0) {
+				attachStr = "";
+			}
+			for (let i = 0; i < fileList1["value"].length; i++) {
+				console.log(fileList1["value"][i].response.data);
+				if (fileList1["value"].length - 1 == i) {
+					attachStr += fileList1["value"][i].response.data;
+				} else {
+					attachStr += fileList1["value"][i].response.data + ",";
+				}
+			}
+			attach = attachStr;
+		};
+
+		const errorMsgs = {
+			name: "请输入项目名称",
+			category: "请选择项目分类",
+			picUrl: "请上传项目封面图",
+			beginTime: "请选择项目开始时间",
+			endTime: "请选择项目结束时间",
+			manager: "请选择项目经理",
+			managerId: "请选择项目经理",
+			sourceBelongId: "请选择资源归属",
+			level: "请填写项目级别",
+			systemId: "请填写项目培训体系",
+			boeFlag: "请选择是否BOE实施"
+		};
+
+		const createProject = () => {
+			console.log('我是否要编辑项目', isEdit.value)
+			if (isEdit.value) {
+				console.log('我要编辑项目', peojectID)
+				let obj = {
+					projectId: Number(peojectID),
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 0,
+					parentId: paraentID,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+
+				console.log(obj);
+
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("编辑成功");
+							setTimeout(() => {
+								router.push({
+									path: "/projectmanage"
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("编辑失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("编辑失败，请检查当前网络状态。");
+					});
+
+			} else {
+				let obj = {
+					name: projectName["value"],
+					category: projectType,
+					picUrl: picUrl,
+					beginTime: beginTime,
+					endTime: endTime,
+					manager: manager,
+					managerId: managerId,
+					sourceBelongId: sourceBelongIdC,
+					remark: remark["value"],
+					courseSyncFlag: courseSyncFlag,
+					level: levels,
+					systemId: systemid,
+					boeFlag: boeFlag,
+					attach: attach,
+					type: 3,
+					templateId: 10,
+					parentId: paraentID,
+					notice: "",
+					noticeFlag: 0,
+					status: 0,
+				};
+				console.log("提交的数据格式 %o", obj);
+				for (let i in errorMsgs) {
+					console.log(obj[i]);
+					if (obj[i] === "" || obj[i] === undefined) {
+						message.destroy();
+						message.warning(errorMsgs[i]);
+						return;
+					}
+				}
+
+				api
+					.createProject(obj)
+					.then((res) => {
+						console.log(res);
+						if (res.status == 200 && res.data.code == 200) {
+							message.destroy();
+							message.success("创建成功");
+							setTimeout(() => {
+								router.push({
+									path: "/taskpage",
+									query: { id: res.data.data.projectId },
+								});
+							}, 1000);
+						} else {
+							message.destroy();
+							message.error("创建失败，请检查当前网络状态。");
+						}
+					})
+					.catch((err) => {
+						console.log(err);
+						message.destroy();
+						message.error("创建失败，请检查当前网络状态。");
+					});
+			}
+		};
+
+		return {
+			...toRefs(state),
+			projectName,
+			classifyList,
+			classificationChange,
+			classificationChange1,
+			classificationChange2,
+			classificationChange3,
+			classificationChange4,
+			classificationChange5,
+			fileList,
+			fileList1,
+			loading,
+			imageUrl,
+			handleChange,
+			handleChange1,
+			beforeUpload,
+			beforeUpload1,
+			onRangeChange,
+			classifyList1,
+			classifyList2,
+			classifyList3,
+			classifyList4,
+			classifyList5,
+			remark,
+			changeChecked,
+			changeChecked1,
+			uplodaFileCount,
+			createProject,
+			removeFile,
+
+			isEdit,
+			backPage,
+			dateFormatList,
+		};
+	},
 };
 </script>
 <style lang="scss">
 .projectAdd {
-  width: 100%;
-  // height: inherit;
-  // flex: 1;
-  // flex-shrink: 0;
-  // overflow-y: scroll;
+	width: 100%;
+	// height: inherit;
+	// flex: 1;
+	// flex-shrink: 0;
+	// overflow-y: auto;
 
-  .header {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    .title {
-      color: #000000;
-      font-size: 18px;
-      //line-height: 36px;
-      padding-top: 30px;
-      padding-left: 37px;
-      //font-weight: 500;
-    }
-    .goback {
-      padding-right: 70px;
-      //padding-top: 37px;
-      position: relative;
-      .return {
-        display: inline-block;
-        width: 42px;
-        height: 42px;
-        margin-top: 17px;
-        margin-right: 10px;
-        background-image: url("../../assets/images/projectadd/return.png");
-      }
-      .returntext {
-        display: inline-block;
-        position: absolute;
-        top: 27px;
-        color: #4ea6ff;
-        font-size: 14px;
-      }
-    }
-  }
-  .content {
-    display: flex;
-    .main {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: left;
-      border-right: 1px solid rgba(153, 155, 163, 0.3);
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
-        //height: 40px;
-        // border: 1px solid black;
-        .namebox {
-          width: 120px;
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-          flex-shrink: 0;
-          .nameimg {
-            width: 10px;
-            height: 10px;
-          }
-        }
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
-        .box {
-          position: relative;
-          margin-left: 14px;
-          .box1 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            width: 50px;
-            margin-left: -25px;
-            margin-top: -5px;
-            border-top: 2px solid rgba(78, 166, 255, 1);
-          }
-          .box2 {
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            height: 50px;
-            //margin-left: -5px;
-            margin-top: -25px;
-            border-left: 2px solid rgba(78, 166, 255, 1);
-          }
-        }
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-        }
-        .in {
-          margin-left: 14px;
-          flex: 1;
-          // .ant-radio-wrapper {
-          // }
-          .ant-input-textarea-show-count {
-              position: relative;
-              height: 88px;
-            }
-            .ant-input-textarea-show-count::after {
-              position: absolute;
-              right: 10px;
-              bottom: 0px;
-            } 
-          .ant-input {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
-        .filebox {
-          margin-left: 14px;
-          flex: 1;
-          .fileimg {
-            width: 15px;
-            height: 15px;
-            margin-right: 6px;
-          }
-          .filetext {
-            font-size: 14px;
-            font-weight: 400;
-            color: #4ea6ff;
-            line-height: 36px;
-          }
-          .support {
-            font-size: 14px;
-            font-weight: 400;
-            color: #999ba3;
-            line-height: 36px;
-            //margin-top: 8px;
-            word-break: break-all;
-          }
-        }
-      }
-      .name2 {
-        display: flex;
-        align-items: flex-start;
-        .ant-input-textarea {
-            .ant-input {
-                height: 88px;
-            }
-        }
-      }
-    }
-    .template {
-      width: 50%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      //justify-content: center;
-      float: right;
-      .name {
-        width: 78%;
-        // background-color: lightcoral;
-        display: flex;
-        margin-top: 20px;
-        align-items: center;
-        height: 40px;
-        // border: 1px solid black;
-        .d {
-          margin-top: 8px;
-          font-size: 25px;
-          color: #ff4e4e;
-        }
-        .inname {
-          color: #6f6f6f;
-          font-size: 14px;
-          margin-left: 7px;
-          width: 65px;
-        }
-        .in {
-          margin-left: 14px;
-          width: 81%;
-          .ant-input {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-          .ant-select-selector {
-            border-radius: 5px;
-            // height: 120%;
-            width: 100%;
-            height: 40px;
-          }
-        }
-      }
-    }
-  }
-  .footer {
-    width: 100%;
-    margin-top: 31px;
-    margin-bottom: 14px;
-    padding-bottom: 20px;
-    .btn {
-      display: flex;
-      justify-content: center;
-    }
-    .text {
-      color: rgba(153, 155, 163, 1);
-      font-size: 14px;
-      margin-left: 223px;
-    }
-  }
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+
+		.title {
+			color: #000000;
+			font-size: 18px;
+			//line-height: 36px;
+			padding-top: 30px;
+			padding-left: 37px;
+			//font-weight: 500;
+		}
+
+		.goback {
+			padding-right: 70px;
+			//padding-top: 37px;
+			position: relative;
+
+			.return {
+				display: inline-block;
+				width: 42px;
+				height: 42px;
+				margin-top: 17px;
+				margin-right: 10px;
+				background-image: url("../../assets/images/projectadd/return.png");
+			}
+
+			.returntext {
+				display: inline-block;
+				position: absolute;
+				top: 27px;
+				color: #4ea6ff;
+				font-size: 14px;
+			}
+		}
+	}
+
+	// 修改 antd upload 样式
+	.ant-upload {
+		border-width: 0px;
+	}
+
+	.content {
+		display: flex;
+
+		.main {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: left;
+			border-right: 1px solid rgba(153, 155, 163, 0.3);
+
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
+
+				//height: 40px;
+				// border: 1px solid black;
+				.namebox {
+					width: 120px;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					flex-shrink: 0;
+
+					.nameimg {
+						width: 10px;
+						height: 10px;
+					}
+				}
+
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
+
+				.box {
+					position: relative;
+					margin-left: 14px;
+
+					.box1 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						width: 50px;
+						margin-left: -25px;
+						margin-top: -5px;
+						border-top: 2px solid rgba(78, 166, 255, 1);
+					}
+
+					.box2 {
+						position: absolute;
+						left: 50%;
+						top: 50%;
+						height: 50px;
+						//margin-left: -5px;
+						margin-top: -25px;
+						border-left: 2px solid rgba(78, 166, 255, 1);
+					}
+				}
+
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+				}
+
+				.in {
+					margin-left: 14px;
+					flex: 1;
+
+					// .ant-radio-wrapper {
+					// }
+					.ant-input-textarea-show-count {
+						position: relative;
+						height: 88px;
+					}
+
+					.ant-input-textarea-show-count::after {
+						position: absolute;
+						right: 10px;
+						bottom: 0px;
+					}
+
+					.ant-input {
+						border-radius: 8px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+
+					.ant-input-affix-wrapper {
+						padding: 0 11px;
+						border-radius: 8px;
+					}
+
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
+
+				.filebox {
+					margin-left: 14px;
+					flex: 1;
+
+					.fileimg {
+						width: 15px;
+						height: 15px;
+						margin-right: 6px;
+					}
+
+					.filetext {
+						font-size: 14px;
+						font-weight: 400;
+						color: #4ea6ff;
+						line-height: 36px;
+					}
+
+					.support {
+						font-size: 14px;
+						font-weight: 400;
+						color: #999ba3;
+						line-height: 36px;
+						margin-top: 8px;
+						word-break: break-all;
+					}
+				}
+			}
+
+			.name2 {
+				display: flex;
+				align-items: flex-start;
+
+				.ant-input-textarea {
+					.ant-input {
+						height: 88px;
+					}
+				}
+			}
+		}
+
+		.template {
+			width: 50%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			//justify-content: center;
+			float: right;
+
+			.name {
+				width: 78%;
+				// background-color: lightcoral;
+				display: flex;
+				margin-top: 20px;
+				align-items: center;
+				height: 40px;
+
+				// border: 1px solid black;
+				.d {
+					margin-top: 8px;
+					font-size: 25px;
+					color: #ff4e4e;
+				}
+
+				.inname {
+					color: #6f6f6f;
+					font-size: 14px;
+					margin-left: 7px;
+					width: 65px;
+				}
+
+				.in {
+					margin-left: 14px;
+					width: 81%;
+
+					.ant-input {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+
+					.ant-select-selector {
+						border-radius: 5px;
+						// height: 120%;
+						width: 100%;
+						height: 40px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer {
+		width: 100%;
+		margin-top: 31px;
+		margin-bottom: 14px;
+		padding-bottom: 20px;
+
+		.btn {
+			display: flex;
+			justify-content: center;
+
+			.btn1 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				background: #409eff;
+				color: #ffffff;
+				margin-right: 14px;
+			}
+
+			.btn2 {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 100px;
+				height: 40px;
+				border-radius: 8px;
+				border: 1px solid #409eff;
+				background: #ffffff;
+				color: #409eff;
+			}
+		}
+
+		.text {
+			color: rgba(153, 155, 163, 1);
+			font-size: 14px;
+			margin-left: 223px;
+		}
+	}
 }
 </style>
+
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 96753fa5..31969683 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -15,25 +15,36 @@
           <div class="btnText">添加阶段</div>
         </div>
         <div class="maincon" style="background-color: #fff">
-          <div
-            class="item"
-            :class="isactive == index && isActive == true ? 'bgcactive' : ''"
-            v-for="(item, index) in level"
-            @click="changebgc(index)"
-            :key="item.id"
+          <draggable
+            v-model="level"
+            chosenClass="chosen"
+            ghostClass="ghost"
+            forceFallback="true"
+            group="stage"
+            animation="500"
+            @start="onStart"
+            @end="onEnd"
           >
-            <div class="itemle">
-              <div class="tit">{{ item.tit }}</div>
-              <div class="name">{{ item.name }}</div>
-            </div>
-            <div class="itemri">
-              <img src="../../assets/images/leveladd/z1.png" />
-              <img
-                style="margin-top: 40px"
-                src="../../assets/images/leveladd/z2.png"
-              />
-            </div>
-          </div>
+            <template #item="{ element }">
+              <div
+                class="item"
+                :class="chooseStageId == element.id ? 'bgcactive' : ''"
+                @click="changebgc(element.id)"
+              >
+                <div class="itemle">
+                  <div class="tit">{{ element.tit }}</div>
+                  <div class="name">{{ element.name }}</div>
+                </div>
+                <div class="itemri">
+                  <img src="../../assets/images/leveladd/z1.png" />
+                  <img
+                    style="margin-top: 40px"
+                    src="../../assets/images/leveladd/z2.png"
+                  />
+                </div>
+              </div>
+            </template>
+          </draggable>
         </div>
       </div>
     </div>
@@ -128,7 +139,16 @@
           </div>
           <!-- 添加作业侧弹窗 -->
           <div>
-            <add-homework v-model:addhomeworkVisible="addhomeworkvisible" />
+            <add-homework 
+              v-model:addhomeworkVisible="addhomeworkvisible" 
+              @changeData="updateTableData"
+              :isLevel=false
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditWorkId="EditWorkId"
+              v-model:projectTaskId="projectTaskId"
+            />
           </div>
           <!-- 添加作业侧弹窗 -->
           <div class="lin"></div>
@@ -142,7 +162,16 @@
           </div>
           <!-- 添加考试侧弹窗 -->
           <div>
-            <add-test v-model:addtestVisible="addtestvisible" />
+            <add-test 
+            v-model:addtestVisible="addtestvisible" 
+            @changeData="updateTableData"
+            :isLevel=false
+            v-model:edit="edit"
+            v-model:projectId="projectId"
+            v-model:chooseStageId="chooseStageId"
+            v-model:EditTestId="EditTestId"
+            v-model:projectTaskId="projectTaskId"
+            />
           </div>
           <!-- 添加考试侧弹窗 -->
           <div class="lin"></div>
@@ -154,11 +183,19 @@
             </div>
             <div class="text">直播</div>
           </div>
-          <!-- 添加考试侧弹窗 -->
+          <!-- 添加直播侧弹窗 -->
           <div>
-            <add-live v-model:addliveVisible="addlivevisible" />
+            <add-live
+              v-model:addliveVisible="addlivevisible"
+              @changeData="updateTableData"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:isLiveEdit="isLiveEdit"
+              v-model:EditLiveId="EditLiveId"
+              v-model:projectTaskId="projectTaskId"
+            />
           </div>
-          <!-- 添加考试侧弹窗 -->
+          <!-- 添加直播侧弹窗 -->
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddRef">
@@ -170,7 +207,16 @@
           </div>
           <!-- 添加外链侧弹窗 -->
           <div>
-            <add-ref v-model:addrefVisible="addrefvisible" />
+            <add-ref
+              v-model:addrefVisible="addrefvisible"
+              :isLevel=false
+              @changeData="updateTableData"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:isRefEdit="isRefEdit"
+              v-model:EditRefId="EditRefId"
+              v-model:projectTaskId="projectTaskId"
+            />
           </div>
           <!-- 添加外链侧弹窗 -->
           <div class="lin"></div>
@@ -184,7 +230,14 @@
           </div>
           <!-- 添加讨论侧弹窗 -->
           <div>
-            <add-discuss v-model:adddiscussVisible="adddiscussvisible" />
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:editDiscussId="editDiscussId"
+              @changeData="updateTableData"
+            />
           </div>
           <!-- 添加讨论侧弹窗 -->
           <div class="lin"></div>
@@ -198,7 +251,13 @@
           </div>
           <!-- 添加活动侧弹窗 -->
           <div>
-            <add-active v-model:addactiveVisible="addactivevisible" />
+            <add-active
+              v-model:addactiveVisible="addactivevisible"
+              v-model:projectId="projectId"
+              v-model:edit="edit"
+              v-model:chooseStageId="chooseStageId"
+              @changeData="updateTableData"
+            />
           </div>
           <!-- 添加活动侧弹窗 -->
           <div class="lin"></div>
@@ -212,7 +271,14 @@
           </div>
           <!-- 添加测评侧弹窗 -->
           <div>
-            <add-eval v-model:addevalVisible="addevalvisible" />
+            <add-eval
+              v-model:addevalVisible="addevalvisible"
+              @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:EditEvalId="EditEvalId"
+            />
           </div>
           <!-- 添加测评侧弹窗 -->
           <div class="lin"></div>
@@ -226,7 +292,13 @@
           </div>
           <!-- 添加评估侧弹窗 -->
           <div>
-            <add-invist v-model:addinvistVisible="addinvistvisible" />
+            <add-invist
+              v-model:addinvistVisible="addinvistvisible"
+              @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+            />
           </div>
           <!-- 添加评估侧弹窗 -->
           <div class="lin"></div>
@@ -239,7 +311,13 @@
             <div class="text">投票</div>
             <!-- 添加投票侧弹窗 -->
             <div>
-              <add-vote v-model:addvoteVisible="addvotevisible" />
+              <add-vote
+                v-model:addvoteVisible="addvotevisible"
+                @changeData="updateTableData"
+                v-model:edit="edit"
+                v-model:projectId="projectId"
+                v-model:chooseStageId="chooseStageId"
+              />
             </div>
             <!-- 添加投票侧弹窗 -->
           </div>
@@ -249,8 +327,8 @@
         <div class="boomcen">
           <div class="onerow">
             <div class="taskmain">任务列表</div>
-            <button class="btn">移动任务到阶段</button>
-            <div class="edit">
+            <button class="btn" @click="moveTask">移动任务到阶段</button>
+            <div class="edit" @click="deleteTaskAll">
               <img
                 class="editimg"
                 src="../../assets/images/projectadd/delete.png"
@@ -288,8 +366,178 @@
                 <span class="yi">条</span>
               </div>
             </div> -->
-            <div class="tableBox">
-              <a-table
+            <div class="tableBox" style="border: 1px solid #f2f6fc">
+              <div
+                style="
+                  height: 50px;
+                  display: flex;
+                  justify-content: space-between;
+                  align-items: center;
+                  background-color: #eff4fc;
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #999ba3;
+                  line-height: 36px;
+                  border-bottom: 1px solid #f2f6fc;
+                "
+              >
+                <div
+                  style="
+                    width: 87px;
+                    text-align: center;
+                    display: flex;
+                    margin-left: 46px;
+                  "
+                >
+                  <img
+                    style="
+                      width: 16px;
+                      height: 16px;
+                      cursor: pointer;
+                      margin-top: 12px;
+                    "
+                    :src="
+                      selectAll === 0
+                        ? require('../../assets/images/notSelect.png')
+                        : selectAll === 1
+                        ? require('../../assets/images/selectAll.png')
+                        : require('../../assets/images/select.png')
+                    "
+                    @click="selectRowAll"
+                  />
+                  <!-- <a-checkbox
+                    v-model:checked="selectAll"
+                    @change="selectRowAll"
+                  >
+                  </a-checkbox> -->
+                  <div style="margin-top: 2px; margin-left: 8px">类型</div>
+                </div>
+                <div style="width: 120px; text-align: center">任务名称</div>
+                <div style="width: 120px; text-align: center">必修/选修</div>
+                <div style="width: 87px; text-align: center">时长</div>
+                <div
+                  style="width: 120px; text-align: center; margin-right: 20px"
+                >
+                  操作
+                </div>
+              </div>
+              <draggable
+                v-model="tableData"
+                chosenClass="chosen"
+                ghostClass="ghost"
+                forceFallback="true"
+                group="task"
+                animation="500"
+                @start="onStart"
+                @end="onEnd"
+              >
+                <template #item="{ element }">
+                  <div
+                    style="
+                      height: 50px;
+                      display: flex;
+                      justify-content: space-between;
+                      align-items: center;
+                      border-bottom: 1px solid #f2f6fc;
+                      font-size: 14px;
+                      font-weight: 400;
+                      color: #4f5156;
+                      line-height: 36px;
+                    "
+                    class="tableRow"
+                  >
+                    <div
+                      style="
+                        width: 87px;
+                        text-align: center;
+                        margin-left: 46px;
+                        position: relative;
+                      "
+                    >
+                      <div class="racona">
+                        <div
+                          class="img"
+                          style="
+                            cursor: pointer;
+                            margin-top: 2px;
+                            margin-right: 9px;
+                            position: absolute;
+                            left: -25px;
+                          "
+                        ></div>
+                        <a-checkbox
+                          :id="element.id"
+                          v-model:checked="element.checked"
+                          @change="changeRow"
+                        >
+                        </a-checkbox>
+                        <div style="margin-top: 2px; margin-left: 8px">
+                          {{ element.lei }}
+                        </div>
+                      </div>
+                    </div>
+                    <div style="width: 120px; text-align: center">
+                      {{ element.creater }}
+                    </div>
+                    <div style="width: 120px; text-align: center">
+                      <div class="opat">
+                        <div class="opacationt clearfix">
+                          <a-switch
+                            style="margin-left: -50px; margin-top: 3px"
+                            :checked="element.checked1"
+                            size="small"
+                            active-color="red"
+                            @click="changeCourseType(element.id)"
+                          />
+                          <div class="showt clearfix">
+                            <div
+                              class="bi"
+                              :style="{
+                                'z-index': element.checked1 ? 999 : 998,
+                              }"
+                            >
+                              必修
+                            </div>
+                            <div class="xuan">选修</div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="width: 87px; text-align: center">
+                      {{ element.cretime }}分钟
+                    </div>
+                    <div
+                      style="
+                        width: 120px;
+                        text-align: center;
+                        margin-right: 20px;
+                      "
+                    >
+                      <div class="opa">
+                        <div class="opacation">
+                          <span
+                            style="
+                              color: #4ea6ff;
+                              margin-right: 25px;
+                              cursor: pointer;
+                            "
+                            @click="decideType(element.lei, element.courseId,element.id)"
+                          >
+                            编辑
+                          </span>
+                          <span
+                            style="color: #4ea6ff; cursor: pointer"
+                            @click="showDelete(element.id)"
+                          >
+                            删除
+                          </span>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </draggable>
+              <!-- <a-table
                 style="border: 1px solid #f2f6fe"
                 :columns="tableDataFunc()"
                 :data-source="tableData"
@@ -302,7 +550,7 @@
                   selectedRowKeys: selectedRowKeys,
                   onChange: onSelectChange,
                 }"
-              />
+              /> -->
 
               <!-- <div class="pa">
                 <a-pagination
@@ -361,11 +609,17 @@
         <div class="modalMain" style="width: 100%">
           <div class="name">
             <div class="namebox">
+              <div>
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <div class="inname">阶段名称：</div>
             </div>
             <div class="in">
               <a-input
-                v-model:value="valueE"
+                v-model:value="valuesname"
                 show-count
                 :maxlength="20"
                 placeholder="请输入阶段名称"
@@ -378,7 +632,7 @@
             </div>
             <div class="intext" style="margin-left: 14px">
               <a-textarea
-                v-model:value="value"
+                v-model:value="valuesnotice"
                 style="height: 88px"
                 show-count
                 :maxlength="100"
@@ -409,7 +663,7 @@
               取消
             </button>
             <button
-              @click="closeModal"
+              @click="editStage"
               style="
                 cursor: pointer;
                 margin-left: 16px;
@@ -488,7 +742,7 @@
         </div>
       </div>
     </a-modal>
-    <!-- 确认删除阶段弹窗 -->
+    <!-- 确认删除任务弹窗 -->
     <a-modal
       v-model:visible="deleteModal"
       :footer="null"
@@ -522,7 +776,7 @@
 </template>
 
 <script>
-import { reactive, toRefs, onMounted, onUnmounted } from "vue";
+import { reactive, toRefs, onMounted, onUnmounted, onUpdated } from "vue";
 import AddOnline from "../../components/drawers/AddOnline.vue";
 import EditOnline from "../../components/drawers/EditOnline.vue";
 import AddFaceteach from "../../components/drawers/AddFaceteach.vue";
@@ -539,7 +793,19 @@ import AddVote from "../../components/drawers/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
+import * as apiExternal from "../../api/indexExternalChain";
+import * as apidiscuss from "../../api/indexDiscuss";
+import * as apiactivity from "../../api/indexActivity";
 import * as apieval from "../../api/indexEval";
+import * as apiinvist from "../../api/indexInvist";
+import * as apivote from "../../api/indexVote";
+import * as apistage from "../../api/indexStage";
+import * as apimove from "../../api/indexMovetask";
+import draggable from "vuedraggable";
+import { storage } from "../../api/storage";
+import { deleteExaminationById } from "@/api/indexExam";
+import { deleteWorkTask } from "@/api/indexWork";
+
 const drawercolumns = [
   {
     title: "项目名称",
@@ -581,6 +847,7 @@ const drawercolumns = [
 export default {
   name: "TaskAdd",
   components: {
+    draggable,
     AddOnline,
     EditOnline,
     AddFaceteach,
@@ -597,6 +864,20 @@ export default {
   },
   setup() {
     const state = reactive({
+      projectId: storage.get("projectId")
+        ? JSON.parse(storage.get("projectId"))
+        : null,
+      chooseStageId: null,
+      edit: false,
+      isRefEdit: false, //外链编辑
+      isLiveEdit:false, //直播编辑
+      EditRefId: null, //要编辑的外链的id
+      EditLiveId: null, //要编辑的直播的id
+      editDiscussId:null,//要编辑的讨论的id
+      EditWorkId:null, // 要编辑的作业id
+      EditTestId: null,// 要编辑的考试id
+      EditEvalId:null,
+      projectTaskId:null, // 要编辑的具体任务id
       projectNameList: [
         {
           id: 1,
@@ -631,125 +912,11 @@ export default {
           label: "移动任务到关卡",
         },
       ],
-      level: [
-        {
-          id: "1",
-          tit: "阶段1",
-          name: "腾飞班1基础",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "腾飞班基础",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-        {
-          id: "2",
-          tit: "阶段2",
-          name: "中级产品经理",
-        },
-      ],
+      //阶段数据
+      level: [],
 
       //任务数据
-      tableData: [
-        {
-          key: 1,
-          lei: "在线",
-          // state: "已发布",
-          creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 2,
-          lei: "面授",
-          // state: "草稿",
-          creater: "管理者面授",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 1,
-          lei: "在线",
-          // state: "已发布",
-          creater: "管理者课程",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 3,
-          lei: "作业",
-          // state: "已停用",
-          creater: "管理者作业",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "60分钟",
-          haspub: false,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 4,
-          lei: "考试",
-          // state: "草稿",
-          creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 5,
-          lei: "案例",
-          // state: "草稿",
-          creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: true,
-          checkedd: false,
-        },
-        {
-          key: 4,
-          lei: "考试",
-          // state: "草稿",
-          creater: "管理者考试",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: false,
-          checkedd: false,
-        },
-        {
-          key: 5,
-          lei: "案例",
-          // state: "草稿",
-          creater: "腾飞班1案例",
-          // pubtime: "2022-07-20 14:00:03",
-          cretime: "20分钟",
-          haspub: true,
-          checked1: true,
-          checkedd: false,
-        },
-      ],
+      tableData: [],
       drawertableData: [
         {
           key: 1,
@@ -848,14 +1015,24 @@ export default {
       addvotevisible: false,
       stage: false,
       selectedRowKeys: [],
+      valuesname: "",
+      valuesnotice: "",
       confirmModal: false, //确认添加阶段弹窗
       cC: false,
       cancelModal: false, //确认取消阶段弹窗
       deleteModal: false, //确认删除弹窗
-      isactive: -1,
       isActive: false,
       deleteLiveID: null, //删除直播id
+      deleteExternalID: null, //删除外链id
+      deleteEvalID: null, //测评
+      deleteInvistID: 4, //评估
+      deleteDiscussID: null, //删除讨论id
+      deleteActivityID: null, //删除活动id
+      deleteID: "",
+      selectRow: [], //选择行
+      selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
+    console.log("projectId", state.projectId);
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
     };
@@ -865,6 +1042,93 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
+    //添加阶段
+    const editStage = () => {
+      if (!state.valuesname) {
+        message.destroy();
+        return message.warning("请输入阶段名称");
+      }
+      let obj = {
+        name: state.valuesname,
+        projectId: state.projectId,
+        remark: state.valuesnotice,
+      };
+      apistage
+        .editStage(obj)
+        .then((res) => {
+          console.log("添加阶段成功", res);
+          (state.valuesname = ""),
+            (state.valuesnotice = ""),
+            (state.stage = false);
+          message.default();
+          message.success("添加阶段成功");
+        })
+        .catch((err) => {
+          console.log("添加阶段失败", err);
+        });
+    };
+    // 把数据放到state里
+    const getTableData = (tableData) => {
+      let data = tableData;
+      let array = [];
+      console.log("data", data);
+      data.map((value) => {
+        let obj = {
+          id: value.projectTaskId,
+          key: value.projectTaskId,
+          lei:
+            value.type == 1
+              ? "在线"
+              : value.type == 2
+              ? "面授"
+              : value.type == 3
+              ? "案例"
+              : value.type == 4
+              ? "作业"
+              : value.type == 5
+              ? "考试"
+              : value.type == 6
+              ? "直播"
+              : value.type == 7
+              ? "外链"
+              : value.type == 8
+              ? "讨论"
+              : value.type == 9
+              ? "活动"
+              : value.type == 10
+              ? "测评"
+              : value.type == 11
+              ? "评估"
+              : value.type == 12
+              ? "投票"
+              : "-",
+          creater: value.name,
+          cretime: value.duration ? value.duration : "-",
+          checked1: value.flag ? true : false,
+          checked: false, //是否选中类型
+          courseId: value.courseId,
+        };
+        array.push(obj);
+      });
+      state.tableData = array;
+      console.log("state.tableData", state.tableData);
+    };
+    //把阶段放到level里
+    const getStageData = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value) => {
+        let obj = {
+          id: value.stageId,
+          tit: value.name,
+          name: value.remark,
+          taskList: value.taskList,
+        };
+        array.push(obj);
+      });
+      state.level = array;
+    };
+
     const tableDataFunc = () => {
       const columns = [
         {
@@ -963,13 +1227,14 @@ export default {
           // width: 100,
           align: "center",
           scopedSlots: { customRender: "action" },
-          customRender: () => {
+          customRender: (text) => {
             return (
               <div class="opa">
                 <div class="opacation">
                   <span
                     onClick={() => {
                       state.editonlinevisible = true;
+                      console.log(text, "编辑text");
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
@@ -979,7 +1244,7 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      {/* deleteEvalText(); */}
+                      state.deleteID = text.record.id;
                     }}
                   >
                     删除
@@ -996,19 +1261,84 @@ export default {
     //获取任务列表
     const getTask = () => {
       let obj = {
-        projectId: 1,
+        projectId: state.projectId,
+        // projectId: 28,
       };
       api
         .getTask(obj)
         .then((res) => {
           if (res.status == 200) {
-            console.log(res.data.data.stageList, 22222);
+            console.log("22222", res.data.data.stageList);
+            // console.log("22222", res.data.data.stageList);
+            let leng = res.data.data.stageList.length;
+            if (leng > 0) {
+              //获取任务列表
+              let arr = res.data.data.stageList[0].taskList;
+              getTableData(arr);
+            }
+
+            let stagearr = res.data.data.stageList;
+            console.log(stagearr, 111111);
+            if (stagearr.length > 0) {
+              getStageData(stagearr);
+            }
+            //给阶段id赋初始值
+            state.chooseStageId = leng > 0 ? stagearr[0].stageId : null;
+            console.log(state.chooseStageId, 1111);
           }
         })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
+    };
+
+    //获取阶段
+    // const getStage = () =>{
+    //   let obj = {
+    //     projectId:state.projectId
+    //   }
+
+    // }
+
+    //数据变化
+    const updateTableData = (data) => {
+      console.log("添加数据", data);
+      getTask(data);
+    };
+    // 删除考试
+    const deleteTest = () => {
+      let obj = {
+        examinationId: state.deleteID,
+      };
+      deleteExaminationById(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
         .catch((err) => {
           console.log(err);
         });
     };
+
+    // 删除作业
+    const deleteWork = () => {
+      let obj = {
+        workId: state.deleteID,
+      };
+      deleteWorkTask(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
     //删除直播
     const deleteLiveBroadcast = () => {
       let obj = {
@@ -1026,14 +1356,31 @@ export default {
           console.log(err);
         });
     };
-    
-    //删除评估测试
-    const deleteEvalText = () => {
+
+    //删除外链
+    const deleteExternalChain = () => {
       let obj = {
-        evaluationId:state.deleteLiveID,
+        linkId: state.deleteExternalID,
+        // linkId: 11,
       };
-      apieval
-        .deleteEvaluationById(obj)
+      apiExternal
+        .deleteLink(obj)
+        .then((res) => {
+          console.log(res);
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+    //删除讨论
+    const deleteDiscuss = () => {
+      let obj = {
+        discussId: state.deleteDiscussID,
+      };
+      apidiscuss
+        .deleteDiscuss(obj)
         .then((res) => {
           console.log("删除成功", res);
           message.success("删除成功");
@@ -1045,6 +1392,256 @@ export default {
           console.log("删除失败", err);
         });
     };
+    //编辑讨论
+    const editDiscuss = () => {
+      let obj = {
+        createTime: "",
+        createUser: 0,
+        discussExplain: "",
+        discussFlag: "",
+        discussId: 0,
+        discussName: "",
+        discussSettings: "",
+        discussTag: "",
+        projectId: 0,
+        updateTime: "",
+        updateUser: 0,
+      };
+      apidiscuss
+        .updateDiscuss(obj)
+        .then((res) => {
+          console.log("更新成功", res);
+          message.success("更新成功");
+        })
+        .catch((err) => {
+          console.log("更新失败", err);
+        });
+    };
+    //删除活动
+    const deleteActivity = () => {
+      let obj = {
+        activityId: state.deleteActivityID,
+      };
+      apiactivity
+        .deleteActivity(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          state.deleteModal = false;
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+    //编辑活动
+    const editActivity = () => {
+      let obj = {
+        activityAddress: "",
+        activityDuration: "",
+        activityEndTime: "",
+        activityExplain: "",
+        activityFlag: "",
+        activityId: 0,
+        activityName: "",
+        activityNotice: "",
+        activityStartTime: "",
+        activityTag: "",
+        afterSignIn: "",
+        beforeSignIn: "",
+        createTime: "",
+        createUser: 0,
+        signOutTime: "",
+        standardSettings: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      apiactivity
+        .updateActivity(obj)
+        .then((res) => {
+          console.log("更新成功", res);
+          message.success("更新成功");
+        })
+        .catch((err) => {
+          console.log("更新失败", err);
+        });
+    };
+    //删除测评测试
+    const deleteEvalText = () => {
+      let obj = {
+        evaluationId: "",
+        token: 123,
+      };
+      apieval
+        .deleteEvaluationById(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
+
+    //删除评估测试
+    const deleteInvistText = () => {
+      let obj = {
+        评估信息Id: "",
+        token: "",
+      };
+      apiinvist
+        .deleteAppraise(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
+    //编辑评估信息
+    const editInvistPath = () => {
+      let obj = {
+        appraiseEndTime: "",
+        appraiseExplain: "",
+        appraiseFlag: "",
+        appraiseId: 0,
+        appraiseName: "",
+        appraiseStartTime: "",
+        appraiseTag: "",
+        createTime: "",
+        createUser: 0,
+        researchId: 0,
+        researchName: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      apiinvist
+        .updateAppraiseMessage(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("修改失败", err);
+          // state.createLoading = false;
+          //重新获取列表
+          getTask();
+        });
+    };
+
+    //删除任务
+    const deleteTask = () => {
+      let obj = { projectTaskIds: state.deleteID };
+      api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+
+    //删除投票信息
+    const deleteVoteText = () => {
+      let obj = {
+        voteId: "",
+      };
+      apivote
+        .deleteVoteMessage(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+
+    //编辑投票信息
+    const editVotePath = () => {
+      let obj = {
+        baseVote: "",
+        createTime: "",
+        createUser: 0,
+        stem: "",
+        stemId: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: "",
+        voteExplain: "",
+        voteFlag: "",
+        voteId: 0,
+        voteName: "",
+        voteStartTime: "",
+        voteTag: "",
+      };
+      apivote
+        .editVote(obj)
+        .then((res) => {
+          setTimeout(() => {
+            console.log("修改成功", res);
+            message.success("修改成功");
+          }, 1000);
+        })
+        .catch((err) => {
+          console.log("修改失败", err);
+          // state.createLoading = false;
+          //重新获取列表
+          getTask();
+        });
+    };
+    //移动任务到阶段
+    const moveTask = () => {
+      let obj = {
+        stageId: state.chooseStageId,
+        projectTaskId: state.selectRow,
+      };
+      apimove
+        .moveTask(obj)
+        .then((res) => {
+          console.log("移动成功", res);
+          message.destroy();
+          message.success("移动成功");
+          getTask();
+        })
+        .catch((err) => {
+          console.log("移动失败", err);
+        });
+    };
+    //批量删除
+    const deleteTaskAll = () => {
+      let arr = state.selectRow;
+      console.log("选择的行信息", arr);
+      arr.map((value) => {
+        let obj = {
+          projectTaskIds: value,
+        };
+        api
+          .deleteTask(obj)
+          .then((res) => {
+            console.log(res);
+            message.destroy();
+            message.success("批量删除成功");
+            getTask();
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      });
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1066,6 +1663,9 @@ export default {
     const showModal1 = () => {
       //关闭确认框
       state.deleteModal = false;
+      deleteTask();
+      message.success("删除成功");
+      getTask();
     };
     const closeModal = () => {
       state.stage = false;
@@ -1076,6 +1676,12 @@ export default {
       document.getElementsByTagName("main")[0].style.boxShadow = "none";
       getTask();
     });
+    onUpdated(() => {
+      // getTask();
+      // setTimeout(() => {
+      //   getTask();
+      // }, 500);
+    });
     onUnmounted(() => {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
       document.getElementsByTagName("main")[0].style.boxShadow =
@@ -1090,21 +1696,32 @@ export default {
     const showDrawerAddCase = () => {
       state.addcasevisible = true;
     };
-    const showDrawerAddHomework = () => {
+    const showDrawerAddHomework = (id,eleId) => {
+      state.EditWorkId = id
+      state.projectTaskId = eleId;
       state.addhomeworkvisible = true;
     };
-    const showDrawerAddTest = () => {
+    const showDrawerAddTest = (id,eleId) => {
+      state.EditTestId = id
+      state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
     const showDrawerAddLive = () => {
       state.addlivevisible = true;
     };
-    const showDrawerAddRef = () => {
+    const showDrawerAddRef = (id,eleId) => {
+      state.EditRefId = id
+      state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
     const showDrawerAddDiscuss = () => {
       state.adddiscussvisible = true;
     };
+    //打开编辑讨论的弹窗
+    const showEditAddDiscuss = (id)=>{
+      state.editDiscussId = id
+      state.adddiscussvisible = true;
+    }
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
     };
@@ -1129,16 +1746,122 @@ export default {
     const closeCancel = () => {
       state.cancelModal = false;
     };
-    const showDelete = () => {
+    const showDelete = (id) => {
       state.deleteModal = true;
+      state.deleteID = id;
     };
     const closeDelete = () => {
       state.deleteModal = false;
     };
-    const changebgc = (index) => {
-      state.isactive = index;
+    const changebgc = (id) => {
       state.isActive = !state.isActive;
+      state.selectRow = []; //选择行
+      state.selectAll = 0; //0：未选择，1：全选，2：部分选择
+      console.log("state.level", id, state.level);
+      state.chooseStageId = id;
+      let final = state.level.find((item) => item.id === id);
+      getTableData(final.taskList);
     };
+
+    //选择单个任务
+    const changeRow = (e) => {
+      //selectRow:已经选择的任务的id数组
+      let arr = state.selectRow;
+      if (e.target.checked) {
+        arr.push(e.target.id);
+      } else {
+        arr.map((value, index) => {
+          if (value == e.target.id) {
+            arr.splice(index, 1);
+          }
+        });
+      }
+      state.selectRow = arr;
+      //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
+      if (arr.length !== 0) {
+        if (arr.length === state.tableData.length) {
+          state.selectAll = 1;
+        } else {
+          state.selectAll = 2;
+        }
+      } else {
+        state.selectAll = 0;
+      }
+      console.log("state.selectRow", state.selectRow, state.selectAll);
+    };
+    //全选任务或全不选任务
+    const selectRowAll = () => {
+      let arr = state.tableData;
+      let array = [];
+      if (state.selectAll === 0 || state.selectAll === 2) {
+        arr.map((value) => {
+          // console.log("value", value, index);
+          value.checked = true;
+          array.push(value.id);
+          // if (value == e.target.id) {
+          //   arr.splice(index, 1);
+          // }
+          state.selectAll = 1;
+        });
+      } else {
+        array = [];
+        arr.map((value) => {
+          // console.log("value", value, index);
+          value.checked = false;
+          state.selectAll = 0;
+        });
+      }
+      state.tableData = arr;
+      state.selectRow = array;
+    };
+    //修改任务的课程类型 id为任务id
+    const changeCourseType = (id) => {
+      console.log("任务id", id);
+    };
+    //打开编辑外链的弹窗
+    const showEditRefDrawer = (id) => {
+      state.addrefvisible = true;
+      state.isRefEdit = true;
+      state.EditRefId = id;
+    };
+    //打开编辑直播的弹窗
+    const showEditLiveDrawer = (id) => {
+      state.addlivevisible = true;
+      state.isLiveEdit = 2;
+      state.EditLiveId = id;
+    };
+    //打开测评的弹窗
+    const showEditEvalDrawer = (id) => {
+      console.log('222222222222222222222',id);
+      state.addevalvisible = true;
+      state.EditRefId = id;
+      console.log(state.EditRefId);
+    };
+    //编辑的按钮
+    const decideType = (type, id,eleId) => {
+      state.edit = true;
+      console.log(type, id);
+      if (type == "外链") {
+        showEditRefDrawer(id);
+      } 
+      else if (type == "直播") {
+        showEditLiveDrawer(id);
+      } else if (type == "测评") {
+        showEditEvalDrawer(id)
+      } else if (type == "评估") {
+        showDrawerAddInvist(id);
+      } else if (type == "投票") {
+        showDrawerAddVote(id);
+      } else if (type == "讨论") {
+        showEditAddDiscuss(id);
+      } else if (type == "活动") {
+        showDrawerAddActive(id);
+      }else if (type == "作业") {
+        showDrawerAddHomework(id,eleId);
+      }else if (type == "考试") {
+        showDrawerAddTest(id,eleId);
+      }
+    }
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1160,6 +1883,7 @@ export default {
       showDrawerAddDiscuss,
       showDrawerAddActive,
       showDrawerAddEval,
+      showEditEvalDrawer,
       showDrawerAddInvist,
       showDrawerAddVote,
       showConfirm,
@@ -1172,19 +1896,43 @@ export default {
       changebgc,
       getTask,
       deleteLiveBroadcast,
+      deleteDiscuss,
+      editDiscuss,
       deleteEvalText,
+      deleteExternalChain,
+      deleteActivity,
+      deleteVoteText,
+      editActivity,
+      deleteInvistText,
+      editInvistPath,
+      editVotePath,
+      getTableData,
+      deleteTask,
+      editStage,
+      updateTableData,
+      changeRow,
+      selectRowAll,
+      changeCourseType,
+      getStageData,
+      moveTask,
+      deleteTaskAll,
+      deleteTest,
+      deleteWork,
+      decideType,
+      showEditRefDrawer,
+      showEditLiveDrawer,
     };
   },
 };
 </script>
 
 <style lang="scss">
-.ant-input {
-  border-radius: 8px;
-  // height: 120%;
-  width: 384px;
-  height: 88px;
-}
+// .ant-input {
+//   border-radius: 8px;
+//   // height: 120%;
+//   width: 384px;
+//   height: 88px;
+// }
 .ConfirmModal {
   .ant-modal {
     width: 424px !important;
@@ -1430,7 +2178,7 @@ export default {
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
-    overflow-x: scroll;
+    overflow-x: auto;
     display: flex;
     flex-direction: column;
     .header {
@@ -1563,6 +2311,11 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center; // background-color: #bfa;
+
+        .ghost {
+          // background-color: red;
+          opacity: 0 !important;
+        }
         .item {
           width: 171px;
           height: 83px;
@@ -1605,7 +2358,7 @@ export default {
         }
         .bgcactive {
           opacity: 1;
-          transition: all 0.5s;
+          // transition: all 0.5s;
         }
       }
     }
@@ -1949,8 +2702,22 @@ export default {
             }
           }
           .tableBox {
-            padding-bottom: 20px;
+            margin-bottom: 20px;
             margin-top: 20px;
+            .chosen {
+              background-color: #f2f6fc;
+              opacity: 1;
+            }
+            .ghost {
+              // background-color: red;
+              opacity: 0;
+            }
+            .tableRow:hover {
+              background-color: #f2f6fc;
+            }
+            //  .tableRow: {
+            //     background-color: #f2f6fc;
+            //   }
             .classify {
               margin-left: 10px !important;
               padding-left: 9px !important;
@@ -2016,6 +2783,7 @@ export default {
         display: flex;
         margin-left: 10px;
         height: 23px;
+        position: relative;
         .bi {
           // margin-top: 10px;
           width: 63px;
@@ -2042,19 +2810,15 @@ export default {
     }
   }
   .racona {
-    // background-color: #bfa;
     display: flex;
     align-items: center;
-    // justify-content: center;
     height: 100%;
     .img {
-      // margin-left: -40px;
-      // margin-top: -2px;
       width: 17px;
       height: 14px;
       background-image: url("../../assets/images/leveladd/z1.png");
-      position: absolute;
-      left: -40px;
+      // position: absolute;
+      // left: -40px;
     }
     .ch {
       margin-left: 10px;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 4d4c232d..0be5c04e 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -30,12 +30,12 @@
           </div>
         </div>
         <div class="line"></div>
-        <router-link to="/projectmanage"
-          ><div style="display: flex">
+        <router-link to="/projectmanage">
+          <div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
-          </div></router-link
-        >
+          </div>
+        </router-link>
       </div>
     </div>
     <div class="split" style="flex-shrink: 0"></div>
@@ -45,6 +45,7 @@
         v-model:activeKey="activeKey"
         size="large"
         :tabBarStyle="{ marginLeft: '10px', marginTop: '5px' }"
+        @change="tabsChange"
       >
         <a-tab-pane key="1" tab="概览">
           <div class="split"></div>
@@ -116,7 +117,9 @@
           <!-- 概览（无数据） -->
           <!-- 概览（有数据） -->
           <div style="display: none">
-            <div class="onerow"><div class="taskmain">项目概览</div></div>
+            <div class="onerow">
+              <div class="taskmain">项目概览</div>
+            </div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">200</span>
@@ -152,7 +155,9 @@
                 <div class="nub2">选修完成率</div>
               </div>
             </div>
-            <div class="onerow"><div class="taskmain">阶段信息</div></div>
+            <div class="onerow">
+              <div class="taskmain">阶段信息</div>
+            </div>
             <div class="stagemess">
               <div class="stage1">阶段1</div>
               <div class="stage2">阶段2</div>
@@ -254,11 +259,11 @@
                 <a-collapse-panel
                   v-for="(value, index) in taskSyllabus"
                   :key="index"
-                  :header="value.text"
+                  :header="value.name"
                 >
                   <div
                     class="course"
-                    v-for="(item, key) in value.children"
+                    v-for="(item, key) in value.taskList"
                     :key="key"
                   >
                     <!-- :style="{width:item.course==='在线'?'28px':
@@ -276,29 +281,29 @@
                         >
                           <img
                             :src="
-                              item.course === '在线'
+                              item.type == '1'
                                 ? require('../../assets/images/leveladd/zai.png')
-                                : item.course === '面授'
+                                : item.type == '2'
                                 ? require('../../assets/images/leveladd/mian.png')
-                                : item.course === '案例'
+                                : item.type == '3'
                                 ? require('../../assets/images/leveladd/an.png')
-                                : item.course === '作业'
+                                : item.type == '4'
                                 ? require('../../assets/images/leveladd/zuo.png')
-                                : item.course === '考试'
+                                : item.type == '5'
                                 ? require('../../assets/images/leveladd/kao.png')
-                                : item.course === '直播'
+                                : item.type == '6'
                                 ? require('../../assets/images/leveladd/zhi.png')
-                                : item.course === '外链'
+                                : item.type == '7'
                                 ? require('../../assets/images/leveladd/wai.png')
-                                : item.course === '讨论'
+                                : item.type == '8'
                                 ? require('../../assets/images/leveladd/tao.png')
-                                : item.course === '活动'
+                                : item.type == '9'
                                 ? require('../../assets/images/leveladd/huo.png')
-                                : item.course === '测评'
+                                : item.type == '10'
                                 ? require('../../assets/images/leveladd/ce.png')
-                                : item.course === '评估'
+                                : item.type == '11'
                                 ? require('../../assets/images/leveladd/diao.png')
-                                : item.course === '投票'
+                                : item.type == '12'
                                 ? require('../../assets/images/leveladd/tou.png')
                                 : null
                             "
@@ -306,26 +311,27 @@
                         </div>
                       </div>
                       <div>
-                        <div class="iconame">「{{ item.course }}」</div>
+                        <div class="iconame">「{{ item.name }}」</div>
                         <div class="icontext">{{ item.name }}</div>
                       </div>
                     </div>
                     <div class="type">
                       <div
                         :class="
-                          item.classify == '必修' ? 'typename1' : 'typename'
+                          item.flag == true ? 'typename1' : 'typename'
                         "
                       >
-                        {{ item.classify }}
+                        <!-- {{ item.classify }}  -->
+                        <span v-if="item.flag">必修</span> <span v-else>选修</span>
                       </div>
                     </div>
                     <div class="time">
                       <div class="timetext">开始时间</div>
-                      <div class="timetext">{{ item.beginTime }}</div>
+                      <div class="timetext">{{ item.createTime }}</div>
                     </div>
                     <div class="progress">
                       <div class="progresstext">
-                        {{ item.complete }}/{{ item.total }}人
+                        {{ item.finishStuCnt }}/{{ item.totalStuCnt }}人
                       </div>
                       <div style="display: flex">
                         <a-progress
@@ -335,7 +341,7 @@
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent }}%</span
+                          >{{ (item.finishStuCnt/item.totalStuCnt)*100 }}%</span
                         >
                       </div>
                     </div>
@@ -344,7 +350,7 @@
                         class="operation"
                         style="cursor: pointer"
                         :style="{
-                          display: item.course === '面授' ? 'flex' : 'none',
+                          display: item.type == '2' ? 'flex' : 'none',
                         }"
                         @click="showFS"
                       >
@@ -353,10 +359,10 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.course)"
+                        @click="showAA(item.type)"
                         :style="{
                           display:
-                            item.course === '直播' || item.course === '活动'
+                            item.type == '6' || item.type == '9'
                               ? 'flex'
                               : 'none',
                         }"
@@ -368,19 +374,19 @@
                         style="cursor: pointer"
                         :style="{
                           display:
-                            item.course === '直播' ||
-                            item.course === '活动' ||
-                            item.course === '面授'
+                            item.type == '6' ||
+                            item.type == '9' ||
+                            item.type == '2'
                               ? 'flex'
                               : 'none',
                         }"
                         @click="
-                          item.course === '面授'
-                            ? showCopyModal(item.course)
-                            : item.course === '直播'
-                            ? showzhibModal(item.course)
-                            : item.course === '活动'
-                            ? showhuodModal(item.course)
+                          item.type == '2'
+                            ? showCopyModal(item.type)
+                            : item.type == '6'
+                            ? showzhibModal(item.type)
+                            : item.type == '9'
+                            ? showhuodModal(item.type)
                             : null
                         "
                       >
@@ -390,20 +396,20 @@
                         class="operation"
                         style="cursor: pointer; margin-right: 35px"
                         @click="
-                          item.course === '在线' ||
-                          item.course === '案例' ||
-                          item.course === '外链' ||
-                          item.course === '讨论' ||
-                          item.course === '直播' ||
-                          item.course === '评估' ||
-                          item.course === '投票' ||
-                          item.course === '活动'
+                          item.type == '1' ||
+                          item.type == '3' ||
+                          item.type == '7' ||
+                          item.type == '8' ||
+                          item.type == '6' ||
+                          item.type == '11' ||
+                          item.type == '12' ||
+                          item.type == '9'
                             ? showTime(item.course, item.name)
-                            : item.course === '考试' || item.course === '测评'
+                            : item.type == '5' || item.type == '10'
                             ? showTest(item.course, item.name)
-                            : item.course === '面授'
+                            : item.type == '面授'
                             ? showFace(item.course)
-                            : item.course === '作业'
+                            : item.type == '作业'
                             ? showWork(item.course)
                             : null
                         "
@@ -805,7 +811,7 @@
           <NoticePub></NoticePub>
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
-          <ProjectScore></ProjectScore>
+          <ProjectScore :projectId="projectId"></ProjectScore>
         </a-tab-pane>
         <a-tab-pane key="6" tab="排行榜">
           <div class="split"></div>
@@ -833,15 +839,16 @@
                     v-model:value="valueDate"
                     style="border-radius: 8px; height: 40px; margin-left: 5px"
                     :placeholder="['      开始时间', '        结束时间']"
+                    @change="rankTimeChange"
                   />
                 </div>
               </div>
               <div class="right">
-                <div class="btn btn1">
+                <div class="btn btn1" @click="rankSearch">
                   <div class="img1"></div>
                   <div class="te">搜索</div>
                 </div>
-                <div class="btn btn2">
+                <div class="btn btn2" @click="rankReset">
                   <div class="img2"></div>
                   <div class="te">重置</div>
                 </div>
@@ -1446,8 +1453,8 @@
                     v-model:checked="checked"
                     :value="1"
                     @click="cloradio1"
-                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）</a-radio
-                  >
+                    >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自由免修改课程）
+                  </a-radio>
                 </a-radio-group>
               </div>
             </div>
@@ -1641,7 +1648,8 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs,onMounted } from "vue";
+import { useRoute } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
@@ -1658,6 +1666,9 @@ import ChangeGroup from "../../components/drawers/ChangeGroup";
 import NoticePub from "../../components/drawers/NoticePub";
 import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
+import { storage } from "../../api/storage";
+import * as api from "../../api/index1";
+import * as apitl from "../../api/index";
 export default {
   name: "taskPage",
   components: {
@@ -1680,6 +1691,7 @@ export default {
   },
   setup() {
     const state = reactive({
+      projectId: storage.get("projectId") ? JSON.parse(storage.get("projectId")) : null,
       goodstuList: [
         {
           id: 1,
@@ -1792,7 +1804,7 @@ export default {
       checkedd2: false, //设置按钮2
       radioV1: "",
       radioV2: "",
-      activeKey: "1", //1:概览 2.任务...
+      activeKey: "5", //1:概览 2.任务...
       activeKey1: "8", //8:学员管理 9：小组管理
       activeKey2: "3",
       inputValue: 5,
@@ -1804,7 +1816,7 @@ export default {
       valuegood: "",
       valuestub: "", //学员管理部门
       valuestug: "", //学员管理小组名称
-      valueName: "", //排行榜输入姓名
+
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2134,125 +2146,127 @@ export default {
 
       //任务大纲列表
       taskSyllabus: [
-        {
-          text: "阶段1腾飞班阶段1",
-          children: [
-            {
-              course: "在线",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-10 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-            },
-            {
-              course: "直播",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-12 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "面授",
-              name: "管理面授课",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 80, //总人数
-              complete: 0, //完成人数
-              percent: 0,
-            },
-            {
-              course: "活动",
-              name: "管理活动",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 40, //完成人数
-              percent: 80,
-            },
-            {
-              course: "作业",
-              name: "管理者作业",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 30, //完成人数
-              percent: 60,
-            },
-            {
-              course: "考试",
-              name: "管理者考试",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 50, //完成人数
-              percent: 100,
-            },
-            {
-              course: "案例",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "外链",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-          ],
-        },
-        {
-          text: "阶段2腾飞班阶段2",
-          children: [
-            {
-              course: "讨论",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-            },
-            {
-              course: "测评",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "评估",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "投票",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-          ],
-        },
+        // {
+        //   text: "阶段1腾飞班阶段1",
+        //   children: [
+        //     {
+        //       course: "在线",
+        //       name: "时间管理",
+        //       classify: "选修",
+        //       beginTime: "2022-09-10 14:03",
+        //       total: 50, //总人数
+        //       complete: 20, //完成人数
+        //       percent: 40,
+        //     },
+        //     {
+        //       course: "直播",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-12 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "面授",
+        //       name: "管理面授课",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 80, //总人数
+        //       complete: 0, //完成人数
+        //       percent: 0,
+        //     },
+        //     {
+        //       course: "活动",
+        //       name: "管理活动",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 40, //完成人数
+        //       percent: 80,
+        //     },
+        //     {
+        //       course: "作业",
+        //       name: "管理者作业",
+        //       classify: "选修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 30, //完成人数
+        //       percent: 60,
+        //     },
+        //     {
+        //       course: "考试",
+        //       name: "管理者考试",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 50, //完成人数
+        //       percent: 100,
+        //     },
+        //     {
+        //       course: "案例",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "外链",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //   ],
+        // },
+        // {
+        //   text: "阶段2腾飞班阶段2",
+        //   children: [
+        //     {
+        //       course: "讨论",
+        //       name: "时间管理",
+        //       classify: "选修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 20, //完成人数
+        //       percent: 40,
+        //     },
+        //     {
+        //       course: "测评",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "调研",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "投票",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //   ],
+        // },
       ],
+
+
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
       showTimeText: "",
@@ -2260,8 +2274,46 @@ export default {
       showTestText: "",
       //直播、活动页面传递参数
       showkaoqinText: "",
+
+      //排行榜时间
+      rankStartTime: null,
+      rankEndTime: null,
+      valueName: "", //排行榜输入姓名
     });
 
+    // 输入接入 -- start --
+
+    const router = useRoute();
+    console.log("route:", router.query.id);
+
+    // 输入接入 -- start --
+
+
+    //任务大纲渲染
+    const getTaskList = () => {
+        let objtl = {
+          projectId: 27,
+        }
+      apitl
+        .getProjectDetail(objtl)
+        .then((res) => {
+          if (res.status == 200) {
+            console.log('res', res)
+            console.log('阶段列表',res.data.data.stageList);
+            let leng = res.data.data.stageList.length;
+            if (leng > 0) {
+              //获取任务列表 阶段
+              let taskarr = res.data.data.stageList
+              state.taskSyllabus = taskarr
+              console.log( res.data.data.stageList[0].taskList[0].type,'ggg');
+            }
+          }
+        })
+        .catch((err) => {
+          console.log('获取任务列表失败', err)
+        })
+      };
+
     //学员学员管理渲染
     const getTableDate = () => {
       let datas = state.tabledata;
@@ -2651,6 +2703,80 @@ export default {
     const delete_exit = () => {
       state.delete_hs = false;
     };
+
+    //tabs切换
+    const tabsChange = (e) => {
+     
+      //排行榜
+      if (e == 6) {
+        //获取进度榜
+      getbillboard(1, 1);
+      //获取学分榜
+      getbillboard(2, 1);
+      //获取学时榜
+      getbillboard(3, 1);
+      } else {
+        rankReset();
+      }
+    };
+
+    
+
+
+
+    // start -------排行榜---------------排行榜------------排行榜------------------排行榜---------
+    //选择搜索时间
+    const rankTimeChange = (e, date) => {
+      let startTime = date[0] + " 00:00:00";
+      let endTime = date[1] + " 23:59:59";
+      state.rankStartTime = new Date(startTime).getTime() / 1000;
+      state.rankEndTime = new Date(endTime).getTime() / 1000;
+      console.log("e", state.rankStartTime, state.rankEndTime);
+    };
+    //获取排行榜 category:榜单类别参数 type:人员类别参数
+    const getbillboard = (category, type) => {
+      let obj = {
+        beginTime: state.rankStartTime,
+        category: category,
+        endTime: state.rankEndTime,
+        name: state.valueName,
+        projectId: state.projectId,
+        stageId: 0,
+        type: type,
+      };
+      api
+        .billboard(obj)
+        .then((res) => {
+          console.log("获取成功", res);
+        })
+        .catch((err) => {
+          console.log("获取失败", err);
+        });
+    };
+
+    //搜索
+    const rankSearch = () => {
+      //获取进度榜
+      getbillboard(1, 1);
+      //获取学分榜
+      getbillboard(2, 1);
+      //获取学时榜
+      getbillboard(3, 1);
+    };
+    //重置
+    const rankReset = () => {
+      state.rankStartTime = null;
+      state.rankEndTime = null;
+      state.valueDate = null;
+      state.valueName = null;
+    };
+
+    // end -----排行榜----------------排行榜----------------------排行榜-----------排行榜----------
+
+    onMounted(()=>{
+      getTaskList()
+    })
+
     return {
       ...toRefs(state),
       totask,
@@ -2692,6 +2818,15 @@ export default {
       showhuodModal,
       closehuodModal,
       closezhibModal,
+
+      tabsChange,
+
+      getTaskList,
+
+      rankTimeChange,
+      getbillboard,
+      rankSearch,
+      rankReset,
     };
   },
 };
@@ -2873,13 +3008,16 @@ export default {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-close {
         margin-right: 18px;
         margin-top: 5px;
       }
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
@@ -2892,6 +3030,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -2905,15 +3044,18 @@ export default {
               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;
+
               .icon1 {
                 width: 16px;
                 height: 16px;
@@ -2921,6 +3063,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -2931,6 +3074,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -2940,6 +3084,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -2948,10 +3093,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -2963,17 +3110,20 @@ export default {
 
                 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: #409eff;
                 color: #ffffff;
@@ -2985,17 +3135,21 @@ export default {
     }
   }
 }
+
 .canclestu1 {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-close {
         margin-right: 18px;
         margin-top: 5px;
       }
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
@@ -3008,6 +3162,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -3021,15 +3176,18 @@ export default {
               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;
+
               .icon1 {
                 width: 16px;
                 height: 16px;
@@ -3037,6 +3195,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/notice.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -3047,6 +3206,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -3056,6 +3216,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -3064,10 +3225,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -3079,17 +3242,20 @@ export default {
 
                 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: #409eff;
                 color: #ffffff;
@@ -3101,6 +3267,7 @@ export default {
     }
   }
 }
+
 .doublepro {
   .ant-modal {
     .ant-modal-body {
@@ -3111,11 +3278,14 @@ export default {
           rgba(78, 166, 255, 0.2) 100%
         );
       }
+
       padding: 0;
+
       .modalMain {
         display: flex;
         flex-direction: column;
         align-items: center;
+
         .name {
           width: 78%;
           // background-color: lightcoral;
@@ -3131,20 +3301,24 @@ export default {
             font-size: 14px;
             margin-left: 7px;
           }
+
           .in {
             margin-left: 14px;
             width: 81%;
+
             .ant-input {
               border-radius: 5px;
               // height: 120%;
               width: 100%;
               height: 30px;
             }
+
             .ant-select {
               border-radius: 5px;
               // height: 120%;
               width: 100%;
               height: 40px;
+
               .ant-select-selector {
                 border-radius: 8px;
                 // height: 120%;
@@ -3154,10 +3328,12 @@ export default {
             }
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
           margin-top: 25px;
+
           //margin-bottom: 29px;
           .pubtn1 {
             width: 100px;
@@ -3172,6 +3348,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;
@@ -3194,13 +3371,16 @@ export default {
   .ant-modal {
     width: 532px !important;
     height: 428px !important;
+
     .ant-modal-content {
       width: 532px !important;
       height: 428px !important;
+
       .ant-modal-body {
         width: 532px !important;
         height: 428px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 532px;
@@ -3208,6 +3388,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -3221,15 +3402,18 @@ export default {
               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;
@@ -3237,6 +3421,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -3247,6 +3432,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -3256,6 +3442,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -3264,14 +3451,17 @@ export default {
                 color: #666666;
               }
             }
+
             .footerr {
               display: flex;
               justify-content: center;
               align-items: center;
+
               .onload {
                 color: rgba(51, 51, 51, 1);
                 font-size: 14px;
               }
+
               .onloadpx {
                 width: 80px;
                 height: 32px;
@@ -3296,6 +3486,7 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   //position: relative;
   .addhead {
     width: 100%;
@@ -3305,27 +3496,32 @@ export default {
     justify-content: space-between;
     align-items: center;
     position: relative;
+
     .leftimg {
       width: 151px;
       height: 100px;
       border: 10px solid #e7f2ff;
       border-radius: 8px;
       margin-left: 20px;
+
       .img {
         width: 100%;
         height: 100%;
       }
     }
+
     .imgfor {
       margin-left: 32px;
       display: flex;
       flex: 1;
       flex-direction: column;
+
       .forz {
         color: #363636;
         font-weight: 600;
         font-size: 16px;
       }
+
       .fort {
         display: flex;
         flex-wrap: wrap;
@@ -3334,11 +3530,13 @@ export default {
         margin-top: 2px;
       }
     }
+
     @media screen and (max-width: 1030px) {
       .imgfor {
         margin-left: 20px;
       }
     }
+
     .right {
       // width: 500px;
       height: 100%;
@@ -3347,22 +3545,26 @@ export default {
       //right: 0;
       display: flex;
       align-items: center;
+
       .img1 {
         width: 24px;
         height: 24px;
         margin-right: 50px;
       }
+
       .line {
         height: 65%;
         width: 1px;
         background-color: #e8effa;
         margin-right: 28px;
       }
+
       .img2 {
         width: 42px;
         height: 42px;
         margin-right: 22px;
       }
+
       .pub {
         color: #ffb64e;
         font-size: 14px;
@@ -3370,18 +3572,21 @@ export default {
         margin-right: 30px;
         cursor: pointer;
       }
+
       .return {
         color: #4ea6ff;
         font-size: 14px;
         margin-top: 10px;
         margin-right: 60px;
       }
+
       .more {
         position: relative;
         margin-right: 30px;
         height: 30px;
         display: flex;
         align-items: center;
+
         .moreArrow {
           width: 13px;
           height: 7px;
@@ -3391,6 +3596,7 @@ export default {
           margin: 2px;
           margin-left: 15px;
         }
+
         .moreItems {
           width: 110px;
           height: 80px;
@@ -3404,49 +3610,62 @@ export default {
           top: 30px;
           z-index: 100;
           cursor: pointer;
+
           .sammo {
             text-align: center;
             margin-top: 12px;
             cursor: pointer;
           }
+
           .sammo:hover {
             color: #4ea6ff;
           }
         }
+
         .moreItems:hover {
           display: block;
         }
       }
+
       @media screen and (max-width: 1240px) {
         .line {
           margin-right: 10px;
         }
+
         .img1 {
           margin-right: 15px;
         }
+
         .img2 {
           margin-right: 10px;
         }
+
         .return {
           margin-right: 10px;
         }
+
         .pub {
           margin-right: 10px;
         }
+
         .more {
           margin-right: 10px;
         }
       }
+
       .more:hover .moreArrow {
         background-image: url("../../assets/images/navtop/up.png");
       }
+
       .more:hover .moreItems {
         display: block;
       }
     }
   }
+
   .tableBox {
     margin: 20px 38px 30px;
+
     .ant-table-thead > tr > th {
       font-size: 14px;
       font-weight: 400;
@@ -3456,11 +3675,13 @@ export default {
       background-color: #eff4fc;
     }
   }
+
   .split {
     width: 100%;
     height: 20px;
     background-color: #edf0f5;
   }
+
   .content {
     //margin: 0 37px;
     .ant-tabs-top > .ant-tabs-nav::before,
@@ -3469,10 +3690,12 @@ export default {
     .ant-tabs-bottom > div > .ant-tabs-nav::before {
       border-bottom: 0px;
     }
+
     .ant-tabs-nav-wrap {
       margin-left: 30px;
       margin-top: 10px;
     }
+
     .onerow {
       //width: 100%;
       display: flex;
@@ -3480,12 +3703,14 @@ export default {
       position: relative;
       margin-top: 15px;
       margin-left: 38px;
+
       //margin-right: 38px;
       .taskmain {
         font-size: 18px;
         padding-top: 7px;
         color: #000000;
       }
+
       .btn {
         position: absolute;
         top: 0;
@@ -3498,6 +3723,7 @@ export default {
         color: #ffffff;
         cursor: pointer;
       }
+
       .edit {
         position: absolute;
         right: 38px;
@@ -3508,31 +3734,37 @@ export default {
         height: 40px;
         border: 1px solid #409eff;
         border-radius: 8px;
+
         .editimg {
           width: 15px;
           height: 15px;
           margin-top: -2px;
           margin-right: 5px;
         }
+
         .editext {
           line-height: 40px;
         }
       }
+
       .edit:hover {
         color: #ffffff;
         background-color: #409eff;
         cursor: pointer;
+
         .editimg {
           background-image: url("../../assets/images/projectadd/edit1.png");
         }
       }
     }
+
     .second {
       display: flex;
       justify-content: left;
       flex-wrap: wrap;
       margin-top: 40px;
       margin-left: 20px;
+
       .nubbox {
         width: 253px;
         height: 116px;
@@ -3544,16 +3776,19 @@ export default {
         background: #fafbfc;
         border-radius: 10px;
         margin-left: 15px;
+
         .nub1 {
           color: #ffb54a;
           font-size: 30px;
           font-weight: 700;
         }
+
         .nub2 {
           color: #6d7584;
           font-size: 14px;
         }
       }
+
       .taskbox {
         width: 412px;
         height: 160px;
@@ -3562,21 +3797,25 @@ export default {
         margin-left: 68px;
         margin-bottom: 40px;
         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;
@@ -3585,6 +3824,7 @@ export default {
           font-weight: 700;
           //line-height: 36px;
         }
+
         .centermain {
           color: rgba(135, 139, 146, 1);
           font-size: 14px;
@@ -3594,9 +3834,11 @@ export default {
         }
       }
     }
+
     .stagemess {
       display: flex;
       margin-left: 38px;
+
       .stage1 {
         width: 100px;
         height: 33px;
@@ -3610,6 +3852,7 @@ export default {
         margin-top: 19px;
         cursor: pointer;
       }
+
       .stage2 {
         width: 100px;
         height: 33px;
@@ -3625,67 +3868,82 @@ export default {
         cursor: pointer;
       }
     }
+
     .stagesecond {
       display: flex;
       margin-left: 39px;
       margin-top: 29px;
+
       .staname {
         color: #999ba3;
         font-size: 14px;
       }
+
       .stamess {
         color: #4f5156;
         font-size: 14px;
       }
     }
+
     .stagelast {
       display: flex;
       flex-wrap: wrap;
       justify-content: center;
       margin-bottom: 55px;
+
       .stagepro {
         display: flex;
         flex-direction: column;
         align-items: center;
         margin-top: 55px;
         margin-right: 120px;
+
         .ant-progress-circle-path {
           stroke: #4ea6ff;
         }
+
         .ant-progress-text {
           color: #4ea6ff;
           font-weight: 700;
         }
+
         .protext {
           color: #6d7584;
           font-size: 14px;
           margin-top: 25px;
         }
       }
+
       .proright {
         width: 500px;
         margin-top: 55px;
         margin-left: 50px;
+
         .ant-progress-bg {
           height: 24px !important;
           background: #4ea6ff;
         }
+
         .ant-progress-inner {
           height: 24px;
         }
+
         .pronub {
           color: #4ea6ff;
           font-size: 14px;
           margin: 5px 0;
         }
+
         .proright1 {
           display: flex;
           justify-content: right;
+
           .textpro {
             color: #6d7584;
             font-size: 14px;
             margin-right: 20px;
           }
+
           .ant-progress-text {
             color: #4ea6ff;
             font-size: 14px;
@@ -3694,6 +3952,7 @@ export default {
         }
       }
     }
+
     .taskSyllabus {
       // flex: 1;
       overflow-x: auto;
@@ -3708,9 +3967,11 @@ export default {
         padding-top: 0px;
         padding-bottom: 0px;
       }
+
       .ant-collapse > .ant-collapse-item {
         border: 0px;
       }
+
       .ant-collapse-header {
         display: flex;
         height: 49px;
@@ -3723,14 +3984,17 @@ export default {
         font-weight: 400;
         color: #409eff;
         line-height: 36px;
+
         .ant-collapse-arrow {
           margin-left: 15px !important;
         }
       }
+
       .ant-collapse-content {
         border-top: 0px;
       }
     }
+
     .taskbox {
       width: 412px;
       height: 160px;
@@ -3740,21 +4004,25 @@ export default {
       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;
@@ -3763,6 +4031,7 @@ export default {
         font-weight: 700;
         //line-height: 36px;
       }
+
       .centermain {
         color: rgba(135, 139, 146, 1);
         font-size: 14px;
@@ -3771,6 +4040,7 @@ export default {
         bottom: 49px;
       }
     }
+
     .stage {
       display: flex;
       height: 49px;
@@ -3779,9 +4049,11 @@ export default {
       margin-top: 20px;
       margin-left: 38px;
       margin-right: 38px;
+
       .stageimg {
         margin-left: 31px;
       }
+
       .stagename {
         color: #409eff;
         font-size: 16px;
@@ -3789,6 +4061,7 @@ export default {
         line-height: 36px;
       }
     }
+
     .course {
       //width: 100%;
       flex-shrink: 0;
@@ -3803,6 +4076,7 @@ export default {
       //margin: 0 12px;
       border: 1px solid #f2f6fc;
       border-top: 0px;
+
       .first {
         //position: relative;
         display: flex;
@@ -3818,6 +4092,7 @@ export default {
           font-size: 16px;
           margin-left: 4px;
         }
+
         .icontext {
           //positipn: absolute;
           color: #999ba3;
@@ -3826,12 +4101,14 @@ export default {
           width: 83px;
         }
       }
+
       .type {
         //height: 71px;
         display: flex;
         flex-grow: 1;
         align-items: center;
         margin-right: 50px;
+
         .typename {
           width: 63px;
           height: 23px;
@@ -3841,6 +4118,7 @@ export default {
           border-radius: 4px;
           text-align: center;
         }
+
         .typename1 {
           width: 63px;
           height: 23px;
@@ -3851,28 +4129,34 @@ export default {
           text-align: center;
         }
       }
+
       .time {
         //height: 71px;
         flex-grow: 1;
         margin-right: 50px;
+
         .timetext {
           font-size: 14px;
           color: #999ba3;
         }
       }
+
       .progress {
         width: 168px;
         margin-left: 10px;
         margin-right: 50px;
         flex-grow: 1;
+
         .progresstext {
           color: #ffc067;
           font-size: 14px;
         }
       }
+
       .operations {
         display: flex;
         width: 200px;
+
         //flex-grow: 1;
         .operation {
           color: #4ea6ff;
@@ -3883,31 +4167,38 @@ 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;
         flex-wrap: wrap;
         align-items: center;
         margin-left: 32px;
+
         .groupname {
           height: 22px;
           width: 70px;
           color: #000000;
           font-size: 14px;
         }
+
         .ant-input {
           border-radius: 8px;
           width: 264px;
           height: 40px;
         }
+
         .ant-select-selector {
           border-radius: 8px;
           width: 264px;
@@ -3915,8 +4206,10 @@ export default {
           padding-top: 5px;
         }
       }
+
       .groupright {
         display: flex;
+
         .btn1 {
           width: 100px;
           height: 40px;
@@ -3928,12 +4221,14 @@ export default {
           border-radius: 8px;
           background: #409eff;
           cursor: pointer;
+
           .btn1text {
             color: #ffffff;
             margin-left: 5px;
             font-size: 14px;
           }
         }
+
         .btn2 {
           width: 100px;
           height: 40px;
@@ -3945,6 +4240,7 @@ export default {
           border-radius: 8px;
           cursor: pointer;
           background: #ffffff;
+
           .btn2text {
             color: #409eff;
             margin-left: 5px;
@@ -3953,9 +4249,11 @@ export default {
         }
       }
     }
+
     .second2 {
       display: flex;
       margin: 30px 0 0 32px;
+
       .btn1 {
         width: 130px;
         height: 40px;
@@ -3967,12 +4265,14 @@ export default {
         border-radius: 8px;
         background: #409eff;
         cursor: pointer;
+
         .btn1text {
           color: #ffffff;
           margin-left: 5px;
           font-size: 14px;
         }
       }
+
       .btn2 {
         width: 130px;
         height: 40px;
@@ -3984,6 +4284,7 @@ export default {
         border-radius: 8px;
         cursor: pointer;
         background: #ffffff;
+
         .btn2text {
           color: #409eff;
           margin-left: 5px;
@@ -3991,6 +4292,7 @@ export default {
         }
       }
     }
+
     .talk {
       margin-top: 24px;
       margin-left: 32px;
@@ -4004,28 +4306,34 @@ export default {
       // opacity: 0.22;
       display: flex;
       align-items: center;
+
       .im {
         width: 14px;
         height: 15px;
         margin-left: 17px;
       }
+
       .xu {
         height: 100%;
         line-height: 40px;
         margin-left: 13px;
+
         .yi {
           color: #4f5156;
           font-size: 14px;
         }
+
         .zon {
           color: #999ba3;
           font-size: 14px;
           margin-left: 34px;
         }
+
         .th {
           color: #4ea6ff;
         }
       }
+
       .clear {
         cursor: pointer;
         font-size: 14px;
@@ -4035,15 +4343,18 @@ export default {
         right: 20px;
       }
     }
+
     .tab {
       .ant-table-thead > tr > th {
         background-color: rgba(239, 244, 252, 1);
         color: rgba(0, 0, 0, 0.85);
       }
+
       .ant-table-tbody > tr > td {
         border-bottom: 1px solid #f0f6fc;
         color: rgba(0, 0, 0, 0.65);
       }
+
       th.h {
         background-color: #eff4fc !important;
       }
@@ -4053,8 +4364,10 @@ export default {
         > td {
         background: rgba(250, 250, 250, 1);
       }
+
       .nostu {
         width: 100%;
+
         .nostuimg {
           margin: 75px auto;
           width: 412px;
@@ -4063,6 +4376,7 @@ export default {
           background-size: 100% 100%;
         }
       }
+
       .pa {
         // left: 0;
         margin-top: 15px;
@@ -4074,21 +4388,25 @@ export default {
         // position: absolute;
         // bottom: 20px;
       }
+
       .operation {
         display: flex;
         justify-content: center;
         align-items: center;
         color: #4ea6ff;
+
         .nselect {
           justify-content: center;
           align-items: center;
           display: flex;
+
           .jc {
             margin-left: 20px;
             cursor: pointer;
             white-space: nowrap;
           }
         }
+
         .tableSelect {
           // margin-right: 10px;
           margin-left: -5px;
@@ -4098,12 +4416,14 @@ export default {
           white-space: nowrap;
         }
       }
+
       .studentName {
         font-size: 14px;
         font-weight: 400;
         color: rgba(0, 0, 0, 0.65);
         line-height: 22px;
       }
+
       .studentExcellent {
         width: 64px;
         height: 24px;
@@ -4113,11 +4433,13 @@ export default {
         margin-left: 24px;
         display: flex;
         align-items: center;
+
         .studentExcellentImg {
           width: 16px;
           height: 16px;
           margin-left: 7px;
         }
+
         .studentExcellentT {
           font-size: 12px;
           font-weight: 400;
@@ -4136,6 +4458,7 @@ export default {
         border-right: 1px solid #e9e9e9;
         cursor: pointer;
       }
+
       .studentopea2 {
         font-size: 14px;
         font-weight: 400;
@@ -4146,6 +4469,7 @@ export default {
         border-right: 1px solid #e9e9e9;
         cursor: pointer;
       }
+
       .studentSelect {
         margin-left: 8px;
         display: inline-block;
@@ -4193,10 +4517,12 @@ export default {
         }
       }
     }
+
     .groupmain {
       display: flex;
       flex-wrap: wrap;
       margin-left: 32px;
+
       .groupbox {
         width: 264px;
         height: 181px;
@@ -4206,23 +4532,27 @@ export default {
         box-shadow: 1px 1px 18px 1px rgba(0, 0, 0, 0.05);
         margin-top: 16px;
         margin-right: 20px;
+
         .grouptitle {
           display: flex;
           justify-content: space-between;
           margin-top: 5px;
           border-bottom: 1px solid rgba(232, 232, 232, 1);
+
           .goodgruop {
             color: rgba(0, 0, 0, 0.85);
             font-size: 16px;
             line-height: 36px;
             font-weight: 600;
           }
+
           .more {
             position: relative;
             //margin-right: 30px;
             height: 30px;
             display: flex;
             align-items: center;
+
             .moreItems {
               width: 76px;
               height: 80px;
@@ -4236,88 +4566,110 @@ export default {
               top: 30px;
               z-index: 100;
               cursor: pointer;
+
               .sammo {
                 text-align: center;
                 margin-top: 12px;
                 cursor: pointer;
               }
+
               .sammo:hover {
                 color: #4ea6ff;
               }
             }
+
             .moreItems:hover {
               display: block;
             }
           }
+
           @media screen and (max-width: 1240px) {
             .line {
               margin-right: 10px;
             }
+
             .img1 {
               margin-right: 15px;
             }
+
             .img2 {
               margin-right: 10px;
             }
+
             .return {
               margin-right: 10px;
             }
+
             .pub {
               margin-right: 10px;
             }
+
             .more {
               margin-right: 10px;
             }
           }
+
           .more:hover .moreArrow {
             background-image: url("../../assets/images/navtop/up.png");
           }
+
           .more:hover .moreItems {
             display: block;
           }
         }
+
         .leader {
           color: rgba(0, 0, 0, 1);
           font-size: 14px;
           margin-top: 16px;
           //margin-left: 24px;
         }
+
         .grocenter {
           display: flex;
           margin-top: 14px;
+
           .leader1 {
             color: rgba(0, 0, 0, 1);
             font-size: 14px;
             width: 51px;
           }
+
           .ant-progress-outer {
             width: 170px;
           }
         }
+
         .grofooter {
           display: flex;
           justify-content: space-between;
           cursor: pointer;
           margin-top: 30px;
+
           .ftext {
             color: rgba(56, 139, 225, 1);
             font-size: 14px;
           }
+
           .peoples {
             display: flex;
             position: relative;
+
             .people1 {
               position: absolute;
               right: 22px;
             }
+
             .people2 {
               position: absolute;
               right: 31px;
             }
+
             .people3 {
               position: absolute;
               right: 40px;
             }
+
             .people4 {
               position: absolute;
               right: 49px;
@@ -4326,15 +4678,18 @@ export default {
         }
       }
     }
+
     .projectscore {
       .pjc_body {
         margin-left: 34px;
         margin-right: 34px;
+
         .pjcb_header {
           display: flex;
           justify-content: space-between;
           align-items: center;
           margin: 24px auto;
+
           .edit_btn {
             width: 100px;
             // padding: 0px 26px 0px 26px;
@@ -4347,12 +4702,14 @@ export default {
             justify-content: center;
             flex-shrink: 0;
             cursor: pointer;
+
             .edit {
               width: 15px;
               height: 15px;
               background-image: url(@/assets/images/coursewareManage/export1.png);
               background-size: 100% 100%;
             }
+
             .btnText {
               font-size: 14px;
               font-weight: 400;
@@ -4362,12 +4719,15 @@ export default {
             }
           }
         }
+
         .pjcb_content {
           border: 1px solid #388be1;
           padding: 32px;
+
           .pjcb_content :last-child {
             margin-bottom: 0px;
           }
+
           .content {
             margin-bottom: 24px;
           }
@@ -4375,10 +4735,12 @@ export default {
       }
     }
   }
+
   .content6 {
     margin-top: 20px;
     width: 100%;
     height: 100%;
+
     // background-color: #bfa;
     .title {
       font-size: 18px;
@@ -4386,35 +4748,41 @@ export default {
       color: #333333;
       margin-left: 34px;
     }
+
     .line {
       width: 100%;
       height: 1px;
       margin-top: 10px;
       background: #e8e8e8;
     }
+
     .search {
       display: flex;
       align-items: center;
       justify-content: space-between;
       flex-wrap: wrap;
       margin: 30px 34px 0 34px;
+
       .left {
         display: flex;
         align-items: center;
         flex-wrap: wrap;
         margin-right: 10px;
+
         .text {
           font-size: 14px;
           font-weight: 400;
           color: rgba(0, 0, 0, 0.85);
           white-space: nowrap;
         }
+
         .name {
           display: flex;
           align-items: center;
           margin-bottom: 10px;
           margin-right: 56px;
         }
+
         .time {
           display: flex;
           align-items: center;
@@ -4422,8 +4790,10 @@ export default {
           margin-bottom: 10px;
         }
       }
+
       .right {
         display: flex;
+
         .btn {
           display: flex;
           width: 100px;
@@ -4433,6 +4803,7 @@ export default {
           justify-content: center;
           align-items: center;
           margin-bottom: 10px;
+
           .img1 {
             width: 15px;
             height: 17px;
@@ -4440,6 +4811,7 @@ export default {
             background-size: 100%;
             margin-right: 5px;
           }
+
           .img2 {
             width: 16px;
             height: 18px;
@@ -4448,11 +4820,13 @@ export default {
             margin-right: 5px;
           }
         }
+
         .btn1 {
           background: #409eff;
           color: #fff;
           margin-right: 16px;
         }
+
         .btn2 {
           border: 1px solid #388be1;
           background: #ffffff;
@@ -4460,12 +4834,14 @@ export default {
         }
       }
     }
+
     .main {
       margin-top: 10px;
       display: flex;
       flex-wrap: wrap;
       margin-left: 34px;
       margin-bottom: 20px;
+
       .rank {
         width: 422px;
         height: 506px;
@@ -4474,6 +4850,7 @@ export default {
         border-radius: 2px;
         border: 1px solid rgba(125, 125, 125, 0.39);
         margin-bottom: 20px;
+
         .rankhead {
           height: 75px;
           width: 100%;
@@ -4482,9 +4859,11 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+
           .ant-select-selector {
             color: #388be1 !important;
           }
+
           .inhead {
             width: 374px;
             // background-color: lightblue;
@@ -4493,6 +4872,7 @@ export default {
             align-items: center;
             margin-top: 10px;
             position: relative;
+
             .icon {
               position: absolute;
               width: 14px;
@@ -4501,11 +4881,13 @@ export default {
               background-size: 100%;
               left: 120px;
             }
+
             .left {
               font-size: 16px;
               font-weight: 500;
               color: rgba(0, 0, 0, 0.85);
             }
+
             .right {
               .ant-select {
                 .ant-select-selector {
@@ -4517,12 +4899,14 @@ export default {
             }
           }
         }
+
         .tab {
           // margin-top: 20px;
           // margin-left: 24px;
           border-radius: 4px 4px 0px 0px;
           border: 1px solid #e9e9e9;
           margin: 20px 24px 0 24px;
+
           th.h {
             background-color: #eff4fc !important;
           }
@@ -4536,24 +4920,29 @@ export default {
       }
     }
   }
+
   .content7 {
     margin-top: 20px;
+
     .set_tit {
       margin-left: 34px;
       font-size: 18px;
       font-weight: 500;
       color: #232425;
     }
+
     .line {
       width: 100%;
       height: 1px;
       background-color: #e8e8e8;
       margin-top: 10px;
     }
+
     .set_body {
       margin-left: 34px;
       margin-right: 34px;
       position: relative;
+
       .edit {
         position: absolute;
         width: 100px;
@@ -4565,6 +4954,7 @@ export default {
         justify-content: center;
         right: 0;
         cursor: pointer;
+
         .img {
           width: 18px;
           height: 18px;
@@ -4572,21 +4962,25 @@ export default {
           background-size: 100%;
           margin-right: 7px;
         }
+
         .ed {
           font-size: 14px;
           font-weight: 400;
           color: #ffffff;
         }
       }
+
       .set_content {
         margin: 32px auto;
         display: flex;
+
         // justify-content: end;
         .setc_name {
           width: 150px;
           display: flex;
           justify-content: end;
         }
+
         .setc_main {
           flex: 1;
           margin-left: 12px;
@@ -4595,10 +4989,12 @@ export default {
     }
   }
 }
+
 .set_edit {
   .ant-modal {
     width: 866px !important;
     height: 870px !important;
+
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
@@ -4626,26 +5022,32 @@ export default {
           font-weight: 500;
           margin-bottom: 24px;
         }
+
         .setbody {
           margin-left: 67px;
+
           .main_item {
             display: flex;
             align-items: center;
             margin-bottom: 32px;
+
             .signbox {
               width: 130px;
               display: flex;
               justify-content: end;
               align-items: center;
               white-space: nowrap;
+
               .sign {
                 margin-right: 5px;
               }
             }
+
             .btnbox {
               display: flex;
               flex: 1;
               align-items: center;
+
               .xkbtn {
                 cursor: pointer;
                 width: 130px;
@@ -4658,20 +5060,24 @@ export default {
               }
             }
           }
+
           .main_item2 {
             display: flex;
             align-items: flex-start;
             margin-bottom: 32px;
+
             .signbox {
               width: 130px;
               display: flex;
               justify-content: end;
               align-items: center;
               white-space: nowrap;
+
               .sign {
                 margin-right: 5px;
               }
             }
+
             .lodalimg {
               width: 120px;
               height: 120px;
@@ -4680,16 +5086,19 @@ export default {
               justify-content: center;
               align-items: center;
               cursor: pointer;
+
               .lodalimg {
                 display: flex;
                 white-space: nowrap;
               }
             }
+
             .kqszbox {
               .qdqtbox {
                 margin-left: 5px;
                 cursor: pointer;
               }
+
               .qdbtn,
               .qtbtn {
                 width: 75px;
@@ -4700,15 +5109,18 @@ export default {
                 display: flex;
                 align-items: center;
                 justify-content: center;
+
                 .btntext {
                   color: #387df7;
                 }
               }
+
               .setbox {
                 display: flex;
                 flex-wrap: wrap;
                 margin-top: 10px;
                 margin-bottom: 24px;
+
                 .timerbox {
                   margin-top: 6px;
                   margin-right: 32px;
@@ -4718,10 +5130,12 @@ export default {
                 }
               }
             }
+
             .btnbox2 {
               display: flex;
               flex-direction: column;
               justify-content: flex-start;
+
               .xkbtn {
                 cursor: pointer;
                 width: 130px;
@@ -4775,10 +5189,12 @@ export default {
     }
   }
 }
+
 .DelModal {
   .ant-modal {
     .ant-modal-content {
       width: 424px !important;
+
       .ant-modal-body {
         .delete {
           z-index: 9999;
@@ -4790,6 +5206,7 @@ export default {
           left: 50%;
           top: 10%;
           transform: translate(-50%, -50%);
+
           .del_header {
             position: absolute;
             width: calc(100%);
@@ -4799,15 +5216,18 @@ export default {
               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;
+
               .del-icon {
                 width: 16px;
                 height: 16px;
@@ -4815,6 +5235,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/notice.png);
                 background-size: 100% 100%;
               }
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -4822,6 +5243,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -4832,6 +5254,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -4839,10 +5262,12 @@ export default {
               justify-content: center;
               align-items: center;
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -4854,16 +5279,19 @@ export default {
                 margin-right: 14px;
                 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;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 1dbb2ba0..9c791a40 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -27,10 +27,12 @@
     <a-upload
       v-model:file-list="fileList"
       name="avatar"
+      action="/api/file/upload"
       list-type="picture-card"
       class="avatar-uploader"
       :show-upload-list="false"
       :before-upload="beforeUpload"
+      @change="handleChange"
     >
       <!-- <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
       <div v-else>
@@ -39,6 +41,43 @@
         <div class="ant-upload-text">Upload</div>
       </div> -->
     </a-upload>
+
+    <div
+      style="
+        width: 130px;
+        height: 40px;
+        background: #388be1;
+        border-radius: 8px;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+      "
+      @click="golearningpath"
+    >
+      跳转
+    </div>
+    <draggable
+      v-model="draggableList"
+      chosenClass="chosen"
+      forceFallback="true"
+      group="people"
+      animation="1000"
+      @start="onStart"
+      @end="onEnd"
+      :list="draggableList"
+    >
+      <template #item="{ element }">
+        <div class="item" :key="element.id">
+          {{ element.name }}
+        </div>
+      </template>
+    </draggable>
   </div>
 </template>
 <script>
@@ -52,12 +91,15 @@ import * as api from "../../api/index1";
 //   reader.addEventListener("load", () => callback(reader.result));
 //   reader.readAsDataURL(img);
 // }
+import { useRouter } from "vue-router";
+import draggable from "vuedraggable";
 export default {
   name: "SystemManage",
   components: {
     AddVote,
     // LoadingOutlined,
     // PlusOutlined,
+    draggable,
   },
   setup() {
     const state = reactive({
@@ -66,6 +108,33 @@ export default {
       imageUrl: "",
       loading: false,
       fileList: [],
+
+      draggableList: [
+        {
+          id: 1,
+          name: "拖拽一",
+        },
+        {
+          id: 2,
+          name: "拖拽二",
+        },
+        {
+          id: 3,
+          name: "拖拽三",
+        },
+        {
+          id: 4,
+          name: "拖拽四",
+        },
+        {
+          id: 5,
+          name: "拖拽五",
+        },
+        {
+          id: 6,
+          name: "拖拽六",
+        },
+      ],
     });
 
     const showDrawer = () => {
@@ -141,13 +210,17 @@ export default {
       }
       // return isJpgOrPng && isLt2M;
     };
-
+    const router = useRouter();
+    const golearningpath = () => {
+      router.push({ path: "/learningpath", params: { id: 1 } });
+    };
     return {
       ...toRefs(state),
       showDrawer,
       changeRadio,
       handleChange,
       beforeUpload,
+      golearningpath,
     };
   },
 };
@@ -163,6 +236,12 @@ export default {
     right: 0px;
     bottom: 0px;
   }
+  .item {
+    width: 100px;
+    height: 50px;
+    background-color: pink;
+    border: 1px solid #000;
+  }
 }
 .drawerStyle {
   .drawerMain {