Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/config/componentsMap.js

@@ -4,6 +4,8 @@
 export default {
     layout: () =>
         import ('@/layout'),
+    layout2: () =>
+        import ('@/layout/index2'),
     // 权限管理
     users: () =>
         import ('@/views/permission/users'),
@@ -33,6 +35,20 @@ export default {
     //邮箱管理
     email: () =>
         import ('@/views/system/email'),
+    database: () =>
+        import ('@/views/system/database'),
+    attachment: () =>
+        import ('@/views/system/attachments'),
+    loginLog: () =>
+        import ('@/views/system/log/login'),
+    operateLog: () =>
+        import ('@/views/system/log/operate'),
+    sensitiveWord: () =>
+        import ('@/views/system/sensitiveWord'),
+    develop: () =>
+        import ('@/views/system/develop'),
+    generate: () =>
+        import ('@/views/system/generate'),
     // 配置管理
     config: () =>
         import ('@/views/system/config'),
@@ -65,6 +81,8 @@ export default {
     //微信公众号补卡管理
     wechatUpdateCard: () =>
         import ('@/views/wechat/updatecard'),
+    routeMap: () =>
+        import ('@/views/map/routeMap.vue'),
     //设备管理
     hydraulic: () =>
         import ('@/views/device/hydraulic'),
@@ -105,11 +123,9 @@ export default {
     // 域名记录
     domainRecord: () =>
         import ('@/views/domain/record'),
-
     //基础配置
     basicConfig: () =>
         import ('@/views/permission/config'),
-
     //类型字典
     sysDictType: () =>
         import ('@/views/system/sysDictType'),

src/layout/index2.vue

@@ -0,0 +1,96 @@
+<template>
+  <div :class="classObj" class="app-wrapper">
+    
+    
+   
+      <app-main />
+     
+   
+  </div>
+</template>
+
+<script>
+import RightPanel from '@/components/RightPanel'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'Layout',
+  components: {
+    AppMain,
+    Navbar,
+    RightPanel,
+    Settings,
+    Sidebar,
+    TagsView
+  },
+  mixins: [ResizeMixin],
+  computed: {
+    ...mapState({
+      sidebar: state => state.app.sidebar,
+      device: state => state.app.device,
+      showSettings: state => state.settings.showSettings,
+      needTagsView: state => state.settings.tagsView,
+      fixedHeader: state => state.settings.fixedHeader
+    }),
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+        withoutAnimation: this.sidebar.withoutAnimation,
+        mobile: this.device === 'mobile'
+      }
+    }
+  },
+  methods: {
+    handleClickOutside() {
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  @import "~@/styles/mixin.scss";
+  @import "~@/styles/variables.scss";
+
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
+
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
+  }
+
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
+
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
+
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
+
+  .mobile .fixed-header {
+    width: 100%;
+  }
+</style>

src/router/index.js

@@ -15,29 +15,29 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/screen',
     children: [
       {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
-  },
-  {
-    path: '/maphydraulic',
-    component: Layout,
-    redirect: '/maphydraulic',
-    children: [
-      {
-        path: 'maphydraulic',
-        component: () => import('@/views/map/routeMap.vue'),
-        name: 'Maphydraulic',
-        meta: { title: '泵设备分布图', icon: 'el-icon-location', affix: true }
+        path: 'screen',
+        component: () => import('@/views/screen'),
+        name: 'Screen',
+        meta: { title: '监控大屏', icon: 'dashboard', affix: true }
       }
     ]
   },
+  // {
+  //   path: '/maphydraulic',
+  //   component: Layout,
+  //   redirect: '/maphydraulic',
+  //   children: [
+  //     {
+  //       path: 'maphydraulic',
+  //       component: () => import('@/views/map/routeMap.vue'),
+  //       name: 'Maphydraulic',
+  //       meta: { title: '泵设备分布图', icon: 'el-icon-location', affix: true }
+  //     }
+  //   ]
+  // },
   
   // {
   //   path: '/Wind',