diff --git a/src/assets/board/bg1.jpg b/src/assets/board/bg1.jpg new file mode 100644 index 0000000..f345dee Binary files /dev/null and b/src/assets/board/bg1.jpg differ diff --git a/src/permission.js b/src/permission.js index 8fefe72..96ceb8d 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import defaultSettings from '@/settings' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register', '/board'] +const whiteList = ['/login', '/register', '/board', '/board1'] router.beforeEach((to, from, next) => { NProgress.start() diff --git a/src/router/index.js b/src/router/index.js index a89a23a..df2c47f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,8 @@ export const constantRoutes = [ path: '/board', component: () => import('@/views/board/index.vue'), hidden: true + }, { + path: '/board1', component: () => import('@/views/board/index1.vue'), hidden: true }, { path: '/redirect', diff --git a/src/views/board/components/DeviceList.vue b/src/views/board/components/DeviceList.vue new file mode 100644 index 0000000..b2d252d --- /dev/null +++ b/src/views/board/components/DeviceList.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/views/board/components/listItem.vue b/src/views/board/components/listItem.vue new file mode 100644 index 0000000..f30122e --- /dev/null +++ b/src/views/board/components/listItem.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/board/index.vue b/src/views/board/index.vue index 81f4302..6642ba3 100644 --- a/src/views/board/index.vue +++ b/src/views/board/index.vue @@ -69,7 +69,6 @@
-
A区 @@ -503,9 +502,12 @@ export default { label: { show: true, position: 'inside', - color: '#000' + color: '#000', + fontSize: 10 }, - barWidth: '30px', + barWidth: '50%', + barMaxWidth: '60px', + barMinWidth: '30px', data: barData.map(v => { return v.data[e] || 0 }), @@ -685,7 +687,7 @@ export default { .title { position: absolute; top: 2%; - left: 50.8%; + left: 50%; color: #eee; font-size: 2vw; font-weight: 600; diff --git a/src/views/board/index1.vue b/src/views/board/index1.vue new file mode 100644 index 0000000..25c9fde --- /dev/null +++ b/src/views/board/index1.vue @@ -0,0 +1,320 @@ + + + \ No newline at end of file