Merge branch 'zcwy-master' into dev0515

This commit is contained in:
zhangsir
2024-07-10 16:47:56 +08:00
2 changed files with 11 additions and 11 deletions

View File

@@ -3,7 +3,7 @@
<div v-if="Object.keys(detailData).length" class="growth">
<div class="growth_heads">
<div class="growth_left">
<div class="left_text">我的成长路径</div>
<div class="left_text">我的专业力必修</div>
<el-popover
placement="right"
width="437"
@@ -24,7 +24,7 @@
</el-popover>
</div>
<div class="growth_right">
<div class="right_text">什么是成长路径</div>
<div class="right_text">什么是专业力必修</div>
<div class="growth_img" @click="checkedTrue">
<img class="img" src="../../assets/images/growth/mark.png" alt="">
</div>
@@ -122,14 +122,14 @@
</div>
<div>
<el-dialog
title="成长路径说明"
title="专业力必修说明"
:visible.sync="centerDialogVisible"
width="476px"
style="margin-top: 30vh;"
center>
<div class="dialog_body">
<div class="dialog_body_text">
本功能针对学员所在组织岗位职级自动匹配成长路径完成本路径方可晋升
本功能针对学员所在组织岗位职级自动匹配专业力必修任务完成专业力必修任务方可晋升
</div>
<div @click="centerDialogVisible = false" class="dialog_body_btn">
<span>我已阅读</span>

View File

@@ -7,7 +7,7 @@
<div style=" background: #0078fc;height: 150px;width: 100%;position: absolute;top: 0;z-index:-9999;"></div>
<div class="pathdetails">
<div class="pdname">
学习任务 / {{$route.query.name}}成长路径
学习任务 / {{$route.query.name}}
</div>
<div class="detailinfo">
<div class="select">
@@ -16,7 +16,7 @@
<!-- <div class="select-radio"><span style="background: #F2675D;"></span>已完成</div> -->
</div>
<div v-if="!$route.query.allPath" class="btn">
<el-button type="primary" @click="dialogTableVisible = true">全岗位路径</el-button>
<el-button type="primary" @click="dialogTableVisible = true">专业力必修</el-button>
<!-- <el-button type="primary" style="margin-left: 0;margin-top: 30px;">信息概览</el-button> -->
</div>
<div class="linehig">
@@ -117,7 +117,7 @@
<div class="select-radio"><span style="background: #FE9C4A;"></span>选修</div>
</div>
<div class="btn">
<el-button type="primary">全岗位路径</el-button>
<el-button type="primary">专业力必修</el-button>
</div>
<div class="detailContent">
<div :class="dataList.length <= 7 ? 'detailbgc' : 'detailAllbgc'">
@@ -187,18 +187,18 @@
</div>
<el-dialog width="80%" :visible.sync="dialogTableVisible">
<span slot="title" class="dialog-header">
<div style="margin-right: 10px;">全岗位路径</div>
<div style="margin-right: 10px;">专业力必修</div>
<div class="otherImg">
<img src="../../assets/images/growth/CurrentPath.png" alt="">
<span>当前路径</span>
<span>当前任务</span>
</div>
<div class="otherImg">
<img src="../../assets/images/growth/NoPermissionPath.png" alt="">
<span>其他路径</span>
<span>其他任务</span>
</div>
<!-- <div class="otherImg">
<img src="../../assets/images/growth/OtherPath.png" alt="">
<span>其他路径无权限</span>
<span>其他任务无权限</span>
</div> -->
</span>
<!-- <el-table :data="pathData.growFullPositionPathBoItemList" border :span-method="arraySpanMethod" style="width: 100%">