diff --git a/src/api/rule-engine/log.ts b/src/api/rule-engine/log.ts
index 9626b05a..cd9530c1 100644
--- a/src/api/rule-engine/log.ts
+++ b/src/api/rule-engine/log.ts
@@ -33,4 +33,9 @@ export const detail = (id:string) => server.get(`/alarm/record/${id}`);
 /**
  * 告警历史记录
  */
-export const queryHistoryList = (data:any) => server.post('/alarm/history/_query',data)
\ No newline at end of file
+export const queryHistoryList = (data:any) => server.post('/alarm/history/_query',data);
+
+/**
+ * 获取告警处理结果
+ */
+export const queryHandleHistory = (data:any) => server.post('/alarm/record/handle-history/_query',data);
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue b/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue
new file mode 100644
index 00000000..61b34dd0
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue
@@ -0,0 +1,79 @@
+<template>
+    <a-modal
+        title="告警处理"
+        okText="确定"
+        cancelText="取消"
+        visible
+        @cancel="handleCancel"
+        @ok="handleSave"
+        destroyOnClose
+        :confirmLoading="loading"
+    >
+        <a-form :rules="rules" layout="vertical" ref="formRef" :model="form">
+            <a-form-item label="处理结果" name="describe">
+                <a-textarea
+                    :rows="8"
+                    :maxlength="200"
+                    showCount
+                    placeholder="请输入处理结果"
+                    v-model:value="form.describe"
+                ></a-textarea>
+            </a-form-item>
+        </a-form>
+    </a-modal>
+</template>
+
+<script lang="ts" setup>
+import { handleLog } from '@/api/rule-engine/log';
+import { onlyMessage } from '@/utils/comm';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const loading = ref<boolean>(false);
+const formRef = ref();
+const rules = {
+    describe: [
+        {
+            required: true,
+            message: '请输入处理结果',
+        },
+    ],
+};
+const form = reactive({
+    describe: '',
+});
+let visible = ref(true);
+const emit = defineEmits(['closeSolve'])
+const handleCancel = () => {
+    emit('closeSolve');
+};
+const handleSave = () => {
+    loading.value = true;
+    formRef.value
+        .validate()
+        .then(async () => {
+            const res = await handleLog({
+                describe: form.describe,
+                type: 'user',
+                state: 'normal',
+                alarmRecordId: props.data?.current?.id || '',
+                alarmConfigId: props.data?.current?.alarmConfigId || '',
+                alarmTime: props?.data?.current?.alarmTime || '',
+            });
+            if (res.status === 200) {
+                onlyMessage('操作成功！');
+            } else {
+                onlyMessage('操作失败！', 'error');
+            }
+            loading.value = false;
+        })
+        .catch((error) => {
+            console.log(error);
+            loading.value = false;
+        });
+};
+</script>
+<style lang="less" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue b/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
index 61b34dd0..da998e3f 100644
--- a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
+++ b/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
@@ -1,79 +1,96 @@
 <template>
     <a-modal
-        title="告警处理"
-        okText="确定"
-        cancelText="取消"
         visible
-        @cancel="handleCancel"
-        @ok="handleSave"
-        destroyOnClose
-        :confirmLoading="loading"
+        title="处理记录"
+        :width="1200"
+        cancelText="取消"
+        okText="确定"
     >
-        <a-form :rules="rules" layout="vertical" ref="formRef" :model="form">
-            <a-form-item label="处理结果" name="describe">
-                <a-textarea
-                    :rows="8"
-                    :maxlength="200"
-                    showCount
-                    placeholder="请输入处理结果"
-                    v-model:value="form.describe"
-                ></a-textarea>
-            </a-form-item>
-        </a-form>
+        <Search :columns="columns" target="bind-channel"></Search>
+        <JTable
+            model="TABLE"
+            :columns="columns"
+            :defaultParams="{
+                sorts: [{ name: 'createTime', order: 'desc' }],
+                terms,
+            }"
+            :request="queryHandleHistory"
+        >
+            <template #alarmTime="slotProps">
+                <span>
+                    {{
+                        moment(slotProps.alarmTime).format(
+                            'YYYY-MM-DD HH:mm:ss',
+                        )
+                    }}
+                </span>
+            </template>
+        </JTable>
     </a-modal>
 </template>
 
 <script lang="ts" setup>
