hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-11 11:56: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-01 15:46:46 +08:00
parent 3d20096824 458e20e4c2
commit 5f48163f66
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/UserCenter/menu.vue
View File

@@ -279,7 +279,8 @@
<!-- </el-submenu> --> <!-- </el-submenu> -->
<el-submenu v-if="fistTotal+pathTotal+proTotal+growTotal" index="mystudy" v-show="curIdentity == 1"> <el-submenu v-if="fistTotal+pathTotal+proTotal+growTotal" index="mystudy" v-show="curIdentity == 1">
<template slot="title"> <template slot="title">
<svg-icon icon-class="mystudy"></svg-icon> <!-- <svg-icon icon-class="mystudy"></svg-icon> -->
<i style="margin-right: 8px;width: 19px;color:#303133;" class="el-icon-collection"></i>
<span>我的必修</span> <span>我的必修</span>
</template> </template>
<el-menu-item v-if="fistTotal" index="/uc/study/task?type=1"> <el-menu-item v-if="fistTotal" index="/uc/study/task?type=1">
@@ -293,7 +294,8 @@
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item v-else index="/uc/study/task?type=9" v-show="curIdentity == 1"> <el-menu-item v-else index="/uc/study/task?type=9" v-show="curIdentity == 1">
<svg-icon :icon-class="activeMenu == '/uc/study/task'?'mystudy':'mystudy'"></svg-icon> <!-- <svg-icon :icon-class="activeMenu == '/uc/study/task'?'mystudy':'mystudy'"></svg-icon> -->
<i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/uc/study/task?type=9'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-collection"></i>
<span slot="title">我的必修</span> <span slot="title">我的必修</span>
</el-menu-item> </el-menu-item>
<el-submenu index="myelective" v-show="curIdentity == 1"> <el-submenu index="myelective" v-show="curIdentity == 1">
@@ -306,7 +308,8 @@
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item index="/exam/mytask" v-show="curIdentity == 1"> <el-menu-item index="/exam/mytask" v-show="curIdentity == 1">
<svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> <!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
<i style="margin-right: 8px;width: 19px;" :style="{color:activeMenu == '/exam/mytask'?'rgb(51, 121, 251)':'#303133'}" class="el-icon-reading"></i>
<span slot="title">我的考试</span> <span slot="title">我的考试</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/user/Mynotes" v-show="curIdentity == 1"> <el-menu-item index="/user/Mynotes" v-show="curIdentity == 1">

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

@@ -228,16 +228,16 @@
</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-for="title,index in titleList"> <!-- <div> -->
<div class="title_item">{{ title.title }}</div> <div v-for="title,index in titleList" :key="index" :style="{maxWidth: index==0?'142px':'none'}" class="title_item">{{ title.title }}</div>
</div> <!-- </div> -->
</div> </div>
<div class="body" v-for="(item,index) in preparedData"> <div class="body" v-for="(item,index) in preparedData">
<div> <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 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'}" v-for="t,i in item.bandCodes"> <div class="body_item" :style="{width: (142 * t.number) + 'px',flexGrow:1*t.number}" 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=""> -->
@@ -865,9 +865,11 @@ export default {
overflow-x: auto; overflow-x: auto;
border: 1px solid #F0F6FC; border: 1px solid #F0F6FC;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
box-sizing: content-box;
.title{ .title{
display: flex; display: flex;
.title_item{ .title_item{
flex-grow: 1;
background: #F0F6FC; background: #F0F6FC;
width: 142px; width: 142px;
height: 88px; height: 88px;
@@ -897,9 +899,11 @@ export default {
} }
.body_right{ .body_right{
display: flex; display: flex;
flex-grow: 1;
.body_item{ .body_item{
width: 142px; width: 142px;
height: 88px; height: 88px;
// flex-grow: 1;
border: 1px solid #F0F6FC; border: 1px solid #F0F6FC;
line-height: 88px; line-height: 88px;
text-align: center; text-align: center;