Browse Source

update css

GuoYuFu123 5 years ago
parent
commit
1eeeca7c09

+ 5 - 0
src/api/framework.js

@@ -41,6 +41,11 @@ export default {
         if (to.path == '/auth' || to.path == '/login') {
             next()
         } else {
+            if (to.meta.breadcrumbs) {
+                store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+            } else {
+                store.dispatch('setBreadcrumb', [])
+            }
             next()
             // let userInfo = store.getters['layout/userInfo']
             // if (!userInfo) {

+ 7 - 6
src/framework/layout/Main.vue

@@ -13,16 +13,17 @@
                     </el-breadcrumb>
                 </div>
                 <!-- <router-view class='page-content'/> -->
-
-                <keep-alive>
-                    <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
-                </keep-alive>
-                <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
+                <el-scrollbar tag="div" wrapClass="content-scrollbar">
+                    <keep-alive>
+                        <router-view v-if='$route.meta.keepAlive' class='page-content'></router-view>
+                    </keep-alive>
+                    <router-view v-if='!$route.meta.keepAlive' class='page-content'></router-view>
+                </el-scrollbar>
             </div>
         </div>
         <!-- <div class='page-footer'>
             © 2016 SAGACLOUD. All rights reserved 京ICP备16059843号-1
-        </div> -->
+        </div>-->
     </div>
 </template>
 <script>

+ 10 - 2
src/framework/style/layout.scss

@@ -45,7 +45,7 @@ body {
 
         .page-sidebar-wrapper {
             width: $pageSidebarWidth;
-            overflow-y: hidden;
+            overflow: hidden;
             flex-grow: 0;
             flex-shrink: 0;
         }
@@ -155,7 +155,7 @@ body {
 }
 
 #page-main .page-container .page-content-wrapper {
-    margin: 0px 20px 10px 10px;
+    margin: 0px 10px 10px 10px;
 
     display: flex;
     flex-direction: column;
@@ -342,6 +342,14 @@ body {
         }
     }
 }
+.content-scrollbar {
+    height: calc(100vh - 108px);
+    .el-scrollbar__bar {
+        &.is-vertical {
+            display: none;
+        }
+    }
+}
 
 #page-main #page-container #page-content-wrapper .box {
     display: flex;

+ 1 - 1
src/framework/style/theme.scss

@@ -31,7 +31,7 @@ $pageHeaderBackground: #2b3643;
 
     #page-container {
         background: #f2f2f2;
-
+        overflow: hidden;
         #page-sidebar-wrapper {
             color: azure;
             background-color: #364150;

+ 36 - 24
src/router/system.js

@@ -8,9 +8,9 @@ import RoleList from '@/views/system/role/RoleList'
 import ChangePwd from '@/views/system/pwd/ChangePwd'
 
 /** 报警设置 */
-const ProjAlarm = () => import('@/views/alarm/projalarm/index');
-const ProjNotice = () => import('@/views/alarm/notice/index');
-const StaffSetting = () => import('@/views/alarm/staff/index');
+const ProjAlarm = () => import('@/views/alarm/projalarm/index')
+const ProjNotice = () => import('@/views/alarm/notice/index')
+const StaffSetting = () => import('@/views/alarm/staff/index')
 
 /**与FM相关设置 */
 const ProjSop = () => import('@/views/fm/projectsop/index')
@@ -22,17 +22,17 @@ import editDataSouce from '@/views/point/config_point/edit_origin'
 import pointSteps from '@/views/point/config_point/steps'
 
 /**项目化配置 */
-import collectsetting from "@/views/project_setting/collection_setting/index"
+import collectsetting from '@/views/project_setting/collection_setting/index'
 
 /** 业务空间 */
-import spacelist from "@/views/business_space/business_list"
+import spacelist from '@/views/business_space/business_list'
 
 /** 扫楼数据整理 */
-import buildAssets from "@/views/data_admin/buildAssets"
-import buildLog from "@/views/data_admin/buildLog"
-import buildUser from "@/views/data_admin/buildUser"
-import buildData from "@/views/data_admin/buildData"
-import buildGraphy from "@/views/data_admin/buildGraphy"
+import buildAssets from '@/views/data_admin/buildAssets'
+import buildLog from '@/views/data_admin/buildLog'
+import buildUser from '@/views/data_admin/buildUser'
+import buildData from '@/views/data_admin/buildData'
+import buildGraphy from '@/views/data_admin/buildGraphy'
 
 /**市场及商务 */
 const OwnerManage = () => import('@/views/market/owner/manage')
@@ -45,7 +45,7 @@ import propertyLedger from '@/views/ledger/property'
 export default [
     { path: '/', name: '', component: LayoutMain },
     { path: '/login', name: 'Login', component: Login },
-    
+
     // 报警设置
     // {
     //     path: '/alarmconfig',
@@ -69,14 +69,19 @@ export default [
     //         { path: 'rulesetting', name: 'Dasboard', component: ProjRules }
     //     ]
     // },
-    // 点位表管理
+    // 系统集成
     {
         path: '/point',
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
             { path: '', name: 'pointConfig', component: pointConfig },
-            { path: 'pointsetting', name: 'Dasboard', component: pointConfig },
+            {
+                path: 'pointsetting',
+                name: 'Dasboard',
+                component: pointConfig,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成' }, { label: '点位表配置工具' }] }
+            },
             { path: 'editDataSouce', name: 'editDataSouce', component: editDataSouce },
             { path: 'pointSteps', name: 'pointSteps', component: pointSteps },
             { path: 'dynamicdata', name: 'dynamicdata', component: Dasboard }
@@ -91,7 +96,7 @@ export default [
             { path: '', name: 'Dasboard', component: Dasboard },
             { path: 'custominfo', name: 'Dasboard', component: Dasboard },
             { path: 'collectsetting', name: 'collectsetting', component: collectsetting },
-            { path: 'floorinfo', name: 'Dasboard', component: Dasboard },
+            { path: 'floorinfo', name: 'Dasboard', component: Dasboard }
         ]
     },
     //模型管理
@@ -105,7 +110,7 @@ export default [
             { path: 'noentity', name: 'collectsetting', component: Dasboard },
             { path: 'beforemodel', name: 'Dasboard', component: Dasboard },
             { path: 'modelrule', name: 'Dasboard', component: Dasboard },
-            { path: 'beacon', name: 'Dasboard', component: Dasboard },
+            { path: 'beacon', name: 'Dasboard', component: Dasboard }
         ]
     },
     //台账管理
@@ -120,10 +125,10 @@ export default [
             { path: 'cenotelist', name: 'Dasboard', component: Dasboard },
             { path: 'dimension', name: 'Dasboard', component: Dasboard },
             { path: 'rubbish', name: 'Dasboard', component: Dasboard },
-            { path: 'updowncheck', name: 'Dasboard', component: Dasboard },
+            { path: 'updowncheck', name: 'Dasboard', component: Dasboard }
         ]
     },
-    //业务空间管理    
+    //业务空间管理
     {
         path: '/business',
         name: 'LayoutMain',
@@ -153,8 +158,18 @@ export default [
             { path: 'data', name: 'buildData', component: buildData },
             { path: 'plan', name: 'buildGraphy', component: buildGraphy },
             { path: 'abnormalprop', name: 'buildAssets', component: buildAssets },
-            { path: 'log', name: 'buildLog', component: buildLog },
-            { path: 'appuser', name: 'buildUser', component: buildUser },
+            {
+                path: 'log',
+                name: 'buildLog',
+                component: buildLog,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '扫楼日志查看' }] }
+            },
+            {
+                path: 'appuser',
+                name: 'buildUser',
+                component: buildUser,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '扫楼App用户管理' }] }
+            }
         ]
     },
     //环境调节
@@ -182,9 +197,6 @@ export default [
         path: '/system',
         name: 'LayoutMain',
         component: LayoutMain,
-        children: [
-            { path: 'list', name: 'systemlist', component: systemLedger },
-
-        ]
-    },
+        children: [{ path: 'list', name: 'systemlist', component: systemLedger }]
+    }
 ]