diff --git a/src/assets/js/utils/utilOptions.js b/src/assets/js/utils/utilOptions.js
index 245ad22..44dd25d 100644
--- a/src/assets/js/utils/utilOptions.js
+++ b/src/assets/js/utils/utilOptions.js
@@ -64,3 +64,42 @@ export const agentType = [
     desc: '面向单轮自动化任务的编排工作流'
   }
 ]
+
+export const timeOptions = [
+  {
+    label: '今天',
+    value: '1'
+  },
+  {
+    label: '过去7天',
+    value: '2'
+  },
+  {
+    label: '过去4周',
+    value: '3'
+  },
+  {
+    label: '过去3月',
+    value: '4'
+  },
+  {
+    label: '过去12月',
+    value: '5'
+  },
+  {
+    label: '本月至今',
+    value: '6'
+  },
+  {
+    label: '本季度至今',
+    value: '7'
+  },
+  {
+    label: '本年至今',
+    value: '8'
+  },
+  {
+    label: '所有时间',
+    value: '9'
+  }
+]
diff --git a/src/views/intelligent-agent/children/Logs&overview/components/API.js b/src/views/intelligent-agent/children/Logs&overview/components/API.js
index 00b9b3b..cc17854 100644
--- a/src/views/intelligent-agent/children/Logs&overview/components/API.js
+++ b/src/views/intelligent-agent/children/Logs&overview/components/API.js
@@ -9,3 +9,11 @@ export function echartsAllData(data) {
     noLoading: true
   })
 }
+export function conversationLog(data) {
+  return request({
+    url: getUrl(`/intelligent/ex/conversation/page`),
+    method: 'post',
+    data
+    // noLoading: true
+  })
+}
diff --git a/src/views/intelligent-agent/children/Logs&overview/components/logs.vue b/src/views/intelligent-agent/children/Logs&overview/components/logs.vue
index d92daf8..07f127b 100644
--- a/src/views/intelligent-agent/children/Logs&overview/components/logs.vue
+++ b/src/views/intelligent-agent/children/Logs&overview/components/logs.vue
@@ -2,17 +2,24 @@
   <div class="p10">
     <el-form ref="form" label-position="top" inline>
       <el-form-item label="时间" prop="time">
-        <el-select size="medium" v-model="form.time"></el-select>
+        <el-select size="medium" v-model="form.time">
+          <el-option
+            v-for="item in timeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="是否标注" prop="time">
-        <el-select size="medium" v-model="form.time"></el-select>
-      </el-form-item>
-      <el-form-item label="搜索" prop="time">
-        <el-input size="medium"></el-input>
-      </el-form-item>
-      <el-form-item label="排序" prop="time">
-        <el-select size="medium" v-model="form.time"></el-select>
+      <!--      <el-form-item label="是否标注" prop="time">-->
+      <!--        <el-select size="medium" v-model="form.time"></el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="搜索" prop="keyWord">
+        <el-input size="medium" v-model="form.keyWord"></el-input>
       </el-form-item>
+      <!--      <el-form-item label="排序" prop="time">-->
+      <!--        <el-select size="medium" v-model="form.time"></el-select>-->
+      <!--      </el-form-item>-->
     </el-form>
 
     <r-table
@@ -28,13 +35,19 @@
   </div>
 </template>
 <script>
