diff --git a/frontend/src/request/batch.ts b/frontend/src/request/batch.ts
index 2344750283288106554c3e411cc3f9b1af5f0e2b..0018ba8b4df7a8cc4f44c80bcd8303f8d4a8f8c3 100644
--- a/frontend/src/request/batch.ts
+++ b/frontend/src/request/batch.ts
@@ -1,53 +1,61 @@
-/* 
+/*
  * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
- * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2.
  * See LICENSE file for more details.
  * Author: Gzx1999 <guozhengxin@kylinos.cn>
  * Date: Wed Jan 3 18:00:12 2024 +0800
  */
-import request from './request';
+import request from "./request";
 
-// 获取批次
+// 获取批次分页
 export function getBatches(data: any) {
-    return request({
-        url: '/batchmanager/batchinfo',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "/batchmanager/batchinfo",
+    method: "get",
+    params: data,
+  });
+}
+
+// 获取所有批次不分页
+export function getAllBatches() {
+  return request({
+    url: "/batchmanager/batchinfo_nopage",
+    method: "get",
+  });
 }
 
 // 获取批次详情
 export function getBatchDetail(data: any) {
-    return request({
-        url: '/batchmanager/batchmachineinfo',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "/batchmanager/batchmachineinfo",
+    method: "get",
+    params: data,
+  });
 }
 
 // 删除批次
 export function deleteBatch(data: any) {
-    return request({
-        url: '/batchmanager/deletebatch',
-        method: 'post',
-        data,
-    })
+  return request({
+    url: "/batchmanager/deletebatch",
+    method: "post",
+    data,
+  });
 }
 
 // 创建批次
 export function createBatch(data: any) {
-    return request({
-        url: 'batchmanager/createbatch',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "batchmanager/createbatch",
+    method: "post",
+    data,
+  });
 }
 
 // 编辑批次信息
 export function updateBatch(data: any) {
-    return request({
-        url: 'batchmanager/updatebatch',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "batchmanager/updatebatch",
+    method: "post",
+    data,
+  });
 }
diff --git a/frontend/src/request/cluster.ts b/frontend/src/request/cluster.ts
index 91120b9b6c6d0ae47851da24abd8c19940b40418..19b9bc2733df37cc7608292343f5f761dc3aa843 100644
--- a/frontend/src/request/cluster.ts
+++ b/frontend/src/request/cluster.ts
@@ -1,224 +1,232 @@
-/* 
+/*
  * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
- * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2.
  * See LICENSE file for more details.
  * Author: Gzx1999 <guozhengxin@kylinos.cn>
  * Date: Wed Jan 3 18:00:12 2024 +0800
  */
-import request from './request';
+import request from "./request";
 
 // 分页获取部门机器信息
 export function getPagedDepartMachines(data: any) {
-    return request({
-        url: 'macList/machineinfo',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "macList/machineinfo",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取部门所有机器信息
 export function getDepartMachines(data: any) {
-    return request({
-        url: 'macList/selectmachine',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "macList/selectmachine",
+    method: "get",
+    params: data,
+  });
+}
+
+// 获取平台所有机器
+export function getAllMachines() {
+  return request({
+    url: "macList/machineinfo_nopage",
+    method: "get",
+  });
 }
 
 // 删除机器接口
-export function deleteMachine(data:any) {
+export function deleteMachine(data: any) {
   return request({
-    url: 'macList/deletemachine',
-    method: 'post',
-    data
-  })
+    url: "macList/deletemachine",
+    method: "post",
+    data,
+  });
 }
 
 // 获取指定部门下的子部门
 export function getSubDepartment(data: any) {
-    return request({
-        url: 'macList/depart',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "macList/depart",
+    method: "get",
+    params: data,
+  });
 }
 
 // 编辑部门节点
 export function updateDepartment(data: any) {
-    return request({
-        url: 'macList/updatedepart',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "macList/updatedepart",
+    method: "post",
+    data,
+  });
 }
 
 // 删除部门节点
 export function deleteDepartment(data: any) {
-    return request({
-        url: 'macList/deletedepartdata',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "macList/deletedepartdata",
+    method: "post",
+    data,
+  });
 }
 
 // 添加部门节点
 export function addDepartment(data: any) {
-    return request({
-        url: 'macList/adddepart',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "macList/adddepart",
+    method: "post",
+    data,
+  });
 }
 
 // 更换机器所属部门
 export function changeDepartment(data: any) {
-    return request({
-        url: 'macList/modifydepart',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "macList/modifydepart",
+    method: "post",
+    data,
+  });
 }
 
 // 获取机器overview信息
 export function getMachineOverview(data: any) {
-    return request({
-        url: 'api/agent_overview',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/agent_overview",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取所有服务
 export function getserviceList(data: any) {
-    return request({
-        url: 'api/service_list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/service_list",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取当前机器登录user
 export function getCurrentUser(data: any) {
-    return request({
-        url: 'api/user_info',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/user_info",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取机器上所有user
 export function getMachineAllUser(data: any) {
-    return request({
-        url: 'api/user_all',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/user_all",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取所有服务
 export function getServiceList(data: any) {
-    return request({
-        url: 'api/service_list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/service_list",
+    method: "get",
+    params: data,
+  });
 }
 
 // 关闭一项服务
 export function stopService(data: any) {
-    return request({
-        url: 'agent/service_stop',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "agent/service_stop",
+    method: "post",
+    data,
+  });
 }
 
 // 开启一项服务
 export function startService(data: any) {
-    return request({
-        url: 'agent/service_start',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "agent/service_start",
+    method: "post",
+    data,
+  });
 }
 
 // 重启一项服务
 export function restartService(data: any) {
-    return request({
-        url: 'agent/service_restart',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "agent/service_restart",
+    method: "post",
+    data,
+  });
 }
 
 // 获取网络信息
 export function getNetworkInfo(data: any) {
-    return request({
-        url: 'api/net',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/net",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取内核信息
 export function getSysctlInfo(data: any) {
-    return request({
-        url: 'api/sysctl_info',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/sysctl_info",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取所有repo源
 export function getRepos(data: any) {
-    return request({
-        url: 'api/repos',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/repos",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取所有已安装的package
 export function getInstalledPackages(data: any) {
-    return request({
-        url: 'api/rpm_all',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/rpm_all",
+    method: "get",
+    params: data,
+  });
 }
 
 // 获取单个packge的详情
 export function getPackageDetail(data: any) {
-    return request({
-        url: 'api/rpm_info',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "api/rpm_info",
+    method: "get",
+    params: data,
+  });
 }
 
 // 安装软件包
 export function installPackage(data: any) {
-    return request({
-        url: 'agent/rpm_install',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "agent/rpm_install",
+    method: "post",
+    data,
+  });
 }
 
 // 卸载软件包
-export function removePackage(data:any) {
+export function removePackage(data: any) {
   return request({
-    url: 'agent/rpm_remove',
-    method: 'post',
-    data
-  })
+    url: "agent/rpm_remove",
+    method: "post",
+    data,
+  });
 }
 
 // 获取给定主机列表的tag标签
 export function getMachineTags(data: any) {
-    return request({
-        url: 'macList/gettags',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "macList/gettags",
+    method: "post",
+    data,
+  });
 }
diff --git a/frontend/src/request/script.ts b/frontend/src/request/script.ts
new file mode 100644
index 0000000000000000000000000000000000000000..cac16385a7018278c9aa6647773e756c24da1f57
--- /dev/null
+++ b/frontend/src/request/script.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2.
+ * See LICENSE file for more details.
+ * Author: Gzx1999 <guozhengxin@kylinos.cn>
+ * Date: Wed Jan 3 18:00:12 2024 +0800
+ */
+import request from "./request";
+
+// 获取全部脚本信息
+export function getScripts(data: { page: number; size: number }) {
+  return request({
+    url: "/script/list_all",
+    method: "get",
+    params: data,
+  });
+}
+
+// 获取脚本历史信息
+export function getScriptHistorys(data: { script_id: number }) {
+  return request({
+    url: "/script/list_history",
+    method: "get",
+    params: data,
+  });
+}
+
+// 添加脚本
+export function addScript(data: any) {
+  return request({
+    url: "/script/create",
+    method: "post",
+    data,
+  });
+}
+
+// 更新脚本信息
+export function updateScript(data: any) {
+  return request({
+    url: "/script/update",
+    method: "put",
+    data,
+  });
+}
+
+// 删除脚本
+export function deleteScript(data: { script_id: number; version?: string }) {
+  return request({
+    url: "/script/delete",
+    method: "delete",
+    data,
+  });
+}
+
+// 运行脚本
+export function runScript(data: any) {
+  return request({
+    url: "/script_auth/run",
+    method: "post",
+    data,
+  });
+}
+
+// 获取黑名单列表
+export function getScriptBlackList() {
+  return request({
+    url: "/script/blacklist",
+    method: "get",
+  });
+}
+
+// 更新黑名单列表
+export function updateScriptBlackList(data: { white_list: number[] }) {
+  return request({
+    url: "/script_auth/update_blacklist",
+    method: "put",
+    data,
+  });
+}
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index b3adc1bb64e2555c67d9cc31863e59dca1ba5040..1a8d8eaca3171cc5c249533716e75b604e77156a 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -42,7 +42,7 @@ let sidebarRoutes = [
         meta: {
           title: "概览",
           panel: "overview",
-          icon: "HomeFilled",
+          icon: "House",
           breadcrumb: [{ name: "概览" }],
         },
       },
@@ -179,10 +179,21 @@ let sidebarRoutes = [
         meta: {
           title: "角色管理",
           panel: "role",
-          icon: "Ticket",
+          icon: "Lock",
           breadcrumb: [{ name: "角色管理" }],
         },
       },
+      {
+        path: "/script",
+        name: "Script",
+        component: () => import("../views/CustomScript/index.vue"),
+        meta: {
+          title: "自定义脚本",
+          panel: "batch",
+          icon: "Management",
+          breadcrumb: [{ name: "自定义脚本" }],
+        },
+      },
       {
         path: "/audit",
         name: "Audit",
diff --git a/frontend/src/styles/main.scss b/frontend/src/styles/main.scss
index 58b569d77acc3de5bd3eec8c5225041f804cb922..01683e61a93a96c2a58895eed06e43bf74a182a2 100644
--- a/frontend/src/styles/main.scss
+++ b/frontend/src/styles/main.scss
@@ -56,3 +56,8 @@ pre {
 .el-table .warning-row {
   --el-table-tr-bg-color: var(--el-color-info-light-8);
 }
+
+.custom-popover {
+  max-height: 500px;
+  overflow: auto;
+}
diff --git a/frontend/src/types/batch.ts b/frontend/src/types/batch.ts
index 28711766f2baa4c07b4882d404bf4eb3e3685edd..c48311faa944fb04f52723b4e79ce0470034a6ba 100644
--- a/frontend/src/types/batch.ts
+++ b/frontend/src/types/batch.ts
@@ -1,17 +1,18 @@
-/* 
+/*
  * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
- * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2.
  * See LICENSE file for more details.
  * Author: zhaozhenfang <zhaozhenfang@kylinos.cn>
  * Date: Fri Mar 15 11:38:55 2024 +0800
  */
 // 批次列表
 export interface BatchItem {
-  CreatedAt:String;
-  DeletedAt:null;
-  Depart:String;
+  CreatedAt: String;
+  DeletedAt: null;
+  Depart: String;
   DepartName: String;
   ID: number;
+  id: number;
   UpdatedAt: String;
   description: String;
   manager: String;
@@ -22,10 +23,10 @@ export interface BatchItem {
 export interface BatchMachineInfo {
   CPU: String;
   departid: number;
-  id:number;
+  id: number;
   ip: String;
   machineuuid: String;
   maintstatus: String;
   runstatus: String;
   sysinfo: String;
-}
\ No newline at end of file
+}
diff --git a/frontend/src/types/script.ts b/frontend/src/types/script.ts
new file mode 100644
index 0000000000000000000000000000000000000000..98503bc37a4bafd457ffbbea7b807352d4ad0d1d
--- /dev/null
+++ b/frontend/src/types/script.ts
@@ -0,0 +1,9 @@
+// 历史版本清单
+export interface HistoryItem {
+  description: string;
+  content: string;
+  version: string;
+  UpdatedAt: string;
+  id: number; // 版本id
+  scriptid?: number; // 脚本id
+}
diff --git a/frontend/src/views/CustomScript/components/BlackList.vue b/frontend/src/views/CustomScript/components/BlackList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d3fed3b26936a978afa041e71eafb3e2c6572b7e
--- /dev/null
+++ b/frontend/src/views/CustomScript/components/BlackList.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="black_c">
+    <el-transfer
+      v-model="rightValue"
+      filterable
+      :filter-method="filterMethod"
+      :titles="['黑名单', '白名单']"
+      filter-placeholder="请输入关键字进行搜索"
+      :data="blackList"
+    >
+      <template #default="{ option }">
+        <span>{{ option.command }}</span>
+      </template>
+    </el-transfer>
+    <div class="footer">
+      <el-button @click="handleCancle">取消</el-button>
+      <el-button type="primary" @click="handleSubmit">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { RespCodeOK } from "@/request/request";
+import { getScriptBlackList, updateScriptBlackList } from "@/request/script";
+import { ElMessage } from "element-plus";
+import { ref, onMounted } from "vue";
+
+const rightValue = ref([]);
+const emits = defineEmits(["close"]);
+interface BlackItem {
+  key: number; // 穿梭框唯一标识
+  id: number;
+  command: string;
+  active: boolean;
+}
+onMounted(() => {
+  onGetBlacklist();
+});
+
+// 获取黑名单
+const blackList = ref<BlackItem[]>();
+const onGetBlacklist = () => {
+  getScriptBlackList()
+    .then((res: any) => {
+      if (res.code === RespCodeOK) {
+        blackList.value = res.data;
+        rightValue.value = res.data.filter((item: BlackItem) => item.active === false).map((i: BlackItem) => i.key);
+      } else {
+        ElMessage.error("获取脚本黑名单失败：", res.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("获取脚本黑名单失败：", err);
+    });
+};
+
+// 提交
+const handleSubmit = () => {
+  console.log(rightValue.value);
+  updateScriptBlackList({ white_list: rightValue.value })
+    .then((res: any) => {
+      if (res.code === RespCodeOK) {
+        ElMessage.success("更新黑名单成功");
+        emits("close");
+      } else {
+        ElMessage.error("更新黑名单失败：", res.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("更新黑名单失败：", err);
+    });
+};
+
+// 取消
+const handleCancle = () => {
+  emits("close");
+};
+
+// 过滤搜索方法
+const filterMethod = (query: string, item: BlackItem) => {
+  return item.command.toLowerCase().includes(query.toLowerCase());
+};
+</script>
+
+<style scoped lang="scss">
+.black_c {
+  width: 100%;
+  height: 400px;
+  display: flex;
+  justify-content: space-around;
+  flex-direction: column;
+  align-items: center;
+  .footer {
+    width: 90%;
+    text-align: right;
+  }
+}
+</style>
diff --git a/frontend/src/views/CustomScript/components/VersionList.vue b/frontend/src/views/CustomScript/components/VersionList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3e7a4f4abad57e5dbab1d0645b3203f6ce7b9fe6
--- /dev/null
+++ b/frontend/src/views/CustomScript/components/VersionList.vue
@@ -0,0 +1,83 @@
+<template>
+  <el-table :data="historyList" max-height="500">
+    <el-table-column property="content" label="脚本内容">
+      <template #default="{ row }">
+        <el-popover placement="left" :width="500" effect="dark" popper-class="custom-popover">
+          <template #reference>
+            <el-link type="primary" :underline="false">
+              {{ row.content.slice(0, 10) + "..." }}
+            </el-link>
+          </template>
+          <pre style="color: #67c23a">{{ row.content }}</pre>
+        </el-popover>
+      </template>
+    </el-table-column>
+    <el-table-column property="version" label="版本" width="240" />
+    <el-table-column property="UpdatedAt" label="修改时间" width="260" />
+    <el-table-column label="操作" width="60">
+      <template #default="{ row }">
+        <el-popconfirm
+          title="确定删除此历史版本？"
+          confirm-button-text="确定"
+          cancel-button-text="取消"
+          @confirm="onDeleteScript(row)"
+          width="250"
+        >
+          <template #reference>
+            <el-button type="danger" size="small">删除</el-button>
+          </template>
+        </el-popconfirm>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, nextTick } from "vue";
+import { deleteScript } from "@/request/script";
+import { RespCodeOK } from "@/request/request";
+import { ElMessage } from "element-plus";
+import type { HistoryItem } from "@/types/script";
+
+const props = defineProps({
+  historyList: {
+    type: Array as () => HistoryItem[],
+    required: true,
+    default: [],
+  },
+});
+
+const historyList = ref<HistoryItem[]>();
+watch(
+  () => props.historyList,
+  (newV: any) => {
+    if (newV) {
+      if (!newV) return;
+      nextTick(() => {
+        historyList.value = props.historyList;
+      });
+    }
+  },
+  { deep: true, immediate: true }
+);
+
+// 删除脚本
+const onDeleteScript = (row: any) => {
+  deleteScript({
+    script_id: row.scriptid,
+    version: row.version,
+  })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        ElMessage.success("success to delete history script:" + resp.msg);
+      } else {
+        ElMessage.error("failed to delete history script:" + resp.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to delete history script:" + err.msg);
+    });
+};
+</script>
+
+<style scoped></style>
diff --git a/frontend/src/views/CustomScript/components/addScript.vue b/frontend/src/views/CustomScript/components/addScript.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a8b0ff02041374c526a420097f889e4d0c1d7197
--- /dev/null
+++ b/frontend/src/views/CustomScript/components/addScript.vue
@@ -0,0 +1,150 @@
+<!--
+ * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * See LICENSE file for more details.
+ * Author: Gzx1999 <guozhengxin@kylinos.cn>
+ * Date: Wed Jan 3 18:00:12 2024 +0800
+-->
+<template>
+  <div>
+    <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+      <el-form-item label="脚本名称:" prop="name">
+        <el-input type="text" v-model="form.name" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="脚本内容:" prop="content">
+        <el-input type="textarea" controls-position="right" v-model="form.content" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="脚本描述:" prop="description">
+        <el-input type="textarea" controls-position="right" v-model="form.description" autocomplete="off"></el-input>
+      </el-form-item>
+    </el-form>
+
+    <div class="dialog-footer">
+      <el-button type="primary" @click="onSubmit">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, watch } from "vue";
+import { ElMessage } from "element-plus";
+
+import { RespCodeOK } from "@/request/request";
+import { addScript, updateScript } from "@/request/script";
+
+const formRef = ref();
+const form = ref<ScriptInterface>({
+  name: "",
+  content: "",
+  description: "",
+});
+const script_id = ref(0);
+
+const props = defineProps({
+  type: {
+    type: String,
+    default: "add",
+  },
+  scriptContent: {
+    type: Object as () => ScriptInterface,
+    defautl: { name: "", content: "", description: "" },
+  },
+});
+
+interface ScriptInterface {
+  name: string;
+  content: string;
+  description: string;
+  [propName: string]: any;
+}
+
+watch(
+  () => props.scriptContent,
+  (newV: any) => {
+    nextTick(() => {
+      script_id.value = newV.id;
+      form.value.name = newV.name as string;
+      form.value.content = newV.content as string;
+      form.value.description = newV.description as string;
+    });
+  },
+  { immediate: true, deep: true }
+);
+
+const rules = {
+  name: [
+    {
+      required: true,
+      message: "请输入脚本名称",
+      trigger: "change",
+    },
+  ],
+  description: [
+    {
+      required: true,
+      message: "请输入描述内容",
+      trigger: "change",
+    },
+  ],
+  content: [
+    {
+      required: true,
+      message: "请输入脚本内容",
+      trigger: "change",
+    },
+  ],
+};
+
+const emits = defineEmits(["updateScript", "close"]);
+
+const onUpdateScript = () => {
+  updateScript({ id: script_id.value, ...form.value })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        emits("updateScript");
+        ElMessage.success("脚本更新成功");
+      } else {
+        ElMessage.error("脚本更新失败: " + resp.msg);
+      }
+    })
+    .catch((err) => {
+      ElMessage.error("脚本更新失败: " + err.msg);
+    });
+  // emits("close");
+};
+
+// 添加脚本
+const onAddScript = () => {
+  addScript(form.value)
+    .then((res: any) => {
+      if (res.code === RespCodeOK) {
+        emits("updateScript");
+        ElMessage.success("脚本添加成功");
+      } else {
+        ElMessage.error("添加脚本失败:" + res.msg);
+      }
+    })
+    .catch((err: any) => {
+      console.log(err);
+      ElMessage.error("添加脚本失败:" + err);
+    });
+  // emits("close");
+};
+
+// 确定方法
+const onSubmit = () => {
+  formRef.value.validate((valid: boolean) => {
+    if (valid) {
+      props.type === "add" ? onAddScript() : onUpdateScript();
+    } else {
+      ElMessage.error("内容填写错误");
+    }
+  });
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/frontend/src/views/CustomScript/components/runScript.vue b/frontend/src/views/CustomScript/components/runScript.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5445afdd3f10fcb08a4885179008d906a5a95a6f
--- /dev/null
+++ b/frontend/src/views/CustomScript/components/runScript.vue
@@ -0,0 +1,222 @@
+<!--
+ * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * See LICENSE file for more details.
+ * Author: Gzx1999 <guozhengxin@kylinos.cn>
+ * Date: Wed Jan 3 18:00:12 2024 +0800
+-->
+<template>
+  <div>
+    <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+      <el-form-item label="脚本内容:" prop="content">
+        <el-input
+          type="textarea"
+          disabled
+          controls-position="right"
+          v-model="form.content"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="目标类型:" :prop="machineType">
+        <el-radio-group v-model="machineType" @change="changeMachineType">
+          <el-radio value="host">主机</el-radio>
+          <el-radio value="batch">批次</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="选择主机:" prop="machine_uuids" v-if="machineType === 'host'">
+        <el-select v-model="form.machine_uuids" multiple placeholder="请选择主机IP">
+          <el-option v-for="item in hosts" :label="item.ip" :value="item.uuid" :key="item.ip" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择批次:" prop="batch_id" v-if="machineType === 'batch'">
+        <el-select v-model="form.batch_id" placeholder="请选择批次">
+          <el-option v-for="item in batches" :label="item.name" :value="item.id" :key="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="历史版本">
+        <el-select v-model="form.version" placeholder="请选择脚本历史版本">
+          <el-option v-for="item in historyList" :label="item.version" :value="item.version" :key="item.version" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="脚本参数" prop="params">
+        <el-input-tag
+          v-model="form.params"
+          placeholder="输入参数后回车"
+          aria-label="Please click the Enter key after input"
+        />
+      </el-form-item>
+    </el-form>
+
+    <div class="dialog-footer">
+      <el-button @click="onCancle">取消</el-button>
+      <el-button type="primary" @click="onSubmit">立即执行</el-button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, watch } from "vue";
+import { ElMessage } from "element-plus";
+
+import { RespCodeOK } from "@/request/request";
+import { runScript, getScriptHistorys } from "@/request/script";
+import { getAllMachines } from "@/request/cluster";
+import { getAllBatches } from "@/request/batch";
+import type { HistoryItem } from "@/types/script";
+import type { MachineInfo } from "@/types/cluster";
+import type { BatchItem } from "@/types/batch";
+
+// todo:引入主机和批次不分页接口，下午
+const emits = defineEmits(["close"]);
+const props = defineProps({
+  scriptContent: {
+    type: Object,
+    defautl: { id: 0, content: "" },
+  },
+});
+interface ScriptInterface {
+  batch_id?: number | null;
+  script_id: number | null;
+  machine_uuids?: number[];
+  content: string;
+  version?: string;
+  params: string[];
+  [propName: string]: any;
+}
+const form = ref<ScriptInterface>({
+  script_id: null,
+  content: "",
+  machine_uuids: [],
+  batch_id: null,
+  version: "",
+  params: [],
+});
+const formRef = ref();
+const script_id = ref(0);
+const machineType = ref("host");
+
+watch(
+  () => props.scriptContent,
+  (newV: any) => {
+    if (!newV) return;
+    nextTick(() => {
+      script_id.value = form.value.script_id = newV.id;
+      form.value.content = newV.content as string;
+      getHostResource();
+    });
+  },
+  { immediate: true, deep: true }
+);
+
+// 变更选择主机类型
+const changeMachineType = (value: any) => {
+  console.log(value);
+};
+
+// 获取form表单列表选项
+const hosts = ref<MachineInfo[]>();
+const batches = ref<BatchItem[]>();
+const historyList = ref<HistoryItem[]>();
+const getHostResource = () => {
+  // 获取所有机器列表
+  getAllMachines()
+    .then((res: any) => {
+      if (res.code === RespCodeOK) {
+        hosts.value = res.data;
+      } else {
+        ElMessage.error("failed to machine list:" + res.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to machine lists:" + err.msg);
+    });
+
+  // 获取所有批次列表
+  getAllBatches()
+    .then((res: any) => {
+      if (res.code === RespCodeOK) {
+        batches.value = res.data;
+      } else {
+        ElMessage.error("failed to batch list:" + res.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to batch lists:" + err.msg);
+    });
+
+  // 获取历史版本列表
+  getScriptHistorys({ script_id: script_id.value })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        historyList.value = resp.data;
+        console.log(historyList.value);
+      } else {
+        ElMessage.error("failed to history list:" + resp.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to history lists:" + err.msg);
+    });
+};
+
+const rules = {
+  content: [
+    {
+      required: true,
+      message: "请输入脚本内容",
+      trigger: "change",
+    },
+  ],
+  machine_uuids: [
+    {
+      required: true,
+      message: "请选择主机ip",
+      trigger: "change",
+    },
+  ],
+  batch_id: [
+    {
+      required: true,
+      message: "请选择批次",
+      trigger: "change",
+    },
+  ],
+};
+
+const onRunScript = () => {
+  runScript({ id: script_id.value, ...form.value })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        emits("close");
+        ElMessage.success("脚本执行成功");
+      } else {
+        ElMessage.error("脚本执行失败: " + resp.msg);
+      }
+    })
+    .catch((err) => {
+      ElMessage.error("脚本执行失败: " + err.msg);
+    });
+};
+
+// 立即执行
+const onSubmit = () => {
+  formRef.value.validate((valid: boolean) => {
+    if (valid) {
+      onRunScript();
+    } else {
+      ElMessage.error("内容填写错误");
+    }
+  });
+};
+
+// 取消
+const onCancle = () => {
+  emits("close");
+};
+</script>
+
+<style lang="scss" scoped>
+.dialog-footer {
+  text-align: right;
+}
+</style>
diff --git a/frontend/src/views/CustomScript/index.vue b/frontend/src/views/CustomScript/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e9f9f95c33a1e6e8f8dc416a2f5d80891a11b79e
--- /dev/null
+++ b/frontend/src/views/CustomScript/index.vue
@@ -0,0 +1,247 @@
+<!--
+ * Copyright (c) KylinSoft  Co., Ltd. 2024.All rights reserved.
+ * PilotGo licensed under the Mulan Permissive Software License, Version 2. 
+ * See LICENSE file for more details.
+ * Author: Gzx1999 <guozhengxin@kylinos.cn>
+ * Date: Wed Jan 3 18:00:12 2024 +0800
+-->
+<template>
+  <div class="container">
+    <PGTable
+      ref="refTable"
+      id="exportTab"
+      :data="scripts"
+      title="自定义脚本"
+      :showSelect="false"
+      :total="total"
+      v-model:page="page"
+    >
+      <template #action>
+        <div class="search">
+          <auth-button auth="button/update_script_blacklist" @click="handleBlackList"> 黑名单</auth-button>
+          <el-button @click="addScript">新增</el-button>
+        </div>
+      </template>
+
+      <template #content>
+        <el-table-column align="center" prop="name" label="脚本名称"></el-table-column>
+        <el-table-column align="center" prop="content" label="脚本内容">
+          <template #default="{ row }">
+            <el-popover placement="right" :width="500" trigger="hover" effect="dark" popper-class="custom-popover">
+              <template #reference>
+                <el-link type="primary" :underline="false">
+                  {{ row.content.slice(0, 10) + "..." }}
+                </el-link>
+              </template>
+              <pre style="color: #67c23a">{{ row.content }}</pre>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="UpdatedAt" label="更新时间"> </el-table-column>
+        <el-table-column align="center" prop="description" label="描述"> </el-table-column>
+        <el-table-column align="center" label="查看">
+          <template #default="{ row }">
+            <el-popover placement="right" :width="800" trigger="click">
+              <template #reference>
+                <el-button link size="small" type="warning" @click="handleHistory(row.id)">历史版本</el-button>
+              </template>
+              <!-- 列表table -->
+              <version-list
+                :ref="`versionRef${row.id}`"
+                :historyList="historyList"
+                v-if="showHistory === `history${row.id}`"
+              />
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" fixed="right" class="operate">
+          <template #default="{ row }">
+            <el-button size="small" @click="updateScript(row)">编辑</el-button>
+            <auth-button size="small" auth="button/run_script" @click="runScript(row)">执行</auth-button>
+
+            <el-popconfirm
+              title="确定删除此脚本？"
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              @confirm="onDeleteScript(row)"
+              width="250"
+            >
+              <template #reference>
+                <el-button type="danger" size="small">删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </template>
+    </PGTable>
+
+    <el-dialog :title="title" v-model="display" :width="dialogWidth" destroy-on-close @close="closeDialog()">
+      <AddScript
+        v-if="displayDialog === 'add' || displayDialog === 'update'"
+        :type="displayDialog"
+        :scriptContent="scriptContent"
+        @updateScript="getScriptList"
+        @close="closeDialog"
+      />
+      <RunScript v-if="displayDialog === 'run'" :scriptContent="scriptContent" @close="closeDialog" />
+      <BlackList v-if="displayDialog === 'blacklist'" @close="closeDialog" />
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, watch } from "vue";
+import { ElMessage } from "element-plus";
+import PGTable from "@/components/PGTable.vue";
+import AddScript from "./components/addScript.vue";
+import RunScript from "./components/runScript.vue";
+import BlackList from "./components/BlackList.vue";
+import AuthButton from "@/components/AuthButton.vue";
+import { getScripts, deleteScript, getScriptHistorys } from "@/request/script";
+import { RespCodeOK } from "@/request/request";
+
+import VersionList from "./components/VersionList.vue";
+const refTable = ref();
+const scripts = ref([]);
+const total = ref(0);
+const page = ref({ pageSize: 10, currentPage: 1 });
+onMounted(() => {
+  getScriptList();
+});
+
+const getScriptList = () => {
+  closeDialog();
+  getScripts({
+    page: page.value.currentPage,
+    size: page.value.pageSize,
+  })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        total.value = resp.total;
+        scripts.value = resp.data;
+      } else {
+        ElMessage.error("failed to get scripts info: " + resp.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to get scripts info:" + err.msg);
+    });
+};
+
+const dialogWidth = ref<number | string>("560px");
+const display = ref(false);
+const displayDialog = ref("");
+const title = ref("");
+
+const closeDialog = () => {
+  display.value = false;
+  title.value = "";
+  displayDialog.value = "";
+  scriptContent.value = {};
+};
+// 查看历史版本列表
+const showHistory = ref("");
+const historyList = ref<any[]>();
+const handleHistory = (id: number) => {
+  getScriptHistorys({ script_id: id })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        historyList.value = resp.data;
+        showHistory.value = "history" + id;
+        ElMessage.success("success to get history list:" + resp.msg);
+      } else {
+        ElMessage.error("failed to history list:" + resp.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to history lists:" + err.msg);
+    });
+};
+
+// 新增脚本
+const addScript = () => {
+  title.value = "添加自定义脚本";
+  displayDialog.value = "add";
+  display.value = true;
+  scriptContent.value = {};
+};
+
+// 执行脚本
+const runScript = (row: any) => {
+  title.value = "执行脚本";
+  displayDialog.value = "run";
+  display.value = true;
+  dialogWidth.value = "720px";
+  scriptContent.value = row;
+};
+
+// 删除脚本
+const onDeleteScript = (row: any) => {
+  deleteScript({
+    script_id: row.id,
+  })
+    .then((resp: any) => {
+      if (resp.code === RespCodeOK) {
+        getScriptList();
+        ElMessage.success("success to delete script:" + resp.msg);
+      } else {
+        ElMessage.error("failed to delete script:" + resp.msg);
+      }
+    })
+    .catch((err: any) => {
+      ElMessage.error("failed to delete script:" + err.msg);
+    });
+};
+
+// 编辑脚本
+const scriptContent = ref();
+const updateScript = (row: any) => {
+  scriptContent.value = row;
+  title.value = "编辑脚本";
+  displayDialog.value = "update";
+  display.value = true;
+};
+
+// 更新黑名单
+const handleBlackList = () => {
+  title.value = "更新黑名单";
+  displayDialog.value = "blacklist";
+  display.value = true;
+  dialogWidth.value = "720px";
+};
+
+// 监听分页选项的修改
+watch(
+  () => page.value,
+  (newV) => {
+    if (newV) {
+      getScriptList();
+    }
+  },
+  { deep: true }
+);
+</script>
+
+<style lang="scss" scoped>
+.container {
+  height: 100%;
+  width: 100%;
+  :deep(.el-popper.is-light) {
+    background-color: #303133 !important;
+  }
+
+  .search {
+    height: 100%;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    &_input {
+      width: 300px;
+    }
+  }
+
+  .el-button {
+    margin-left: 5px;
+  }
+}
+</style>
diff --git a/frontend/src/views/Role/components/authData.ts b/frontend/src/views/Role/components/authData.ts
index dd6fbebd4ea90aeae6f03863f6e4a18bcfedcb17..81db03cad26a981d9f9038d92b1deec5e551a185 100644
--- a/frontend/src/views/Role/components/authData.ts
+++ b/frontend/src/views/Role/components/authData.ts
@@ -168,24 +168,33 @@ export let authData = [
       },
     ],
   },
-  /* {
-    id: '6',
-    label: '配置管理',
-    isMenu: true,display:true,
-    menuName: 'config',
-    operations: [{
-        id: '21',
-        btnId: '14',
-        label: '配置下发',
-        menuName: 'config_install',
-    }]
-}, */
+  {
+    id: "6",
+    label: "自定义脚本管理",
+    isMenu: true,
+    display: true,
+    menuName: "script",
+    operations: [
+      {
+        id: "28",
+        btnId: "21",
+        label: "执行脚本",
+        menuName: "run_script",
+      },
+      {
+        id: "29",
+        btnId: "22",
+        label: "更新黑名单",
+        menuName: "update_script_blacklist",
+      },
+    ],
+  },
   {
     id: "7",
     label: "日志管理",
     isMenu: true,
     display: true,
-    menuName: "log",
+    menuName: "audit",
     operations: [],
   },
   {
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 1ca2e9b56a2db1d1bbafa2a60619f101ad093957..6a4bf7c9e0c36512fe0d337c33061fd041388536 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -9,8 +9,10 @@ import { fileURLToPath, URL } from "node:url";
 
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
+import { createSvgIconsPlugin } from "vite-plugin-svg-icons";
 
 import postCssPxToRem from "postcss-pxtorem";
+import { resolve } from "node:path";
 
 export default defineConfig({
   plugins: [
@@ -21,6 +23,10 @@ export default defineConfig({
         },
       },
     }),
+    createSvgIconsPlugin({
+      iconDirs: [resolve(resolve("src", "assets/icons"))],
+      symbolId: "icon-[dir]-[name]",
+    }),
   ],
   resolve: {
     alias: {
@@ -33,7 +39,7 @@ export default defineConfig({
     cors: true,
     proxy: {
       "/api/v1": {
-        target: "http://10.44.43.181:8888", //10.41.107.196
+        target: "https://10.41.107.29:8888", //10.41.107.29:8888 \  10.44.43.181:8888 \ 10.41.161.101:8888"
         secure: false, // 如果是https接口，需要配置这个参数
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // rewrite: path => path.replace(/^\/demo/, '/demo')