From c867c8575656e256b47f5c325e6d282e06ba332f Mon Sep 17 00:00:00 2001
From: wangyan <405898180@qq.com>
Date: Thu, 13 Nov 2025 14:25:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(tables):=20=E6=9B=B4=E6=96=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E5=8F=8A=E6=8A=A5=E8=AD=A6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91-=20=E5=9C=A8?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E8=A1=A8=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20REPORT=5FID=20=E5=AD=97=E6=AE=B5=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20-=20=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8C=89=E6=8A=A5=E8=AD=A6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E8=B5=B7=E6=AD=A2=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?-=20=E5=AE=8C=E5=96=84=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E8=BF=87=E6=BB=A4=E5=AD=97=E6=AE=B5=20-=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E8=A1=A8=E5=8D=95=E9=A1=B9?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=B8=8E=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E4=BB=A5=E9=80=82=E9=85=8D=E5=90=8E=E7=AB=AF=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E6=A0=BC=E5=BC=8F=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=97=A7?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device_monitoring/alarm_logs/index.vue    | 52 ++++++++++++-------
 .../tbiron/coalarm/components/edit_sensor.vue | 24 ++++-----
 src/views/tbiron/coalarm/index.vue            | 16 +++++-
 .../warning_information/information/index.vue | 46 ++++++++++++++--
 4 files changed, 100 insertions(+), 38 deletions(-)

diff --git a/src/views/device_monitoring/alarm_logs/index.vue b/src/views/device_monitoring/alarm_logs/index.vue
index 4d52c59..6b742ad 100644
--- a/src/views/device_monitoring/alarm_logs/index.vue
+++ b/src/views/device_monitoring/alarm_logs/index.vue
@@ -7,30 +7,47 @@
         @submit.prevent="fnResetPagination"
       >
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="设备名称" prop="DEVICE_ID">
               <el-input v-model="searchForm.DEVICE_ID" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="监测节点名称" prop="PLC_NAME">
               <el-input v-model="searchForm.PLC_NAME" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label=" " prop="dates" label-width="0px">
+          <el-col :span="8">
+            <el-form-item label="报警类型" prop="OVERVIEW_OF_ALERTS">
+              <el-select v-model="searchForm.OVERVIEW_OF_ALERTS">
+                <el-option label="高高报警" value="高高报警" />
+                <el-option label="高报警" value="高报警" />
+                <el-option label="低报警" value="低报警" />
+                <el-option label="低低报警" value="低低报警" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="开始时间" prop="START_DATE">
               <el-date-picker
-                v-model="searchForm.dates"
-                type="daterange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                value-format="YYYY-MM-DD"
-                format="YYYY-MM-DD"
-                range-separator="至"
+                v-model="searchForm.START_DATE"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="datetime"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
+            <el-form-item label="结束时间" prop="END_DATE">
+              <el-date-picker
+                v-model="searchForm.END_DATE"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="datetime"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>
               <el-button native-type="reset" @click="fnResetPagination">
@@ -58,8 +75,8 @@
         <el-table-column prop="DEVICE_ID" label="设备名称" />
         <el-table-column prop="PLC_NAME" label="监测节点名称" />
         <el-table-column prop="CURRENT_VALUE" label="当前值" />
-        <el-table-column prop="THRESHOLD_UP_LIMIT" label="高报阈值" />
         <el-table-column prop="THRESHOLD_UP_UP_LIMIT" label="高高报阈值" />
+        <el-table-column prop="THRESHOLD_UP_LIMIT" label="高报阈值" />
         <el-table-column prop="THRESHOLD_DOWN_LIMIT" label="低报阈值" />
         <el-table-column prop="THRESHOLD_DOWN_DOWN_LIMIT" label="低低报阈值" />
         <el-table-column prop="OVERVIEW_OF_ALERTS" label="报警类型" />
@@ -73,16 +90,11 @@
 
 <script setup>
 import { serialNumber } from "@/assets/js/utils";
-import {getIronAlarmLogList} from "@/request/tb_iron.js";
+import { getIronAlarmLogList } from "@/request/tb_iron.js";
 import useListData from "@/assets/js/useListData.js";
 
 const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
-  useListData(getIronAlarmLogList,{
-    beforeGetData: (searchForm) => ({
-      START_DATE: searchForm.dates?.[0],
-      END_DATE: searchForm.dates?.[1],
-    }),
-  });
+  useListData(getIronAlarmLogList);
 </script>
 
 <style scoped></style>
