diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index 0c7c5fc278ffb7999c8c90e18e1787cf1a18c155..7868197d1f1e02420193ffe2f231873e51031566 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -29,4 +29,54 @@
       </template>
     </a-table>
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+import { getUserList } from '../../api/user'
+import { parseTime } from '../../utils/time'
+export default {
+  data() {
+    return {
+      loading: false,
+      tableHeight: '70vh',
+      list: [],
+      rowData: {},
+      editUserVisible: false,
+      columns: [
+        { title: '用户名称', dataIndex: 'id', ellipsis: true, scopedSlots: { customRender: 'id' }},
+        { title: '修改时间', dataIndex: 'modifyTime', ellipsis: true, customRender: (text) => { return parseTime(text) } },
+        { title: '输入密码错误次数', dataIndex: 'pwdErrorCount', ellipsis: true },
+        { title: '输入密码错误时间', dataIndex: 'lastPwdErrorTime', ellipsis: true, customRender: (text) => { if (text === '0') { return '--' } return parseTime(text) } },
+        { title: '操作', dataIndex: 'operation', scopedSlots: { customRender: 'operation' }, width: 200, align: 'center' }
+      ],
+      title: '新增用户'
+    }
+  },
+  created() {
+    this.calcTableHeight()
+    this.loadData()
+  },
+  methods: {
+    calcTableHeight() {
+      this.$nextTick(() => {
+        this.tableHeight = window.innerHeight - this.$refs['filter'].clientHeight - 135
+      })
+    },
+    loadData() {
+      this.list = []
+      this.loading = true
+      getUserList().then(res => {
+        if (res.code === 200) {
+          this.list = res.data
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    refreshTable() {
+      this.editUserVisible = false
+      this.loadData()
+    },
+  }
+}
+</script>
\ No newline at end of file