diff --git a/src/api/manager.js b/src/api/manager.js index 14458f5..01738c3 100644 --- a/src/api/manager.js +++ b/src/api/manager.js @@ -9,58 +9,94 @@ export const driverApi = { url: '/device_api/manager/driver/list', method: 'post', data: driver + }) +}; + +export const driverAttributeApi = { + add: (driverAttribute) => request({ + url: '/device_api/manager/driverAttribute/add', + method: 'post', + data: driverAttribute }), - dictionary: () => request({ - url: '/device_api/manager/driver/dictionary', - method: 'get' + delete: (id) => request({ + url: '/device_api/manager/driverAttribute/delete/' + id, + method: 'post' + }), + update: (driverAttribute) => request({ + url: '/device_api/manager/driverAttribute/update', + method: 'post', + data: driverAttribute + }), + list: (driverAttribute) => request({ + url: '/device_api/manager/driverAttribute/list', + method: 'post', + data: driverAttribute }) }; -export const connectInfoApi = { - add: (connectInfo) => request({ - url: '/device_api/manager/connectInfo/add', +export const driverInfoApi = { + add: (driverInfo) => request({ + url: '/device_api/manager/driverInfo/add', method: 'post', - data: connectInfo + data: driverInfo }), delete: (id) => request({ - url: '/device_api/manager/connectInfo/delete/' + id, + url: '/device_api/manager/driverInfo/delete/' + id, method: 'post' }), - update: (connectInfo) => request({ - url: '/device_api/manager/connectInfo/update', + update: (driverInfo) => request({ + url: '/device_api/manager/driverInfo/update', method: 'post', - data: connectInfo + data: driverInfo }), - list: (connectInfo) => request({ - url: '/device_api/manager/connectInfo/list', + list: (driverInfo) => request({ + url: '/device_api/manager/driverInfo/list', method: 'post', - data: connectInfo + data: driverInfo }) }; -export const profileInfoApi = { - add: (profileInfo) => request({ - url: '/device_api/manager/profileInfo/add', +export const pointAttributeApi = { + add: (pointAttribute) => request({ + url: '/device_api/manager/pointAttribute/add', method: 'post', - data: profileInfo + data: pointAttribute }), delete: (id) => request({ - url: '/device_api/manager/profileInfo/delete/' + id, + url: '/device_api/manager/pointAttribute/delete/' + id, method: 'post' }), - update: (profileInfo) => request({ - url: '/device_api/manager/profileInfo/update', + update: (pointAttribute) => request({ + url: '/device_api/manager/pointAttribute/update', method: 'post', - data: profileInfo + data: pointAttribute }), - list: (profileInfo) => request({ - url: '/device_api/manager/profileInfo/list', + list: (pointAttribute) => request({ + url: '/device_api/manager/pointAttribute/list', + method: 'post', + data: pointAttribute + }) +}; + +export const pointInfoApi = { + add: (pointInfo) => request({ + url: '/device_api/manager/pointInfo/add', method: 'post', - data: profileInfo + data: pointInfo }), - dictionary: () => request({ - url: '/device_api/manager/profileInfo/dictionary', - method: 'get' + delete: (id) => request({ + url: '/device_api/manager/pointInfo/delete/' + id, + method: 'post' + }), + update: (pointInfo) => request({ + url: '/device_api/manager/pointInfo/update', + method: 'post', + data: pointInfo + }), + list: (pointInfo) => request({ + url: '/device_api/manager/pointInfo/list', + method: 'post', + data: pointInfo }) }; @@ -83,10 +119,6 @@ export const profileApi = { url: '/device_api/manager/profile/list', method: 'post', data: profile - }), - dictionary: () => request({ - url: '/device_api/manager/profile/dictionary', - method: 'get' }) }; @@ -109,10 +141,6 @@ export const groupApi = { url: '/device_api/manager/group/list', method: 'post', data: group - }), - dictionary: () => request({ - url: '/device_api/manager/group/dictionary', - method: 'get' }) }; @@ -135,10 +163,6 @@ export const deviceApi = { url: '/device_api/manager/device/list', method: 'post', data: device - }), - dictionary: () => request({ - url: '/device_api/manager/device/dictionary', - method: 'get' }) }; @@ -161,32 +185,6 @@ export const pointApi = { url: '/device_api/manager/point/list', method: 'post', data: point - }), - dictionary: () => request({ - url: '/device_api/manager/point/dictionary', - method: 'get' - }) -}; - -export const pointInfoApi = { - add: (pointInfo) => request({ - url: '/device_api/manager/pointInfo/add', - method: 'post', - data: pointInfo - }), - delete: (id) => request({ - url: '/device_api/manager/pointInfo/delete/' + id, - method: 'post' - }), - update: (pointInfo) => request({ - url: '/device_api/manager/pointInfo/update', - method: 'post', - data: pointInfo - }), - list: (pointInfo) => request({ - url: '/device_api/manager/pointInfo/list', - method: 'post', - data: pointInfo }) }; @@ -202,3 +200,34 @@ export const scheduleApi = { data: schedule }) }; + +export const dictionaryApi = { + driverDictionary: () => request({ + url: '/device_api/manager/dictionary/driver', + method: 'get' + }), + profileDictionary: () => request({ + url: '/device_api/manager/dictionary/profile', + method: 'get' + }), + driverAttributeDictionary: () => request({ + url: '/device_api/manager/dictionary/driverAttribute', + method: 'get' + }), + pointAttributeDictionary: () => request({ + url: '/device_api/manager/dictionary/pointAttribute', + method: 'get' + }), + groupDictionary: () => request({ + url: '/device_api/manager/dictionary/group', + method: 'get' + }), + deviceDictionary: (parent) => request({ + url: '/device_api/manager/dictionary/device/' + parent, + method: 'get' + }), + pointDictionary: (parent) => request({ + url: '/device_api/manager/dictionary/point/' + parent, + method: 'get' + }) +}; diff --git a/src/router/views/index.js b/src/router/views/index.js index bd20682..ceeb997 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -21,19 +21,19 @@ export default [ }, component: () => import('@/views/driver/Driver') }, { - name: 'connect', - path: '/connect', + name: 'driverAttribute', + path: '/driverAttribute', meta: { isAuth: true }, - component: () => import('@/views/connect/Connect') + component: () => import('@/views/driver/DriverAttribute') }, { - name: 'attribute', - path: '/attribute', + name: 'pointAttribute', + path: '/pointAttribute', meta: { isAuth: true }, - component: () => import('@/views/attribute/Attribute') + component: () => import('@/views/point/PointAttribute') }, { name: 'profile', path: '/profile', @@ -41,6 +41,13 @@ export default [ isAuth: true }, component: () => import('@/views/profile/Profile') + }, { + name: 'driverInfo', + path: '/driverInfo', + meta: { + isAuth: true + }, + component: () => import('@/views/driver/DriverInfo') }, { name: 'point', path: '/point', @@ -63,12 +70,12 @@ export default [ }, component: () => import('@/views/device/Device') }, { - name: 'config', - path: '/config', + name: 'pointInfo', + path: '/pointInfo', meta: { isAuth: true }, - component: () => import('@/views/config/Config') + component: () => import('@/views/point/PointInfo') }, { name: 'schedule', path: '/schedule', diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue index e028c7b..57fd133 100644 --- a/src/views/device/Device.vue +++ b/src/views/device/Device.vue @@ -23,7 +23,7 @@ + + diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 6b28cb9..d89b6ce 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -11,14 +11,15 @@ :router=true> 首页 驱动 - 连接 - 属性 + 驱动属性 + 位号属性 模板 + 驱动配置 位号 分组 设备 - 配置 - 任务 + 位号配置 + 调度