+import { conversationLog } from '@/views/intelligent-agent/children/Logs&overview/components/API'
+import { timeOptions } from '@/assets/js/utils/utilOptions'
+import '@/assets/js/business-common'
+
 export default {
   name: 'logs',
   data() {
     return {
       form: {
-        time: ''
+        time: '9',
+        keyWord: ''
       },
+      timeOptions,
       tableConfig: {
         tableData: [],
         pageSize: 10,
@@ -48,6 +61,77 @@ export default {
   components: {},
   filters: {},
   methods: {
+    /**
+     * 根据 value 返回对应的时间范围
+     * @param {string} value - 选项值，如 '2', '3', ..., '8'
+     * @returns {{startDate: string, endDate: string}}
+     */
+    getDateRangeByValue(value) {
+      const today = new Date()
+
+      // 辅助函数：格式化日期为 yyyy-MM-dd
+      function formatDate(date) {
+        const y = date.getFullYear()
+        const m = String(date.getMonth() + 1).padStart(2, '0')
+        const d = String(date.getDate()).padStart(2, '0')
+        return `${y}-${m}-${d}`
+      }
+
+      let startDate = ''
+      let endDate = ''
+
+      switch (value) {
+        case '1': // 今天
+          endDate = startDate = formatDate(today)
+          break
+        case '2': // 过去7天
+          startDate = formatDate(
+            new Date(today.getTime() - 6 * 24 * 60 * 60 * 1000)
+          )
+          endDate = formatDate(today)
+          break
+        case '3': // 过去4周（28天）
+          startDate = formatDate(
+            new Date(today.getTime() - 27 * 24 * 60 * 60 * 1000)
+          )
+          endDate = formatDate(today)
+          break
+        case '4': // 过去3个月（约90天）
+          startDate = formatDate(
+            new Date(today.getTime() - 89 * 24 * 60 * 60 * 1000)
+          )
+          endDate = formatDate(today)
+          break
+        case '5': // 过去12个月（约365天）
+          startDate = formatDate(
+            new Date(today.getTime() - 364 * 24 * 60 * 60 * 1000)
+          )
+          endDate = formatDate(today)
+          break
+        case '6': // 本月至今
+          startDate = formatDate(
+            new Date(today.getFullYear(), today.getMonth(), 1)
+          )
+          endDate = formatDate(today)
+          break
+        case '7': // 本季度至今
+          const quarterStartMonth = Math.floor(today.getMonth() / 3) * 3
+          startDate = formatDate(
+            new Date(today.getFullYear(), quarterStartMonth, 1)
+          )
+          endDate = formatDate(today)
+          break
+        case '8': // 本年至今
+          startDate = formatDate(new Date(today.getFullYear(), 0, 1))
+          endDate = formatDate(today)
+          break
+        default:
+          startDate = endDate = formatDate(today)
+          break
+      }
+
+      return { startDate, endDate }
+    },
     handleCurrentChange(val) {
       this.tableConfig.pageNum = val
       this.load()
@@ -58,45 +142,105 @@ export default {
       this.load()
     },
     load() {
-      this.tableConfig.tableData = []
+      let params = {
+        page: this.tableConfig.pageNum,
+        pageSize: this.tableConfig.pageSize,
+        appId: this.$route.query.appId,
+        keyword: this.form.keyWord
+      }
+      if (this.form.time !== '9') {
+        let times = this.getDateRangeByValue(this.form.time)
+        params.startDate = times.startDate
+        params.endDate = times.endDate
+      }
+
+      conversationLog(params).then(res => {
+        if (res) {
+          this.tableConfig.tableData = res.content.content.list
+          this.tableConfig.total = res.content.content.total
+        }
+      })
     }
   },
   created() {},
-  mounted() {},
+  mounted() {
+    this.load()
+  },
   computed: {
     columns: () => {
       return [
         {
           title: '标题',
-          prop: 'index'
-        },
-        {
-          label: '用户',
-          prop: 'time'
+          prop: 'name'
         },
+        // {
+        //   label: '用户',
+        //   prop: 'time'
+        // },
         {
           label: '状态',
-          prop: 'content'
+          prop: 'content',
+          render: (h, params) => {
+            let text = ''
+            let color = ''
+            if (params.row.status_count.success === params.row.message_count) {
+              text = 'SUCCESS'
+              color = 'green'
+            } else {
+              text = 'failed'
+              color = 'red'
+            }
+            return h(
+              'div',
+              {
+                style: {
+                  color: color
+                }
+              },
+              text
+            )
+          }
         },
         {
           label: '消息数',
-          prop: 'operation'
+          prop: 'message_count',
+          render: (h, params) => {
+            return h('SPAN', params.row.message_count)
+          }
         },
         {
           label: '用户反馈',
-          prop: 'operation'
+          prop: 'operation',
+          render: (h, params) => {
+            return h('SPAN', 'N/A')
+          }
         },
         {
           label: '管理员反馈',
-          prop: 'operation'
+          prop: 'operation',
+          render: (h, params) => {
+            return h('SPAN', 'N/A')
+          }
         },
         {
           label: '更新时间',
-          prop: 'operation'
+          prop: 'operation',
+          render: (h, params) => {
+            let data = new Date(Number(params.row.updated_at + '000')).format(
+              'yyyy-MM-dd hh:mm'
+            )
+            return h('SPAN', data)
+          }
         },
         {
           label: '创建时间',
-          prop: 'operation'
+          prop: 'operation',
+          render: (h, params) => {
+            let data = new Date(Number(params.row.created_at + '000')).format(
+              'yyyy-MM-dd hh:mm'
+            )
+            return h('SPAN', data)
+          }
         }
       ]
     }
diff --git a/src/views/intelligent-agent/children/Logs&overview/components/overview.vue b/src/views/intelligent-agent/children/Logs&overview/components/overview.vue
index edb7f36..7612bda 100644
--- a/src/views/intelligent-agent/children/Logs&overview/components/overview.vue
+++ b/src/views/intelligent-agent/children/Logs&overview/components/overview.vue
@@ -29,50 +29,14 @@
 import LineEcharts from '@/views/intelligent-agent/children/Logs&overview/components/lineEcharts.vue'
 import { echartsAllData } from './API'
 import '@/assets/js/business-common'
+import { timeOptions } from '@/assets/js/utils/utilOptions'
 export default {
   name: 'overveiw',
   data() {
     return {
       times: '9',
       list: [],
-      options: [
-        {
-          label: '今天',
-          value: '1'
-        },
-        {
-          label: '过去7天',
-          value: '2'
-        },
-        {
-          label: '过去4周',
-          value: '3'
-        },
-        {
-          label: '过去3月',
-          value: '4'
-        },
-        {
-          label: '过去12月',
-          value: '5'
-        },
-        {
-          label: '本月至今',
-          value: '6'
-        },
-        {
-          label: '本季度至今',
-          value: '7'
-        },
-        {
-          label: '本年至今',
-          value: '8'
-        },
-        {
-          label: '所有时间',
-          value: '9'
-        }
-      ]
+      options: timeOptions
     }
   },
   props: {},