From 042f55c1c1bc86f85c207234af470a8e98785f6f Mon Sep 17 00:00:00 2001 From: wyx Date: Sun, 15 Jan 2023 14:53:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=AD=A6=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=88=97=E8=A1=A8=E6=93=8D=E4=BD=9C-=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E3=80=81=E8=B0=83=E6=95=B4=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index1.js | 5 +- src/components/drawers/CheckStu.vue | 255 ++++++++++++++++++++++++---- src/views/learningpath/LevelAdd.vue | 110 ++++++++++-- 3 files changed, 325 insertions(+), 45 deletions(-) diff --git a/src/api/index1.js b/src/api/index1.js index a9626a13..eafae25e 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -78,8 +78,9 @@ export const delStudent = (obj) => http.post("/admin/router/deleteStudent", obj); // 获取学员路径图进度明细 -export const stuProgress = (obj) => - http.post("/admin/router/studentProcess", obj); +export const stuProgress = (params) => http.get('/admin/router/studentProcess', {params}); +// export const stuProgress = (obj) =>http.post("/admin/router/studentProcess", obj); + //编辑学习路径基本信息 export const editLearnInfo = (obj) => http.post('/admin/router/editInfo', obj) diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue index 25585065..72ef168f 100644 --- a/src/components/drawers/CheckStu.vue +++ b/src/components/drawers/CheckStu.vue @@ -15,14 +15,15 @@ @click="closeDrawer" /> -
+ +
{{pro.userInfoBo.userName}}
-
{{pro.userInfoBo.deptName+'-'+pro.userInfoBo.jobName}}
+
{{pro.userInfoBo.deptName?pro.userInfoBo.deptName:"" + '-' + pro.userInfoBo.jobName?pro.userInfoBo.jobName:""}}
进度排名
@@ -46,7 +47,7 @@ /{{pro.totalReqCnt}}
- {{pro.certCnt}}
-
+ -->
-
产品经理管理 - 腾飞班1
-
+
{{ pro.name }}
+
-
@@ -81,7 +82,7 @@ " />
-
关卡{{index}} {{item.chapterName}}
+
{{item.chapterName}}
@@ -99,11 +100,105 @@
+ --> + +
+ + + + + +
+ +
+
+ +
+
{{ checkType(item.type) }}
+
{{ item.name }}
+
+
+
+ +
+
{{ item.status ==0?"进行中":item.status ==1?"已完成":"未开始" }}
+
+ +
+ +
- +
@@ -114,7 +209,7 @@ import { reactive, toRefs } from "vue"; import CheckStuMess from "./CheckStuMess.vue"; import {stuProgress} from "@/api/index1"; -import {message} from "ant-design-vue"; +// import {message} from "ant-design-vue"; export default { name: "CheckStu", components: { CheckStuMess }, @@ -126,13 +221,19 @@ export default { studentId: { type: Number, default: null, - } + }, + routerId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ StuMessvisible: false, showDown: false, pro:null, + loading:true, + stageListActive: 0, }); const closeDrawer = () => { ctx.emit("update:CheckStuvisible", false); @@ -151,21 +252,24 @@ export default { state.showDown = !state.showDown; }; const getStuProgress = () => { + state.loading = true let obj = { - routerId:100, + routerId:props.routerId, studentId:props.studentId } stuProgress(obj).then(res => { - message.success("操作成功") + console.log("查询当前学员进度信息success",res) state.pro = res.data.data + state.loading = false console.log(res) }).catch(err => { - message.error("操作失败"+err) + console.log("查询当前学员进度信息err",err) + state.loading = false console.log(err) }) } - const checkType = (type) => { + const checkType = (type) => { let typeRules = [ "", "在线", @@ -317,28 +421,115 @@ export default { } } } + // .mainbox { + // // 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); + // 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; + // } + // } + // .rowclass { + // height: 81px; + // border-bottom: 1px solid rgba(221, 238, 255, 1); + // display: flex; + // justify-content: space-between; + // align-items: center; + // .leftclass { + // display: flex; + // margin-left: 25px; + // align-items: center; + // .text1 { + // color: #000000; + // font-size: 14px; + // font-weight: 500; + // margin-left: 25px; + // } + // .text2 { + // color: rgba(51, 51, 51, 0.8); + // font-size: 14px; + // margin-left: 65px; + // } + // } + // .alreadyclass { + // display: flex; + // margin-right: 57px; + // .alimg { + // height: 16px; + // width: 16px; + // } + // .altext { + // color: rgba(56, 125, 247, 1); + // font-size: 14px; + // margin-left: 16px; + // } + // } + // } + // } .mainbox { // 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; + .rowbox { + width: 64px; + height: 24px; + display: flex; + justify-content: center; + align-items: center; + margin-left: 24px; + border: 1px solid rgba(64, 158, 255, 1); + background: rgba(64, 158, 255, 0.1); + margin-right: 480px; + cursor: pointer; + .shuom { + color: rgba(64, 158, 255, 1); + font-size: 14px; + line-height: 20px; + margin-right: 5px; + } + } + .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; diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index f79ce983..0cc907d0 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -525,12 +525,13 @@ - + + + + @@ -861,21 +898,21 @@
-
当前关卡：关卡2
+
当前关卡：{{ curLevelName }}
- - + +
@@ -1019,6 +1056,7 @@ @@ -1269,7 +1307,7 @@