diff --git a/src/assets/icons/svg/alarm.svg b/src/assets/icons/svg/alarm.svg new file mode 100644 index 00000000..bf0448e3 --- /dev/null +++ b/src/assets/icons/svg/alarm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-alarm-white.svg b/src/assets/icons/svg/home-alarm-white.svg new file mode 100644 index 00000000..f1eb9020 --- /dev/null +++ b/src/assets/icons/svg/home-alarm-white.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device-alarm.svg b/src/assets/icons/svg/home-device-alarm.svg new file mode 100644 index 00000000..9aae4e56 --- /dev/null +++ b/src/assets/icons/svg/home-device-alarm.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device-menu.svg b/src/assets/icons/svg/home-device-menu.svg new file mode 100644 index 00000000..b0427dde --- /dev/null +++ b/src/assets/icons/svg/home-device-menu.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-device.svg b/src/assets/icons/svg/home-device.svg new file mode 100644 index 00000000..3da9be44 --- /dev/null +++ b/src/assets/icons/svg/home-device.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-order-menu.svg b/src/assets/icons/svg/home-order-menu.svg new file mode 100644 index 00000000..09c4d4ca --- /dev/null +++ b/src/assets/icons/svg/home-order-menu.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-order-monitor.svg b/src/assets/icons/svg/home-order-monitor.svg new file mode 100644 index 00000000..712ef780 --- /dev/null +++ b/src/assets/icons/svg/home-order-monitor.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-produce.svg b/src/assets/icons/svg/home-produce.svg new file mode 100644 index 00000000..8123f2f2 --- /dev/null +++ b/src/assets/icons/svg/home-produce.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-quality-menu.svg b/src/assets/icons/svg/home-quality-menu.svg new file mode 100644 index 00000000..16c618a9 --- /dev/null +++ b/src/assets/icons/svg/home-quality-menu.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-store-menu.svg b/src/assets/icons/svg/home-store-menu.svg new file mode 100644 index 00000000..b0065389 --- /dev/null +++ b/src/assets/icons/svg/home-store-menu.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/home-work-menu.svg b/src/assets/icons/svg/home-work-menu.svg new file mode 100644 index 00000000..7f1d512b --- /dev/null +++ b/src/assets/icons/svg/home-work-menu.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/alarm-bg.png b/src/assets/img/alarm-bg.png new file mode 100644 index 00000000..8c788654 Binary files /dev/null and b/src/assets/img/alarm-bg.png differ diff --git a/src/assets/img/home-bg.png b/src/assets/img/home-bg.png new file mode 100644 index 00000000..5ef3977f Binary files /dev/null and b/src/assets/img/home-bg.png differ diff --git a/src/assets/img/home-progress-bg.png b/src/assets/img/home-progress-bg.png new file mode 100644 index 00000000..39ddb5ef Binary files /dev/null and b/src/assets/img/home-progress-bg.png differ diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 02ca003d..84421582 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -1,188 +1,256 @@ + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c23172b9..d936d406 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,204 +1,174 @@ diff --git a/src/layout/components/NavbarRight.vue b/src/layout/components/NavbarRight.vue index 228cde89..b0eea010 100644 --- a/src/layout/components/NavbarRight.vue +++ b/src/layout/components/NavbarRight.vue @@ -1,120 +1,140 @@ - \ No newline at end of file + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index bac19f28..81fac875 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -48,11 +48,9 @@ export default { computed: { ...mapState(['settings']), ...mapGetters(['sidebarRouters', 'sidebar', 'choicepart']), - routeList() { - // return [this.partList[this.choicepart]] - // return [this.sidebarRouters[29]] - return [this.sidebarRouters[this.choicepart]] - }, + routeList() { + return this.sidebarRouters; + }, activeMenu() { const route = this.$route; const { meta, path } = route; diff --git a/src/router/index.js b/src/router/index.js index 40189532..305eff0b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -71,7 +71,8 @@ export const constantRoutes = [ }, { path: '/', - component: () => import('@/views/choicePart'), + // component: () => import('@/views/choicePart'), + component: () => import('@/views/home'), hidden: true, meta: { requireToken: true } }, diff --git a/src/settings.js b/src/settings.js index 045f5eb3..17ef259c 100644 --- a/src/settings.js +++ b/src/settings.js @@ -13,7 +13,7 @@ module.exports = { /** * 是否显示顶部导航 */ - topNav: false, + topNav: true, /** * 是否显示 tagsView diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 2da339e2..5cf38dfd 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -23,6 +23,7 @@ const permission = { state.topbarRouters = routes }, SET_SIDEBAR_ROUTERS: (state, routes) => { + console.log('=========:',routes) state.sidebarRouters = routes }, }, diff --git a/src/views/abnormalWarning/components/Navbar.vue b/src/views/abnormalWarning/components/Navbar.vue new file mode 100644 index 00000000..cf022a9b --- /dev/null +++ b/src/views/abnormalWarning/components/Navbar.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/views/abnormalWarning/components/NavbarRight.vue b/src/views/abnormalWarning/components/NavbarRight.vue new file mode 100644 index 00000000..1e858dfd --- /dev/null +++ b/src/views/abnormalWarning/components/NavbarRight.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/views/abnormalWarning/components/TopNav.vue b/src/views/abnormalWarning/components/TopNav.vue new file mode 100644 index 00000000..7f29a740 --- /dev/null +++ b/src/views/abnormalWarning/components/TopNav.vue @@ -0,0 +1,267 @@ + + + + + + diff --git a/src/views/abnormalWarning/index.vue b/src/views/abnormalWarning/index.vue new file mode 100644 index 00000000..e1a7e61d --- /dev/null +++ b/src/views/abnormalWarning/index.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/views/home/components/Navbar.vue b/src/views/home/components/Navbar.vue new file mode 100644 index 00000000..d56bb4e6 --- /dev/null +++ b/src/views/home/components/Navbar.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/src/views/home/components/NavbarRight.vue b/src/views/home/components/NavbarRight.vue new file mode 100644 index 00000000..848cd9bd --- /dev/null +++ b/src/views/home/components/NavbarRight.vue @@ -0,0 +1,143 @@ + + + diff --git a/src/views/home/components/TopNav.vue b/src/views/home/components/TopNav.vue new file mode 100644 index 00000000..95de0e58 --- /dev/null +++ b/src/views/home/components/TopNav.vue @@ -0,0 +1,267 @@ + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue new file mode 100644 index 00000000..d317f776 --- /dev/null +++ b/src/views/home/index.vue @@ -0,0 +1,416 @@ + + + + +