From 1bb40fbdc71bc9c340bb5099170e3f20bc9c5f7c Mon Sep 17 00:00:00 2001 From: pnoker Date: Tue, 3 Nov 2020 16:58:53 +0800 Subject: [PATCH] add event page --- src/api/data.js | 10 +- src/router/common/index.js | 28 ++-- src/router/views/index.js | 9 ++ src/views/event/DeviceEvent.vue | 242 ++++++++++++++++++++++++++++++++ src/views/layout/Layout.vue | 1 + 5 files changed, 271 insertions(+), 19 deletions(-) create mode 100644 src/views/event/DeviceEvent.vue diff --git a/src/api/data.js b/src/api/data.js index f00e9a2..1831424 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -2,8 +2,16 @@ import request from '@/config/axios' export const pointValueApi = { list: (pointValue) => request({ - url: '/data_api/data/list', + url: '/data_api/data/pointValue/list', method: 'post', data: pointValue }) }; + +export const deviceEventApi = { + list: (event) => request({ + url: '/data_api/data/deviceEvent/list', + method: 'post', + data: event + }) +}; diff --git a/src/router/common/index.js b/src/router/common/index.js index f2c4f29..8db3095 100644 --- a/src/router/common/index.js +++ b/src/router/common/index.js @@ -1,8 +1,4 @@ export default [ - { - path: '*', - redirect: '/404' - }, { name: 'login', path: '/login', @@ -13,12 +9,17 @@ export default [ component: () => import('@/views/login/Login') }, { - name: 'index', - path: '/', - redirect: '/home', + name: '403', + path: '/403', meta: { - isAuth: true - } + isAuth: false, + title: '403' + }, + component: () => import('@/components/error/403') + }, + { + path: '*', + redirect: '/404' }, { name: '404', @@ -30,15 +31,6 @@ export default [ component: () => import('@/components/error/404') }, - { - name: '403', - path: '/403', - meta: { - isAuth: false, - title: '403' - }, - component: () => import('@/components/error/403') - }, { name: '500', path: '/500', diff --git a/src/router/views/index.js b/src/router/views/index.js index 670602c..c487810 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -104,6 +104,15 @@ export default [ title: '数据' }, component: () => import('@/views/point/PointValue') + }, + { + name: 'deviceEvent', + path: '/deviceEvent', + meta: { + isAuth: true, + title: '事件' + }, + component: () => import('@/views/event/DeviceEvent') } ] } diff --git a/src/views/event/DeviceEvent.vue b/src/views/event/DeviceEvent.vue new file mode 100644 index 0000000..ac3270a --- /dev/null +++ b/src/views/event/DeviceEvent.vue @@ -0,0 +1,242 @@ + + + + + diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index e028f71..fdb34bb 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -20,6 +20,7 @@ 设备 位号配置 数据 + 事件