he wei
2025-04-23 1fe112d228eae029d5635f47ec0fe4f944da7b50
U 修复通信电源告警bug 电池实时告警添加非一级告警的批量确认
3个文件已修改
88 ■■■■■ 已修改文件
src/views/alarmMager/batteryrTimequery.vue 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/batteryrTimequery.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/powerBoxAlarmData.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/batteryrTimequery.vue
@@ -233,12 +233,21 @@
            <el-table
              id="batteryrTimequeryTable"
              stripe
              row-key="num"
              size="small"
              :data="table1.datas"
              height="100%"
              class="tableCent"
              ref="unconfirmTable"
              tooltip-effect="light"
              @selection-change="handleSelect"
            >
              <el-table-column
                type="selection"
                width="50"
                align="center"
              >
              </el-table-column>
              <el-table-column label="编号" type="index" width="50">
              </el-table-column>
              <el-table-column
@@ -354,6 +363,12 @@
              layout="total, sizes, prev, pager, next, jumper"
              :total="total1"
            ></el-pagination>
            <el-button
              type="danger"
              size="mini"
              @click="batchOkAlarm()"
              >批量确认告警</el-button
            >
            <!--  <el-button type="primary" round size="mini" icon="el-icon-wallet">全部选中</el-button> -->
          </div>
        </flex-layout>
@@ -654,6 +669,7 @@
  deletionRecord /* 删除 */,
  reporTemergency /* 确认告警 */,
  CancelTheAlarm /* 取消告警 */,
  reporTemergencyBatch,
} from "./js/batteryrTimequery.js";
import {
  searchProvince,
@@ -973,6 +989,7 @@
        four: 0,
      },
      detailsVisible: false,
      selectedRows: [],
    };
  },
  components: {
@@ -1083,6 +1100,55 @@
        "电池告警-待处理",
      ][idx - 1];
      export_json_to_excel(tHeader, excelData, fileName);
    },
    isRowSelectable(row, index) {
      return row.alarmLevel != 1;
    },
    toggleRowSelection(row, selected) {
      if (selected) {
        this.selectedRows.push(row);
      } else {
        this.selectedRows = this.selectedRows.filter(r => r !== row);
      }
    },
    handleSelect(data) {
      // console.log('handleSelect', data, '=============');
      this.selectedRows = data;
    },
    // 批量确认
    batchOkAlarm() {
      const selectedData = this.selectedRows;
      if (selectedData.length === 0) {
        this.$message.error("请至少选择一条数据");
        return false;
      }
      if (selectedData.some(row => row.alarmLevel == 1)) {
        this.$message.error("一级告警不能批量确认");
        return false;
      }
      let nums = selectedData.map(row => row.num);
      // console.log('nums', nums, '=============');
      let loading = this.$layer.loading();
      reporTemergencyBatch(nums).then((res) => {
        let { code, data } = res.data;
        this.$layer.close(loading);
        if (code && data) {
          this.$message.success("操作成功");
          this.sendMessage();
        } else {
          this.$message.error("操作失败");
        }
      })
      .catch((err) => {
        this.$layer.close(loading);
        console.log(err);
      });
    },
    /* 维护区 */
    async vindicateData() {
@@ -1245,6 +1311,7 @@
              monNum: item.monNum == 0 ? "-" : item.monNum,
              almValue: item.almValue,
              almLevel: item.almLevelName,
              alarmLevel: item.almLevel,
              almStartTime: item.almStartTime,
              almConfirmedTime: "",
              almIsConfirmed: false,
@@ -1257,6 +1324,7 @@
          this.exportFile(list, 1);
        } else {
          this.table1.datas = list;
          // this.updateSelectionState();
        }
      } else {
        this.total1 = 0;
@@ -1581,6 +1649,9 @@
      this.sendMessage();
    },
    sendMessage() {
      if (!this.isWSOpen) {
        return false;
      }
      let params = this.formatParams();
      console.log("====", params, JSON.stringify(params));
      this.SOCKET.send(JSON.stringify(params));
@@ -1812,4 +1883,8 @@
    background-color: #ccc;
  }
}
/* 隐藏表头选择框 */
:deep(.el-table__header-wrapper .el-table-column--selection .cell .el-checkbox) {
  // display: none;
}
</style>
src/views/alarmMager/js/batteryrTimequery.js
@@ -36,6 +36,17 @@
  })
}
/**
 * 批量确认 电池告警
 */
export const reporTemergencyBatch = (data) => {
  return axios({
    method: "POST",
    url: "Battalarm_dataAction/updatePro",
    data
  })
}
/* 点击取消告警
  num
*/
src/views/alarmMager/js/powerBoxAlarmData.js
@@ -5,7 +5,7 @@
        {value:"110010,110137,110300,110301",label:"停电",model:true},
        {value:"110111,110112,110304,110305,110325,110326,110504,110505",label:"跳闸",model:true},
        {value:"110001,110004,110007,110139,110142,110145,110306,110309,110312,110315,110318,110321",label:"过压",model:true},
        {value:"110002,110005,110005,110140,110143,110146,110307,110310,110313,110316,110319,110322",label:"欠压",model:true},
        {value:"110002,110005,110008,110140,110143,110146,110307,110310,110313,110316,110319,110322",label:"欠压",model:true},
        {value:"110003,110006,110009,110141,110144,110147,110308,110311,110314,110317,110320,110323",label:"缺相",model:true},
    ],
    // 直流状态