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

bug修复

Browse Source
This commit is contained in:
李东进1
2023-02-22 00:53:12 +08:00
parent b1d134e8f4
commit 86b9ba16f2
2 changed files with 207 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,8 +22,8 @@
<img src="../../assets/images/studentimg/character.png" /> <img src="../../assets/images/studentimg/character.png" />
</div> </div>
<div class="stumation"> <div class="stumation">
<div class="stuname">{{pro.routerInfo.userName}}</div> <div class="stuname">{{pro.routerInfo.name}}</div>
<div class="stugangw">{{pro.routerInfo.deptName?pro.routerInfo.deptName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div> <div class="stugangw">{{pro.routerInfo.organizationName?pro.routerInfo.organizationName:"" + '-' + pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
</div> </div>
<div class="sortbox"> <div class="sortbox">
<div class="sortname">进度排名</div> <div class="sortname">进度排名</div>
@@ -57,7 +57,7 @@
<div class="sortbox" style="margin-left: 34px"> <div class="sortbox" style="margin-left: 34px">
<div class="sortname">已修证书</div> <div class="sortname">已修证书</div>
<div class="sortnub"> <div class="sortnub">
<span class="nub1">{{pro.certCnt?pro.certCnt:0}}</span> <span class="nub1">{{pro.routerInfo.certCnt?pro.routerInfo.certCnt:0}}</span>
</div> </div>
</div> </div>
</div> </div>

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

@@ -1,22 +1,14 @@
<!-- eslint-disable vue/no-use-v-if-with-v-for --> <!-- eslint-disable vue/no-use-v-if-with-v-for -->
<template> <template>
<a-drawer <a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%"
:visible="Seevisible" @after-visible-change="afterVisibleChange">
class="drawerStyle seestu"
placement="right"
width="70%"
@after-visible-change="afterVisibleChange"
>
<div class="drawerMain"> <div class="drawerMain">
<div class="header"> <div class="header">
<div class="headerTitle">查看</div> <div class="headerTitle">查看</div>
<img <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
style="width: 29px; height: 29px; cursor: pointer" @click="closeDrawer" />
src="../../assets/images/basicinfo/close.png"
@click="closeDrawer"
/>
</div> </div>
<a-spin v-if="loading" :spinning="loading"/> <a-spin v-if="loading" :spinning="loading" />
<div v-if="!loading" class="main"> <div v-if="!loading" class="main">
<div class="stuinfor"> <div class="stuinfor">
<div class="portrait"> <div class="portrait">
@@ -29,18 +21,15 @@
<div class="sortbox"> <div class="sortbox">
<div class="sortname">进度排名</div> <div class="sortname">进度排名</div>
<div class="sortnub"> <div class="sortnub">
<span class="nub1">{{rank.current}}</span> <span class="nub1">{{ rank.current }}</span>
<span class="total">/{{rank.total}}</span> <span class="total">/{{ rank.total }}</span>
</div> </div>
</div> </div>
<a-divider <a-divider type="vertical" style="
type="vertical" height: 49px;
style=" margin-left: 34px;
height: 49px; background-color: rgba(170, 166, 166, 0.3);
margin-left: 34px; " />
background-color: rgba(170, 166, 166, 0.3);
"
/>
<div class="sortbox" style="margin-left: 34px"> <div class="sortbox" style="margin-left: 34px">
<div class="sortname">完成必修</div> <div class="sortname">完成必修</div>
<div class="sortnub"> <div class="sortnub">
@@ -49,110 +38,91 @@
</div> </div>
</div> </div>
<a-divider <a-divider type="vertical" style="
type="vertical" height: 49px;
style=" margin-left: 34px;
height: 49px; background-color: rgba(170, 166, 166, 0.3);" />
margin-left: 34px;
background-color: rgba(170, 166, 166, 0.3);"
/>
<div class="sortbox" style="margin-left: 34px"> <div class="sortbox" style="margin-left: 34px">
<div class="sortname">已修证书</div> <div class="sortname">已修证书</div>
<div class="sortnub"> <div class="sortnub">
<span class="nub1">{{ certCnt?certCnt:0 }}</span> <span class="nub1">{{ 0 }}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="secondrow"> <div class="secondrow">
<div class="rowleft">{{ name }} </div> <div class="rowleft">{{ name }} </div>
<div class="rowRight"> 排序号：{{ sort }}</div> <div class="rowRight"> 排序号：{{ sort }}</div>
</div> </div>
<div class="mainbox"> <div class="mainbox">
<a-collapse v-model:activeKey="stageListActive"> <a-collapse v-model:activeKey="stageListActive">
<template #expandIcon="{ isActive }"> <template #expandIcon="{ isActive }">
<img <img style="margin-right: 20px" :src="
style="margin-right: 20px" isActive
:src=" ? require('../../assets/images/studentimg/open.png')
isActive : require('../../assets/images/studentimg/close.png')
? require('../../assets/images/studentimg/open.png') " />
: require('../../assets/images/studentimg/close.png')
"
/>
<div></div> <div></div>
</template> </template>
<a-collapse-panel <a-collapse-panel v-for="value in stageList" :key="value.stageId" :header="value.stageName">
v-for="value in stageList" <template #extra>
:key="value.stageId" <div @click.stop="">
:header="value.stageName" <div class="rowbox">
<a-popover title="阶段说明">
<template #content>
<p>{{ value.remark }}</p>
</template>
<div class="shuom">说明</div>
</a-popover>
<div><img src="../../assets/images/studentimg/chak.png" /></div>
</div>
</div>
</template>
> <div class="rowclass" v-for="(item, key) in value.taskList" :key="key">
<template #extra >
<div @click.stop="">
<div class="rowbox">
<a-popover title="阶段说明">
<template #content>
<p>{{value.remark}}</p>
</template>
<div class="shuom">说明</div>
</a-popover>
<div><img src="../../assets/images/studentimg/chak.png" /></div>
</div>
</div>
</template>
<div
class="rowclass"
v-for="(item, key) in value.taskList"
:key="key"
>
<div class="leftclass"> <div class="leftclass">
<div> <div>
<img <img :src="
:src=" item.course === '在线'
item.course === '在线' ? require('../../assets/images/leveladd/zai.png')
? require('../../assets/images/leveladd/zai.png') : item.course === '面授'
: item.course === '面授'
? require('../../assets/images/leveladd/mian.png') ? require('../../assets/images/leveladd/mian.png')
: item.course === '案例' : item.course === '案例'
? require('../../assets/images/leveladd/an.png') ? require('../../assets/images/leveladd/an.png')
: item.course === '作业' : item.course === '作业'
? require('../../assets/images/leveladd/zuo.png') ? require('../../assets/images/leveladd/zuo.png')
: item.course === '考试' : item.course === '考试'
? require('../../assets/images/leveladd/kao.png') ? require('../../assets/images/leveladd/kao.png')
: item.course === '直播' : item.course === '直播'
? require('../../assets/images/leveladd/zhi.png') ? require('../../assets/images/leveladd/zhi.png')
: item.course === '外链' : item.course === '外链'
? require('../../assets/images/leveladd/wai.png') ? require('../../assets/images/leveladd/wai.png')
: item.course === '讨论' : item.course === '讨论'
? require('../../assets/images/leveladd/tao.png') ? require('../../assets/images/leveladd/tao.png')
: item.course === '活动' : item.course === '活动'
? require('../../assets/images/leveladd/huo.png') ? require('../../assets/images/leveladd/huo.png')
: item.course === '测评' : item.course === '测评'
? require('../../assets/images/leveladd/ce.png') ? require('../../assets/images/leveladd/ce.png')
: item.course === '调研' : item.course === '调研'
? require('../../assets/images/leveladd/diao.png') ? require('../../assets/images/leveladd/diao.png')
: item.course === '投票' : item.course === '投票'
? require('../../assets/images/leveladd/tou.png') ? require('../../assets/images/leveladd/tou.png')
: item.course === '评估' : item.course === '评估'
? require('../../assets/images/leveladd/diao.png') ? require('../../assets/images/leveladd/diao.png')
: null : null
" " />
/>
</div> </div>
<div class="text1">{{ item.course }}</div> <div class="text1">{{ item.course }}</div>
<div class="text2">{{ item.name }}</div> <div class="text2">{{ item.name }}</div>
</div> </div>
<div class="alreadyclass"> <div class="alreadyclass">
<div class="alimg"> <div class="alimg">
<img <img :src="
:src=" item.complete === '已完成'
item.complete === '已完成' ? require('../../assets/images/studentimg/complete.png')
? require('../../assets/images/studentimg/complete.png') : require('../../assets/images/studentimg/notice.png')
: require('../../assets/images/studentimg/notice.png') " />
"
/>
</div> </div>
<div class="altext">{{ item.complete }}</div> <div class="altext">{{ item.complete }}</div>
</div> </div>
@@ -173,7 +143,7 @@
<script> <script>
import { reactive, toRefs } from "vue"; import { reactive, toRefs } from "vue";
import ProMess from "./ProMess.vue"; import ProMess from "./ProMess.vue";
import {studentProcess, studentRank} from "../../api/indexProjStu"; import { studentProcess, studentRank } from "../../api/indexProjStu";
export default { export default {
name: "SeeStu", name: "SeeStu",
components: { ProMess }, components: { ProMess },
@@ -193,7 +163,7 @@ export default {
}, },
setup(props, ctx) { setup(props, ctx) {
const state = reactive({ const state = reactive({
loading:false, loading: false,
userName: null, //用户名 userName: null, //用户名
deptName: null, //部门 deptName: null, //部门
jobName: null, //岗位 jobName: null, //岗位
@@ -204,8 +174,8 @@ export default {
Provisible: false, Provisible: false,
showDown: true, showDown: true,
showDown1: false, showDown1: false,
rank:{total:1,current:1}, rank: { total: 1, current: 1 },
sort:null, sort: null,
stageList: [ stageList: [
// { // {
// stageName: "阶段1腾飞班阶段1", // stageName: "阶段1腾飞班阶段1",
@@ -249,8 +219,8 @@ export default {
studentRank({ studentRank({
projectId: props.projectId, projectId: props.projectId,
studentId: props.checkStuId, studentId: props.checkStuId,
type:1 type: 1
}).then(res=>{ }).then(res => {
state.rank = res.data.data state.rank = res.data.data
}) })
} }
@@ -275,52 +245,54 @@ export default {
let data = tableData; let data = tableData;
console.log('我排序了吗--------------------------》', data) console.log('我排序了吗--------------------------》', data)
let array = []; let array = [];
if(data!=undefined){ if (data != undefined) {
data.map((value) => { data.map((value) => {
let obj = { console.log('我排序了吗---------value-----------------》', value)
course: let obj = {
value.type == 1 course:
? "在线" value.type == 1
: value.type == 2 ? "在线"
? "面授" : value.type == 2
: value.type == 3 ? "面授"
? "案例" : value.type == 3
: value.type == 4 ? "案例"
? "作业" : value.type == 4
: value.type == 5 ? "作业"
? "考试" : value.type == 5
: value.type == 6 ? "考试"
? "直播" : value.type == 6
: value.type == 7 ? "直播"
? "外链" : value.type == 7
: value.type == 8 ? "外链"
? "讨论" : value.type == 8
: value.type == 9 ? "讨论"
? "活动" : value.type == 9
: value.type == 10 ? "活动"
? "测评" : value.type == 10
: value.type == 11 ? "测评"
? "评估" : value.type == 11
: value.type == 12 ? "评估"
? "投票" : value.type == 12
: "-", ? "投票"
name: value.name, : "-",
projectId: value.projectId, name: value.name,
complete: projectId: value.projectId,
value.status == -1 complete:
? "未开始" value.status == -1
: value.status == 1 ? "未开始"
? "已完成" : value.status == 1
: value.status == 0 ? "已完成"
? "未完成" : value.status == 0
: "-", ? "未完成"
flag: value.flag == 0 ? "选修" : "必修", : "-",
currentRatio: value.currentRatio, flag: value.flag == 0 ? "选修" : "必修",
routerTaskId: value.routerTaskId, currentRatio: value.currentRatio,
}; routerTaskId: value.routerTaskId,
array.push(obj); };
}); console.log('我排序了吗---------obj-----------------》', obj)
array.sort((a,b)=>{return a.projectId - b.projectId}) array.push(obj);
});
array.sort((a, b) => { return a.projectId - b.projectId })
} }
console.log('我排序了吗-----------1---------------》', array) console.log('我排序了吗-----------1---------------》', array)
@@ -331,29 +303,32 @@ export default {
console.log("查看了学员1", data); console.log("查看了学员1", data);
let array = []; let array = [];
//无阶段任务 //无阶段任务
if(data?.length ==1 && data[0].stageId ==0){ if (data?.length == 1 && data[0].id == 0) {
console.log("无阶段任务", data);
data.map((value) => { data.map((value) => {
let obj = { let obj = {
stageName:"无阶段任务", stageName: "无阶段任务",
stageId:0, stageId: 0,
remark:value.remark, remark: value.remark,
taskList: taskList(value.taskList), taskList: taskList(value.taskList),
}; };
array.push(obj);
});
}else{ //有阶段
data.map((value) => {
let obj = {
stageName: value.stageName,
stageId: value.stageId,
remark:value.remark,
taskList: taskList(value.taskList),
};
if(value.stageId >0){
array.push(obj); array.push(obj);
} });
} else { //有阶段
}); console.log("有阶段", data);
data.map((value) => {
console.log("有阶段value", value);
let obj = {
stageName: value.name,
stageId: value.id,
remark: value.remark,
taskList: taskList(value.taskList),
};
if (value.id > 0) {
array.push(obj);
}
console.log("有阶段array", array);
});
} }
state.stageList = array; state.stageList = array;
@@ -366,9 +341,10 @@ export default {
}; };
studentProcess(obj).then((res) => { studentProcess(obj).then((res) => {
state.loading = false state.loading = false
console.log("查看了学员", res.data.data); console.log("查看了学员", res.data);
let result = res.data.data; let result = res.data.data;
state.userName = result.projectInfo.userName; console.log("查看了学员result:", result);
state.userName = result.projectInfo.name;
state.deptName = result.projectInfo.deptName; state.deptName = result.projectInfo.deptName;
state.jobName = result.projectInfo.jobName; state.jobName = result.projectInfo.jobName;
state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt; state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
@@ -403,20 +379,24 @@ export default {
<style lang="scss"> <style lang="scss">
.seestu { .seestu {
.ant-drawer-content-wrapper { .ant-drawer-content-wrapper {
// max-width: 1000px; // max-width: 1000px;
.ant-drawer-header { .ant-drawer-header {
display: none !important; display: none !important;
} }
.ant-drawer-body { .ant-drawer-body {
padding: 0; padding: 0;
} }
} }
.drawerMain { .drawerMain {
min-width: 600px; min-width: 600px;
margin: 0px 32px 0px 32px; margin: 0px 32px 0px 32px;
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.header { .header {
height: 73px; height: 73px;
border-bottom: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8;
@@ -426,6 +406,7 @@ export default {
// background-color: red; // background-color: red;
margin-bottom: 20px; margin-bottom: 20px;
flex-shrink: 0; flex-shrink: 0;
.headerTitle { .headerTitle {
font-size: 18px; font-size: 18px;
font-weight: 600; font-weight: 600;
@@ -434,11 +415,13 @@ export default {
// margin-left: 24px; // margin-left: 24px;
} }
} }
.main { .main {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y: auto; overflow-y: auto;
padding-bottom: 80px; padding-bottom: 80px;
.stuinfor { .stuinfor {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -448,35 +431,43 @@ export default {
background-image: url("../../assets/images/studentimg/bgimg.png"); background-image: url("../../assets/images/studentimg/bgimg.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right; background-position: right;
.stumation { .stumation {
margin-left: 24px; margin-left: 24px;
.stuname { .stuname {
color: #333333; color: #333333;
font-size: 18px; font-size: 18px;
} }
.stugangw { .stugangw {
color: #999999; color: #999999;
font-size: 16px; font-size: 16px;
margin-top: 7px; margin-top: 7px;
} }
} }
.sortbox { .sortbox {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
margin-left: 114px; margin-left: 114px;
.sortname { .sortname {
color: #666660; color: #666660;
font-size: 14px; font-size: 14px;
} }
.sortnub { .sortnub {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 7px; margin-top: 7px;
.nub1 { .nub1 {
color: #0060ff; color: #0060ff;
font-size: 22px; font-size: 22px;
} }
.total { .total {
color: #999999; color: #999999;
font-size: 22px; font-size: 22px;
@@ -484,19 +475,23 @@ export default {
} }
} }
} }
.secondrow { .secondrow {
margin-top: 32px; margin-top: 32px;
display: flex; display: flex;
.rowleft { .rowleft {
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-size: 16px; font-size: 16px;
} }
} }
.mainbox { .mainbox {
// height: 463px; // height: 463px;
margin-right: 37px; margin-right: 37px;
margin-top: 32px; margin-top: 32px;
//border: 1px solid rgba(221, 238, 255, 1); //border: 1px solid rgba(221, 238, 255, 1);
//border-radius: 6px; //border-radius: 6px;
.rowbox { .rowbox {
@@ -510,6 +505,7 @@ export default {
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
margin-right: 480px; margin-right: 480px;
cursor: pointer; cursor: pointer;
.shuom { .shuom {
color: rgba(64, 158, 255, 1); color: rgba(64, 158, 255, 1);
font-size: 14px; font-size: 14px;
@@ -517,23 +513,28 @@ export default {
margin-right: 5px; margin-right: 5px;
} }
} }
.ant-collapse { .ant-collapse {
background-color: #ffffff; background-color: #ffffff;
border: 0; border: 0;
} }
.ant-collapse-content > .ant-collapse-content-box {
.ant-collapse-content>.ant-collapse-content-box {
padding: 0; padding: 0;
border: 0; border: 0;
} }
.ant-collapse > .ant-collapse-item {
.ant-collapse>.ant-collapse-item {
border: 1px solid rgba(221, 238, 255, 1); border: 1px solid rgba(221, 238, 255, 1);
border-radius: 6px; border-radius: 6px;
margin-bottom: 15px; margin-bottom: 15px;
border-bottom: 0px; border-bottom: 0px;
} }
.ant-collapse-content { .ant-collapse-content {
border-top: 0; border-top: 0;
} }
.ant-collapse-header { .ant-collapse-header {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -543,52 +544,60 @@ export default {
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
font-weight: 500; font-weight: 500;
} }
.rowclass { .rowclass {
height: 81px; height: 81px;
border-bottom: 1px solid rgba(221, 238, 255, 1); border-bottom: 1px solid rgba(221, 238, 255, 1);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.leftclass { .leftclass {
display: flex; display: flex;
margin-left: 25px; margin-left: 25px;
align-items: center; align-items: center;
.text1 { .text1 {
color: #000000; color: #000000;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
margin-left: 25px; margin-left: 25px;
word-break:keep-all; word-break: keep-all;
white-space:nowrap; white-space: nowrap;
} }
.text2 { .text2 {
color: rgba(51, 51, 51, 0.8); color: rgba(51, 51, 51, 0.8);
font-size: 14px; font-size: 14px;
margin-left: 65px; margin-left: 65px;
word-break:keep-all; word-break: keep-all;
white-space:nowrap; white-space: nowrap;
overflow:hidden; overflow: hidden;
text-overflow:ellipsis; text-overflow: ellipsis;
} }
} }
.alreadyclass { .alreadyclass {
display: flex; display: flex;
margin-right: 57px; margin-right: 57px;
.alimg { .alimg {
height: 16px; height: 16px;
width: 16px; width: 16px;
} }
.altext { .altext {
color: rgba(56, 125, 247, 1); color: rgba(56, 125, 247, 1);
font-size: 14px; font-size: 14px;
margin-left: 16px; margin-left: 16px;
word-break:keep-all; word-break: keep-all;
white-space:nowrap; white-space: nowrap;
} }
} }
} }
} }
} }
.btnn { .btnn {
height: 72px; height: 72px;
width: 100%; width: 100%;
@@ -600,6 +609,7 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
.btn2 { .btn2 {
cursor: pointer; cursor: pointer;
width: 100px; width: 100px;
@@ -612,5 +622,4 @@ export default {
} }
} }
} }
} }</style>
</style>