提交 6a0f2294 编写于 作者: tony001's avatar tony001

调整整体样式

上级 f27e07bf
...@@ -21,28 +21,32 @@ ...@@ -21,28 +21,32 @@
} }
} }
.el-submenu__title i, .el-menu-item i { .el-submenu__title i, .el-menu-item i {
font-size: 16px; font-size: 12px;
width: 16px; width: 18px;
}
.el-submenu__title .app-menu-icon,.el-submenu__title .app-menu-icon{
width:20px;
font-size: 14px;
} }
.el-submenu__title .text { .el-submenu__title .text {
font-size: 16px; font-size: 16px;
} }
.el-menu-item, .el-submenu__title { .el-menu-item, .el-submenu__title {
height: 36px; height: 50px;
font-size: 16px; font-size: 14px;
line-height: 32px; line-height: 50px;
} }
.el-menu-item, .el-submenu, .el-menu { .el-menu-item, .el-submenu, .el-menu {
border-top: 1px solid #fff; border-top: 1px solid #fff;
} }
> .el-menu-item, > .el-submenu > .el-submenu__title { > .el-menu-item, > .el-submenu > .el-submenu__title {
height: 40px; height: 56px;
line-height: 36px; line-height: 56px;
border-left: 4px solid transparent;
padding-left: 16px !important; padding-left: 16px !important;
} }
.app-menu-icon { .app-menu-icon {
margin-right: 4px; margin: 4px;
text-align: center;
} }
> .el-submenu { > .el-submenu {
> .el-menu { > .el-menu {
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
> .ivu-split-pane { > .ivu-split-pane {
> div { > div {
height: 100%; height: 100%;
overflow: auto; overflow-y: auto;
overflow-x: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.tree-exp-bar-header { .tree-exp-bar-header {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
padding: 0; padding: 0;
margin: 0; margin: 0;
.index_header{ .index_header{
height:50px; height:65px;
padding:0 20px; padding:0 20px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -18,6 +18,12 @@ ...@@ -18,6 +18,12 @@
align-items: center; align-items: center;
} }
.header-left{ .header-left{
.ivu-icon{
font-size: 20px;
padding: 4px;
margin-top: -2px;
cursor: pointer;
}
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -33,7 +39,7 @@ ...@@ -33,7 +39,7 @@
} }
} }
.index_content{ .index_content{
background-color:#fff; background-color:#F0F2F5;
height:calc(100vh - 50px); height:calc(100vh - 50px);
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
...@@ -45,15 +51,18 @@ ...@@ -45,15 +51,18 @@
} }
.ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{ .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{
line-height: 58px; line-height: 58px;
text-align: right; text-align: center;
padding-right: 18px; padding-right: 18px;
} }
.ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top .ivu-icon{ .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{
font-size: 20px; font-size: 20px;
padding: 4px; padding: 4px;
margin-top: -2px; margin-top: -2px;
cursor: pointer; cursor: pointer;
} }
.sider-top{
height:65px;
}
} }
/*** BRGIN:滚动条样式 ***/ /*** BRGIN:滚动条样式 ***/
......
...@@ -9,15 +9,27 @@ ...@@ -9,15 +9,27 @@
<div class="index_view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>"> <div class="index_view ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<layout :class="themeClasses" :style="themeStyle"> <layout :class="themeClasses" :style="themeStyle">
<layout>
<sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
<div class="sider-top">
<div class="page-logo">
<#if view.getAppIconPath() != "">
<img v-show="collapseChange" src="${view.getAppIconPath()}" height="16">
<#else>
<img v-show="collapseChange" src="../../../assets/img/logo.png" height="16" />
</#if>
<span v-show="!collapseChange" style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
</div>
</div>
${P.getCtrlCode('appmenu', 'CONTROL.html').code}
</sider>
</layout>
<header class="index_header"> <header class="index_header">
<div class="header-left" > <div class="header-left" >
<div class="page-logo"> <div class="page-logo">
<#if view.getAppIconPath() != ""> <i v-show="!collapseChange" class="ivu-icon el-icon-s-fold" @click="handleClick"></i>
<img src="${view.getAppIconPath()}" height="32"> <i v-show="collapseChange" class="ivu-icon el-icon-s-unfold" @click="handleClick"></i>
<#else> <app-breadcrumb></app-breadcrumb>
<img src="../../../assets/img/logo.png" height="32" />
</#if>
<span style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
</div> </div>
</div> </div>
<div class="header-right" style="display: flex;align-items: center;justify-content: space-between;"> <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
...@@ -28,29 +40,12 @@ ...@@ -28,29 +40,12 @@
<app-theme style="width:45px;display: flex;justify-content: center;"></app-theme> <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
</div> </div>
</header> </header>
<layout> <content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 240px)' }">
<#if view.hasPSControl('appmenu')> <tab-page-exp></tab-page-exp>
<sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange"> <app-keep-alive :routerList="getRouterList">
<div class="sider-top"> <router-view :key="getRouterViewKey"></router-view>
<i class="ivu-icon ivu-icon-md-menu" @click="handleClick"></i> </app-keep-alive>
</div> </content>
${P.getCtrlCode('appmenu', 'CONTROL.html').code}
</sider>
<content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 200px)' }">
<tab-page-exp></tab-page-exp>
<app-keep-alive :routerList="getRouterList">
<router-view :key="getRouterViewKey"></router-view>
</app-keep-alive>
</content>
<#else>
<content style="width: 100vw;height: calc(100vh - 50px);">
<tab-page-exp></tab-page-exp>
<app-keep-alive :routerList="getRouterList">
<router-view :key="getRouterViewKey"></router-view>
</app-keep-alive>
</content>
</#if>
</layout>
</layout> </layout>
</div> </div>
<#else> <#else>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册