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

Merge branch '20151115-zxj' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal into 20251117-new-employee

Browse Source
This commit is contained in:
joshen
2025-12-16 17:31:25 +08:00
parent b9353a683a f1c65a66af
commit 5fd6ef726a
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/router/index.js
View File

@@ -362,7 +362,6 @@ export const constantRoutes = [{
component: (resolve) => require(['@/views/error/500'], resolve), component: (resolve) => require(['@/views/error/500'], resolve),
hidden: true hidden: true
}, },
{ {
path: '/new-employee/welcome', path: '/new-employee/welcome',
hidden: true, hidden: true,
@@ -376,7 +375,7 @@ export const constantRoutes = [{
component: (resolve) => require(['@/views/new-employee/StudyPage'], resolve), component: (resolve) => require(['@/views/new-employee/StudyPage'], resolve),
name: 'NewEmployeeStudy', name: 'NewEmployeeStudy',
meta: { title: '社招新员工学习页面', icon: 'dashboard', noCache: true, affix: false }, meta: { title: '社招新员工学习页面', icon: 'dashboard', noCache: true, affix: false },
} },
{ {
path: '/qualityCourse', path: '/qualityCourse',
hidden: true, hidden: true,

27
src/views/new-employee/StudyPage.vue
View File

@@ -451,7 +451,9 @@ export default {
} }
.content { .content {
box-sizing: border-box;
max-width: 1200px; max-width: 1200px;
width: 100%;
margin: 16px auto 40px; margin: 16px auto 40px;
padding: 0 16px; padding: 0 16px;
display: flex; display: flex;
@@ -459,6 +461,7 @@ export default {
} }
.main { .main {
flex: 1; flex: 1;
min-width: 0;
} }
.sidebar { .sidebar {
width: 360px; width: 360px;
@@ -480,12 +483,14 @@ export default {
background: #ffffff; background: #ffffff;
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04); box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04);
width: 68%; width: 100%;
box-sizing: border-box;
} }
.filter-group { .filter-group {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
flex-wrap: wrap;
} }
.label { .label {
color: #333333; color: #333333;
@@ -584,6 +589,8 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
width: 100%;
flex-wrap: wrap;
} }
.progress { .progress {
position: relative; position: relative;
@@ -592,6 +599,7 @@ export default {
background: #eff2f6; background: #eff2f6;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
min-width: 0;
} }
.bar { .bar {
position: absolute; position: absolute;
@@ -846,6 +854,7 @@ export default {
.sidebar { .sidebar {
width: 100%; width: 100%;
margin-top: 0; margin-top: 0;
order: -1;
} }
.filters { .filters {
width: 100%; width: 100%;
@@ -884,7 +893,8 @@ export default {
align-items: center; align-items: center;
} }
.progress { .progress {
min-width: 180px; min-width: 0;
width: 100%;
} }
.pagination { .pagination {
padding: 8px 0 0; padding: 8px 0 0;
@@ -912,6 +922,19 @@ export default {
box-shadow: inset 0 0 0 5px #ffffff; box-shadow: inset 0 0 0 5px #ffffff;
} }
} }
/* 桌面端恢复原布局宽度与不换行 */
@media (min-width: 769px) {
.filters {
width: 68%;
}
.filter-group {
flex-wrap: nowrap;
}
.progress-wrap {
flex-wrap: nowrap;
}
}
</style> </style>
<style lang="scss"> <style lang="scss">