diff --git a/src/views/tbiron/coalarm/components/edit_sensor.vue b/src/views/tbiron/coalarm/components/edit_sensor.vue
index c1e48af..d0137ca 100644
--- a/src/views/tbiron/coalarm/components/edit_sensor.vue
+++ b/src/views/tbiron/coalarm/components/edit_sensor.vue
@@ -212,18 +212,18 @@ const rules = {
   TARGET_UNIT: [
     { required: true, message: "计量单位不能为空", trigger: "blur" },
   ],
-  THRESHOLD_UP_LIMIT: [
-    { required: true, message: "高爆阈值不能为空", trigger: "blur" },
-  ],
-  THRESHOLD_UP_UP_LIMIT: [
-    { required: true, message: "高高报阈值不能为空", trigger: "blur" },
-  ],
-  THRESHOLD_DOWN_LIMIT: [
-    { required: true, message: "低报阈值不能为空", trigger: "blur" },
-  ],
-  THRESHOLD_DOWN_DOWN_LIMIT: [
-    { required: true, message: "低低报阈值不能为空", trigger: "blur" },
-  ],
+  // THRESHOLD_UP_LIMIT: [
+  //   { required: true, message: "高报阈值不能为空", trigger: "blur" },
+  // ],
+  // THRESHOLD_UP_UP_LIMIT: [
+  //   { required: true, message: "高高报阈值不能为空", trigger: "blur" },
+  // ],
+  // THRESHOLD_DOWN_LIMIT: [
+  //   { required: true, message: "低报阈值不能为空", trigger: "blur" },
+  // ],
+  // THRESHOLD_DOWN_DOWN_LIMIT: [
+  //   { required: true, message: "低低报阈值不能为空", trigger: "blur" },
+  // ],
   RANGE_UP: [{ required: true, message: "量程上限不能为空", trigger: "blur" }],
   RANGE_DOWN: [
     { required: true, message: "量程下限不能为空", trigger: "blur" },
diff --git a/src/views/tbiron/coalarm/index.vue b/src/views/tbiron/coalarm/index.vue
index e882c0e..3d2086e 100644
--- a/src/views/tbiron/coalarm/index.vue
+++ b/src/views/tbiron/coalarm/index.vue
@@ -32,6 +32,14 @@
               <el-input v-model="searchForm.COALARM_AREA" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="预警状态" prop="OPEN_ALARM">
+              <el-select v-model="searchForm.OPEN_ALARM">
+                <el-option label="开启" value="0" />
+                <el-option label="未开启" value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>
@@ -140,7 +148,13 @@
             <el-button type="warning" text link @click="fnGateMachine(row)">
               添加监测节点
             </el-button>
-            <el-button type="primary" text link @click="fnEarlyWarning(row)">
+            <el-button
+              type="primary"
+              text
+              link
+              :disabled="row.REPORT_ID !== null && row.REPORT_ID !== ''"
+              @click="fnEarlyWarning(row)"
+            >
               {{ row.OPEN_ALARM === 0 ? "关闭预警" : "开启预警" }}
             </el-button>
             <el-button
diff --git a/src/views/warning_information/information/index.vue b/src/views/warning_information/information/index.vue
index 87e5fb0..13c1155 100644
--- a/src/views/warning_information/information/index.vue
+++ b/src/views/warning_information/information/index.vue
@@ -7,11 +7,6 @@
         @submit.prevent="fnResetPagination"
       >
         <el-row>
-          <el-col :span="6">
-            <el-form-item label="预警发布单位" prop="KEYWORDS">
-              <el-input v-model="searchForm.KEYWORDS" />
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <el-form-item label="预警状态" prop="WARN_STATUS">
               <el-select
@@ -66,6 +61,47 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="预警描述" prop="MESSAGE">
+              <el-input v-model="searchForm.MESSAGE" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否反馈" prop="FEED_BACK">
+              <el-select v-model="searchForm.FEED_BACK">
+                <el-option label="已反馈" value="0" />
+                <el-option label="未反馈" value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="省平台预警" prop="IS_REPORT">
+              <el-select v-model="searchForm.IS_REPORT">
+                <el-option label="是" value="1" />
+                <el-option label="否" value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="开始时间" prop="START_TIME">
+              <el-date-picker
+                v-model="searchForm.START_TIME"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="datetime"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束时间" prop="END_TIME">
+              <el-date-picker
+                v-model="searchForm.END_TIME"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="datetime"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label-width="10px">
               <el-button type="primary" native-type="submit">搜索</el-button>