Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
new-sing
admin-base
Commits
611ad860
Commit
611ad860
authored
Sep 07, 2019
by
赵茹林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面CSS框架优化,菜单与内容滚动条分离
parent
279c38a0
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
125 additions
and
95 deletions
+125
-95
index.vue
src/components/exchange/index.vue
+1
-1
index.vue
src/components/framework/index.vue
+48
-31
leftMenu.vue
src/components/framework/leftMenu.vue
+67
-54
index.vue
src/components/integral/index.vue
+1
-1
index.vue
src/components/lesson/index.vue
+1
-1
index.vue
src/components/noLesson/index.vue
+1
-1
index.vue
src/components/qrcode/index.vue
+2
-2
index.vue
src/components/subList/index.vue
+1
-1
growth.vue
src/components/teacher/growth.vue
+1
-1
index.vue
src/components/teacher/index.vue
+1
-1
userservice.vue
src/components/teacher/userservice.vue
+1
-1
No files found.
src/components/exchange/index.vue
View file @
611ad860
<
template
>
<div
class=
"
integral-page
"
>
<div
class=
"
admin-refresh
"
>
<el-form
ref=
"searchFrom"
:model=
"form"
style=
"padding-top: 20px;background: white"
label-width=
"100px"
size=
"small"
inline
>
<el-form-item
label=
"标题"
>
<el-input
v-model=
"form.name"
></el-input>
...
...
src/components/framework/index.vue
View file @
611ad860
...
...
@@ -3,20 +3,22 @@
<el-header>
<head-index/>
</el-header>
<el-container>
<
el-main
>
<el-container
class=
"refresh-container"
>
<
!--
<el-main>
--
>
<transition
name=
"el-fade-in"
>
<div
class=
"menu-block"
>
<left-menu/>
</div>
</transition>
<div
class=
"content"
>
<!--
<div
class=
"content"
>
-->
<el-container
class=
"content"
>
<div
class=
"router-block"
>
<!--
<tab/>
-->
<router-view
class=
"child-view"
v-loading=
"$store.state.mainLoad"
/>
</div>
</div>
</el-main>
</el-container>
<!--
</div>
-->
<!--
</el-main>
-->
</el-container>
</el-container>
</
template
>
...
...
@@ -26,10 +28,10 @@
// import tab from './tab'
export
default
{
components
:
{
leftMenu
,
headIndex
},
data
(){
data
()
{
return
{
transitionName
:
'slide-left'
,
menuList
:
this
.
$store
.
state
.
menuList
menuList
:
this
.
$store
.
state
.
menuList
}
},
computed
:
{
...
...
@@ -42,16 +44,43 @@
<
style
lang=
"less"
>
@import "../../util/public";
.el-header{
.el-header {
background: #333333;
color: white;
}
.el-main{
.refresh-container {
height: calc(100% - 60px);
.content {
display: flex;
height: 100%;
.router-block {
position: relative;
width: 100%;
height: 100%;
.child-view {
box-sizing: border-box;
overflow-y: auto;
height: 100%;
/*height: calc(100% - 40px);
width: 100%;
overflow-y: auto;*/
}
}
}
}
.el-main {
margin: 0;
padding: 0;
background: #f8f8f8;
.menu-block{
.menu-block {
flex-shrink: 0;
float: left;
height: 100%;
background-color: #333333;
...
...
@@ -63,22 +92,10 @@
bottom: 0;
z-index: 10;*/
}
.content{
display: flex;
height: 100%;
.router-block{
width: 100%;
height: 100%;
position: relative;
.child-view{
/*height: calc(100% - 40px);
width: 100%;
overflow-y: auto;*/
}
}
}
}
.main-container{
.main-container {
height: 100%;
}
</
style
>
...
...
src/components/framework/leftMenu.vue
View file @
611ad860
...
...
@@ -7,7 +7,7 @@
background-color=
"#333333"
active-text-color=
"#ffd04b"
:collapse=
"menuType"
class=
"
el-menu-vertical-demo
"
>
class=
"
menu-refresh
"
>
<div
class=
"menu-btn"
@
click=
"menuType = !menuType"
>
<i
v-if=
"!menuType"
class=
"iconfont icon-shouqi"
></i>
<i
v-if=
"menuType"
class=
"iconfont icon-zhankai"
></i>
...
...
@@ -20,14 +20,15 @@
<
template
v-for=
"(item,i) in data.list"
>
<el-menu-item
v-if=
"!item.hidden"
class=
"item"
:index=
"item.path"
:key=
"i"
>
{{
item
.
value
}}
</el-menu-item>
:index=
"item.path"
:key=
"i"
>
{{
item
.
value
}}
</el-menu-item>
</
template
>
</el-submenu>
</el-menu>
</template>
<
script
>
export
default
{
export
default
{
name
:
"leftMenu"
,
data
()
{
return
{
...
...
@@ -39,40 +40,49 @@ export default {
// console.log(this.menuList);
},
methods
:
{
changeMenuType
:
function
()
{
changeMenuType
:
function
()
{
this
.
$store
.
state
.
menuType
=
!
this
.
$store
.
state
.
menuType
;
},
toPath
:
function
(
data
)
{
this
.
$router
.
push
({
name
:
data
.
routerName
});
toPath
:
function
(
data
)
{
this
.
$router
.
push
({
name
:
data
.
routerName
});
if
(
this
.
$store
.
state
.
openedTab
.
indexOf
(
data
)
<
0
)
{
this
.
$store
.
state
.
openedTab
.
push
(
data
);
}
}
}
};
};
</
script
>
<
style
scoped
lang=
"less"
>
@import "../../util/public";
.el-menu-vertical-demo:not(.el-menu--collapse) {
<
style
lang=
"less"
>
@import "../../util/public";
.menu-refresh {
&:not(.el-menu--collapse) {
width: 200px;
}
.el-menu {
}
&.el-menu {
overflow-x: hidden;
overflow-y: auto;
box-sizing: border-box;
height: 100%;
background: @bg-b;
color: white;
overflow: auto;
height: 100%;
.menu-btn {
width: 100%;
height: 35px;
background: @bg-b-s;
line-height: 35px;
/*text-align: center;*/
i {
font-size: 26px;
float: right;
padding: 0 15px;
}
}
.el-submenu {
.menu-icon {
color: white;
...
...
@@ -80,12 +90,15 @@ export default {
position: relative;
right: 5px;
}
.el-menu-item {
background: @main-font-color;
}
.template {
color: black;
}
}
}
}
}
</
style
>
src/components/integral/index.vue
View file @
611ad860
<
template
>
<div
class=
"
integral-page
"
>
<div
class=
"
admin-refresh
"
>
<el-form
ref=
"searchFrom"
:model=
"form"
...
...
src/components/lesson/index.vue
View file @
611ad860
...
...
@@ -181,7 +181,7 @@
.user{
/*height: 100%;*/
/*overflow: auto;*/
padding: 20px 0;
/*padding: 20px 0;*/
.btn-content{
text-align: center;
}
...
...
src/components/noLesson/index.vue
View file @
611ad860
...
...
@@ -5,7 +5,7 @@
<el-button
type=
"success"
plain
@
click=
"add"
v-if=
"!$store.state.readonly"
>
添加不上课日期
</el-button>
</el-col>
</el-row>
<div
class=
"card"
>
<div
class=
"card"
style=
"margin-bottom: 10px;"
>
<el-card
:body-style=
"
{ padding: '0px' }" v-for="(currentDate, index) in list" :key="index">
<span
class=
"time"
>
{{
currentDate
}}
</span>
<div
class=
"bottom clearfix"
>
...
...
src/components/qrcode/index.vue
View file @
611ad860
<
template
>
<div
class=
"
qrcode
"
>
<el-form
label-width=
"100px"
inline=
""
>
<div
class=
"
admin-refresh
"
>
<el-form
label-width=
"100px"
inline=
""
style=
"padding-top: 10px;"
>
<el-form-item
label=
"标题"
>
<el-input/>
</el-form-item>
...
...
src/components/subList/index.vue
View file @
611ad860
<
template
>
<div
class=
"
integral-page
"
>
<div
class=
"
admin-refresh
"
>
<el-form
ref=
"searchFrom"
:model=
"searchFrom"
...
...
src/components/teacher/growth.vue
View file @
611ad860
...
...
@@ -50,7 +50,7 @@
<el-table
size=
"mini"
:data=
"userList"
height=
"calc(100vh - 3
35
px)"
height=
"calc(100vh - 3
22
px)"
style=
"width: 100%"
>
<el-table-column
prop=
"name"
...
...
src/components/teacher/index.vue
View file @
611ad860
...
...
@@ -48,7 +48,7 @@
<el-table
size=
"mini"
:data=
"userList"
height=
"calc(100vh - 3
35
px)"
height=
"calc(100vh - 3
22
px)"
style=
"width: 100%"
>
<el-table-column
prop=
"name"
...
...
src/components/teacher/userservice.vue
View file @
611ad860
...
...
@@ -49,7 +49,7 @@
<el-table
size=
"mini"
:data=
"userList"
height=
"calc(100vh - 3
35
px)"
height=
"calc(100vh - 3
22
px)"
style=
"width: 100%"
>
<el-table-column
prop=
"name"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment