diff --git a/src/components/manual-distribution/form.vue b/src/components/manual-distribution/form.vue
index adfdae646e43aabed5c8d728a5e51590700abd93..04d7d9885dd32461d4d8a9d1c72c29dee8dbbe31 100644
--- a/src/components/manual-distribution/form.vue
+++ b/src/components/manual-distribution/form.vue
@@ -97,7 +97,7 @@ const props = defineProps({
   },
   history: {
     type: Object,
-    default: () => ({}),
+    default: null,
   },
   labelWidth: {
     type: String,
@@ -212,10 +212,12 @@ const Remove = (index) => {
 watch(
   () => props.history,
   (n) => {
-    let history = { ...n };
     getUserLists();
-    state.form.method = history?.method || [];
-    state.form.lists = history?.lists || [];
+    if (n) {
+      let history = { ...n };
+      state.form.method = history?.method || [];
+      state.form.lists = history?.lists || [];
+    }
     // 如果没有默认下发用户则创建一条空数据
     if (state.form.lists.length == 0) {
       Add(0);
diff --git a/src/components/warn-detail/env.js b/src/components/warn-detail/env.js
index c8c7e0e86d7f2ce5736da9f07e48d94ce9d23e4e..57d1c15305014d03b6f6c95e8d54de1ed4d481df 100644
--- a/src/components/warn-detail/env.js
+++ b/src/components/warn-detail/env.js
@@ -3,6 +3,6 @@ export const STATUS_OBJ = {
     error: '未恢复'
 }
 export const PUSH_STATUS = {
-    success: '成功',
-    error: '失败'
+    1: '成功',
+    2: '失败'
 }
\ No newline at end of file
diff --git a/src/components/warn-detail/tab.vue b/src/components/warn-detail/tab.vue
index 1615ab4211a7f6d24a1b214e0792278349a4e7e5..417ba4e6449b3cb1963dcf3663399d5ebd220e9e 100644
--- a/src/components/warn-detail/tab.vue
+++ b/src/components/warn-detail/tab.vue
@@ -8,8 +8,8 @@
         height="100%"
         :isIndex="true"
         :stripe="true">
-        <template #person="{ row }">
-          <span>{{ row.person.join(",") }}</span>
+        <template #method="{ row }">
+          <span>{{ row.method.map((e) => methodLists[e]).join("，") }}</span>
         </template>
         <template #status="{ row }">
           <span v-if="item.prop == 'push'">
@@ -28,12 +28,17 @@
 <script setup>
 import { ref } from "vue";
 import { STATUS_OBJ, PUSH_STATUS } from "./env.js";
+import { METHODS } from "@/components/manual-distribution/env.js";
 const activeTab = ref("push");
 const props = defineProps({
   tabs: {
     type: Array,
     default: () => [],
   },
+  methodLists: {
+    type: Object,
+    default: METHODS,
+  },
 });
 const headers = {
   push: [
@@ -81,8 +86,8 @@ const headers = {
 
 <style lang="scss" scoped>
 $statusObj: (
-  success: #48ad97,
-  error: #d75138,
+  1: #48ad97,
+  2: #d75138,
 );
 .tab {
   @each $status, $color in $statusObj {
diff --git a/src/page/main/forewarning/list/detail/index.vue b/src/page/main/forewarning/list/detail/index.vue
index 1d218d0dc09b0f4b47eb9a46fbb06484fd9d6d0e..c682cbd50a17da5d89331b4f51a7b28379c8165e 100644
--- a/src/page/main/forewarning/list/detail/index.vue
+++ b/src/page/main/forewarning/list/detail/index.vue
@@ -80,26 +80,11 @@ const labelData = [
   ],
 ];
 const info = ref({});
-const tabs = [
+const tabs = ref([
   {
     label: "推送记录",
     prop: "push",
-    lists: [
-      {
-        method: "短信",
-        person: [11, 22, 33, 44],
-        push_time: "2022-07-29 10:23:59",
-        push_type: "自动推送",
-        status: "success",
-      },
-      {
-        method: "钉钉",
-        person: [11, 33, 44],
-        push_time: "2022-07-29 10:23:59",
-        push_type: "自动推送",
-        status: "error",
-      },
-    ],
+    lists: [],
   },
   {
     label: "处置记录",
@@ -119,7 +104,7 @@ const tabs = [
       },
     ],
   },
-];
+]);
 const getInfo = () => {
   const params = {
     id,
@@ -161,8 +146,29 @@ const GetRuleTypeOptions = () => {
     }
   });
 };
+const pushType = {
+  1: "自动推送",
+  2: "手动推送",
+};
+const getPushLog = () => {
+  axios.get("/v1/api/push_record/list", { params: { alert_list_id: id } }).then((res) => {
+    if (res.data.code == 200) {
+      tabs.value[0].lists =
+        res.data.data.list?.map((e) => {
+          return {
+            method: e.notify_method,
+            person: e.system_account,
+            push_time: e.push_time?.split("+")[0].replace("T", " ").replace("Z", " ") || "-",
+            push_type: pushType[e.push_type],
+            status: e.status,
+          };
+        }) || [];
+    }
+  });
+};
 onBeforeMount(() => {
   GetRuleTypeOptions();
+  getPushLog();
 });
 </script>
 
diff --git a/src/page/main/forewarning/list/index.vue b/src/page/main/forewarning/list/index.vue
index a9b687ecb2a11b08d08385721bf89cc7897f1a9f..cfefad2d9841b0348cd9b248c681e7efc9230b14 100644
--- a/src/page/main/forewarning/list/index.vue
+++ b/src/page/main/forewarning/list/index.vue
@@ -120,15 +120,11 @@
           icon="#bg-ic-s-circle-tips"></bg-icon
         >该推送为临时推送，可调整推送人员，仅本次有效！如固定通知人员，则前往【预警规则设置】调整预警内容
       </div>
-      <el-form ref="pushForm" :model="pushFormData" :rules="pushRules" label-width="120px" class="bg_form">
-        <el-form-item label="预警工单推送" prop="method" style="margin-bottom: 24px">
-          <el-checkbox-group v-model="pushFormData.method">
-            <el-checkbox :label="1">钉钉</el-checkbox>
-            <el-checkbox :label="2">短信</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-      </el-form>
-      <user-input-table v-if="userTableFlag" ref="userTable" :data="userData" @change="changeData" />
+      <ManualDistributionForm
+        ref="manual_distribution_form"
+        :noElLabel="false"
+        methodLabel="预警工单推送"
+        :history="state.history" />
       <template v-slot:footer>
         <div class="apaas_button">
           <el-button type="default" @click="cancelPushDialog">取消</el-button>
@@ -180,6 +176,7 @@ import { Search } from "@element-plus/icons-vue";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 import userInputTable from "./user-input-table.vue";
 import { useRouter } from "vue-router";
+import ManualDistributionForm from "@/components/manual-distribution/form.vue";
 import { GetRuleTypeOptions } from "@/components/env.js";
 
 const router = useRouter();
@@ -188,7 +185,7 @@ const bgForm = ref(null);
 const dataTable = ref(null);
 const closeForm = ref(null);
 const userTable = ref(null);
-const pushForm = ref(null);
+const manual_distribution_form = ref(null);
 const statusOptions = {
   "": "全部",
   1: "已恢复",
@@ -285,14 +282,8 @@ const state = reactive({
   closeRules: {
     close_notes: [{ required: true, message: "请输入关闭备注", trigger: "blur" }],
   },
+  history: null,
   pushDialog: false,
-  userData: [],
-  pushFormData: {
-    method: [],
-  },
-  pushRules: {
-    method: [{ type: "array", required: true, message: "请最少选择一种推送方式", trigger: "change" }],
-  },
   pushType: 0, // 1-单条推送 2-批量推送
   closeType: 0, // 1-单条推送 2-批量推送
 });
@@ -371,89 +362,73 @@ const changeSize = (size) => {
 }; // 改变每页条数
 
 const batchPush = () => {
-  console.log("批量推送");
   if (!state.selected || state.selected.length == 0) {
     ElMessage.error("请先勾选要推送的数据");
     return;
   }
   state.pushType = 2;
-  state.userData = [
-    {
-      account: 1,
-      name: "张一",
-      mobile: "13111111111",
-    },
-    {
-      account: 2,
-      name: "张二二",
-      mobile: "13222222222",
-    },
-    {
-      account: 4,
-      name: "张四三",
-      mobile: "13443434344",
-    },
-  ];
+  state.history = null;
   state.pushDialog = true;
 }; // 批量推送
-
 const pushWarning = (row) => {
   state.actionRow = row;
-  console.log("推送提醒");
   state.pushType = 1;
-  state.userData = [
-    {
-      account: 1,
-      name: "张一",
-      mobile: "13111111111",
-    },
-    {
-      account: 2,
-      name: "张二二",
-      mobile: "13222222222",
-    },
-    {
-      account: 4,
-      name: "张四三",
-      mobile: "13443434344",
-    },
-  ];
   state.pushDialog = true;
+  let alert_rules_id = row.alert_rules_id;
+  axios.get(`/v1/api/alert_rules/list`, { params: { id: alert_rules_id } }).then((res) => {
+    if (res.data.code == 200) {
+      if (!res.data.data.list || res.data.data.list.length == 0) return;
+      state.history = {
+        method: res.data.data.list[0].notify_method || [],
+        lists:
+          res.data.data.list[0].notify_recipients?.map((e) => {
+            return {
+              user_id: e.system_account,
+              user_name: e.user_name,
+              phone: e.phone,
+            };
+          }) || [],
+      };
+    } else {
+      ElMessage.error(res.data.msg);
+    }
+  });
 }; // 推送提醒
 
-const changeData = (data) => {
-  state.userData = data.data;
-};
-
 const cancelPushDialog = () => {
-  pushForm.value.resetFields();
   state.pushDialog = false;
 }; // 预警推送弹窗取消按钮：重置表单
 
-const pushConfirm = () => {
-  pushForm.value.validate((valid) => {
-    if (valid) {
-      let ids = [];
-      if (state.pushType == 1) {
-        ids.push(state.actionRow.id);
+const pushConfirm = async () => {
+  const manual_distribution_form_valid = await manual_distribution_form.value.Submit();
+  if (!manual_distribution_form_valid) return;
+  const { method, lists } = manual_distribution_form.value.form || {};
+  let params = {
+    ids: state.pushType == 1 ? [`${state.actionRow.id}`] : state.selected.map((e) => `${e.id}`),
+    notify_method: method || [],
+    notify_recipients: lists?.map((e) => {
+      return {
+        system_account: e.user_id,
+        user_name: e.user_name,
+        phone: e.phone,
+      };
+    }),
+  };
+  axios
+    .put("/v1/api/alert_list/batch/push", params)
+    .then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success("推送成功");
       } else {
-        ids = state.selected.map((e) => {
-          return e.id;
-        });
+        ElMessage.error(res.data.msg);
       }
-      let params = {
-        ids: ids,
-        method: state.pushFormData.method || [],
-      };
-      setTimeout(() => {
-        cancelPushDialog();
-        clearSelected();
-        changePage(1);
-      }, 200);
-    }
-  });
+    })
+    .finally((e) => {
+      cancelPushDialog();
+      clearSelected();
+      changePage(1);
+    });
 };
-
 const closeWarning = (row) => {
   state.actionRow = row;
   state.closeType = 1;
@@ -469,25 +444,25 @@ const cancelCloseWarningDialog = () => {
 const confirmClose = () => {
   closeForm.value.validate((valid) => {
     if (valid) {
-      let ids = [];
-      if (state.closeType == 1) {
-        ids.push(state.actionRow.id);
-      } else {
-        ids = state.selected.map((e) => {
-          return e.id;
-        });
-      }
       let params = {
-        ids: ids,
-        close_notes: state.closeFormData.close_notes,
-        close_remind: state.closeFormData.close_remind,
+        ids: state.closeType == 1 ? [state.actionRow.id] : state.selected.map((e) => e.id),
+        close_remark: state.closeFormData.close_notes,
+        defer_push: state.closeFormData.close_remind ? 1 : 0,
       };
-      console.log(params);
-      setTimeout(() => {
-        cancelCloseWarningDialog();
-        clearSelected();
-        changePage(1);
-      }, 200);
+      axios
+        .put("/v1/api/alert_list/batch/close", params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            ElMessage.success("关闭预警操作成功");
+          } else {
+            ElMessage.error(res.dta.msg);
+          }
+        })
+        .finally((e) => {
+          cancelCloseWarningDialog();
+          clearSelected();
+          changePage(1);
+        });
     }
   });
 }; // 关闭预警弹窗确定按钮：提交表单
@@ -510,9 +485,6 @@ const {
   closeFormData,
   closeRules,
   pushDialog,
-  userData,
-  pushFormData,
-  pushRules,
 } = toRefs(state);
 </script>
 
diff --git a/src/page/main/ticket/business-ticket-manage/add/index.vue b/src/page/main/ticket/business-ticket-manage/add/index.vue
index 0eebacb10a19fed52d4acda85299d3587304d807..6ab4dfc20d20948f83d70f4c587fba4d7b1b9bdc 100644
--- a/src/page/main/ticket/business-ticket-manage/add/index.vue
+++ b/src/page/main/ticket/business-ticket-manage/add/index.vue
@@ -30,14 +30,14 @@ const add_form = ref(null);
 const SaveSubmit = async () => {
   let res = await add_form.value.Submit();
   if (!res) return;
-  Save(res, { url: "/v1/api/work_order/work_order_manage/add" }, () => {
+  Save({ res, is_push: 0 }, { url: "/v1/api/work_order/work_order_manage/add" }, () => {
     Cancle();
   });
 };
 const Distribute = async () => {
   let res = await add_form.value.Submit();
   if (!res) return;
-  Save(res, {}, () => {
+  Save({ res, is_push: 1 }, {}, () => {
     Cancle();
   });
 };
diff --git a/src/page/main/ticket/business-ticket-manage/edit/index.vue b/src/page/main/ticket/business-ticket-manage/edit/index.vue
index 9cd09eee9fdbae3327c8d63d119f109928fb5abb..f012dbc8419a59a7daa8401c137fb7f120d5cded 100644
--- a/src/page/main/ticket/business-ticket-manage/edit/index.vue
+++ b/src/page/main/ticket/business-ticket-manage/edit/index.vue
@@ -34,14 +34,14 @@ const add_form = ref(null);
 const Save = async () => {
   let res = await add_form.value.Submit();
   if (!res) return;
-  Save(res, { url: "/v1/api/work_order/work_order_manage/edit" }, () => {
+  Save({ res, is_push: 0 }, { url: "/v1/api/work_order/work_order_manage/edit" }, () => {
     Cancle();
   });
 };
 const Distribute = async () => {
   let res = await add_form.value.Submit();
   if (!res) return;
-  Save(res, { id, url: "/v1/api/work_order/work_order_manage/edit" }, () => {
+  Save({ res, is_push: 1 }, { id, url: "/v1/api/work_order/work_order_manage/edit" }, () => {
     Cancle();
   });
 };
diff --git a/src/page/main/ticket/business-ticket-manage/modules/interface.js b/src/page/main/ticket/business-ticket-manage/modules/interface.js
index c55a1dcf18cccea759cd204b146fc89120d44a4c..11466d7109ab6e50233265bf60ebe1fc067dffb1 100644
--- a/src/page/main/ticket/business-ticket-manage/modules/interface.js
+++ b/src/page/main/ticket/business-ticket-manage/modules/interface.js
@@ -2,6 +2,7 @@ import { ElMessage } from "element-plus";
 import axios from "@/request/http.js";
 const setParams = (res, { id }) => {
     let params = {
+        is_push: res.is_push,
         order_name: res.ticket_name,
         order_level: +res.ticket_level,
         order_desc: res.ticket_desc,