完成预防检查

src/types/disaster-warning/index.ts

@@ -24,7 +24,7 @@ export interface DefenseNoticeListQuery extends BasicListQuery {}
 
 export interface DefenseNoticeListResponse extends BasicResponse {
   title: string;
-  updatedAt: string;
+  createdAt: string;
 }
 
 interface BasicDetailResponse {

src/views/disaster/disaster-precaution/PageTaskExecution.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="disaster-precaution-container">
     <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">检查任务执行</span>
+      <span class="disaster-precaution-container__title">灾害预防检查任务</span>
     </header>
     <main class="disaster-precaution-container__main">
       <div class="disaster-precaution">
@@ -142,6 +142,10 @@
     if (searchData.taskState !== '') {
       taskManagementListQuery.queryParam.taskState = searchData.taskState;
     }
+    if (Object.keys(taskManagementListQuery.queryParam).length > 0) {
+      pagination.pageNumber = 1;
+      taskManagementListQuery.pageNumber = 1;
+    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {

src/views/disaster/disaster-precaution/PageTaskExecutionDetail.vue

@@ -2,7 +2,7 @@
   <div class="disaster-precaution-container">
     <header class="disaster-precaution-container__header">
       <img :src="BackIcon" alt="back" class="back-icon" @click="router.back()" />
-      <span class="disaster-precaution-container__title">灾害预防检查任务</span>
+      <span class="disaster-precaution-container__title">任务执行</span>
     </header>
     <main class="disaster-precaution-container__main">
       <div class="disaster-precaution">

src/views/disaster/disaster-precaution/PageTaskItem.vue

@@ -30,12 +30,13 @@
   const id = route.query.id;
   const formLoading = ref(false);
   const headerTitle = computed(() => {
+    const title = '灾害检查任务';
     if (operate === 'create') {
-      return '创建灾害检测任务';
+      return `创建${title}`;
     } else if (operate === 'edit') {
-      return '编辑灾害检测任务';
+      return `编辑${title}`;
     }
-    return '查看灾害检测任务';
+    return `查看${title}`;
   });
   const dynamicComponent = computed(() => {
     if (operate === 'create') {

src/views/disaster/disaster-precaution/PageTaskManagement.vue

@@ -154,6 +154,10 @@
     if (searchData.taskState !== '') {
       taskManagementListQuery.queryParam.taskState = searchData.taskState;
     }
+    if (Object.keys(taskManagementListQuery.queryParam).length > 0) {
+      pagination.pageNumber = 1;
+      taskManagementListQuery.pageNumber = 1;
+    }
     getTableData();
   };
   const selectionItems = ref<any[]>([]);

src/views/disaster/disaster-warning/PageDefenseNotice.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="disaster-precaution-container">
     <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">防御通知管理列表</span>
+      <span class="disaster-precaution-container__title">灾害防御通知</span>
     </header>
     <main class="disaster-precaution-container__main">
       <div class="disaster-precaution">
@@ -202,7 +202,10 @@
     if (searchData.disasterType !== '') {
       defenseNoticeListQuery.queryParam.disasterType = searchData.disasterType;
     }
-
+    if (Object.keys(defenseNoticeListQuery.queryParam).length > 0) {
+      pagination.pageNumber = 1;
+      defenseNoticeListQuery.pageNumber = 1;
+    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {

src/views/disaster/disaster-warning/PageWarningInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="disaster-precaution-container">
     <header class="disaster-precaution-container__header">
-      <span class="disaster-precaution-container__title">预警信息列表</span>
+      <span class="disaster-precaution-container__title">灾害预警信息</span>
     </header>
     <main class="disaster-precaution-container__main">
       <div class="disaster-precaution">
@@ -210,6 +210,10 @@
     if (searchData.effectState !== '') {
       wanrningInfoListQuery.queryParam.effectState = searchData.effectState;
     }
+    if (Object.keys(wanrningInfoListQuery.queryParam).length > 0) {
+      pagination.pageNumber = 1;
+      wanrningInfoListQuery.pageNumber = 1;
+    }
     getTableData();
   };
   const handleSizeChange = (value: number) => {

src/views/disaster/disaster-warning/src/components/ViewDefenseNoticeItem.vue

@@ -6,7 +6,7 @@
       </el-tooltip>
       <div class="disaster">
         <p class="info-item">
-          类型：<span class="info-content">{{ getDisasterType(defenseNoticeDetail?.disasterType || '') }}</span>
+          灾害类型：<span class="info-content">{{ getDisasterType(defenseNoticeDetail?.disasterType || '') }}</span>
         </p>
         <p class="info-item">
           灾害等级：<span class="info-content">{{ getDisasterLevel(defenseNoticeDetail?.disasterLevel || '') }}</span>
@@ -92,6 +92,7 @@
   .info-container {
     width: 100%;
     height: 100%;
+    overflow-y: auto;
     &__header {
       display: flex;
       flex-direction: column;
@@ -121,8 +122,6 @@
   }
 
   .content {
-    max-height: 500cpx;
-    overflow-y: auto;
     white-space: pre-wrap;
   }
 
@@ -135,8 +134,6 @@
     margin-bottom: 18cpx;
   }
   .attachment {
-    max-height: 150cpx;
-    overflow-y: auto;
     margin-top: 18cpx;
     a {
       color: $primary-color;

src/views/disaster/disaster-warning/src/config/form.ts

@@ -2,7 +2,6 @@
  * 灾害预警信息表单配置
  */
 import type { FormConfig } from '@/types/basic-form';
-import { validateFormTime } from '@/views/disaster/utils/validateTime';
 // 通用表单信息
 const BASIC_FROM_CONFIG = {
   DISASTER_LEVEL: {
@@ -153,10 +152,7 @@ const BASIC_FROM_RULES = {
 export const WARNING_INFO_FROM_RULES = {
   disasterType: [{ required: true, message: '请选择预警类型', trigger: 'change' }],
   ...BASIC_FROM_RULES,
-  warnTime: [
-    { required: true, message: '请选择预警时间', trigger: 'change' },
-    { validator: validateFormTime, trigger: 'change' },
-  ],
+  warnTime: [{ required: true, message: '请选择预警时间', trigger: 'change' }],
   source: [{ required: true, message: '请输入信息来源', trigger: 'blur' }],
 };
 

src/views/disaster/disaster-warning/src/config/table.ts

@@ -117,7 +117,7 @@ export const DEFENSE_NOTICE_TABLE_COLUMNS_PERMISSION: TableColumnProps[] = [
   BASIC_TABLE_COLUMNS.ACTIVE_STATUS,
   {
     label: '创建时间',
-    prop: 'updatedAt',
+    prop: 'createdAt',
     align: 'center',
     width: '200cpx',
   },