-import { handleLog } from '@/api/rule-engine/log';
-import { onlyMessage } from '@/utils/comm';
+import { queryHandleHistory } from '@/api/rule-engine/log';
+import moment from 'moment';
 const props = defineProps({
     data: {
         type: Object,
     },
 });
-const loading = ref<boolean>(false);
-const formRef = ref();
-const rules = {
-    describe: [
-        {
-            required: true,
-            message: '请输入处理结果',
+const terms = [
+    {
+        column: 'alarmRecordId',
+        termType: 'eq',
+        value: props.data.id,
+        type: 'and',
+    },
+];
+const columns = [
+    {
+        title: '处理时间',
+        dataIndex: 'handleTime',
+        key: 'handleTime',
+        search: {
+            type: 'string',
         },
-    ],
-};
-const form = reactive({
-    describe: '',
-});
-let visible = ref(true);
-const emit = defineEmits(['closeSolve'])
-const handleCancel = () => {
-    emit('closeSolve');
-};
-const handleSave = () => {
-    loading.value = true;
-    formRef.value
-        .validate()
-        .then(async () => {
-            const res = await handleLog({
-                describe: form.describe,
-                type: 'user',
-                state: 'normal',
-                alarmRecordId: props.data?.current?.id || '',
-                alarmConfigId: props.data?.current?.alarmConfigId || '',
-                alarmTime: props?.data?.current?.alarmTime || '',
-            });
-            if (res.status === 200) {
-                onlyMessage('操作成功！');
-            } else {
-                onlyMessage('操作失败！', 'error');
-            }
-            loading.value = false;
-        })
-        .catch((error) => {
-            console.log(error);
-            loading.value = false;
-        });
-};
+    },
+    {
+        dataIndex: 'handleType',
+        title: '处理类型',
+        key: 'handleType',
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: [
+                {
+                    label: '系统',
+                    value: 'system',
+                },
+                {
+                    label: '人工',
+                    value: 'user',
+                },
+            ],
+        },
+    },
+    {
+        title: '告警时间',
+        dataIndex: 'alarmTime',
+        key: 'alarmTime',
+        scopedSlots: true,
+        search: {
+            type: 'date',
+        },
+    },
+    {
+        title: '告警处理',
+        dataIndex: 'description',
+        key: 'description',
+        search: {
+            type: 'string',
+        },
+    },
+];
 </script>
 <style lang="less" scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index b4eb3c9e..c575c10e 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -115,7 +115,8 @@
                 </CardBox>
             </template>
         </JTable>
-        <SolveLog :data="data" v-if="data.solveVisible" @closeSolve="closeSolve"/>
+        <SolveComponent :data="data" v-if="data.solveVisible" @closeSolve="closeSolve"/>
+        <SolveLog :data="data.current" v-if="data.logVisible"/>
     </div>
 </template>
 
@@ -134,6 +135,7 @@ import { storeToRefs } from 'pinia';
 import { Store } from 'jetlinks-store';
 import moment from 'moment';
 import type { ActionsType } from '@/components/Table';
+import SolveComponent from '../SolveComponent/index.vue';
 import SolveLog from '../SolveLog/index.vue'
 import { useMenuStore } from '@/store/menu';
 const menuStory = useMenuStore();
@@ -390,6 +392,10 @@ const getActions = (
                 title: '处理记录',
             },
             icon: 'FileTextOutlined',
+            onClick:() =>{
+                data.value.current = currentData;
+                data.value.logVisible = true;
+            }
         },
     ];
     return actions;