Bladeren bron

#fix 修改字段

jc-wangyt 6 dagen geleden
bovenliggende
commit
77d20ff045
1 gewijzigde bestanden met toevoegingen van 30 en 50 verwijderingen
  1. 30 50
      src/views/alarm/index.vue

+ 30 - 50
src/views/alarm/index.vue

@@ -44,23 +44,16 @@
           v-loading="loadingsystemStats">
           <el-table-column prop="systemName" label="系统名称" width="120" fixed="left" />
           <el-table-column prop="totalAlarms" label="告警总数" min-width="120" align="center" />
-          <el-table-column prop="processedAlarms" label="已处理告警总数" min-width="120" align="center" />
-          <el-table-column prop="unprocessedAlarms" label="未处理告警总数" min-width="120" align="center" />
+          <el-table-column prop="processedCount" label="已处理告警总数" min-width="120" align="center" />
+          <el-table-column prop="untreatedCount" label="未处理告警总数" min-width="120" align="center" />
+          <el-table-column prop="contentAlarms" label="内容类告警" min-width="120" align="center" />
+          <el-table-column prop="thresholdAlarms" label="阈值类告警" min-width="120" align="center" />
+          <el-table-column prop="existenceAlarms" label="存在性告警总数" min-width="120" align="center" />
           <el-table-column prop="permissionCount" label="用户权限变更监控数量" min-width="120" align="center" />
-          <el-table-column prop="indicator_databaseConnectCount" label="数据库连接数告警总数" min-width="120" align="center" />
-          <el-table-column prop="indicator_internalConnetCount" label="内部连接性告警总数" min-width="120" align="center" />
-          <el-table-column prop="indicator_scheduledTaskCount" label="定时任务告警总数" min-width="120" align="center" />
-          <el-table-column prop="indicator_abnormalAccessCount" label="异常IP访问监控数量" min-width="120" align="center" />
-
-          <!-- <el-table-column prop="contentAlarms" label="内容类告警总数" min-width="120" align="center" />
-          <el-table-column prop="thresholdAlarms" label="阈值类告警总数" min-width="120" align="center" />
-          <el-table-column prop="existenceAlarms" label="存在性告警总数" min-width="120" align="center" /> -->
-          <!-- <el-table-column prop="indicator_dataNoDeliveredCount" label="数据未送达告警总数" min-width="120" align="center" /> -->
-          <!-- <el-table-column prop="indicator_interfaceFrequencyCount" label="访问接口频率告警总数" min-width="120" align="center" /> -->
-          <!-- <el-table-column prop="indicator_pageTamperProofCount" label="页面防篡改告警总数" min-width="120" align="center" /> -->
-          <!-- <el-table-column prop="indicator_networkBoundaryConnectCount" label="网络边界连通性告警总数" min-width="120"
-            align="center" /> -->
-          <!-- <el-table-column prop="indicator_ossUseCount" label="OSS使用情况告警总数" min-width="120" align="center" /> -->
+          <el-table-column prop="dbCount" label="数据库监控数量" min-width="120" align="center" />
+          <el-table-column prop="connectCount" label="系统内部连接性监控数量" min-width="120" align="center" />
+          <el-table-column prop="ipCount" label="异常IP访问监控数量" min-width="120" align="center" />
+          <el-table-column prop="taskCount" label="定时任务异常情况监控数量" min-width="120" align="center" />
         </el-table>
       </div>
     </el-card>
@@ -93,33 +86,27 @@ export default {
       return [
         { label: '告警总数', value: overall.totalAlarms },
         { label: '已处理告警总数', value: overall.totalProcessed },
-        { label: '未处理告警总数', value: overall.totalUntreated },  
-        { label: '总送达数', value: overall.totalDelivered },
-        { label: '总未送达数', value: overall.totalUndelivered },
-        { label: '用户权限变更监控数', value: overall.permissionAlarms },
-        { label: '数据库监控数', value: overall.dbAlarms },
-        { label: '系统内部连接监控数', value: overall.connectAlarms },
-        { label: '异常IP访问监控数', value: overall.ipAlarms },
-        { label: '定时任务异常监控数', value: overall.taskAlarms }
+        { label: '未处理告警总数', value: overall.totalUntreated },
+        { label: '内容行性告警', value: overall.toralContentAlarms },
+        { label: '阈值类告警', value: overall.totalThresholdAlarms },
+        { label: '存在性告警总数', value: overall.existenceAlarms },
       ];
     },
     // 根据当前选择的月份获取各系统告警统计数据
     systemStatsData() {
       return (this.alarmData.indicatorStats || []).map(item => ({
         systemName: item.systemName,
-        totalAlarms: item.totalAlarms || 0,
-        processedAlarms: item.processedCount || 0,
-        unprocessedAlarms: item.untreatedCount || 0,
-        permissionCount: item.permissionCount || 0,
-        // indicator_dataNoDeliveredCount: 0, // 新数据格式中没有直接提供
-        indicator_internalConnetCount: item.connectCount || 0,
-        // indicator_interfaceFrequencyCount: 0, // 新数据格式中没有直接提供
-        indicator_databaseConnectCount: item.dbCount || 0,
-        // indicator_pageTamperProofCount: 0, // 新数据格式中没有直接提供
-        // indicator_networkBoundaryConnectCount: 0, // 新数据格式中没有直接提供
-        indicator_scheduledTaskCount: item.taskCount || 0,
-        // indicator_ossUseCount: 0, // 新数据格式中没有直接提供
-        indicator_abnormalAccessCount: item.ipCount || 0
+        totalAlarms: item.totalAlarms,
+        processedCount: item.processedCount,
+        untreatedCount: item.untreatedCount,
+        contentAlarms: item.contentAlarms,
+        thresholdAlarms: item.thresholdAlarms,
+        existenceAlarms: item.existenceAlarms,
+        permissionCount: item.permissionCount,
+        dbCount: item.dbCount,
+        connectCount: item.connectCount,
+        ipCount: item.ipCount,
+        taskCount: item.taskCount
       }));
     }
   },
@@ -136,19 +123,12 @@ export default {
 
           this.alarmData = {
             overall: {
-              totalAlarms: res.data.totalAlarms || 0,
-              totalProcessed: res.data.totalUntreated || 0,
-              totalUntreated: res.data.totalProcessed || 0,
-              contentCount: 0,
-              thresholdCount: 0,
-              existenceCount: 0, 
-              permissionAlarms: res.data.permissionAlarms || 0,
-              dbAlarms: res.data.dbAlarms || 0,
-              connectAlarms: res.data.connectAlarms || 0,
-              ipAlarms: res.data.ipAlarms || 0,
-              taskAlarms: res.data.taskAlarms || 0,
-              totalUndelivered: res.data.totalUndelivered || 0,
-              totalDelivered: res.data.totalDelivered || 0
+              totalAlarms: res.data.totalAlarms,
+              totalProcessed: res.data.totalProcessed,
+              totalUntreated: res.data.totalUntreated,
+              toralContentAlarms: res.data.toralContentAlarms,
+              totalThresholdAlarms: res.data.totalThresholdAlarms,
+              existenceAlarms: res.data.existenceAlarms
             },
             indicatorStats: res.data.systemStats || []
           };