diff --git a/.gitignore b/.gitignore
index 5598dbd..60b4ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 node_modules
 /dist
 
-*lock.json
 /express/node_modules
 /express/public
 
diff --git a/src/api/device.js b/src/api/device.js
new file mode 100644
index 0000000..2394ad8
--- /dev/null
+++ b/src/api/device.js
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export const groupApi = {
+    add: (group) => request({
+        url: '/api/manager/group/add',
+        method: 'post',
+        data: group
+    }),
+    delete: (id) => request({
+        url: '/api/manager/group/delete/' + id,
+        method: 'post'
+    }),
+    update: (group) => request({
+        url: '/api/manager/group/update',
+        method: 'post',
+        data: group
+    }),
+    selectById: (id) => request({
+        url: '/api/manager/group/id/' + id,
+        method: 'get'
+    }),
+    list: (group) => request({
+        url: '/api/manager/group/list',
+        method: 'post',
+        data: group
+    })
+};
+
+export const deviceApi = {
+    add: (group) => request({
+        url: '/device_api/manager/device/add',
+        method: 'post',
+        data: group
+    }),
+    delete: (id) => request({
+        url: '/device_api/manager/device/delete/' + id,
+        method: 'post'
+    }),
+    update: (group) => request({
+        url: '/device_api/manager/device/update',
+        method: 'post',
+        data: group
+    }),
+    selectById: (id) => request({
+        url: '/device_api/manager/device/id/' + id,
+        method: 'get'
+    }),
+    selectByCode: (code) => request({
+        url: '/device_api/manager/device/code/' + code,
+        method: 'get'
+    }),
+    selectByGroupAndName: (groupId, name) => request({
+        url: '/device_api/manager/device/group/' + groupId + '/name/' + name,
+        method: 'get'
+    }),
+    list: (group) => request({
+        url: '/device_api/manager/device/list',
+        method: 'post',
+        data: group
+    })
+};
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index 64b0b8d..55bba8a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,12 +1,12 @@
 import request from '@/config/axios'
 
 export const generateToken = (user) => request({
-    url: '/api/auth/token',
+    url: '/user_api/auth/token',
     method: 'post',
     data: user
 });
 
 export const checkTokenValid = (token) => request({
-    url: '/auth/token/' + token,
+    url: '/user_api/auth/token/' + token,
     method: 'post'
 });
diff --git a/src/util/util.js b/src/util/util.js
index df3be0b..08fdc5a 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -1,4 +1,5 @@
 import {isNull} from './validate'
+import {Message} from 'element-ui'
 
 /**
  * 表单序列化
@@ -250,6 +251,38 @@ export const randomLenNum = (len, date) => {
     return random;
 };
 
+/**
+ * 成功操作
+ *
+ * @param message
+ */
+export const successMessage = (message) => {
+    if (message === '' || message == null) {
+        message = '操作成功!';
+    }
+    Message({
+        center: true,
+        type: 'success',
+        message: message
+    });
+};
+
+/**
+ * 失败操作
+ *
+ * @param message
+ */
+export const failMessage = (message) => {
+    if (message === '' || message == null) {
+        message = '操作失败!';
+    }
+    Message({
+        center: true,
+        type: 'error',
+        message: message
+    });
+};
+
 /**
  * 打开全屏/关闭全屏
  */
@@ -271,16 +304,16 @@ export const listenFullscreen = (callback) => {
         callback()
     }
 
