hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
李东进1
2023-02-21 07:50:14 +08:00
parent c46f409f64
commit 80d520bfd0
4 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/index1.js
View File

@@ -79,7 +79,7 @@ export const delStudent = (obj) =>
http.post("/admin/router/deleteStudent", obj);
// 获取学员路径图进度明细
export const stuProgress = (params) => http.get('/admin/router/studentProcess', { params });
export const stuProgress = (params) => http.get('/admin/router/detail', { params });
// export const stuProgress = (obj) =>http.post("/admin/router/studentProcess", obj);
//编辑学习路径基本信息

3
src/api/indexProjStu.js
View File

@@ -25,7 +25,8 @@ export const editGroup = (obj) => http.post('/admin/project/editGroup', obj)
//移除小组成员
export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroupStudent', obj)
//查看学员
export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
// export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
export const studentProcess = (obj) => http.get('/admin/project/detail', { params: obj })
export const studentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
//是否优秀学员

12
src/components/drawers/CheckStu.vue
View File

@@ -22,8 +22,8 @@
<img src="../../assets/images/studentimg/character.png" />
</div>
<div class="stumation">
<div class="stuname">{{pro.userInfoBo.userName}}</div>
<div class="stugangw">{{pro.userInfoBo.deptName?pro.userInfoBo.deptName:"" + '-' + pro.userInfoBo.jobName?pro.userInfoBo.jobName:""}}</div>
<div class="stuname">{{pro.routerInfo.userName}}</div>
<div class="stugangw">{{pro.routerInfo.deptName?pro.routerInfo.deptName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
</div>
<div class="sortbox">
<div class="sortname">进度排名</div>
@@ -68,7 +68,7 @@
<div><img src="../../assets/images/studentimg/chak.png" /></div>
</div> -->
</div>
<div v-for="(item) in pro.chapterProcessList" class="mainbox"
<div v-for="(item) in pro.chapterList" class="mainbox"
style="margin-top: 15px; height: 56px"
:key="item.chapterId">
<div class="rowtitle" @click="changeDown">
@@ -85,7 +85,7 @@
</div>
<div :style="{ display: showDown ? 'block' : 'none' }">
<div v-for="_item in item.taskProcessList" :key="_item.routerTaskId" class="rowclass">
<div v-for="_item in item.taskList" :key="_item.routerTaskId" class="rowclass">
<div class="leftclass">
<div><img src="../../assets/images/leveladd/zai.png" /></div>
<div class="text1">{{checkType(_item.type)}}</div>
@@ -115,7 +115,7 @@
<div></div>
</template>
<a-collapse-panel
v-for="value in pro.chapterProcessList"
v-for="value in pro.chapterList"
:key="value.chapterId"
:header="value.chapterName"
@@ -136,7 +136,7 @@
<div
class="rowclass"
v-for="(item, key) in value.taskProcessList"
v-for="(item, key) in value.taskList"
:key="key"
>

44
src/components/drawers/SeeStu.vue
View File

@@ -103,7 +103,7 @@
<div
class="rowclass"
v-for="(item, key) in value.taskProcessList"
v-for="(item, key) in value.taskList"
:key="key"
>
@@ -210,7 +210,7 @@ export default {
// {
// stageName: "阶段1腾飞班阶段1",
// stageId: 1,
// taskProcessList: [
// taskList: [
// {
// course: "在线",
// name: "如何成为一个产品经理",
@@ -271,9 +271,11 @@ export default {
const changeDown1 = () => {
state.showDown1 = !state.showDown1;
};
const taskProcessList = (tableData) => {
const taskList = (tableData) => {
let data = tableData;
console.log('我排序了吗--------------------------》', data)
let array = [];
if(data!=undefined){
data.map((value) => {
let obj = {
course:
@@ -303,7 +305,7 @@ export default {
? "投票"
: "-",
name: value.name,
projectTaskId: value.projectTaskId,
projectId: value.projectId,
complete:
value.status == -1
? "未开始"
@@ -318,12 +320,15 @@ export default {
};
array.push(obj);
});
array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId})
console.log('我排序了吗--------------------------》', array)
array.sort((a,b)=>{return a.projectId - b.projectId})
}
console.log('我排序了吗-----------1---------------》', array)
return array;
};
const setStageList = (tableData) => {
let data = tableData;
console.log("查看了学员1", data);
let array = [];
//无阶段任务
if(data?.length ==1 && data[0].stageId ==0){
@@ -332,7 +337,7 @@ export default {
stageName:"无阶段任务",
stageId:0,
remark:value.remark,
taskProcessList: taskProcessList(value.taskProcessList),
taskList: taskList(value.taskList),
};
array.push(obj);
});
@@ -342,7 +347,7 @@ export default {
stageName: value.stageName,
stageId: value.stageId,
remark:value.remark,
taskProcessList: taskProcessList(value.taskProcessList),
taskList: taskList(value.taskList),
};
if(value.stageId >0){
array.push(obj);
@@ -363,18 +368,19 @@ export default {
state.loading = false
console.log("查看了学员", res.data.data);
let result = res.data.data;
state.userName = result.userName;
state.deptName = result.deptName;
state.jobName = result.jobName;
state.certCnt = result.certCnt == null ? 0 : result.certCnt;
state.name = result.name;
state.currentReqCnt = result.currentReqCnt;
state.totalReqCnt = result.totalReqCnt;
state.userName = result.projectInfo.userName;
state.deptName = result.projectInfo.deptName;
state.jobName = result.projectInfo.jobName;
state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
state.name = result.projectInfo.name;
state.currentReqCnt = result.projectInfo.currentReqCnt;
state.totalReqCnt = result.projectInfo.totalReqCnt;
if (result.stageList.length > 0) {
state.sort = result.stageList[0].sort;
if (result.stageProcessList.length > 0) {
state.sort = result.stageProcessList[0].sort;
setStageList(result.stageProcessList);
}
setStageList(result.stageList);
});
};
@@ -387,7 +393,7 @@ export default {
changeDown1,
check,
setStageList,
taskProcessList,
taskList,
// change,
};
},