diff --git a/src/views/monitor/server/form.vue b/src/views/monitor/server/form.vue
new file mode 100644
index 0000000..191b6ba
--- /dev/null
+++ b/src/views/monitor/server/form.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" :title="isAdd ? '新增' : '编辑'" width="500px">
+    <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
+      <el-form-item label="名称" >
+        <el-input v-model="form.name" style="width: 370px;"/>
+      </el-form-item>
+      <el-form-item label="IP地址" >
+        <el-input v-model="form.ip" style="width: 370px;"/>
+      </el-form-item>
+      <el-form-item label="访问端口" >
+        <el-input-number v-model="form.port"/>
+      </el-form-item>
+      <el-form-item label="排序" >
+        <el-input-number v-model="form.sort"/>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="text" @click="cancel">取消</el-button>
+      <el-button :loading="loading" type="primary" @click="doSubmit">确认</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { add, edit } from '@/api/server'
+export default {
+  props: {
+    isAdd: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false,
+      form: {
+        id: '',
+        name: '',
+        ip: '',
+        port: '8777',
+        state: '',
+        cpuRate: '',
+        cpuCore: '',
+        memTotal: '',
+        memUsed: '',
+        diskTotal: '',
+        diskUsed: '',
+        swapTotal: '',
+        swapUsed: '',
+        sort: '999'
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入名称', trigger: 'blur' }
+        ],
+        ip: [
+          { required: true, message: '请输入IP', trigger: 'blur' }
+        ],
+        port: [
+          { required: true, message: '请输入访问端口', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    cancel() {
+      this.resetForm()
+    },
+    doSubmit() {
+      this.loading = true
+      if (this.isAdd) {
+        this.doAdd()
+      } else this.doEdit()
+    },
+    doAdd() {
+      add(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '添加成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    doEdit() {
+      edit(this.form).then(res => {
+        this.resetForm()
+        this.$notify({
+          title: '修改成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.loading = false
+        this.$parent.init()
+      }).catch(err => {
+        this.loading = false
+        console.log(err.response.data.message)
+      })
+    },
+    resetForm() {
+      this.dialog = false
+      this.$refs['form'].resetFields()
+      this.form = {
+        id: '',
+        name: '',
+        ip: '',
+        port: '',
+        state: '',
+        cpuRate: '',
+        cpuCore: '',
+        memTotal: '',
+        memUsed: '',
+        diskTotal: '',
+        diskUsed: '',
+        swapTotal: '',
+        swapUsed: '',
+        sort: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
new file mode 100644
index 0000000..e7c19f2
--- /dev/null
+++ b/src/views/monitor/server/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!-- 搜索 -->
+      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
+      </el-select>
+      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+      <!-- 新增 -->
+      <div style="display: inline-block;margin: 0px 2px;">
+        <el-button
+          v-permission="['admin','server:add']"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-plus"
+          @click="add">新增
+        </el-button>
+      </div>
+      <!-- 刷新 -->
+      <div style="display: inline-block;">
+        <el-button
+          size="mini"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-refresh"
+          @click="refresh">刷新</el-button>
+      </div>
+    </div>
+    <!--表单组件-->
+    <eForm ref="form" :is-add="isAdd"/>
+    <!--表格渲染-->
+    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
+      <el-table-column prop="name" label="名称"/>
+      <el-table-column prop="ip" label="IP地址"/>
+      <el-table-column prop="port" label="访问端口"/>
+      <el-table-column label="状态">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.state === '1' ? 'success' : 'info'"
+            disable-transitions>
+            <i v-if="scope.row.state === '1'" class="el-icon-success"/>
+            <i v-if="scope.row.state === '0'" class="el-icon-error"/>
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :formatter="percentNumber" prop="cpuRate" label="CPU使用率"/>
+      <el-table-column prop="cpuCore" label="CPU内核数"/>
+      <el-table-column :formatter="formatMem" label="物理内存"/>
+      <el-table-column :formatter="formatDisk" label="磁盘使用情况"/>
+      <el-table-column :formatter="formatSwap" label="交换空间"/>
+      <el-table-column v-if="checkPermission(['admin','server:edit','server:del'])" label="操作" width="150px" align="center">
+        <template slot-scope="scope">
+          <el-button v-permission="['admin','server:edit']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)"/>
+          <el-popover
+            v-permission="['admin','server:del']"
+            :ref="scope.row.id"
+            placement="top"
+            width="180">
+            <p>确定删除本条数据吗？</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+            </div>
+            <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini"/>
+          </el-popover>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :total="total"
+      :current-page="page + 1"
+      style="margin-top: 8px;"
+      layout="total, prev, pager, next, sizes"
+      @size-change="sizeChange"
+      @current-change="pageChange"/>
+  </div>
+</template>
+
+<script>
+import checkPermission from '@/utils/permission'
+import initData from '@/mixins/initData'
+import { del } from '@/api/server'
+import eForm from './form'
+export default {
+  components: { eForm },
+  mixins: [initData],
+  data() {
+    return {
+      delLoading: false,
+      queryTypeOptions: [
+        { key: 'name', display_name: '名称' },
+        { key: 'ip', display_name: 'IP地址' }
+      ]
+    }
+  },
+  created() {
+    this.$nextTick(() => {
+      this.init()
+    })
+  },
+  methods: {
+    checkPermission,
+    beforeInit() {
+      this.url = 'api/server'
+      const sort = 'id,desc'
+      this.params = { page: this.page, size: this.size, sort: sort }
+      const query = this.query
+      const type = query.type
+      const value = query.value
+      if (type && value) {
+        this.params[type] = value
+      }
+      return true
+    },
+    subDelete(id) {
+      this.delLoading = true
+      del(id).then(res => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        this.dleChangePage()
+        this.init()
+        this.$notify({
+          title: '删除成功',
+          type: 'success',
+          duration: 2500
+        })
+      }).catch(err => {
+        this.delLoading = false
+        this.$refs[id].doClose()
+        console.log(err.response.data.message)
+      })
+    },
+    add() {
+      this.isAdd = true
+      this.$refs.form.dialog = true
+    },
+    edit(data) {
+      this.isAdd = false
+      const _this = this.$refs.form
+      _this.form = {
+        id: data.id,
+        name: data.name,
+        ip: data.ip,
+        port: data.port,
+        state: data.state,
+        cpuRate: data.cpuRate,
+        cpuCore: data.cpuCore,
+        memTotal: data.memTotal,
+        memUsed: data.memUsed,
+        diskTotal: data.diskTotal,
+        diskUsed: data.diskUsed,
+        swapTotal: data.swapTotal,
+        swapUsed: data.swapUsed,
+        sort: data.sort
+      }
+      _this.dialog = true
+    },
+    refresh() {
+      this.init()
+    },
+    percentNumber(row, column) {
+      let num = row.cpuRate
+      if (!num) {
+        return '-'
+      }
+      num = num * 100 + ''
+      if (num.length > 5) {
+        num = num.substring(0, 5)
+      }
+      return num + '%'
+    },
+    convertToGb(num) {
+      if (!num) {
+        return '-'
+      }
+      num = num + ''
+      if (num.length > 5) {
+        num = num.substring(0, 5)
+      }
+      return num + 'GB'
+    },
+    formatMem(row, column) {
+      return this.convertToGb(row.memUsed) + ' / ' + this.convertToGb(row.memTotal)
+    },
+    formatDisk(row, column) {
+      return this.convertToGb(row.diskUsed) + ' / ' + this.convertToGb(row.diskTotal)
+    },
+    formatSwap(row, column) {
+      return this.convertToGb(row.swapUsed) + ' / ' + this.convertToGb(row.swapTotal)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>