diff --git a/src/api/node.js b/src/api/node.js
index 75aa2935f2ffac1e19245b9763c501d551d49f26..4811629387107592a55c3109be3aae4b5f7ed244 100644
--- a/src/api/node.js
+++ b/src/api/node.js
@@ -1,128 +1,144 @@
-import axios from '@/utils/request'
-
-export function getNodeList(params) {
- return axios({
- url: '/node/list_data.json',
- method: 'get',
- params: params
- })
-}
-
-export function getNodeStatus(nodeId) {
- return axios({
- url: '/node/node_status',
- method: 'post',
- data: { nodeId },
- headers: {
- tip: 'no',
- loading: 'no'
- }
- })
-}
-
-export function editNode(params) {
- const data = {
- id: params.id,
- name: params.name,
- protocol: params.protocol,
- url: params.url,
- timeOut: params.timeOut,
- cycle: params.cycle,
- openStatus: params.openStatus,
- loginName: params.loginName,
- loginPwd: params.loginPwd,
- type: params.type,
- proxyPort: params.proxyPort,
- checkStatus: params.checkStatus
- }
- return axios({
- url: '/node/save.json',
- method: 'post',
- data
- })
-}
-
-export function deleteNode(id) {
- return axios({
- url: '/node/del.json',
- method: 'post',
- data: { id }
- })
-}
-
-export function getNodeTop(data) {
- return axios({
- url: '/node/getTop',
- method: 'post',
- data: data,
- headers: {
- loading: 'no'
- }
- })
-}
-
-export function getProcessList(nodeId) {
- return axios({
- url: '/node/processList',
- method: 'post',
- data: { nodeId },
- headers: {
- loading: 'no',
- tip: 'no'
- }
- })
-}
-
-export function killPid(params) {
- return axios({
- url: '/node/kill.json',
- method: 'post',
- data: params
- })
-}
-export function setNodeLocalIp(data) {
- return axios({
- url: 'node/setNodeLocalIp',
- method: 'post',
- data,
- headers: {
- tip: 'no'
- }
- })
-}
-
-export function getTopHistory(data) {
- return axios({
- url: 'node/getTopHistory',
- method: 'post',
- data
- })
-}
-
-export function getOsVersion(data) {
- return axios({
- url: '/node/getOsVersion',
- method: 'post',
- data,
- headers: {
- tip: 'no'
- }
- })
-}
-
-export function getAptStatus(data) {
- return axios({
- url: '/node/sshGetAptStatus',
- method: 'post',
- data
- })
-}
-
-export function unLockApt(data) {
- return axios({
- url: '/node/sshUnLockApt',
- method: 'post',
- data
- })
-}
-
+import axios from './config'
+
+// node 列表
+export function getNodeList(params) {
+ return axios({
+ url: '/node/list_data.json',
+ method: 'get',
+ params: params
+ })
+}
+
+// node 状态
+export function getNodeStatus(nodeId) {
+ return axios({
+ url: '/node/node_status',
+ method: 'post',
+ data: { nodeId },
+ headers: {
+ tip: 'no',
+ loading: 'no'
+ }
+ })
+}
+
+// 编辑节点
+export function editNode(params) {
+ const data = {
+ id: params.id,
+ name: params.name,
+ protocol: params.protocol,
+ url: params.url,
+ timeout: params.timeout,
+ cycle: params.cycle,
+ openStatus: params.openStatus,
+ loginName: params.loginName,
+ loginPwd: params.loginPwd,
+ type: params.type,
+ proxyPort: params.proxyPort,
+ checkStatus: params.checkStatus,
+ status: params.status,
+ linxSerial: params.linxSerial || null,
+ snType: params.snType || null,
+ snText: params.snText || null,
+ system: params.system,
+ kernel: params.kernel
+ }
+ return axios({
+ url: '/node/save.json',
+ method: 'post',
+ data
+ })
+}
+
+// 删除 node
+export function deleteNode(id) {
+ return axios({
+ url: '/node/del.json',
+ method: 'post',
+ data: { id }
+ })
+}
+
+// 节点 top 命令
+export function getNodeTop(data) {
+ return axios({
+ url: '/node/getTop',
+ method: 'post',
+ data: data,
+ headers: {
+ loading: 'no'
+ }
+ })
+}
+
+// 获取进程列表
+export function getProcessList(nodeId) {
+ return axios({
+ url: '/node/processList',
+ method: 'post',
+ data: { nodeId },
+ headers: {
+ loading: 'no',
+ tip: 'no'
+ }
+ })
+}
+
+// 杀进程
+export function killPid(params) {
+ return axios({
+ url: '/node/kill.json',
+ method: 'post',
+ data: params
+ })
+}
+export function setNodeLocalIp(data) {
+ return axios({
+ url: 'node/setNodeLocalIp',
+ method: 'post',
+ data,
+ headers: {
+ tip: 'no'
+ }
+ })
+}
+
+// 获取历史监控数据
+export function getTopHistory(data) {
+ return axios({
+ url: 'node/getTopHistory',
+ method: 'post',
+ data
+ })
+}
+
+// 获取apt锁状态
+export function getAptStatus(data) {
+ return axios({
+ url: '/node/sshGetAptStatus',
+ method: 'post',
+ data
+ })
+}
+
+// apt解锁
+export function unLockApt(data) {
+ return axios({
+ url: '/node/sshUnLockApt',
+ method: 'post',
+ data
+ })
+}
+
+// 节点列表 包含搜索
+export function getNodeListSearch(data) {
+ return axios({
+ url: '/node/search',
+ headers: {
+ 'Content-Type': 'application/json; charset=UTF-8'
+ },
+ method: 'post',
+ data
+ })
+}
diff --git a/src/pages/node/components/node_operation.vue b/src/pages/node/list/components/node_operation.vue
similarity index 100%
rename from src/pages/node/components/node_operation.vue
rename to src/pages/node/list/components/node_operation.vue
diff --git a/src/pages/node/list.vue b/src/pages/node/list/index.vue
similarity index 48%
rename from src/pages/node/list.vue
rename to src/pages/node/list/index.vue
index 5c4d7e34cdcd88a5492c8456796a7727d537d7dc..0ad4fcfa9764d95b4ae9636d0a179b3d902168da 100644
--- a/src/pages/node/list.vue
+++ b/src/pages/node/list/index.vue
@@ -1,323 +1,517 @@
-
-
-
节点注册
-
-
- {{ text }}
-
-
-
-
- 未注册
-
-
- 在线
- 离线
-
-
-
-
- {{ text }}
-
-
-
- {{ text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
条件搜索
+
重置
+
软件包总数: {{ allPkgCount }}
+
+
+
+
+ {{ text }}
+
+
+
+
+ 未注册
+
+
+ 在线
+ 离线
+
+
+
+
+ {{ text || '--' }}
+
+
+
+ {{ text || '--' }}
+
+
+ --
+ {{ text }}
+
+
+
+
+
+ 有效期:
+
+
+ 网卡MAC:
+
+
+ {{ record.snText }}
+
+
+
+
+ 时间序列号
+
+
+ 永久序列号
+
+
+ --
+
+
+
+ --
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/node/components/.keep b/src/pages/node/list/node-layout/.keep
similarity index 100%
rename from src/pages/node/components/.keep
rename to src/pages/node/list/node-layout/.keep
diff --git a/src/pages/node/node-layout/.keep b/src/pages/node/list/node-layout/components/.keep
similarity index 100%
rename from src/pages/node/node-layout/.keep
rename to src/pages/node/list/node-layout/components/.keep
diff --git a/src/pages/node/node-layout/components/lock-status.vue b/src/pages/node/list/node-layout/components/lock-status.vue
similarity index 100%
rename from src/pages/node/node-layout/components/lock-status.vue
rename to src/pages/node/list/node-layout/components/lock-status.vue
diff --git a/src/pages/node/node-layout/index.vue b/src/pages/node/list/node-layout/index.vue
similarity index 100%
rename from src/pages/node/node-layout/index.vue
rename to src/pages/node/list/node-layout/index.vue
diff --git a/src/pages/node/node-layout/components/.keep b/src/pages/node/list/node-layout/package/.keep
similarity index 100%
rename from src/pages/node/node-layout/components/.keep
rename to src/pages/node/list/node-layout/package/.keep
diff --git a/src/pages/node/node-layout/package/Installable_package_list.vue b/src/pages/node/list/node-layout/package/Installable_package_list.vue
similarity index 100%
rename from src/pages/node/node-layout/package/Installable_package_list.vue
rename to src/pages/node/list/node-layout/package/Installable_package_list.vue
diff --git a/src/pages/node/node-layout/package/package-list.vue b/src/pages/node/list/node-layout/package/package-list.vue
similarity index 100%
rename from src/pages/node/node-layout/package/package-list.vue
rename to src/pages/node/list/node-layout/package/package-list.vue
diff --git a/src/pages/node/node-layout/package/package_batch_install.vue b/src/pages/node/list/node-layout/package/package_batch_install.vue
similarity index 100%
rename from src/pages/node/node-layout/package/package_batch_install.vue
rename to src/pages/node/list/node-layout/package/package_batch_install.vue
diff --git a/src/pages/node/node-layout/package/package_task_list.vue b/src/pages/node/list/node-layout/package/package_task_list.vue
similarity index 100%
rename from src/pages/node/node-layout/package/package_task_list.vue
rename to src/pages/node/list/node-layout/package/package_task_list.vue
diff --git a/src/pages/node/node-layout/package/updateable_package_list.vue b/src/pages/node/list/node-layout/package/updateable_package_list.vue
similarity index 100%
rename from src/pages/node/node-layout/package/updateable_package_list.vue
rename to src/pages/node/list/node-layout/package/updateable_package_list.vue
diff --git a/src/pages/node/node-layout/package/.keep b/src/pages/node/list/node-layout/source/.keep
similarity index 100%
rename from src/pages/node/node-layout/package/.keep
rename to src/pages/node/list/node-layout/source/.keep
diff --git a/src/pages/node/node-layout/source/source_list.vue b/src/pages/node/list/node-layout/source/source_list.vue
similarity index 100%
rename from src/pages/node/node-layout/source/source_list.vue
rename to src/pages/node/list/node-layout/source/source_list.vue
diff --git a/src/pages/node/node-layout/source/source_setting.vue b/src/pages/node/list/node-layout/source/source_setting.vue
similarity index 100%
rename from src/pages/node/node-layout/source/source_setting.vue
rename to src/pages/node/list/node-layout/source/source_setting.vue
diff --git a/src/pages/node/node-layout/welcome.vue b/src/pages/node/list/node-layout/welcome.vue
similarity index 100%
rename from src/pages/node/node-layout/welcome.vue
rename to src/pages/node/list/node-layout/welcome.vue
diff --git a/src/pages/node/node-layout/source/.keep b/src/pages/node/node-layout/source/.keep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/pages/node/nodeGroupManager/components/all_node.vue b/src/pages/node/nodeGroupManager/components/all_node.vue
new file mode 100644
index 0000000000000000000000000000000000000000..aeb40edee3ec8fbc76770a965420b0fef8c9bd01
--- /dev/null
+++ b/src/pages/node/nodeGroupManager/components/all_node.vue
@@ -0,0 +1,133 @@
+
+
+
+
+ {{ text }}
+
+
+ {{ text }}
+
+
+ {{ text }}
+ 暂无分组
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/node/components/node_list.vue b/src/pages/node/nodeGroupManager/components/node_list.vue
similarity index 98%
rename from src/pages/node/components/node_list.vue
rename to src/pages/node/nodeGroupManager/components/node_list.vue
index 46617d80991c4c6a14906f444bf86c50f8c0196c..eb5e59e985cc212c3fb56cb5ad77a9aa3fda2532 100644
--- a/src/pages/node/components/node_list.vue
+++ b/src/pages/node/nodeGroupManager/components/node_list.vue
@@ -34,6 +34,7 @@
title="待添加节点"
:width="800"
>
+
关闭
@@ -57,6 +58,7 @@ import { getNodeStatus, setNodeLocalIp, getNodeList } from '@/api/node'
import AllNode from './all_node.vue'
export default {
components: {
+ AllNode,
NodeLayout
},
props: {
diff --git a/src/pages/node/nodeGroupManager/index.vue b/src/pages/node/nodeGroupManager/index.vue
index 5b87d35620c229fc85832b9ae81471e0a0be312c..9461764b07f7565dc4ef66b5deb4d8377c293ed5 100644
--- a/src/pages/node/nodeGroupManager/index.vue
+++ b/src/pages/node/nodeGroupManager/index.vue
@@ -280,6 +280,27 @@ export default {
},
closeShowNodeList() {
this.nodelistVisible = false
+ },
+ // 打开条件搜索框
+ openGroupSearch() {
+ this.groupSearch = true
+ },
+ // 条件搜索
+ sumbitGroupSearch() {
+ this.listQuery.pageNum = 1
+ this.listGroup()
+ this.groupSearch = false
+ },
+ // 重置
+ resetSearch() {
+ this.listQuery = {
+ pageNum: 1,
+ pageSize: 10,
+ id: '',
+ name: ''
+ }
+ this.listGroup()
+ this.groupSearch = false
}
}
}