hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-18 07:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-master' into dev0515

Browse Source
This commit is contained in:
zhangsir
2024-07-05 14:54:01 +08:00
parent df2e485d31 99ea8d35c9
commit a3e17cd87e
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/views/study/Growth.vue
View File

@@ -94,17 +94,17 @@
<div class="body_schedule_item"> <div class="body_schedule_item">
<div class="body_schedule_one"> <div class="body_schedule_one">
<div class="body_schedule_left"> <div class="body_schedule_left">
<div>总任务</div> <div style="margin-bottom: 9px;">总任务</div>
<div>当前任务</div> <div>当前任务</div>
</div> </div>
<div class="body_schedule_right"> <div class="body_schedule_right">
<div>{{detailData.taskNum}}门</div> <div style="margin-bottom: 9px;">{{detailData.taskNum}}门</div>
<div :title="detailData.currentTaskName">{{detailData.currentTaskName.length>30?detailData.currentTaskName.slice(0,30)+'...':detailData.currentTaskName}}</div> <div :title="detailData.currentTaskName">{{detailData.currentTaskName.length>30?detailData.currentTaskName.slice(0,30)+'...':detailData.currentTaskName}}</div>
</div> </div>
</div> </div>
<div class="body_schedule_two"> <div class="body_schedule_two">
<div class="body_schedule_pro"> <div class="body_schedule_pro">
<span class="pro_text">总进度</span> <div class="pro_text">总进度</div>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<el-progress style="width: 213px;" :show-text="false" :stroke-width="10" :percentage="Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))"></el-progress> <el-progress style="width: 213px;" :show-text="false" :stroke-width="10" :percentage="Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))"></el-progress>
<div class="text">{{ Number(((detailData.overallCompletionRate || 0)*100).toFixed(2)) || 0 }}%</div> <div class="text">{{ Number(((detailData.overallCompletionRate || 0)*100).toFixed(2)) || 0 }}%</div>
@@ -588,7 +588,7 @@ export default {
font-weight: 500; font-weight: 500;
font-size: 13px; font-size: 13px;
color: #3B3C4A; color: #3B3C4A;
line-height: 22px; line-height: 18px;
text-align: left; text-align: left;
} }
.body_schedule_right{ .body_schedule_right{
@@ -597,7 +597,7 @@ export default {
font-weight: 500; font-weight: 500;
font-size: 13px; font-size: 13px;
color: #2E72F2; color: #2E72F2;
line-height: 22px; line-height: 18px;
text-align: left; text-align: left;
} }
} }
@@ -608,11 +608,11 @@ export default {
height: 30px; height: 30px;
.pro_text{ .pro_text{
width: 42px; width: 42px;
height: 22px; height: 18px;
font-weight: 400; font-weight: 400;
font-size: 11px; font-size: 11px;
color: #666660; color: #666660;
line-height: 22px; line-height: 18px;
text-align: left; text-align: left;
margin-bottom: 2px; margin-bottom: 2px;
} }
@@ -621,6 +621,7 @@ export default {
font-size: 10px; font-size: 10px;
color: #333333; color: #333333;
margin-left: 15px; margin-left: 15px;
line-height: 14px;
} }
} }
.body_schedule_btn{ .body_schedule_btn{

4
src/views/study/GrowthPath.vue
View File

@@ -228,7 +228,7 @@
</el-table> --> </el-table> -->
<div style="margin-bottom: 30px;min-height: 300px;" class="table_box"> <div style="margin-bottom: 30px;min-height: 300px;" class="table_box">
<div class="title"> <div class="title">
<div v-if="titleList.length>5" v-for="title,index in titleList"> <div v-if="titleList.length>8" v-for="title,index in titleList">
<div :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div> <div :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div>
</div> </div>
<div v-else :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div> <div v-else :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div>
@@ -238,7 +238,7 @@
<div class="body_left" :title="item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName">{{ item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName }}</div> <div class="body_left" :title="item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName">{{ item.isOtherPosition == 1 ? item.positionName + '(' + item.organizationName + ')' : item.positionName }}</div>
</div> </div>
<div class="body_right"> <div class="body_right">
<div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:titleList.length<=5?1*t.number:none}" v-for="t,i in item.bandCodes"> <div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:titleList.length<=8?1*t.number:none}" v-for="t,i in item.bandCodes">
<img v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt=""> <img v-if="(t && t.isMajorPosition) " src="../../assets/images/growth/CurrentPath.png" alt="">
<img @click="goLearnPath(t)" v-else-if="(t && t.permission)" src="../../assets/images/growth/NoPermissionPath.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=""> --> <!-- <img v-else-if="!(t && t.permission)" src="../../assets/images/growth/OtherPath.png" alt=""> -->