From 4c45142ce683183d8422d284eaaedf34272ca318 Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 31 Oct 2024 13:07:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/script/components/execResult.vue | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/pages/script/components/execResult.vue

diff --git a/src/pages/script/components/execResult.vue b/src/pages/script/components/execResult.vue
new file mode 100644
index 0000000..0e6edbf
--- /dev/null
+++ b/src/pages/script/components/execResult.vue
@@ -0,0 +1,74 @@
+<template>
+  <div ref="tableBox" style="height: 100%;">
+    <a-table
+      :loading="loading"
+      :columns="columns"
+      :data-source="tableData"
+      :pagination="pagination"
+      :scroll="{ y: tableHeight - 50}"
+      @change="change"
+    >
+      <a slot="id" slot-scope="text">{{ text }}</a>
+      <a slot="ip" slot-scope="text">{{ text }}</a>
+      <a slot="path" slot-scope="text">{{ text }}</a>
+      <a slot="result" slot-scope="text">{{ text }}</a>
+      <a slot="exitValue" slot-scope="text">{{ text }}</a>
+    </a-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      tableHeight: 0,
+      loading: false,
+      tableData: [],
+      total: 0,
+      listQuery: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      columns: [
+        { title: 'id', dataIndex: 'id', key: 'id', width: 100, ellipsis: true },
+        { title: 'ip', dataIndex: 'ip', key: 'ip', width: 100, ellipsis: true },
+        { title: '路径', dataIndex: 'path', key: 'path', width: 100, ellipsis: true },
+        { title: '信息', dataIndex: 'result', key: 'result', width: 100, ellipsis: true },
+        { title: '结果', dataIndex: 'exitValue', key: 'exitValue', width: 100, ellipsis: true, align: 'center' }
+      ]
+    }
+  },
+  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} 条`
+        }
+      }
+    }
+  },
+  methods: {
+
+    // 分页、排序、筛选变化时触发
+    change(pagination) {
+      this.listQuery.pageNum = pagination.current
+      this.listQuery.pageSize = pagination.pageSize
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
-- 
Gitee


From d3641afdf25853f4e84e7d94772405746d17bc3a Mon Sep 17 00:00:00 2001
From: Dong Xia <dev12301@linx-info.com>
Date: Thu, 31 Oct 2024 13:14:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=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/api/script.js                 | 20 +++++++++
 src/pages/script/script/index.vue | 67 +++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/src/api/script.js b/src/api/script.js
index d543e5e..8aacba4 100644
--- a/src/api/script.js
+++ b/src/api/script.js
@@ -1,5 +1,15 @@
 import request from './config'
 
+// 获取脚本列表
+export function getScriptListApi(data) {
+  return request({
+    url: '/script/list',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data
+  })
+}
+
 // 上传脚本
 export function uploadScriptApi(data) {
   return request({
@@ -9,3 +19,13 @@ export function uploadScriptApi(data) {
     data
   })
 }
+
+// 下发脚本
+export function executeScriptApi(data) {
+  return request({
+    url: '/script/execute',
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' },
+    data
+  })
+}
diff --git a/src/pages/script/script/index.vue b/src/pages/script/script/index.vue
index d56e90b..25256a1 100644
--- a/src/pages/script/script/index.vue
+++ b/src/pages/script/script/index.vue
@@ -18,6 +18,9 @@
       <a slot="createTime" slot-scope="text">{{ text }}</a>
 
       <template slot="operation" slot-scope="text, record">
+        <a-tooltip title="下发">
+          <a-button type="link" @click="handleExecuteScript(record)"><a-icon type="export" /></a-button>
+        </a-tooltip>
       </template>
     </a-table>
 
@@ -33,22 +36,52 @@
       <FileUpload :url="'/script/upload'" @on-success="uploadSuccess" />
     </a-modal>
 
+    <!-- 下发脚本弹框 -->
+    <a-modal
+      v-model="execScriptVisible"
+      title="下发脚本"
+      width="700px"
+      :footer="execScriptFooter ? null : undefined"
+      :mask-closable="false"
+      :destroy-on-close="true"
+      @ok="handleExecScript"
+      @cancel="handleCancelExecScript"
+    >
+      <ExecScriptRes v-if="isShowExecRes" :result-data="execRes" />
+      <ExecScript v-else ref="execScriptForm" :script-item="selectedRow" />
+
+      <template slot="footer">
+        <div>
+          <a-button type="white" @click="handleCancelExecScript">取消</a-button>
+          <a-button type="primary" :loading="buttonLoading" @click="handleExecScript">确定</a-button>
+        </div>
+      </template>
+    </a-modal>
+
   </div>
 </template>
 
 <script>
 import { getScriptListApi } from '@/api/script'
 import FileUpload from '@/components/file-upload'
+import ExecScript from './components/execScript.vue'
+import ExecScriptRes from './components/execScriptRes.vue'
 
 export default {
   components: {
     FileUpload,
+    ExecScript,
+    ExecScriptRes,
   },
   data() {
     return {
       tableHeight: 0,
       uploadVisible: false,
+      execScriptVisible: false,
       loading: false,
+      execScriptFooter: false,
+      isShowExecRes: false,
+      execRes: null,
       selectedRow: null,
       scriptTable: [],
       total: 0,
@@ -80,6 +113,17 @@ export default {
       }
     }
   },
+  watch: {
+    isShowExecRes: {
+      handler(val) {
+        if (val) {
+          this.execScriptFooter = true
+        } else {
+          this.execScriptFooter = false
+        }
+      }
+    }
+  },
   created() {
     this.loadData()
   },
@@ -125,6 +169,29 @@ export default {
       })
       this.uploadVisible = false
       this.loadData()
+    },
+
+    // 下发按钮
+    handleExecuteScript(record) {
+      this.selectedRow = record
+      this.execScriptVisible = true
+    },
+
+    //  确认下发
+    handleExecScript() {
+      this.buttonLoading = true
+      this.$refs['execScriptForm'].handleSubmit().then((res) => {
+        this.isShowExecRes = true
+        this.execRes = res.data
+      }).finally(() => {
+        this.buttonLoading = false
+      })
+    },
+
+    // 关闭下发弹窗
+    handleCancelExecScript() {
+      this.isShowExecRes = false
+      this.execScriptVisible = false
     }
   }
 }
-- 
Gitee