Merge branch 'dev0124' into dev0515

This commit is contained in:
zhangsir
2024-06-25 23:03:49 +08:00

View File

@@ -15,7 +15,7 @@
<div class="select-radio"><span style="background: #FE9C4A;"></span>选修</div>
<!-- <div class="select-radio"><span style="background: #F2675D;"></span>已完成</div> -->
</div>
<div class="btn">
<div v-if="!$route.query.allPath" class="btn">
<el-button type="primary" @click="dialogTableVisible = true">全岗位路径图</el-button>
<!-- <el-button type="primary" style="margin-left: 0;margin-top: 30px;">信息概览</el-button> -->
</div>
@@ -196,10 +196,10 @@
<img src="../../assets/images/growth/NoPermissionPath.png" alt="">
<span>其他路径</span>
</div>
<div class="otherImg">
<!-- <div class="otherImg">
<img src="../../assets/images/growth/OtherPath.png" alt="">
<span>其他路径无权限</span>
</div>
</div> -->
</span>
<!-- <el-table :data="pathData.growFullPositionPathBoItemList" border :span-method="arraySpanMethod" style="width: 100%">
<el-table-column fixed align="center" property="bandCodes" width="120" label=""></el-table-column>
@@ -239,8 +239,8 @@
<div class="body_right">
<div class="body_item" v-for="t,i in item.bandCodes">
<img v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt="">
<img v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.png" alt="">
<img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt="">
<img @click="goLearnPath(t)" v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.png" alt="">
<!-- <img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt=""> -->
<span v-else></span>
</div>
</div>
@@ -258,7 +258,7 @@
</div>
</el-drawer>
<el-backtop :bottom="700" :right="200" visibility-height="700">
<el-backtop :bottom="700" :right="200" :visibility-height="700">
<div class="back-to-top">
<div class="img"></div>
<div class="text">继续学习之旅</div>
@@ -453,6 +453,10 @@ export default {
})
},
methods: {
goLearnPath(item){
console.log(item.growId,'item')
window.open(`${process.env.VUE_APP_BOE_WEB_URL}/pc/growthpath?growId=${item.growId}&name=${item.growName}&isTrue=true&status=0.1&allPath=${true}`)
},
integrateTableData(data) {
const { growFullPositionPathBoItemList, allBandCodeList } = data;
const bandCodeIndexMap = new Map(allBandCodeList.map((code, index) => [code, index]));
@@ -472,11 +476,12 @@ export default {
const codeTrimmed = code.trim();
const index = bandCodeIndexMap.get(codeTrimmed);
if (index !== undefined) {
integratedDataMap.get(key).bandCodes[index] = { growId: item.growId, permission: item.permission ,isMajorPosition:item.isMajorPosition };
integratedDataMap.get(key).bandCodes[index] = { growId: item.growId, permission: item.permission ,isMajorPosition:item.isMajorPosition ,growName:item.growName };
}
});
});
const integratedDataArray = Array.from(integratedDataMap.values());
console.log(integratedDataArray,'integratedDataArray')
return integratedDataArray;
},
@@ -692,8 +697,9 @@ export default {
console.log(item,'在线')
this.$router.push("/course/studyindex?id=" + item.targetId);
}else if (item.type == 5) {
if(item.examType == 2){
if(item.examType != 1){
window.open(`${process.env.VUE_APP_BOE_WEB_URL}/fe-student/externalexamination?id=${item.id}&type=${item.type}&infoId=${item.id}&courseId=${item.id}&pName=${item.name}&exname=${item.name}&chapterOrStageId=${0}`)
return
}
console.log(item,'考试')
this.$router.push("exam/test?id=" + item.targetId);