Merge branch 'zcwy-master' into dev0515

This commit is contained in:
zhangsir
2024-06-17 08:54:57 +08:00

View File

@@ -182,7 +182,7 @@
<el-submenu :index="item.section.id"> <el-submenu :index="item.section.id">
<template slot="title"> <template slot="title">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<span style="font-weight: 700;font-size: 16px;" :title="item.section.name">{{item.section.name.slice(0, 15)+(item.section.name.length > 15 ? '...' : '')}}</span> <div style="width: 240px;font-weight: 700;font-size: 16px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="item.section.name">{{item.section.name}}</div>
<div style="margin-right: 23px;font-weight: 700;font-size: 16px;">({{ item.children.filter(item=>item.status == 9).length }}/{{ item.children.length }})</div> <div style="margin-right: 23px;font-weight: 700;font-size: 16px;">({{ item.children.filter(item=>item.status == 9).length }}/{{ item.children.length }})</div>
</div> </div>
</template> </template>
@@ -190,7 +190,7 @@
<div class="units-info" :class="{'units-active':contentData.id == ele.id}" @click="showRes(ele,i,index,item)"> <div class="units-info" :class="{'units-active':contentData.id == ele.id}" @click="showRes(ele,i,index,item)">
<el-menu-item :index="ele.id" style="padding: 0;padding-left: 10px;"> <el-menu-item :index="ele.id" style="padding: 0;padding-left: 10px;">
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<div style="font-size: 16px;" :title="ele.contentName">{{i+1}}. {{ ele.contentName.slice(0, 15)+(ele.contentName.length > 15 ? '...' : '') }}</div> <div style="width: 200px;font-size: 16px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" :title="ele.contentName">{{i+1}}. {{ ele.contentName }}</div>
<div> <div>
<span v-if="contentData.id == ele.id" style="color: #387DF7;font-size: 14px;margin-right: 4px;">学习中</span> <span v-if="contentData.id == ele.id" style="color: #387DF7;font-size: 14px;margin-right: 4px;">学习中</span>
<img v-if="contentData.id == ele.id" :src="`${webBaseUrl}/images/playicon.png`" alt=""> <img v-if="contentData.id == ele.id" :src="`${webBaseUrl}/images/playicon.png`" alt="">