From 2d7f8cddc312126433e4450f9fb897094f5a562d Mon Sep 17 00:00:00 2001
From: dengjia <dengjia@zcloudchina.com>
Date: Thu, 14 Aug 2025 10:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarm_management/index.vue          | 35 ++++++++++++++++---
 .../data_directory/basic/records_detail.vue   |  9 +++--
 .../schedule_management/scheduleLog/index.vue |  9 +++--
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/views/alarm_management/index.vue b/src/views/alarm_management/index.vue
index 6a175c5..96e1b1c 100644
--- a/src/views/alarm_management/index.vue
+++ b/src/views/alarm_management/index.vue
@@ -1,7 +1,17 @@
 <template>
   <div>
-    <!-- <app-search v-model="searchForm" :options @submit="resetPagination" /> -->
-    <app-table ref="tableRef" v-model:pagination="pagination" :data="list">
+    <app-search
+      v-model="searchForm"
+      :options
+      label-width="150px"
+      @submit="resetPagination"
+    />
+    <app-table
+      ref="tableRef"
+      v-model:pagination="pagination"
+      :data="list"
+      @get-data="getData"
+    >
       <el-table-column prop="companyName" label="企业名称" />
       <el-table-column prop="servicePlatformName" label="服务平台名称" />
       <el-table-column prop="thirdPlatformName" label="上级平台名称" />
@@ -46,7 +56,7 @@
 </template>
 
 <script setup>
-// import AppSearch from "@/components/search/index.vue";
+import AppSearch from "@/components/search/index.vue";
 import { ref } from "vue";
 import useListData from "@/hooks/useListData.js";
 import { getAlarmList } from "@/request/alarm_management.js";
@@ -56,9 +66,24 @@ import editDialog from "./components/edit.vue";
 
 const router = useRouter();
 
-const { list, pagination, tableRef, resetPagination } =
+const { list, pagination, searchForm, tableRef, resetPagination, getData } =
   useListData(getAlarmList);
-// const options = [{ key: "jobName", label: "任务名称" }];
+const handleStatusOptions = [
+  { name: "未处理", id: 1 },
+  { name: "处理成功", id: 2 },
+  { name: "不需要处理", id: 3 },
+];
+const options = [
+  { key: "companyName", label: "企业名称" },
+  { key: "servicePlatformName", label: "服务平台名称" },
+  { key: "thirdPlatformName", label: "上级平台名称" },
+  {
+    key: "handleStatus",
+    label: "处理类型",
+    type: "select",
+    options: handleStatusOptions,
+  },
+];
 const editDialogInfo = ref({
   visible: false,
   id: "",
diff --git a/src/views/data_directory/basic/records_detail.vue b/src/views/data_directory/basic/records_detail.vue
index 8d25a74..89c9b72 100644
--- a/src/views/data_directory/basic/records_detail.vue
+++ b/src/views/data_directory/basic/records_detail.vue
@@ -3,12 +3,14 @@
     <el-row :gutter="40">
       <el-col :span="8">
         <div class="grid-content">
-          <template v-if="!fnToJsonParse(json)">{{ json }}</template>
+          <template v-if="!fnToJsonParse(requestJson)">{{
+            requestJson
+          }}</template>
           <template v-else>
             {
             <div
               class="mt-2 pl-18"
-              v-for="(value, key) in fnToJsonParse(json)"
+              v-for="(value, key) in fnToJsonParse(requestJson)"
               :key="key"
             >
               <span class="key-contanier"> {{ key }}</span> :
@@ -20,6 +22,7 @@
       </el-col>
       <el-col :span="16">
         <div class="grid-content" v-for="(item, index) in logList" :key="index">
+          <div v-if="item.requestTime">请求时间{{ item.requestTime }}</div>
           <el-row :gutter="40">
             <el-col :span="12">
               <h4 class="mb-10">请求信息</h4>
@@ -69,7 +72,7 @@ const { data } = await getRecordDetail({
   id: route.query.id,
   dataType: Number(route.query.dataType),
 });
-const { json, logList } = data;
+const { requestJson, logList } = data;
 const fnToJsonParse = (params) => {
   if (params === null) {
     return false;
diff --git a/src/views/schedule_management/scheduleLog/index.vue b/src/views/schedule_management/scheduleLog/index.vue
index fa13ae7..3833f02 100644
--- a/src/views/schedule_management/scheduleLog/index.vue
+++ b/src/views/schedule_management/scheduleLog/index.vue
@@ -1,7 +1,12 @@
 <template>
   <div>
     <app-search v-model="searchForm" :options @submit="resetPagination" />
-    <app-table ref="tableRef" v-model:pagination="pagination" :data="list">
+    <app-table
+      ref="tableRef"
+      v-model:pagination="pagination"
+      :data="list"
+      @get-data="getData"
+    >
       <el-table-column prop="beanName" label="bean名称" />
       <el-table-column prop="jobName" label="任务名称" />
       <el-table-column prop="params" label="参数" />
@@ -43,7 +48,7 @@ import { useRouter } from "vue-router";
 
 const router = useRouter();
 
-const { list, pagination, searchForm, resetPagination, tableRef } =
+const { list, pagination, searchForm, resetPagination, tableRef, getData } =
   useListData(getScheduleLogList);
 const options = [{ key: "jobName", label: "任务名称" }];
 </script>