-    document.addEventListener("fullscreenchange", function () {
+    document.addEventListener('fullscreenchange', function () {
         listen();
     });
-    document.addEventListener("mozfullscreenchange", function () {
+    document.addEventListener('mozfullscreenchange', function () {
         listen();
     });
-    document.addEventListener("webkitfullscreenchange", function () {
+    document.addEventListener('webkitfullscreenchange', function () {
         listen();
     });
-    document.addEventListener("msfullscreenchange", function () {
+    document.addEventListener('msfullscreenchange', function () {
         listen();
     });
 };
diff --git a/src/views/things/Things.vue b/src/views/things/Things.vue
index b5ed0db..b2bb264 100644
--- a/src/views/things/Things.vue
+++ b/src/views/things/Things.vue
@@ -11,12 +11,13 @@
             <base-card>
                 <avue-crud :option="option"
                            :data="data"
+                           :page="page"
                            ref="crud"
                            v-model="form"
-                           :page="page"
+                           @on-load="onLoad"
+                           @row-save="rowSave"
+                           @row-update="rowUpdate"
                            @row-del="rowDel"
-                           @row-update="handleRowUpdate"
-                           @row-save="handleRowSave"
                            @search-change="searchChange"
                            @search-reset="searchReset">
                     <template slot="menuLeft">
@@ -33,6 +34,9 @@
 </template>
 
 <script>
+    import {deviceApi} from '@/api/device'
+    import {failMessage, successMessage} from "@/util/util";
+
     export default {
         data() {
             return {
@@ -56,14 +60,14 @@
                     }
                 },
                 option: {
+                    tip: false,
                     index: true,
-                    align: 'center',
+                    stripe: true,
                     border: true,
                     viewBtn: true,
                     selection: true,
-                    stripe: true,
-                    tip: false,
                     height: 664,
+                    align: 'center',
                     column: [
                         {
                             label: '设备',
@@ -87,26 +91,54 @@
                             label: '状态',
                             prop: 'status',
                             search: true,
+                            type: 'select',
+                            dicData: [
+                                {
+                                    label: '全部',
+                                    value: -1
+                                }, {
+                                    label: '离线',
+                                    value: 0
+                                }, {
+                                    label: '在线',
+                                    value: 1
+                                }, {
+                                    label: '维护',
+                                    value: 2
+                                }, {
+                                    label: '故障',
+                                    value: 3
+                                }, {
+                                    label: '失效',
+                                    value: 4
+                                }
+                            ],
                             rules: [{
                                 required: true,
                                 message: "请输入设备状态",
                                 trigger: "blur"
                             }]
+                        }, {
+                            label: '分组',
+                            prop: 'groupId'
+                        }, {
+                            label: '模板',
+                            prop: 'profileId'
                         }, {
                             label: '描述',
                             prop: 'description'
                         }, {
                             label: "创建日期",
-                            prop: "create_time",
+                            prop: "createTime",
                             type: "date",
                             format: "yyyy-MM-dd hh:mm:ss",
-                            valueFormat: "yyyy-MM-dd hh:mm:ss",
+                            valueFormat: "yyyy-MM-dd hh:mm:ss"
                         }, {
                             label: "修改日期",
-                            prop: "update_time",
+                            prop: "updateTime",
                             type: "date",
                             format: "yyyy-MM-dd hh:mm:ss",
-                            valueFormat: "yyyy-MM-dd hh:mm:ss",
+                            valueFormat: "yyyy-MM-dd hh:mm:ss"
                         }
                     ]
                 },
@@ -123,93 +155,75 @@
                             }
                         ]
                     }],
-                data: [{
-                    name: '张三',
-                    sex: '男',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '李四',
-                    sex: '女',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '王五',
-                    sex: '女',
-                    date: '1994-02-23 00:00:00'
-                }, {
-                    name: '赵六',
-                    sex: '男',
-                    date: '1994-02-23 00:00:00'
-                }]
+                data: []
             }
         },
-        created() {
-            this.getList()
-        },
         methods:
             {
-                getList() {
-                    this.page.total = 200
-                    if (this.page.currentPage === 1) {
-                        this.data = [
-                            {
-                                name: '张三',
-                                sex: '男'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }, {
-                                name: '李四',
-                                sex: '女'
-                            }
-                        ]
-                    } else if (this.page.currentPage == 2) {
-                        this.data = [
-                            {
-                                name: '李四',
-                                sex: '女'
+                onLoad() {
+                    deviceApi.list(
+                        {
+                            page: {
+                                current: this.page.currentPage,
+                                size: this.page.pageSize
                             }
-                        ]
-                    }
+                        }
+                    ).then(res => {
+                        const data = res.data;
+                        if (data.ok) {
+                            this.page.total = data.data.total;
+                            this.data = data.data.records;
+                        }
+                    });
                 },
-                // 增加按钮
-                handleRowSave(row, done, loading) {
-                    this.data.splice(0, 0, row);
-                    done();  // 关闭表单
-                    loading(); // 按钮停止加载
-                }
-                ,
-                // 修改按钮
-                handleRowUpdate(row, index, done, loading) {
-                    this.data.splice(index, 1, row);
-                    done();  // 关闭表单
-                    loading(); // 按钮停止加载
-                }
-                ,
-                // 删除按钮
-                rowDel(row, index) {
-                    this.$confirm('是否删除该条信息？', '提示', {
+                rowSave(row, done, loading) {
+                    deviceApi.add(row).then(res => {
+                        loading();
+                        const data = res.data;
+                        if (data.ok) {
+                            this.onLoad(this.page);
+                            successMessage();
+                        } else {
+                            failMessage();
+                        }
+                    }, error => {
+                        console.log(error);
+                    });
+                    done();
+                },
+                rowUpdate(row, index, done, loading) {
+                    deviceApi.update(row).then(res => {
+                        loading();
+                        const data = res.data;
+                        if (data.ok) {
+                            this.onLoad(this.page);
+                            successMessage();
+                        } else {
+                            failMessage();
+                        }
+                    }, error => {
+                        console.log(error);
+                    });
+                    done();
+                },
+                rowDel(row) {
+                    this.$confirm('是否删除该条设备？', '提示', {
                         confirmButtonText: '确定',
                         cancelButtonText: '取消',
                         type: 'warning'
                     }).then(() => {
-                        this.data.splice(index, 1);
+                        return deviceApi.delete(row.id);
+                    }).then(res => {
+                        const data = res.data;
+                        if (data.ok) {
+                            this.onLoad(this.page);
+                            successMessage();
+                        } else {
+                            failMessage();
+                        }
                     });
-                }
-                ,
+                },
             }
-        ,
     }
 </script>
 
diff --git a/vue.config.js b/vue.config.js
index f2ade37..e0998f8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,6 +11,22 @@ module.exports = {
                 pathRewrite: {
                     '^/api': ''
                 }
+            },
+            '/user_api': {
+                target: 'http://localhost:8400',
+                changeOrigin: true,
+                ws: true,
+                pathRewrite: {
+                    '^/user_api': ''
+                }
+            },
+            '/device_api': {
+                target: 'http://localhost:8600',
+                changeOrigin: true,
+                ws: true,
+                pathRewrite: {
+                    '^/device_api': ''
+                }
             }
         }
     }