From 447d146e7ad5b378b138be9a6618309ab397fddf Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Tue, 29 Oct 2024 17:29:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=B9=E7=BB=84?=
 =?UTF-8?q?=E5=86=85=E8=8A=82=E7=82=B9=E7=9A=84=E6=93=8D=E4=BD=9C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/node/components/all_node.vue    | 133 ++++++++++++++++++++++
 src/pages/node/components/node_list.vue   |   2 +
 src/pages/node/nodeGroupManager/index.vue |  21 ++++
 3 files changed, 156 insertions(+)
 create mode 100644 src/pages/node/components/all_node.vue

diff --git a/src/pages/node/components/all_node.vue b/src/pages/node/components/all_node.vue
new file mode 100644
index 0000000..aeb40ed
--- /dev/null
+++ b/src/pages/node/components/all_node.vue
@@ -0,0 +1,133 @@
+<template>
+  <div style="max-height:500px;overflow:auto">
+    <a-table
+      ref="allNodeTable"
+      :loading="loading"
+      :columns="columns"
+      :data-source="list"
+      :pagination="false"
+      row-key="id"
+      bordered
+    >
+      <a-tooltip slot="name" slot-scope="text" placement="topLeft" :title="text">
+        <span>{{ text }}</span>
+      </a-tooltip>
+      <a-tooltip slot="createTime" slot-scope="text" placement="topLeft" :title="text">
+        <span>{{ text }}</span>
+      </a-tooltip>
+      <a-tooltip slot="group" slot-scope="text" placement="topLeft" :title="text">
+        <span v-if="text">{{ text }}</span>
+        <span v-else style="color:gray">暂无分组</span>
+      </a-tooltip>
+      <template slot="operation" slot-scope="text, record">
+        <a-tooltip title="添加节点">
+          <a-button type="link" :disabled="record.disabled" @click="addnode(record)"><a-icon type="plus-circle" /></a-button>
+        </a-tooltip>
+
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script>
+import { getNodeList } from '@/api/node'
+import { addnode } from '@/api/node_group'
+export default {
+  props: {
+    parentList: {
+      type: Array,
+      default: () => []
+    },
+    parentMsg: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      columns: [
+        { title: '节点 ID', dataIndex: 'id', key: 'id', width: 100, ellipsis: true },
+        { title: '节点名称', dataIndex: 'name', key: 'name', width: 200, ellipsis: true, scopedSlots: { customRender: 'name' }},
+        { title: '节点地址', dataIndex: 'url', key: 'url', width: 150, ellipsis: true },
+        { title: '节点所属分组', dataIndex: 'group', key: 'group', ellipsis: true, scopedSlots: { customRender: 'group' }},
+        { title: '操作', dataIndex: 'operation', key: 'operation', width: 80, scopedSlots: { customRender: 'operation' }, align: 'center' }
+      ]
+    }
+  },
+  watch: {
+    'parentList.length': {
+      handler(val) {
+        this.banedNode()
+      }
+    }
+  },
+  mounted() {
+    this.loadData()
+  },
+  methods: {
+    // 加载数据
+    loadData() {
+      this.list = []
+      this.loading = true
+      getNodeList().then((res) => {
+        if (res.code === 200) {
+          const nodeList = res.data || []
+
+          this.list = nodeList.filter((element) => {
+            if (element.checkStatus) return element
+          })
+          this.banedNode()
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    // 遍历数据，对重复节点添加进行限制
+    banedNode() {
+      this.list.forEach(element => {
+        // 有分组节点无法再分组
+        if (element.group)element.disabled = true
+        this.parentList.forEach(param => {
+          if (element.id === param.nodeId)element.disabled = true
+        })
+      })
+      this.list = [...this.list]
+    },
+    // 添加节点入组
+    addnode(record) {
+      this.$confirm({
+        title: '系统提示',
+        content: '确定要添加 ' + record.name + ' 入组吗？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          addnode({
+            nodeId: record.id,
+            groupId: this.parentMsg.id
+          }).then(res => {
+            if (res.code === 200) {
+              this.$emit('nodelist')
+              this.list.forEach(element => {
+                // 手动置灰
+                if (element.id === record.id) {
+                  element.disabled = true
+                  element.group = this.parentMsg.name
+                }
+              })
+              // this.loadData()
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/pages/node/components/node_list.vue b/src/pages/node/components/node_list.vue
index 46617d8..eb5e59e 100644
--- a/src/pages/node/components/node_list.vue
+++ b/src/pages/node/components/node_list.vue
@@ -34,6 +34,7 @@
       title="待添加节点"
       :width="800"
     >
+      <AllNode v-if="penddingAddVisble" :parent-list="list" :parent-msg="parentMsg" @nodelist="nodelist" />
       <template slot="footer">
         <a-button type="primary" @click="penddingAddVisble = false">
           关闭
@@ -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 5b87d35..9461764 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
     }
   }
 }
-- 
Gitee


From 51dc9f42084ca054a2cbf7e2847cae0cbb817e02 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Wed, 30 Oct 2024 16:58:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{ => list}/components/node_operation.vue  |   0
 src/pages/node/{list.vue => list/index.vue}   | 840 +++++++++++-------
 .../{components => list/node-layout}/.keep    |   0
 .../node-layout/components}/.keep             |   0
 .../node-layout/components/lock-status.vue    |   0
 .../node/{ => list}/node-layout/index.vue     |   0
 .../node-layout/package}/.keep                |   0
 .../package/Installable_package_list.vue      |   0
 .../node-layout/package/package-list.vue      |   0
 .../package/package_batch_install.vue         |   0
 .../node-layout/package/package_task_list.vue |   0
 .../package/updateable_package_list.vue       |   0
 .../package => list/node-layout/source}/.keep |   0
 .../node-layout/source/source_list.vue        |   0
 .../node-layout/source/source_setting.vue     |   0
 .../node/{ => list}/node-layout/welcome.vue   |   0
 src/pages/node/node-layout/source/.keep       |   0
 .../components/all_node.vue                   |   0
 .../components/node_list.vue                  |   0
 19 files changed, 517 insertions(+), 323 deletions(-)
 rename src/pages/node/{ => list}/components/node_operation.vue (100%)
 rename src/pages/node/{list.vue => list/index.vue} (48%)
 rename src/pages/node/{components => list/node-layout}/.keep (100%)
 rename src/pages/node/{node-layout => list/node-layout/components}/.keep (100%)
 rename src/pages/node/{ => list}/node-layout/components/lock-status.vue (100%)
 rename src/pages/node/{ => list}/node-layout/index.vue (100%)
 rename src/pages/node/{node-layout/components => list/node-layout/package}/.keep (100%)
 rename src/pages/node/{ => list}/node-layout/package/Installable_package_list.vue (100%)
 rename src/pages/node/{ => list}/node-layout/package/package-list.vue (100%)
 rename src/pages/node/{ => list}/node-layout/package/package_batch_install.vue (100%)
 rename src/pages/node/{ => list}/node-layout/package/package_task_list.vue (100%)
 rename src/pages/node/{ => list}/node-layout/package/updateable_package_list.vue (100%)
 rename src/pages/node/{node-layout/package => list/node-layout/source}/.keep (100%)
 rename src/pages/node/{ => list}/node-layout/source/source_list.vue (100%)
 rename src/pages/node/{ => list}/node-layout/source/source_setting.vue (100%)
 rename src/pages/node/{ => list}/node-layout/welcome.vue (100%)
 delete mode 100644 src/pages/node/node-layout/source/.keep
 rename src/pages/node/{ => nodeGroupManager}/components/all_node.vue (100%)
 rename src/pages/node/{ => nodeGroupManager}/components/node_list.vue (100%)

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 5c4d7e3..0ad4fcf 100644
--- a/src/pages/node/list.vue
+++ b/src/pages/node/list/index.vue
@@ -1,323 +1,517 @@
-<template>
-  <div>
-    <a-button type="primary" icon="plus" @click="handleAdd">节点注册</a-button>
-    <a-table
-      :loading="loading"
-      :columns="columns"
-      :data-source="list"
-      :style="{ 'max-height': tableHeight + 'px' }"
-      :scroll="{x:900, y: tableHeight}"
-      row-key="id"
-      :pagination="false"
-      bordered
-    >
-      <a-tooltip slot="name" slot-scope="text" placement="topLeft" :title="text">
-        <span>{{ text }}</span>
-      </a-tooltip>
-      <template slot="status" slot-scope="text, record">
-        <a-icon v-if="text===undefined" type="loading" />
-        <span v-if="record.checkStatus === false" class="danger" style="cursor:pointer;border-bottom:1px solid" @click="registerNode(record)">
-          <span><a-icon :style="{paddingRight: "3px"}" type="api" />未注册</span>
-        </span>
-        <span v-else>
-          <span v-if="text == 1"><a-icon class="success" :style="{ paddingRight: '3px' }" type="check" /> 在线</span>
-          <span v-if="text == 0"><a-icon class="danger" :style="{ paddingRight: '3px' }" type="close" /> 离线</span>
-        </span>
-      </template>
-      <a-tooltip slot="system" slot-scope="text" placement="topLeft" :title="text">
-        <a-icon v-if="text===undefined" type="loading" />
-        <span>{{ text }}</span>
-      </a-tooltip>
-      <a-tooltip slot="kernel" slot-scope="text" placement="topLeft" :title="text">
-        <a-icon v-if="text===undefined" type="loading" />
-        <span>{{ text }}</span>
-      </a-tooltip>
-      <template slot="operation" slot-scope="text, record">
-        <a-tooltip title="节点管理">
-          <a-button :disabled="record.status === 0||record.checkStatus === false" type="link" @click="handleNode(record)"><a-icon type="desktop" /></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>
-    <a-modal
-      v-model="editNodeVisible"
-      :title="temp.title"
-      :mask-closable="false"
-      :destroy-on-close="true"
-      width="700px"
-      @keyup.native.enter="handleEditNodeOk"
-      @ok="handleEditNodeOk"
-    >
-      <node-operation ref="operationForm" :temp="temp" />
-    </a-modal>
-    <a-drawer class="nodeManager" :title="drawerTitle" placement="right" width="100%" :visible="drawerVisible" @close="onClose">
-      <node-layout v-if="drawerVisible" :node="temp" />
-    </a-drawer>
-  </div>
-</template>
-
-<script>
-import { getNodeList, deleteNode, getNodeStatus, getOsVersion, editNode } from '@/api/node'
-import { isIpAndPort } from '@/utils/validate'
-import NodeOperation from './components/node_operation.vue'
-import NodeLayout from './node-layout'
-
-export default {
-  components: {
-    NodeOperation,
-    NodeLayout
-  },
-  data() {
-    return {
-      loading: false,
-      listQuery: {},
-      tableHeight: '70vh',
-      list: [],
-      temp: {
-        formData: {}
-      },
-      drawerTitle: '',
-      columns: [
-        { title: '节点 ID', dataIndex: 'id', key: 'id', width: 100, ellipsis: true },
-        { title: '节点名称', dataIndex: 'name', key: 'name', ellipsis: true, scopedSlots: { customRender: 'name' }},
-        { title: '节点地址', dataIndex: 'url', key: 'url', width: 150, ellipsis: true },
-        { title: '状态', dataIndex: 'status', key: 'status', width: 100, ellipsis: true, scopedSlots: { customRender: 'status' }},
-        { title: '系统版本', dataIndex: 'system', key: 'system', ellipsis: true, scopedSlots: { customRender: 'system' }},
-        { title: '内核版本', dataIndex: 'kernel', key: 'kernel', ellipsis: true, scopedSlots: { customRender: 'kernel' }},
-        { title: '超时时间', dataIndex: 'timeOut', key: 'timeOut', width: 100, ellipsis: true },
-        { title: '操作', dataIndex: 'operation', key: 'operation', scopedSlots: { customRender: 'operation' }, width: 200, align: 'center' }
-      ],
-      timer: null,
-      editNodeVisible: false,
-      drawerVisible: false    
-    }
-  },
-  watch: {
-    list: {
-      handler(val) {
-        if (val.length && this.drawerVisible) {
-          const nodeId = this.$route.query.nodeId
-          const node = val.find(item => item.id === nodeId)
-          if (node.status === 0) {
-            this.onClose()
-            this.$notification.warning({ message: `节点${node.name}(${node.url})已离线，节点管理抽屉关闭` })
-          }
-        }
-      },
-      deep: true
-    }
-  },
-  created() {
-    // 计算表格高度
-    this.$nextTick(() => {
-      this.tableHeight = window.innerHeight - this.$refs['filter'].clientHeight - 135
-    })
-    this.loadData()
-  },
-  beforeDestroy() {
-    clearInterval(this.timer)
-  },
-  methods: {
-    loadData() {
-      if (this.timer != null) clearInterval(this.timer)
-      this.list = []
-      this.loading = true
-      getNodeList(this.listQuery).then((res) => {
-        if (res.code === 200) {
-          this.list = res.data || []
-          this.getAllNodeStatus()
-          this.timer = setInterval(this.getAllNodeStatus, 60 * 1000)
-          let nodeId = this.$route.query.nodeId
-          this.list.forEach((item) => {
-            if (nodeId === item.id) {
-              this.handleNode(item)
-            }
-          })
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    getAllNodeStatus() {
-      let promiseList = []
-      this.list.forEach(item => {
-        const p = getNodeStatus(item.id).then(res => {
-          if (res.code === 200) {
-            item['status'] = 1
-            this.list = [...this.list]
-            const query = JSON.parse(JSON.stringify(item))
-            query.type = ''
-            editNode(query)
-            getOsVersion({ nodeId: item.id }).then(res => {
-              if (res.code === 200) {
-                item.system = res.data.system
-                item.kernel = res.data.kernel
-                this.list = [...this.list]
-              } else {
-                getOsVersion({ nodeId: item.id }).then(res => {
-                  if (res.code === 200) {
-                    item.system = res.data.system
-                    item.kernel = res.data.kernel
-                    this.list = [...this.list]
-                  } else {
-                    getOsVersion({ nodeId: item.id }).then(res => {
-                      if (res.code === 200) {
-                        item.system = res.data.system
-                        item.kernel = res.data.kernel
-                      } else {
-                        item.system = '--'
-                        item.kernel = '--'
-                      }
-                      this.list = [...this.list]
-                    })
-                  }
-                })
-              }
-            }).catch(() => {
-              item.system = '--'
-              item.kernel = '--'
-              this.list = [...this.list]
-            })
-          } else {
-            item['status'] = 0
-            item.system = '--'
-            item.kernel = '--'
-          }
-        }).catch(() => {
-          item['status'] = 0
-          item.system = '--'
-          item.kernel = '--'
-        })
-        promiseList.push(p)
-      })
-      Promise.all(promiseList).then(() => {
-        this.list = [...this.list]
-      })
-    },
-    handleDelete(record) {
-      this.$confirm({
-        title: '系统提示',
-        content: '真的要删除节点么？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk: () => {
-          // 删除
-          deleteNode(record.id).then((res) => {
-            if (res.code === 200) {
-              this.$notification.success({
-                message: res.msg,
-                duration: 2
-              })
-              this.loadData()
-            }
-          })
-        }
-      })
-    },
-    // 自定义检验url
-    checkUrl(rule, value, callback) {
-      if (!isIpAndPort(value)) {
-        return callback(new Error('请填写正确的ip地址+端口号'))
-      }
-      callback()
-    },
-    handleAdd() {
-      this.temp.formData = {}
-      this.temp = {
-        type: 'add',
-        title: '注册节点',
-        formData: {
-          cycle: 0,
-          protocol: 'http',
-          openStatus: true,
-          timeOut: 0,
-          loginName: 'mpmsProxy'
-        }
-      }
-      this.editNodeVisible = true
-    },
-    handleEdit(record) {
-      this.temp = {
-        type: 'edit',
-        title: '编辑节点',
-        formData: {
-          ...record
-        }
-      }
-      this.editNodeVisible = true
-    },
-    handleEditNodeOk() {
-      this.$refs['operationForm'].handleSubmit().then(() => {
-        // 节点信息处理
-        this.editNodeVisible = false
-        this.loadData()
-      })
-    },
-    handleNode(record) {
-      setNodeLocalIp({ nodeId: record.id, nodeIp: record.url.split(':')[0] }).then(() => {
-        this.temp = Object.assign(record)
-        this.drawerTitle = `${this.temp.name} (${this.temp.url})`
-        this.drawerVisible = true
-        let nodeId = this.$route.query.nodeId
-        if (nodeId !== record.id) {
-          this.$router.push({
-            query: { nodeId: record.id }
-          })
-        }
-      })
-    },
-    onClose() {
-      this.drawerVisible = false
-      this.$router.push({
-        query: { nodeId: null }
-      })
-    },
-    // 节点注册
-    registerNode(record) {
-      this.$confirm({
-        title: '系统提示',
-        content: '确定要注册 ' + record.name + ' 节点么？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk: () => {
-          // 注册
-          let query = JSON.parse(JSON.stringify(record))
-          query.checkStatus = true
-          query.type = 'edit'
-          editNode(query).then((res) => {
-            if (res.code === 200) {
-              this.$notification.success({
-                message: res.msg,
-                duration: 2
-              })
-              this.loadData()
-            }
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.filter {
-  margin-bottom: 10px;
-}
-
-.ant-btn {
-  margin-right: 10px;
-}
-
-.filter-item {
-  width: 150px;
-  margin-right: 10px;
-}
-
-.btn-add {
-  margin-left: 10px;
-  margin-right: 0;
-}
-</style>
+<template>
+  <div>
+    <div ref="filter" class="filter">
+      <a-button type="primary" icon="search" @click="openSearch">条件搜索</a-button>
+      <a-button type="primary" icon="sync" @click="resetSearch">重置</a-button>
+      <span style="float: right;line-height: 32px;">软件包总数： {{ allPkgCount }}</span>
+    </div>
+    <!-- 节点表格数据 -->
+    <a-table
+      :loading="loading"
+      :columns="columns"
+      :data-source="list"
+      :pagination="pagination"
+      :style="{ 'max-height': tableHeight + 'px' }"
+      :scroll="{x:900, y: tableHeight}"
+      row-key="id"
+      bordered
+      @change="change"
+    >
+      <a-tooltip slot="name" slot-scope="text" placement="topLeft" :title="text">
+        <span>{{ text }}</span>
+      </a-tooltip>
+      <template slot="status" slot-scope="text,record">
+        <a-icon v-if="text===undefined" type="loading" />
+        <span v-if="record.checkStatus === false" class="danger" style="cursor:pointer;border-bottom:1px solid" @click="registerNode(record)">
+          <span> <a-icon :style="{ paddingRight: '3px' }" type="api" /> 未注册</span>
+        </span>
+        <span v-else>
+          <span v-if="text == 1"><a-icon class="success" :style="{ paddingRight: '3px' }" type="check" /> 在线</span>
+          <span v-if="text == 0"><a-icon class="danger" :style="{ paddingRight: '3px' }" type="close" /> 离线</span>
+        </span>
+      </template>
+      <a-tooltip slot="system" slot-scope="text" placement="topLeft" :title="text">
+        <!-- <a-icon v-if="text===undefined" type="loading" /> -->
+        <span>{{ text || '--' }}</span>
+      </a-tooltip>
+      <a-tooltip slot="kernel" slot-scope="text" placement="topLeft" :title="text">
+        <!-- <a-icon v-if="text===undefined" type="loading" /> -->
+        <span>{{ text || '--' }}</span>
+      </a-tooltip>
+      <a-tooltip slot="linxSerial" slot-scope="text" placement="topLeft" :title="text">
+        <span v-if="!text">--</span>
+        <span v-else>{{ text }}</span>
+      </a-tooltip>
+      <a-tooltip slot="linxType" slot-scope="text, record" placement="topLeft">
+        <a-tooltip v-if="record.snType ==='time'||record.snType ==='mac'">
+          <template slot="title">
+            <span v-if="record.snType ==='time'">
+              有效期:
+            </span>
+            <span v-else-if="record.snType ==='mac'">
+              网卡MAC:
+            </span>
+            <span>
+              {{ record.snText }}
+            </span>
+          </template>
+
+          <a-tag v-if="record.snType ==='time'" color="blue">
+            时间序列号
+          </a-tag>
+          <a-tag v-else-if="record.snType ==='mac'" color="cyan">
+            永久序列号
+          </a-tag>
+          <span v-else>
+            --
+          </span>
+        </a-tooltip>
+        <span v-else>
+          --
+        </span>
+      </a-tooltip>
+      <template slot="operation" slot-scope="text, record">
+        <a-tooltip title="节点管理">
+          <a-button :disabled="record.status === 0||record.checkStatus === false" type="link" @click="handleNode(record)"><a-icon type="desktop" /></a-button>
+        </a-tooltip>
+        <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>
+    <!-- 编辑区 -->
+    <a-modal
+      v-model="editNodeVisible"
+      :title="temp.title"
+      :mask-closable="false"
+      :destroy-on-close="true"
+      width="700px"
+      @keyup.native.enter="handleEditNodeOk"
+      @ok="handleEditNodeOk"
+    >
+      <node-operation ref="operationForm" :temp="temp" />
+    </a-modal>
+    <!-- 管理节点 -->
+    <a-drawer
+      class="nodeManager"
+      :title="drawerTitle"
+      placement="right"
+      width="100%"
+      :visible="drawerVisible"
+      :mask-closable="false"
+      @close="onClose"
+    >
+      <!-- 节点管理组件 -->
+      <node-layout v-if="drawerVisible" :node="temp" />
+    </a-drawer>
+    <a-drawer
+      title="条件搜索"
+      placement="right"
+      :mask-closable="false"
+      :width="500"
+      height="100%"
+      :visible="searchVisible"
+      @close="searchVisible = false"
+      @keyup.native.enter="sumbitSearch"
+    >
+      <a-form-model
+        ref="searchForm"
+        :model="listQuery"
+        :wrapper-col="{ span: 20 }"
+        :label-col="{ span: 4 }"
+      >
+        <a-form-model-item label="节点名称" prop="id">
+          <a-input v-model="listQuery.name" allow-clear placeholder="请输入节点名称,按回车(Enter)查找" />
+        </a-form-model-item>
+        <a-form-model-item label="节点IP" prop="id">
+          <a-input v-model="listQuery.url" allow-clear placeholder="请输入节点IP,按回车(Enter)查找" />
+        </a-form-model-item>
+        <a-form-model-item label="节点分组" prop="id">
+          <a-select
+            :value="listQuery.groupId"
+            placeholder="请输入分组名,按回车(Enter)查找"
+            :default-active-first-option="false"
+            :show-arrow="false"
+            :filter-option="false"
+            :not-found-content="null"
+            show-search
+            allow-clear
+            @search="groupSearch"
+            @change="groupChange"
+          >
+            <a-select-option v-for="item in groupList" :key="item.value" :value="item.id">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-model-item>
+      </a-form-model>
+
+      <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' }" @click="searchVisible = false">
+          取消
+        </a-button>
+        <a-button type="primary" @click="sumbitSearch">
+          确定
+        </a-button>
+      </div>
+    </a-drawer>
+  </div>
+</template>
+
+<script>
+import { getNodeListSearch, deleteNode, setNodeLocalIp, getNodeStatus, editNode } from '@/api/node'
+import { getAllPkgCount } from '@/api/node_package'
+import { listGroup } from '@/api/node_group'
+import NodeLayout from './node-layout'
+import NodeOperation from './components/node_operation.vue'
+import { isIpAndPort } from '@/utils/validate'
+import { mapState } from 'vuex'
+export default {
+  components: {
+    NodeLayout,
+    NodeOperation
+  },
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      listQuery: {
+        url: '',
+        name: '',
+        groupId: undefined,
+        pageNum: 1,
+        pageSize: 10
+      },
+      groupList: [],
+      tableHeight: '70vh',
+      list: [],
+      temp: {
+        formData: {}
+      },
+      editNodeVisible: false,
+      drawerVisible: false,
+      drawerTitle: '',
+      columns: [
+        { title: '节点 ID', dataIndex: 'id', key: 'id', width: 100, ellipsis: true },
+        { title: '节点名称', dataIndex: 'name', key: 'name', ellipsis: true, scopedSlots: { customRender: 'name' }},
+        { title: '节点地址', dataIndex: 'url', key: 'url', width: 150, ellipsis: true },
+        { title: '状态', dataIndex: 'status', key: 'status', width: 100, ellipsis: true, scopedSlots: { customRender: 'status' }},
+        { title: '系统版本', dataIndex: 'system', key: 'system', ellipsis: true, scopedSlots: { customRender: 'system' }},
+        { title: '内核版本', dataIndex: 'kernel', key: 'kernel', ellipsis: true, scopedSlots: { customRender: 'kernel' }},
+        { title: '超时时间', dataIndex: 'timeout', key: 'timeout', width: 100, ellipsis: true },
+        { title: '当前序列号', dataIndex: 'linxSerial', key: 'linxSerial', ellipsis: true, scopedSlots: { customRender: 'linxSerial' }},
+        { title: '序列号类型', dataIndex: 'linxType', key: 'linxType', width: 120, ellipsis: true, align: 'center', scopedSlots: { customRender: 'linxType' }},
+        { title: '操作', dataIndex: 'operation', key: 'operation', scopedSlots: { customRender: 'operation' }, width: 200, align: 'center' }
+      ],
+      timer: null,
+      allPkgCount: 0,
+      searchVisible: false
+    }
+  },
+  computed: {
+    pagination() {
+      return {
+        total: this.total,
+        current: this.listQuery.pageNum || 1,
+        pageSize: this.listQuery.pageSize || 10,
+        pageSizeOptions: ['10', '20', '50', '100'],
+        showSizeChanger: true,
+        showTotal: (total) => {
+          return `共 ${total} 条`
+        }
+      }
+    },
+    ...mapState({
+      openNode: state => state.node.openNode,
+      openNodeFlag: state => state.node.openNodeFlag
+    })
+  },
+  watch: {
+    list: {
+      handler(val) {
+        if (val.length && this.drawerVisible) {
+          const nodeId = this.$route.query.nodeId
+          const node = val.find(item => item.id === nodeId)
+          if (node.status === 0) {
+            this.onClose()
+            this.$notification.warning({ message: `节点${node.name}(${node.url})已离线` })
+          }
+        }
+      },
+      deep: true
+    }
+  },
+  created() {
+    // 计算表格高度
+    this.$nextTick(() => {
+      // this.tableHeight = window.innerHeight - this.$refs['filter'].clientHeight - 135
+      this.tableHeight = window.innerHeight - 135
+    })
+    this.loadData()
+
+    // 系统软件包总数
+    getAllPkgCount()
+      .then(res => {
+        this.allPkgCount = res?.data || 0
+      })
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
+  methods: {
+    // 加载数据
+    loadData() {
+      // 刷新节点列表节点状态清除定时器
+      if (this.timer != null) clearInterval(this.timer)
+      this.list = []
+      this.loading = true
+      getNodeListSearch(this.listQuery).then((res) => {
+        if (res.code === 200) {
+          this.list = res.data.list || []
+          this.getAllNodeStatus()
+          // 初次加载或刷新节点列表开启节点状态定时器
+          this.timer = setInterval(this.getAllNodeStatus, 60 * 1000)
+          let nodeId = this.$route.query.nodeId
+          // 展示节点抽屉
+          this.list.forEach((item) => {
+            if (nodeId === item.id) {
+              this.handleNode(item)
+            }
+          })
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    search() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.loadData()
+    },
+    // 分页
+    change(pagination) {
+      this.listQuery.pageNum = pagination.current
+      this.listQuery.pageSize = pagination.pageSize
+      this.loadData()
+    },
+    // 获取取节点分组
+    getNodeGroup(searchName) {
+      listGroup({
+        name: searchName,
+        pageNum: 1,
+        pageSize: 999
+      })
+        .then(res => {
+          this.groupList = res?.data?.list || []
+        })
+        .catch(() => {})
+    },
+    // 分组搜索
+    groupSearch(val) {
+      this.getNodeGroup(val)
+    },
+    groupChange(val) {
+      this.listQuery.groupId = val
+      this.getNodeGroup(val)
+      // this.search()
+    },
+    // 判断当前主机列表中所有主机状态
+    getAllNodeStatus() {
+      let promiseList = []
+      this.list.forEach(item => {
+        const p = getNodeStatus(item.id).then(res => {
+          if (res.code === 200) {
+            // 主机在线
+            item['status'] = 1
+            this.list = [...this.list]
+            // 获取到节点调用一次编辑接口
+            const query = JSON.parse(JSON.stringify(item))
+            query.type = ''
+            editNode(query)
+          } else {
+            item['status'] = 0
+          }
+        }).catch(() => {
+          item['status'] = 0
+        })
+        promiseList.push(p)
+      })
+      Promise.all(promiseList).then(() => {
+        this.list = [...this.list]
+        // 查询标志 是否要打开对应的节点管理页面
+        this.openNodeMange()
+      })
+    },
+    // 添加
+    handleAdd() {
+      // 清空用户上次填写记录
+      this.temp.formData = {}
+      this.temp = {
+        type: 'add',
+        title: '注册节点',
+        formData: {
+          cycle: 0,
+          protocol: 'http',
+          openStatus: true,
+          timeout: 0,
+          loginName: 'mpmsProxy'
+        }
+      }
+      this.editNodeVisible = true
+    },
+    // 修改
+    handleEdit(record) {
+      this.temp = {
+        type: 'edit',
+        title: '编辑节点',
+        formData: {
+          ...record
+        }
+      }
+      this.editNodeVisible = true
+    },
+    // 提交节点数据
+    handleEditNodeOk() {
+      this.$refs['operationForm'].handleSubmit().then(() => {
+        // 节点信息处理
+        this.editNodeVisible = false
+        this.loadData()
+      })
+    },
+    handleDelete(record) {
+      this.$confirm({
+        title: '系统提示',
+        content: '真的要删除节点么？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          // 删除
+          deleteNode(record.id).then((res) => {
+            if (res.code === 200) {
+              this.$notification.success({
+                message: res.msg,
+                duration: 2
+              })
+              this.loadData()
+            }
+          })
+        }
+      })
+    },
+    // 管理节点
+    handleNode(record) {
+      if (!record.status) {
+        this.$notification.warning({ message: `节点${record.name}(${record.url})已离线` })
+        return
+      }
+      setNodeLocalIp({ nodeId: record.id, nodeIp: record.url.split(':')[0] }).then(() => {
+        this.temp = Object.assign(record)
+        this.drawerTitle = record.flag ? `${this.temp.url} (${this.temp.url})` : `${this.temp.name} (${this.temp.url})`
+        this.drawerVisible = true
+        let nodeId = this.$route.query.nodeId
+        if (nodeId !== record.id) {
+          this.$router.push({
+            query: { nodeId: record.id }
+          })
+        }
+      })
+    },
+    // 注册节点
+    registerNode(record) {
+      this.$confirm({
+        title: '系统提示',
+        content: '确定要注册 ' + record.name + ' 节点么？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          // 注册
+          let query = JSON.parse(JSON.stringify(record))
+          query.checkStatus = true
+          query.type = 'edit'
+          editNode(query).then((res) => {
+            if (res.code === 200) {
+              this.$notification.success({
+                message: res.msg,
+                duration: 2
+              })
+              this.loadData()
+            }
+          })
+        }
+      })
+    },
+    // 关闭抽屉层
+    onClose() {
+      this.drawerVisible = false
+      this.$router.push({
+        query: { nodeId: null }
+      })
+    },
+    // 自定义检验url
+    checkUrl(rule, value, callback) {
+      if (!isIpAndPort(value)) {
+        return callback(new Error('请填写正确的ip地址+端口号'))
+      }
+      callback()
+    },
+    openNodeMange() {
+      if (this.openNodeFlag) {
+        let openNodeInfo = {}
+        this.list.forEach(item => {
+          // eslint-disable-next-line eqeqeq
+          if (item.id == this.openNode.id) { openNodeInfo = item }
+        })
+        openNodeInfo && this.handleNode(openNodeInfo)
+        this.$store.commit('CLEAR_OPEN_NODE')
+      }
+    },
+    openSearch() {
+      this.searchVisible = true
+      this.getNodeGroup('')
+    },
+    sumbitSearch() {
+      this.search()
+      this.searchVisible = false
+    },
+    resetSearch() {
+      this.listQuery.name = ''
+      this.listQuery.url = ''
+      this.listQuery.groupId = ''
+      this.search()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.filter {
+  margin-bottom: 10px;
+}
+
+.ant-btn {
+  margin-right: 10px;
+}
+
+.filter-item {
+  width: 150px;
+  margin-right: 10px;
+}
+
+.btn-add {
+  margin-left: 10px;
+  margin-right: 0;
+}
+</style>
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 e69de29..0000000
diff --git a/src/pages/node/components/all_node.vue b/src/pages/node/nodeGroupManager/components/all_node.vue
similarity index 100%
rename from src/pages/node/components/all_node.vue
rename to src/pages/node/nodeGroupManager/components/all_node.vue
diff --git a/src/pages/node/components/node_list.vue b/src/pages/node/nodeGroupManager/components/node_list.vue
similarity index 100%
rename from src/pages/node/components/node_list.vue
rename to src/pages/node/nodeGroupManager/components/node_list.vue
-- 
Gitee


From 426386cd8b57671244c7a1191d77fcaaf475aaf5 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Wed, 30 Oct 2024 17:01:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/node.js | 272 +++++++++++++++++++++++++-----------------------
 1 file changed, 144 insertions(+), 128 deletions(-)

diff --git a/src/api/node.js b/src/api/node.js
index 75aa293..4811629 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
+  })
+}
-- 
Gitee