From 66accbd61f3a94c2373ffe0fa3a8ce68f545ff5e Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 31 Oct 2024 16:58:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8E=E4=B8=8B=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../script/command/components/commandform.vue |  82 +++++++++++++
 src/pages/script/command/index.vue            | 114 ++++++++++++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 src/pages/script/command/components/commandform.vue

diff --git a/src/pages/script/command/components/commandform.vue b/src/pages/script/command/components/commandform.vue
new file mode 100644
index 0000000..3fc49b1
--- /dev/null
+++ b/src/pages/script/command/components/commandform.vue
@@ -0,0 +1,82 @@
+<template>
+  <!-- 新增 或 编辑 -->
+  <div>
+    <a-form-model
+      ref="form"
+      :model="form"
+      :rules="rules"
+      :label-col="{ span: 4 }"
+      :wrapper-col="{ span: 20 }"
+    >
+
+      <a-form-model-item ref="name" label="命令名称" prop="name">
+        <a-input v-model="form.name" />
+      </a-form-model-item>
+
+      <a-form-model-item ref="command" label="执行命令" prop="command">
+        <a-input v-model="form.command" />
+      </a-form-model-item>
+    </a-form-model>
+  </div>
+</template>
+
+<script>
+import { addCommandApi } from '@/api/script'
+
+export default {
+  data() {
+    return {
+      form: {
+        command: ''
+      },
+      rules: {
+        name: [{ required: true, message: '请输入命令名称', trigger: 'blur' }],
+        command: [{ required: true, message: '请输入执行命令', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    addCommand() {
+      return new Promise((resolve, reject) => {
+        this.$refs['form'].validate(valid => {
+          if (!valid) {
+            reject()
+            return false
+          }
+          addCommandApi({
+            path: this.form.command,
+            param: this.form.name
+          })
+            .then(res => {
+              if (res.code === 200) {
+                this.$notification.success({
+                  message: `添加命令成功`,
+                  duration: 2
+                })
+                resolve(res)
+              }
+              reject(res)
+            })
+            .catch(err => {
+              reject(err)
+            })
+        })
+      })
+    },
+
+    editCommand() {
+      return new Promise((resolve, reject) => {
+        this.$refs['form'].validate(valid => {
+          if (!valid) {
+            return false
+          }
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/pages/script/command/index.vue b/src/pages/script/command/index.vue
index b6d691a..8613cc7 100644
--- a/src/pages/script/command/index.vue
+++ b/src/pages/script/command/index.vue
@@ -18,14 +18,68 @@
       <a slot="path" slot-scope="text">{{ text }}</a>
       <a slot="createTime" slot-scope="text">{{ text }}</a>
       <template slot="operation" slot-scope="text, record">
+        <a-tooltip title="下发">
+          <a-button type="link" @click="handleExecCommand(record)"><a-icon type="export" /></a-button>
+        </a-tooltip>
       </template>
     </a-table>
 
+    <!-- 添加命令 -->
+    <a-modal
+      v-model="addCommandVisible"
+      title="添加命令"
+      width="700px"
+      :mask-closable="false"
+      :destroy-on-close="true"
+      @ok="addCommand"
+    >
+      <Commandform ref="commandform" />
+    </a-modal>
+
+    <!-- 下发命令 -->
+    <a-modal
+      v-model="execCommandVisible"
+      title="下发命令"
+      width="700px"
+      :footer="execScriptFooter ? null : undefined"
+      :mask-closable="false"
+      :destroy-on-close="true"
+      @ok="execCommand"
+      @cancel="cancelExecCommand"
+    >
+      <ExecScriptRes v-if="isShowExecRes" :result-data="execRes" />
+      <ExecScript v-else ref="execScriptForm" :script-item="selectedRow" type="command" />
+
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="cancelExecCommand">取消</a-button>
+          <a-button type="primary" :loading="buttonLoading" @click="execCommand">确定</a-button>
+        </div>
+      </template>
+
+    </a-modal>
+
+    <!-- 下发结果 -->
+    <a-drawer
+      title="执行结果"
+      width="700"
+      :visible="execResVisible"
+      :destroy-on-close="true"
+      :mask-closable="false"
+      @close="onCloseEexecRes"
+    >
+      <ExecResult :type="1" />
+    </a-drawer>
+
   </div>
 </template>
 
 <script>
 import { getCmommandListApi } from '@/api/script'
+import Commandform from './components/commandform.vue'
+import ExecScript from '@/pages/script/script/components/execScript.vue'
+import ExecScriptRes from '@/pages/script/script/components/execScriptRes.vue'
+import ExecResult from '../components/execResult.vue'
 
 export default {
   components: {
@@ -37,6 +91,11 @@ export default {
   data() {
     return {
       loading: false,
+      addCommandVisible: false,
+      execCommandVisible: false,
+      isShowExecRes: false,
+      execResVisible: false,
+      execScriptFooter: false,
       tableHeight: 0,
       total: 0,
       listQuery: {
@@ -68,6 +127,17 @@ export default {
       }
     }
   },
+  watch: {
+    isShowExecRes: {
+      handler(val) {
+        if (val) {
+          this.execScriptFooter = true
+        } else {
+          this.execScriptFooter = false
+        }
+      }
+    }
+  },
   created() {
     this.loadData()
   },
@@ -100,6 +170,50 @@ export default {
       this.listQuery.pageNum = pagination.current
       this.listQuery.pageSize = pagination.pageSize
       this.loadData()
+    },
+
+    // 添加命令
+    handleAddCommand() {
+      this.addCommandVisible = true
+    },
+    // 添加命令-确认
+    addCommand() {
+      this.$refs['commandform'].addCommand().then(() => {
+        this.addCommandVisible = false
+        this.loadData()
+      })
+    },
+
+    // 下发命令-按钮
+    handleExecCommand(record) {
+      this.selectedRow = record
+      this.execCommandVisible = true
+    },
+
+    // 下发命令-确认
+    execCommand() {
+      this.buttonLoading = true
+      this.$refs['execScriptForm'].execCommand().then((res) => {
+        this.isShowExecRes = true
+        this.execRes = res.data
+      }).finally(() => {
+        this.buttonLoading = false
+      })
+    },
+
+    // 关闭下发弹窗
+    cancelExecCommand() {
+      this.isShowExecRes = false
+      this.execCommandVisible = false
+    },
+
+    // 下发结果-按钮
+    handleExecRes() {
+      this.execResVisible = true
+    },
+
+    onCloseEexecRes() {
+      this.execResVisible = false
     }
 
   }
-- 
Gitee


From c7081485ba8b7fc965c95eb13172bd6e89bfe4ae Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 31 Oct 2024 17:00:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/script.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/api/script.js b/src/api/script.js
index 3ad9605..b072e1f 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -39,6 +39,27 @@ export function getCmommandListApi(data) {
     data
   })
 }
+
+// 新增命令
+export function addCommandApi(data) {
+  return request({
+    url: '/manageCommandPre/insert',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data
+  })
+}
+
+// 下发命令
+export function executeCommandApi(data) {
+  return request({
+    url: '/manageCommandPre/executeLocal',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data
+  })
+}
+
 // 执行结果列表
 export function getExecResApi(data) {
   return request({
-- 
Gitee