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

Merge branch 'dev0124' into dev0515

Browse Source
This commit is contained in:
zhangsir
2024-06-21 13:36:02 +08:00
parent c47036ffdf cd9bf1261a
commit 9e785bba5f
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@
<div class="body_schedule_two">
<div class="body_schedule_pro">
<span class="pro_text">总进度</span>
<el-progress :stroke-width="12" :percentage="detailData.overallCompletionRate"></el-progress>
<el-progress :stroke-width="12" :percentage="Number(((detailData.overallCompletionRate || 0)*100).toFixed(2))"></el-progress>
</div>
<div class="body_schedule_btn" @click="startLearn">
<span class="body_schedule_text">{{detailData.overallCompletionRate==0?'开始学习':detailData.overallCompletionRate==100?'回顾':'继续学习'}}</span>

38
src/views/study/GrowthPath.vue
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">
@@ -33,14 +33,18 @@
<div style="font-size: 14px;padding: 20px 20px 10px; ">
<div style="font-size: 16px;font-weight: 600;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="item.title">{{ item.title }}</div>
<div style="margin: 20px 0;">
<el-tag hit :type="item.flag == 0 ? 'danger' : 'success'">{{ item.flag == 0 ? '选修' : '必修' }}</el-tag>
<el-tag hit :type="item.flag == 0 ? 'warning' : 'success'">{{ item.flag == 0 ? '选修' : '必修' }}</el-tag>
<el-tag>{{item.type == 1 ? '在线' : item.type == 5 ?'考试' : '课程'}}</el-tag>
</div>
<div>
<span style="color: #387DF7;">学习进度</span>
<el-progress :percentage="item.currentRatio || 0"></el-progress>
</div>
<div style="margin: 20px 0;">课程讲师：{{item.teacherName}}</div>
<div style="margin: 20px 0;">
课程讲师：{{item.teacherName?item.teacherName.split(',').length > 3
? item.teacherName.split(',').slice(0, 3).join(',') + '...'
: item.teacherName:''}}
</div>
<div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">课程简介：{{item.introduce}}</div>
<el-button style="width: 100%;margin-top: 20px;" type="primary" @click="goStudy(item)">
<div style="display: flex;justify-content: space-between;align-items: center;">
@@ -60,24 +64,23 @@
(notColor.includes(item.id)?4:item.id == istabId?flagToggle:0):item.id == istabId?flagToggle:0)),
left: getPosition(item.name, index).left + 'px',
top: getPosition(item.name, index).top + 'px'
}">
}" @click="goStudy(item)">
<div class="icon">
<div class="icon-content" :style="{ background: getColor(item.flag, (notColor.length>0?
<div v-if="item.currentRatio!=100" class="icon-content" :style="{ background: getColor(item.flag, (notColor.length>0?
(notColor.includes(item.id)?4:item.id == istabId?flagToggleTwo:1):item.id == istabId?flagToggleTwo:1)) }">
{{ item.currentRatio || 0 }}%
</div>
<!-- <div v-else class="icon-content" style="background-color: #fff;">
<svg style="width: 36px;height: 36px;" t="1706149497692" class="icon" viewBox="0 0 1024 1024"
version="1.1" p-id="4648">
<path
d="M0 512C0 229.234759 229.234759 0 512 0s512 229.234759 512 512-229.234759 512-512 512S0 794.765241 0 512z m419.310345 194.630621a35.310345 35.310345 0 0 0 49.399172 1.271172l335.518897-311.931586a35.310345 35.310345 0 0 0-48.075035-51.729655l-309.124413 289.544827-145.125518-149.645241a35.310345 35.310345 0 1 0-50.688 49.169655l168.112552 173.320828z"
fill="#F2675D" p-id="4649"></path>
<div v-else class="icon-content" :style="{background: getColor(item.flag,1)}">
<svg style="width: 19px;height: 15px;" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(1 0 0 1 -583 -2082 )">
<path d="M 6.163343558282208 9.152636718750001 L 15.538803680981593 0.0888671875 L 17.948926380368096 2.536132812499999 L 6.189570552147239 13.903613281250001 L 0.022776073619630802 8.07119140625 L 2.406671779141104 5.599316406250001 L 6.163343558282208 9.152636718750001 Z " fill-rule="nonzero" fill="#ffffff" stroke="none" transform="matrix(1 0 0 1 583 2082 )" />
</g>
</svg>
</div> -->
</div>
</div>
</div>
</el-popover>
<div :style="{
<div @click="goStudy(item)" :style="{
left: (getPosition(item.name, index).left + 55) + 'px',
top: getPosition(item.name, index).top + 'px'
}" class="iconTitle" :title="item.title">{{ item.title.length>15?item.title.slice(0,15)+'...':item.title }}
@@ -288,8 +291,8 @@ export default {
switchFalse: false,
showUClass: false,
colorAttrValue: {
0: ['#FFD04B', "#FBA944"],
1: ["#b8e3b8", "#8ac84a","#FBA944","#8ac84a","#EE423D"],
0: ['#FFD04B', "#FBA944",'#FFD04B', "#FBA944","#EE423D"],
1: ["#b8e3b8", "#8ac84a","#b8e3b8","#8ac84a","#EE423D"],
2: ['#FFD04B', '#FBA944']
},
iconAttrs: {
@@ -396,7 +399,6 @@ export default {
// 滚动到指定位置
this.performScroll(scrollTop.top);
//判断显示提示弹窗
console.log(this.dataList[foundItemIndex],'xixixi')
this.istabId = this.dataList[foundItemIndex].id
}
}
@@ -726,6 +728,9 @@ export default {
.icon-content {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
top: 50%;
left: 50%;
font-size: 12px;
@@ -752,6 +757,7 @@ export default {
border-radius: 80px 80px 80px 8px;
padding: 0 20px;
white-space: nowrap;
cursor: pointer;
}
.growth_explain1{
position: absolute;