diff --git a/src/api/node_group.js b/src/api/node_group.js
new file mode 100644
index 0000000000000000000000000000000000000000..caf91b2bb952d78356678f5015ab61ed67a6cf86
--- /dev/null
+++ b/src/api/node_group.js
@@ -0,0 +1,61 @@
+import axios from './config'
+
+// 节点分组查询
+export function listGroup(data) {
+  return axios({
+    url: '/nodeGroup/list',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 节点分组新增
+export function addGroup(data) {
+  return axios({
+    url: '/nodeGroup/add',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 节点分组修改
+export function updateGroup(data) {
+  return axios({
+    url: '/nodeGroup/update',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 节点分组删除
+export function deleteGroup(data) {
+  return axios({
+    url: '/nodeGroup/delete',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
+
+// 查询分组节点列表
+export function nodelist(data) {
+  return axios({
+    url: '/nodegroupinfo/nodelist',
+    headers: {
+      'Content-Type': 'application/json; charset=UTF-8'
+    },
+    method: 'post',
+    data
+  })
+}
diff --git a/src/pages/node/nodeGroupManager/index.vue b/src/pages/node/nodeGroupManager/index.vue
index d1f32bae50fe07d8d8e5cf4a812de4e2c0f27f75..2fcd8092369b4c2a63654c9483afc9d067502b59 100644
--- a/src/pages/node/nodeGroupManager/index.vue
+++ b/src/pages/node/nodeGroupManager/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div ref="groupManage" class="groupManage">
     <div ref="filter" class="filter">
+      <a-button type="primary" icon="search" @click="openGroupSearch()">条件搜索</a-button>
+      <a-button type="primary" icon="sync" class="ml10" @click="resetSearch">重置</a-button>
       <a-button type="primary" style="margin-left:10px" icon="plus" @click="openGroupAdd()">新增分组</a-button>
     </div>
     <a-table
@@ -20,6 +22,12 @@
         <span>{{ text }}</span>
       </a-tooltip>
       <template slot="operation" slot-scope="text, record">
+        <a-tooltip title="编辑">
+          <a-button type="link" @click="handleEdit(record)"><a-icon type="edit" /></a-button>
+        </a-tooltip>
+        <a-tooltip title="删除">
+          <a-button type="link" @click="handleDelete(record)"><a-icon type="delete" class="danger" /></a-button>
+        </a-tooltip>
       </template>
     </a-table>
     <!-- 控制节点分组 -->
@@ -44,17 +52,63 @@
         </a-form-model-item>
       </a-form-model>
     </a-modal>
+    <!-- 条件搜索 -->
+    <a-drawer
+      title="条件搜索"
+      placement="right"
+      :mask-closable="false"
+      :width="500"
+      height="100%"
+      :visible="groupSearch"
+      @close="groupSearch = false"
+      @keyup.native.enter="sumbitGroupSearch"
+    >
+      <div>
+        <a-form-model
+          ref="searchForm"
+          :model="listQuery"
+          :wrapper-col="{ span: 20 }"
+          :label-col="{ span: 4 }"
+        >
+          <a-form-model-item label="分组ID" prop="id">
+            <a-input v-model="listQuery.id" placeholder="请输入分组ID,按回车(Enter)查找" />
+          </a-form-model-item>
+          <a-form-model-item label="分组名称" prop="name">
+            <a-input v-model="listQuery.name" placeholder="请输入分组名称,按回车(Enter)查找" />
+          </a-form-model-item>
+        </a-form-model>
+      </div>
+      <div
+        :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: 0,
+          width: '100%',
+          borderTop: '1px solid #377bc9',
+          padding: '10px 16px',
+          background: '#fff',
+          textAlign: 'right',
+          zIndex: 1,
+        }"
+      >
+        <!-- <a-button :style="{ marginRight: '8px' }" type="primary" @click="resetSearch">
+          重置
+        </a-button> -->
+        <a-button :style="{ marginRight: '8px' }" @click="groupSearch = false">
+          取消
+        </a-button>
+        <a-button type="primary" @click="sumbitGroupSearch">
+          确定
+        </a-button>
+      </div>
+    </a-drawer>
   </div>
 </template>
 
 <script>
 import { parseTime } from '@/utils/time'
 import { listGroup, addGroup, updateGroup, deleteGroup } from '@/api/node_group'
-import NodeList from './components/node_list.vue'
 export default {
-  components: {
-    NodeList
-  },
   data() {
     return {
       loading: false,
@@ -173,7 +227,33 @@ export default {
           })
         }
       })
-    }
+    },
+    // 编辑分组
+    handleEdit(record) {
+      this.groupForm.name = record.name
+      this.groupId = record.id
+      this.controlGroupVisible = true
+      this.isGroupAdd = false
+    },
+    // 删除分组
+    handleDelete(record) {
+      this.$confirm({
+        title: '系统提示',
+        content: '确定要删除 ' + record.name + ' 分组吗？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          deleteGroup({
+            id: record.id
+          }).then(res => {
+            if (res.code === 200) {
+              this.listQuery.pageNum = 1
+              this.listGroup()
+            }
+          })
+        }
+      })
+    },
   }
 }
 </script>