diff --git a/src/api/index1.js b/src/api/index1.js
index abe4699f..b8f120f7 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -72,7 +72,8 @@ export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
//删除学员
export const delStudent = (obj) => http.post('/admin/router/deleteStudent', obj);
-
+// 获取学员路径图进度明细
+export const stuProgress = (obj) => http.post('/admin/router/studentProcess', obj);
//项目基础信息-----------------------------------
diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index 392664b7..b8dfc793 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -22,4 +22,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
//项目概览
-export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
\ No newline at end of file
+export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+
+//设置项目积分规则
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
\ No newline at end of file
diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js
index ac0f16bf..dc6a6bcb 100644
--- a/src/api/indexTaskadd.js
+++ b/src/api/indexTaskadd.js
@@ -15,3 +15,6 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
//新建或编辑项目
export const editProj = (obj) => http.post('/admin/project/edit', obj)
+
+//路径图里的新建或编辑关卡任务
+export const editTask = (obj) => http.post('/admin/router/editTask', obj)
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
new file mode 100644
index 00000000..4808d440
--- /dev/null
+++ b/src/components/TwoDimensionalCode.vue
@@ -0,0 +1,270 @@
+
+
+
+
+
+
+
+
+
+
{{codeInfo.name?codeInfo.name:''}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index 0b32c086..25585065 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -21,14 +21,14 @@
-
王明
-
产研部门 - 产品经理
+
{{pro.userInfoBo.userName}}
+
{{pro.userInfoBo.deptName+'-'+pro.userInfoBo.jobName}}
进度排名
- 2
- /10
+ {{pro.currentChapterCnt}}
+ /{{pro.totalChapterCnt}}
完成必修
- 3
- /10
+ {{pro.currentReqCnt}}
+ /{{pro.totalReqCnt}}
已修证书
- 1
+ {{pro.certCnt}}
@@ -68,8 +68,10 @@

-
-
+
+
-
阶段1 腾飞班阶段1
+
关卡{{index}} {{item.chapterName}}
+
-
+
-
在线
-
如何成为一个产品经理
+
{{checkType(_item.type)}}
+
{{_item.name}}
-
-
-
-
-
-

-
-
已完成
-
-
-
-
-
-
-

-
-
未完成
-
-
-
-
-
-
-

-
-
未完成
-
-
-
-
-
-
-

-
-
未完成
+
{{checkStatus(_item.status)}}
-
-
-
-

-
-
阶段2 腾飞班阶段2
-
-
+
@@ -169,6 +113,8 @@
+
+
diff --git a/src/components/drawers/CourseView.vue b/src/components/drawers/CourseView.vue
new file mode 100644
index 00000000..198d192a
--- /dev/null
+++ b/src/components/drawers/CourseView.vue
@@ -0,0 +1,2157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
搜索
+
+
+
+

+
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
搜索
+
+
+
+

+
+
重置
+
+
+
+
+
+
BOE组织树
+
+
+
+
+
+ 确认添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
搜索
+
+
+
+

+
+
重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
快速选人
+
+
+
+
+ 查看更多
+

+
+
+
+
+ 收起
+

+
+
+
+
+
添加组织
+
+
+
+
+ 查看更多
+

+
+
+
+
+ 收起
+

+
+
+
+
+
受众关联
+
+
+
+
+ 查看更多
+

+
+
+
+
+ 收起
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index d30f9203..68a3273d 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -362,7 +362,7 @@ export default {
let timer;
onMounted(() => {
setTimeout(() => {
- getManageList();
+ // getManageList();
}, 1000);
timer = setInterval(() => {
state.open = false;
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index f2de47ca..e52e83a2 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -3,10 +3,10 @@
:visible="ownpowervisible"
class="drawerStyle ownpower"
placement="right"
- width="60%"
+ width="85%"
@after-visible-change="afterVisibleChange"
>
-