style

src/api/framework.js

@@ -67,9 +67,9 @@ export default {
         let result = []
         let allMenus = []
         // 开发环境下展示demo页面
-        if (process.env.NODE_ENV === 'development') {
-            allMenus = demoMenus
-        }
+        // if (process.env.NODE_ENV === 'development') {
+        //     allMenus = demoMenus
+        // }
         allMenus = allMenus.concat(menus)
         let ps = !permissions ? {} : permissions
         allMenus.forEach(item => {

src/components/data_admin/selectTime.vue

@@ -118,12 +118,13 @@ export default {
       color: #409eff;
     }
     .picker_view {
+      display: flex;
       position: absolute;
-      width: 30rem;
-      bottom: -3rem;
-      left: -23rem;
+      width: 34rem;
+      bottom: -4rem;
+      left: -18rem;
       height: 3rem;
-      padding-top: 0.5rem;
+      // padding-top: 0.5rem;
       box-sizing: border-box;
       z-index: 999;
       background-color: rgba(255, 255, 255, 1);
@@ -153,3 +154,11 @@ export default {
   }
 }
 </style>
+<style lang="less">
+.select_time{
+  .el-date-editor{
+    margin-top: 5px;
+  }
+}
+</style>
+

src/demo/demo-menus.js

@@ -1,32 +1,32 @@
 export default [
     {
-        icon: 'el-icon-fa-diamond',
-        name: 'Demo Page',
-        path: '/demo',
-        children: [
-            {
-                icon: 'el-icon-fa-diamond',
-                name: 'Form Panel',
-                path: '/demo/form'
-            },
-            {
-                icon: 'el-icon-fa-diamond',
-                name: 'Table Panel',
-                path: '/demo/table'
-            }, {
-                icon: 'el-icon-fa-diamond',
-                name: '点位配置',
-                path: '/demo/point'
-            },
-            {
-                icon: 'el-icon-fa-diamond',
-                name: '数据整理',
-                path: '/demo/data'
-            }, {
-                icon: 'el-icon-fa-diamond',
-                name: '报警配置',
-                path: '/demo/alarm'
-            }
-        ]
+        // icon: 'el-icon-fa-diamond',
+        // name: 'Demo Page',
+        // path: '/demo',
+        // children: [
+        //     {
+        //         icon: 'el-icon-fa-diamond',
+        //         name: 'Form Panel',
+        //         path: '/demo/form'
+        //     },
+        //     {
+        //         icon: 'el-icon-fa-diamond',
+        //         name: 'Table Panel',
+        //         path: '/demo/table'
+        //     }, {
+        //         icon: 'el-icon-fa-diamond',
+        //         name: '点位配置',
+        //         path: '/demo/point'
+        //     },
+        //     {
+        //         icon: 'el-icon-fa-diamond',
+        //         name: '数据整理',
+        //         path: '/demo/data'
+        //     }, {
+        //         icon: 'el-icon-fa-diamond',
+        //         name: '报警配置',
+        //         path: '/demo/alarm'
+        //     }
+        // ]
     }
 ]

src/demo/demo-routes.js

@@ -1,53 +1,53 @@
-import LayoutMain from '@/framework/layout/Main'
+// import LayoutMain from '@/framework/layout/Main'
 
-import HelloWorld from '@/components/HelloWorld'
-import TablePageDemo from '@/demo/views/table/TablePageDemo'
-import FormPageDemo from '@/demo/views/form/FormPageDemo'
+// import HelloWorld from '@/components/HelloWorld'
+// import TablePageDemo from '@/demo/views/table/TablePageDemo'
+// import FormPageDemo from '@/demo/views/form/FormPageDemo'
 
-import Ponit from './test/fugy/index'
-import Data from './test/wangsw/index'
-import Alarm from './test/zhulz/index'
+// import Ponit from './test/fugy/index'
+// import Data from './test/wangsw/index'
+// import Alarm from './test/zhulz/index'
 
-export default [
-    {
-        path: '/demo',
-        name: 'LayoutMain',
-        component: LayoutMain,
-        children: [
-            {
-                path: '',
-                name: 'HelloWorld',
-                component: HelloWorld,
-                meta: { keepAlive: true, breadcrumbs: [] }
-            },
-            {
-                path: 'table',
-                name: 'TablePageDemo',
-                component: TablePageDemo,
-                meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Table' }] }
-            },
-            {
-                path: 'form',
-                name: 'FormPageDemo',
-                component: FormPageDemo,
-                meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
-            },
-            {
-                path: 'point',
-                name: 'point',
-                component: Ponit,
-                meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
-            }, {
-                path: 'data',
-                name: 'data',
-                component: Data,
-                meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
-            }, {
-                path: 'alarm',
-                name: 'alarm',
-                component: Alarm,
-                meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
-            }
-        ]
-    }
-]
+// export default [
+//     {
+//         path: '/demo',
+//         name: 'LayoutMain',
+//         component: LayoutMain,
+//         children: [
+//             {
+//                 path: '',
+//                 name: 'HelloWorld',
+//                 component: HelloWorld,
+//                 meta: { keepAlive: true, breadcrumbs: [] }
+//             },
+//             {
+//                 path: 'table',
+//                 name: 'TablePageDemo',
+//                 component: TablePageDemo,
+//                 meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Table' }] }
+//             },
+//             {
+//                 path: 'form',
+//                 name: 'FormPageDemo',
+//                 component: FormPageDemo,
+//                 meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
+//             },
+//             {
+//                 path: 'point',
+//                 name: 'point',
+//                 component: Ponit,
+//                 meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
+//             }, {
+//                 path: 'data',
+//                 name: 'data',
+//                 component: Data,
+//                 meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
+//             }, {
+//                 path: 'alarm',
+//                 name: 'alarm',
+//                 component: Alarm,
+//                 meta: { keepAlive: true, breadcrumbs: [{ label: 'Demo' }, { label: 'Form' }] }
+//             }
+//         ]
+//     }
+// ]

src/framework/layout/PageSidebar.vue

@@ -75,4 +75,5 @@ export default {
     mounted() {},
     components: {}
 }
-</script>
+</script>
+

src/router/index.js

@@ -6,7 +6,7 @@ import systemRoute from './system'
 Vue.use(Router)
 
 let routes = []
-routes = routes.concat(demoRoute)
+// routes = routes.concat(demoRoute)
 routes = routes.concat(systemRoute)
 
 const router = new Router({

src/utils/authutils.js

@@ -96,9 +96,9 @@ export default {
         let result = []
         let allMenus = []
         // 开发环境下展示demo页面
-        if (process.env.NODE_ENV === 'development') {
-            allMenus = menus.demoMenus
-        }
+        // if (process.env.NODE_ENV === 'development') {
+        //     allMenus = menus.demoMenus
+        // }
         allMenus = allMenus.concat(menus.menus)
         let ps = !permissions ? {} : permissions
         allMenus.forEach(item => {

src/views/demo/FormPageDemo.vue

@@ -147,7 +147,7 @@ export default {
         }
     },
     created() {
-        this.$store.dispatch('setBreadcrumb', [{ label: 'Demo' }, { label: 'Form' }])
+        // this.$store.dispatch('setBreadcrumb', [{ label: 'Demo' }, { label: 'Form' }])
     }
 }
 </script>

src/views/demo/TablePageDemo.vue

@@ -110,7 +110,7 @@ export default {
         }
     },
     created() {
-        this.$store.dispatch('setBreadcrumb', [{ label: 'Demo' }, { label: 'Table' }])
+        // this.$store.dispatch('setBreadcrumb', [{ label: 'Demo' }, { label: 'Table' }])
         for (let i = 0; i < 50; i++) {
             this.tableData3.push({
                 date: '2016-05-03',