gengx

src/views/subSystem/drainage/jcbj/bjsh.vue

@@ -253,8 +253,9 @@ const loading = ref(false)
 async function loadData() {
   loading.value = true
   try {
-    // 调用 alarm_data 真实接口，只取未处理报警(alarmStatus=0)
-    const res = await getAlarmDataPage(1, 200, { equipmentType: 'drainage', alarmStatus: 0 })
+    // 查询排水全部报警，由综合审核状态筛选待审核/已审核。
+    // 不能固定传 alarmStatus=0，否则已审核记录无法在页面显示。
+    const res = await getAlarmDataPage(1, 200, { equipmentType: 'drainage' })
     const pageData = res.code !== undefined ? res.data : res
     const records = pageData.records || pageData.rows || []
     let tableData_local = records.map(row => ({
@@ -270,7 +271,10 @@ async function loadData() {
       currentValue: row.actualValue,
       thresholdValue: row.maxValue,
       warningType: row.warningType,
-      status: 1,  // 未处理(alarmStatus=0)在审核页面显示为"待审核"
+      // 以接口返回的综合审核状态为准；已有工单的历史报警不能继续显示为待审核。
+      status: row.auditStatus != null
+        ? Number(row.auditStatus)
+        : (row.hasWorkOrder || row.alarmStatus === 1 ? 2 : 1),
       source: 'alarm_data'
     }))
 
@@ -373,7 +377,7 @@ async function submitAudit() {
         })
       : await handleAlarm(currentAlarm.value.id, userStore.name || 'admin', auditForm.value.opinion || auditForm.value.result)
     if (res.code === 200 || res.code === 0) {
-      ElMessage.success(isApproved ? '审核通过，已自动上传至工单' : '审核提交成功')
+      ElMessage.success(res.msg || (isApproved ? '审核通过，已自动上传至工单' : '审核提交成功'))
       auditVisible.value = false
       loadData()
     } else {

src/views/subSystem/drainage/jcbj/bjtx.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="top-right">
         <div class="alarm-stats">
-          <span class="stat-item">今日报警 <em class="stat-num">{{ alarmList.length }}</em> 条</span>
+          <span class="stat-item">待处理报警 <em class="stat-num">{{ alarmList.length }}</em> 条</span>
           <span class="stat-divider">/</span>
           <span class="stat-item">未处理 <em class="stat-num warn">{{ unHandledCount }}</em> 条</span>
         </div>
@@ -91,20 +91,26 @@ const alarmList = ref([])
 
 async function loadAlarms() {
   try {
-    const res = await getAlarmDataPage(1, 200, { equipmentType: 'drainage' })
+    // 报警提醒只展示未处理报警，已审核/已建工单的报警不再提醒。
+    const res = await getAlarmDataPage(1, 200, {
+      equipmentType: 'drainage',
+      alarmStatus: 0
+    })
     const pageData = res.code !== undefined ? res.data : res
     const records = pageData.records || pageData.rows || []
 
-    alarmList.value = records.map(row => ({
+    alarmList.value = records
+      .filter(row => Number(row.alarmStatus) === 0)
+      .map(row => ({
       ...row,
       alarmLevelText: alarmLevelMap[row.alarmLevel] || '-'
-    }))
+      }))
   } catch (error) {
     console.error('加载报警数据失败', error)
   }
 }
 
-const unHandledCount = computed(() => alarmList.value.filter(a => a.alarmStatus === 0).length)
+const unHandledCount = computed(() => alarmList.value.filter(a => Number(a.alarmStatus) === 0).length)
 
 // ==================== 自动滚动 ====================
 const scrollWrapper = ref(null)

src/views/subSystem/drainage/jcyj/dqyjGIS.vue

@@ -154,7 +154,6 @@ async function loadData() {
   try {
     const params = {
       equipmentType: 'drainage',
-      warningType: '2',
       currentOnly: true,
       userId: userStore.id,
       isAdmin: isAdmin.value
@@ -178,6 +177,7 @@ async function loadData() {
       id: w.id,
       name: w.equipmentName || '-',
       warningNo: w.warningNo || '-',
+      deviceCode: w.deviceCode || w.warningType || '',
       level: levelMap[w.warningLevel] || '一般',
       createTime: w.createTime || '-',
       location: w.location || '-',

src/views/subSystem/drainage/jcyj/lsyjGIS.vue

@@ -146,7 +146,8 @@ const statusMap = { HANDLED: '已处置', CLOSED: '已解除', DRAFT: '草稿',
 async function loadData() {
   try {
     const res = await getWarningHistoryPage(1, 1000, {
-      historyOnly: true
+      historyOnly: true,
+      equipmentType: 'drainage'
     })
     const pageData = res.code !== undefined ? res.data : res
     const records = pageData.records || []
@@ -163,6 +164,7 @@ async function loadData() {
       id: w.id,
       name: w.equipmentName || '-',
       warningNo: w.warningNo || '-',
+      deviceCode: w.deviceCode || w.warningType || '',
       level: levelMap[w.warningLevel] || '一般',
       createTime: w.createTime || '-',
       location: w.location || '-',