diff --git a/src/api/manager.js b/src/api/manager.js index 8827cae..4441208 100644 --- a/src/api/manager.js +++ b/src/api/manager.js @@ -1,5 +1,35 @@ import request from '@/config/axios' +export const driverApi = { + add: (driver) => request({ + url: '/device_api/manager/driver/add', + method: 'post', + data: driver + }), + delete: (id) => request({ + url: '/device_api/manager/driver/delete/' + id, + method: 'post' + }), + update: (driver) => request({ + url: '/device_api/manager/driver/update', + method: 'post', + data: driver + }), + selectById: (id) => request({ + url: '/device_api/manager/driver/id/' + id, + method: 'get' + }), + list: (driver) => request({ + url: '/device_api/manager/driver/list', + method: 'post', + data: driver + }), + dictionary: () => request({ + url: '/device_api/manager/driver/dictionary', + method: 'get' + }) +}; + export const groupApi = { add: (group) => request({ url: '/device_api/manager/group/add', @@ -60,6 +90,36 @@ export const profileApi = { }) }; +export const pointApi = { + add: (point) => request({ + url: '/device_api/manager/point/add', + method: 'post', + data: point + }), + delete: (id) => request({ + url: '/device_api/manager/point/delete/' + id, + method: 'post' + }), + update: (point) => request({ + url: '/device_api/manager/point/update', + method: 'post', + data: point + }), + selectById: (id) => request({ + url: '/device_api/manager/point/id/' + id, + method: 'get' + }), + list: (point) => request({ + url: '/device_api/manager/point/list', + method: 'post', + data: point + }), + dictionary: () => request({ + url: '/device_api/manager/point/dictionary', + method: 'get' + }) +}; + export const deviceApi = { add: (device) => request({ url: '/device_api/manager/device/add', @@ -91,5 +151,9 @@ export const deviceApi = { url: '/device_api/manager/device/list', method: 'post', data: device + }), + dictionary: () => request({ + url: '/device_api/manager/device/dictionary', + method: 'get' }) }; diff --git a/src/router/views/index.js b/src/router/views/index.js index 8d3e6cf..dc296d3 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -13,21 +13,27 @@ export default [ isAuth: true }, component: () => import('@/views/home/Home') - }, - { - name: 'things', - path: '/things', + }, { + name: 'driver', + path: '/driver', meta: { isAuth: true }, - component: () => import('@/views/things/Things') + component: () => import('@/views/driver/Driver') }, { name: 'template', path: '/template', meta: { isAuth: true }, - component: () => import('@/views/Template') + component: () => import('@/views/template/Template') + }, { + name: 'things', + path: '/things', + meta: { + isAuth: true + }, + component: () => import('@/views/things/Things') }, { name: 'now', path: '/now', @@ -50,19 +56,12 @@ export default [ }, component: () => import('@/views/Alarm') }, { - name: 'label', - path: '/label', - meta: { - isAuth: true - }, - component: () => import('@/views/Label') - }, { - name: 'picture', - path: '/picture', + name: 'point', + path: '/point', meta: { isAuth: true }, - component: () => import('@/views/Picture') + component: () => import('@/views/point/Point') }, { name: 'video', path: '/video', diff --git a/src/views/Label.vue b/src/views/Label.vue deleted file mode 100644 index 6de73ef..0000000 --- a/src/views/Label.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/Picture.vue b/src/views/Picture.vue deleted file mode 100644 index 6de73ef..0000000 --- a/src/views/Picture.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/Template.vue b/src/views/Template.vue deleted file mode 100644 index 6de73ef..0000000 --- a/src/views/Template.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/driver/Driver.vue b/src/views/driver/Driver.vue new file mode 100644 index 0000000..62b569f --- /dev/null +++ b/src/views/driver/Driver.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 842e547..d4077fe 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -10,9 +10,9 @@ mode="horizontal" :router=true> 首页 - 驱动 + 驱动 模板 - 位号 + 位号 设备 实时 历史 diff --git a/src/views/point/Point.vue b/src/views/point/Point.vue new file mode 100644 index 0000000..5049e23 --- /dev/null +++ b/src/views/point/Point.vue @@ -0,0 +1,340 @@ + + + + + diff --git a/src/views/template/Template.vue b/src/views/template/Template.vue new file mode 100644 index 0000000..4a7f6f5 --- /dev/null +++ b/src/views/template/Template.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/views/things/Things.vue b/src/views/things/Things.vue index ba4137f..f8143d6 100644 --- a/src/views/things/Things.vue +++ b/src/views/things/Things.vue @@ -52,7 +52,7 @@ rules: [ { required: true, - message: '请输入设备名称', + message: '请输入 设备名称', trigger: 'blur' }, { min: 2, @@ -61,7 +61,7 @@ trigger: 'blur' }, { pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/, - message: '请输入正确格式的设备名称,例:name01、名称01' + message: '请输入 正确格式的设备名称,例:\'name01\' 或 \'名称01\'' } ] }, { @@ -70,11 +70,7 @@ width: 280, search: true, searchSpan: 5, - disabled: true, - rules: [{ - message: '请输入设备编码', - trigger: 'blur' - }] + disabled: true }, { label: '分组', prop: 'groupId', @@ -146,7 +142,14 @@ prop: 'description', width: 220, span: 24, - type: 'textarea' + type: 'textarea', + rules: [ + { + max: 380, + message: '最多输入380个字符', + trigger: 'blur' + } + ] }, { label: '创建日期', prop: 'createTime',