调整整体样式

@CONTROL/应用菜单/CONTROL.less.ftl

@@ -21,28 +21,32 @@
             }
         }
         .el-submenu__title i, .el-menu-item i {
-            font-size: 16px;
-            width: 16px;
+            font-size: 12px;
+            width: 18px;
+        }
+        .el-submenu__title .app-menu-icon,.el-submenu__title .app-menu-icon{
+            width:20px;
+            font-size: 14px;
         }
         .el-submenu__title .text {
             font-size: 16px;
         }
         .el-menu-item, .el-submenu__title {
-            height: 36px;
-            font-size: 16px;
-            line-height: 32px;
+            height: 50px;
+            font-size: 14px;
+            line-height: 50px;
         }
         .el-menu-item, .el-submenu, .el-menu {
             border-top: 1px solid #fff;
         }
         > .el-menu-item, > .el-submenu > .el-submenu__title {
-            height: 40px;
-            line-height: 36px;
-            border-left: 4px solid transparent;
+            height: 56px;
+            line-height: 56px;
             padding-left: 16px !important;
         }
         .app-menu-icon {
-            margin-right: 4px;
+            margin: 4px;
+            text-align: center;
         }
         > .el-submenu {
             > .el-menu {

@CONTROL/树视图导航栏/CONTROL.less.ftl

@@ -7,7 +7,8 @@
         > .ivu-split-pane {
             > div {
                 height: 100%;
-                overflow: auto;
+                overflow-y: auto;
+                overflow-x: hidden;
                 display: flex;
                 flex-direction: column;
                 .tree-exp-bar-header {

@CONTROL/视图布局面板/应用首页视图/VIEW.less.ftl

@@ -8,7 +8,7 @@
     padding: 0;
     margin: 0;
     .index_header{
-        height:50px;
+        height:65px;
         padding:0 20px;
         display: flex;
         align-items: center;
@@ -18,6 +18,12 @@
           align-items: center;
         }
         .header-left{
+            .ivu-icon{
+                 font-size: 20px;
+                padding: 4px;
+                margin-top: -2px;
+                cursor: pointer;
+            }
             display: flex;
             align-items: center;
             justify-content: space-between;
@@ -33,7 +39,7 @@
         }
     }
     .index_content{
-        background-color:#fff;
+        background-color:#F0F2F5;
         height:calc(100vh - 50px);
         overflow-x: hidden;
         overflow-y: hidden;
@@ -45,15 +51,18 @@
     }
     .ivu-layout .ivu-layout-sider .ivu-layout-sider-children .sider-top{
         line-height: 58px;
-        text-align: right;
+        text-align: center;
         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;
         padding: 4px;
         margin-top: -2px;
         cursor: pointer;
     }
+    .sider-top{
+        height:65px;
+    }
 }
 
 /***    BRGIN:滚动条样式    ***/

@CONTROL/视图布局面板/应用首页视图/VIEW.vue.ftl

@@ -9,15 +9,27 @@
 <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>
     <layout :class="themeClasses" :style="themeStyle">
-        <header class="index_header">
-            <div class="header-left" >
+        <layout>
+            <sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
+                <div class="sider-top">
                     <div class="page-logo">
                         <#if view.getAppIconPath() != "">
-                        <img src="${view.getAppIconPath()}" height="32">
+                        <img v-show="collapseChange" src="${view.getAppIconPath()}" height="16">
                         <#else>
-                        <img src="../../../assets/img/logo.png" height="32" />
+                        <img v-show="collapseChange" src="../../../assets/img/logo.png" height="16" />
                     </#if>
-                    <span style="display: inline-block;margin-left: 10px;font-size: 22px;">{{$t(model.srfCaption)}}</span>
+                        <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">
+            <div class="header-left" >
+                <div class="page-logo">
+                    <i v-show="!collapseChange" class="ivu-icon el-icon-s-fold" @click="handleClick"></i>
+                    <i v-show="collapseChange" class="ivu-icon el-icon-s-unfold" @click="handleClick"></i>
+                    <app-breadcrumb></app-breadcrumb>
                 </div>
             </div>
             <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
@@ -28,29 +40,12 @@
                 <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
             </div>
         </header>
-        <layout>
-            <#if view.hasPSControl('appmenu')>
-            <sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
-                <div class="sider-top">
-                    <i class="ivu-icon ivu-icon-md-menu" @click="handleClick"></i>
-                </div>
-                ${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);">
+        <content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 240px)' }">
             <tab-page-exp></tab-page-exp>
             <app-keep-alive :routerList="getRouterList">
                 <router-view :key="getRouterViewKey"></router-view>
             </app-keep-alive>
         </content>
-            </#if>
-        </layout>
     </layout>
 </div>
 <#else>