he wei
2021-12-07 183b6625c9b61eece608bc6cb02c7cd3d53e851c
U 电池告警 实时历史页面
4个文件已修改
348 ■■■■■ 已修改文件
src/views/alarmMager/batteryrHistoryquery.vue 268 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/batteryrTimequery.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/batteryrHistoryquery.js 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/js/batteryrTimequery.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/alarmMager/batteryrHistoryquery.vue
@@ -43,6 +43,7 @@
              v-model="selectValue3"
              size="small"
              :placeholder="selectPlace3"
              @change="historyArlm"
              class="dainchi"
            >
              <el-option :label="selectPlace3" :value="0"></el-option>
@@ -50,7 +51,7 @@
                v-for="(item, i) in batterList"
                :key="'batt_' + i"
                :label="item.BattGroupName"
                :value="item.label"
                :value="item.battGroupId"
              ></el-option>
            </el-select>
          </div>
@@ -190,6 +191,8 @@
          class="tableCent"
          ref="goodsDetailTable"
        >
          <el-table-column :width="50" type="index" label="编号">
          </el-table-column>
          <el-table-column
            v-for="header in table.headers"
            :key="header.prop"
@@ -255,14 +258,14 @@
<script>
import {
  historyStation /*机房站点 */,
  historyBattery /* 蓄电池组 */,
  roomsStation /* 机房站点 */,
  batterySearch /* 蓄电池组 */,
} from "./js/batteryrTimequery.js";
import {
  historySeroom /* 历史告警记录 */,
  hisDelet /*删除 */,
} from "./js/batteryrHistoryquery.js";
import {
  searchProvince
} from '@/assets/js/api';
import { searchProvince } from "@/assets/js/api";
// 引入导出表格
import { export_json_to_excel } from "@/assets/js/excel/Export2Excel.js";
import { isHasPermit } from "@/assets/js/tools";
@@ -276,7 +279,7 @@
    let dd = thistime.getDate();
    let day1 = yy + "-" + MM + "-" + dd;
    return {
      isCanDel: isCanDel,
      isCanDel: isCanDel || !0,
      usr_ids: "119001",
      queryInfo: {
        pageCurr: 1,
@@ -284,14 +287,12 @@
      },
      total: 0,
      /* 日期 */
      startDrsj: "2000-01-01 00:00:00",
      startDrsj: "2000-01-01",
      endDrsj: day1,
      pickerOptions0: {
        disabledDate: (time) => {
          if (this.endDrsj) {
            return new Date(time.getTime()) > new Date(this.endDrsj);
          } else {
            // return time.getTime() > Date.now();
          }
        },
      },
@@ -304,26 +305,11 @@
        },
      },
      /* 维护区 */
      newsHost: [
        {
          value: null,
          label: null,
        },
      ],
      newsHost: [],
      /* 机房站点 */
      newSite: [
        {
          value: null,
          label: null,
        },
      ],
      newSite: [],
      /*蓄电池组 */
      batterList: [
        {
          value: null,
          label: null,
        },
      ],
      batterList: [],
      checkbox: {
        usr_id: {
          bol: true,
@@ -406,72 +392,52 @@
      table: {
        headers: [
          {
            prop: "room1",
            label: "编号",
            width: 50,
          },
          {
            prop: "battery1",
            prop: "stationName",
            label: "机房名称",
            minWidth: 320,
          },
          {
            prop: "tes1",
            prop: "battGroupName",
            label: "电池组名称",
            width: 120,
          },
          {
            prop: "tester1",
            prop: "alarmName",
            label: "告警名称",
            width: 162,
          },
          {
            prop: "current1",
            prop: "monNum",
            label: "单体编号",
            width: 80,
          },
          {
            prop: "capacity1",
            prop: "almValue",
            label: "告警值",
            width: 80,
          },
          {
            prop: "monomer1",
            prop: "almLevel",
            label: "告警等级",
            width: 120,
          },
          {
            prop: "start1",
            prop: "almStartTime",
            label: "告警开始时间",
            width: 180,
          },
          {
            prop: "alarm1",
            prop: "almConfirmedTime",
            label: "告警确认时间",
            width: 180,
          },
          {
            prop: "end1",
            prop: "almEndTime",
            label: "告警结束时间",
            width: 180,
          },
        ],
        datas: [
          {
            room1: 0,
            battery1: 0,
            tes1: 0,
            tester1: 0,
            current1: 0,
            capacity1: 0,
            monomer1: 0,
            number1: 0,
            vol1: 0,
            alarm1: 0,
            start1: 0,
            end1: 0,
          },
        ],
        datas: [],
      },
    };
  },
@@ -500,8 +466,7 @@
    /* 维护区 */
    async hisPivot() {
      const hisTrpes = await searchProvince();
      let res = resType.data;
      // console.log(res, 'res====');
      let res = hisTrpes.data;
      if (res.code) {
        let newsHost = res.data.map((item) => {
          return {
@@ -509,48 +474,49 @@
            value: item,
          };
        });
        let len = res.data.len;
        let len = res.data.length;
        newsHost.unshift({
          label: `全部共${len}种`,
          value: "",
        });
        this.vindicate = newsHost;
        this.newsHost = newsHost;
        this.selectPlace1 = `全部(共${len}种)`;
      }
    },
    /*机房站点 */
    async sessionSite() {
      const siteList = await historyStation({
        UNote: this.selectValue1,
      const siteList = await roomsStation({
        stationName1: this.selectValue1,
      });
      /* console.log("siteList", siteList); */
      if (siteList.data.result) {
        let newSite = JSON.parse(siteList.data.result).data.map((item) => {
      let res = siteList.data;
      if (res.code) {
        let newSite = res.data.map((item) => {
          return {
            label: item,
            value: item,
            value: item
          };
        });
        let len = res.data.length;
        newSite.unshift({
          label: `全部共${newSite.length}种`,
          label: `全部共${len}种`,
          value: "",
        });
        this.newSite = newSite;
        this.selectPlace2 = `全部(共${newSite.length}种)`;
        this.selectPlace2 = `全部(共${len}种)`;
      }
    },
    /* 蓄电池组 */
    async batterJque() {
      // 重置电池组的值
      this.selectValue3 = 0;
      const jquerys = await historyBattery({
        UNote: this.selectValue1,
        UName: this.selectValue2,
      const jquerys = await batterySearch({
        stationName1: this.selectValue1,
        stationName: this.selectValue2,
      });
      /*  console.log(jquerys); */
      if (jquerys.data.result) {
        let batterList = JSON.parse(jquerys.data.result).data.map((item) => {
          item.BattGroupName = `${item.BattGroupName}-${item.MonCount}节`;
      let res = jquerys.data;
      if (res.code) {
        let batterList = res.data.map((item) => {
          item.BattGroupName = `${item.battGroupName}-${item.monCount}节`;
          return item;
        });
        /*  console.log("batterList", batterList); */
@@ -581,78 +547,62 @@
          params[item] = this.checkbox[item].value2;
        }
      });
      // 一级和二级告警
      params.num = this.checkbox.Level_one_warn.bol ? 1 : 0;
      params.BattGroupId = this.checkbox.Level_two_warn.bol ? 2 : 0;
      // 上限和下限告警
      params.alm_id = this.checkbox.alm_id.bol ? 1 : 100;
      params.alm_signal_id = this.checkbox.alm_signal_id.bol ? 0 : 100;
      /*  console.log('params',params); */
      const historyList = await historySeroom({
      let param = {
        almIdOne: params.usr_id,
        almIdTwo: params.fault_type_id,
        almIdThree: params.uname,
        almIdFour: params.fault_level,
        almIdFive: params.record_uid,
        almIdSix: params.maint_type_id,
        almIdSeven: params.maint_close,
        almIdEight: params.maint_done,
        almLevelFour: params.appoint_uid,
        almLevelOne: params.Level_one_warn,
        almLevelThree: params.master_audit,
        almLevelTwo: params.Level_two_warn,
        almSignalIdOne: params.alm_id,
        almSignalIdTwo: params.alm_signal_id,
        almStartTime: this.startDrsj + " 00:00:00",
        almStartTime1: this.endDrsj + " 23:59:59",
        battGroupId: this.selectValue3 ? this.selectValue3 : 0,
        page: {
          pageCurr: this.queryInfo.currentPage,
          pageCurr: this.queryInfo.pagenum,
          pageSize: this.queryInfo.pagesize,
          pageAll: 0,
        },
        binf: {
          StationName1: this.selectValue1,
          StationName: this.selectValue2,
          BattGroupId: 0,
        },
        mainf: {
          usr_id: params.usr_id,
          fault_type_id: params.fault_type_id,
          uname: params.uname,
          fault_level: params.fault_level,
          record_uid: params.record_uid,
          maint_type_id: params.maint_type_id,
          maint_done: params.maint_done,
          maint_close: params.maint_close,
          appoint_uid: params.appoint_uid,
          master_audit: params.master_audit,
          num: params.num,
          BattGroupId: params.BattGroupId,
          master_id: "0",
        },
        adata_H: {
          MonNum: "0",
          alm_id: params.alm_id,
          /*alm_start_time: "2000-1-1 00:00:00",
                        alm_start_time1:"2020-1-1 00:00:00", */
          alm_start_time: this.startDrsj + " 00:00:00",
          alm_start_time1: this.endDrsj + " 23:59:59",
          alm_signal_id: params.alm_signal_id,
          Record_Id: "0",
        },
      });
      if (JSON.parse(historyList.data.result).code === 0) {
        this.$layer.close(loading); // 关闭等待框
        this.table.datas = [];
        return false;
      }
      const newHist = JSON.parse(historyList.data.result).data;
      /* console.log("newHist", newHist); */
      this.$layer.close(loading); // 关闭等待框
      this.total = newHist[newHist.length - 1].page.pageAll;
      let newLists = newHist.map((item, index) => {
        item.index = index + 1;
        return {
          room1: item.index,
          battery1: item.binf.StationName,
          tes1: item.binf.BattGroupName,
          tester1: item.binf.StationName8,
          current1: item.adata_H.MonNum,
          capacity1: item.adata_H.alm_value,
          monomer1: item.binf.StationName9,
          start1: item.adata_H.alm_start_time,
          end1: item.adata_H.alm_end_time,
          alarm1: item.adata_H.alm_confirmed_time,
          num: item.adata_H.num,
        stationname: this.selectValue2,
        stationname1: this.selectValue1,
        };
      console.log("param", param);
      const historyList = await historySeroom(param);
      let res = historyList.data;
      let list = [];
      // console.log(res, 'res1=====');
      if (res.code) {
        this.total = res.data.total;
        res.data.list.forEach((v) => {
          let stationName = v.stationName;
          let battGroupName = v.battGroupName;
          let battGroupId = v.battGroupId;
          v.adataHs.forEach((item) => {
            list.push({
              stationName,
              battGroupName,
              battGroupId,
              num: item.num,
              alarmName: item.almSignalIdName,
              monNum: item.monNum,
              almValue: item.almValue,
              almLevel: item.almLevelName,
              almStartTime: item.almStartTime,
              almEndTime: item.almEndTime,
              almConfirmedTime: item.almConfirmedTime,
      });
      /*  console.log("newLists", newLists); */
      this.table.datas = newLists;
      this.$layer.close(loading);
          });
        });
        // console.log(list, 'list=====');
        this.table.datas = list;
      }
      this.$layer.close(loading); // 关闭等待框
    },
    /* 删除 */
    async deleteUser(value) {
@@ -666,27 +616,17 @@
        }
      ).catch((err) => err);
      if (confirmResult !== "confirm") {
        return this.$message.info("已取消删除");
        return;
      }
      const ws = await hisDelet([
        {
          stationname: value.battery1,
          num: value.num,
          note: value.tester1,
        },
      ]);
      /*   console.log("ws", ws);
                console.log("value", value); */
      if (JSON.parse(ws.data.result).code !== 1) {
        return this.$message.error("删除失败");
      }
      const ws = await hisDelet([value.num]);
      let res = ws.data;
      if (res.code) {
      this.$message.success("删除成功");
      if (this.currentPage !== 1) {
        if (this.table.datas.length === 1) {
          this.currentPage -= 1;
        }
        if (this.currentPage != 1 && this.table.datas.length == 1) {
          this.currentPage--;
      }
      this.historyArlm();
      }
    },
    handleSizeChange(val) {
      this.queryInfo.pagesize = val;
@@ -743,8 +683,14 @@
  width: 100%;
  border: 1px solid #4ba1fa;
  // .trTitle {
  //   height: 35px;
  // }
  .trTitle {
    height: 35px;
    font-size: 14px;
    font-weight: bold;
    color: #00ffff;
  }
  /* 告警状态警示灯 */
src/views/alarmMager/batteryrTimequery.vue
@@ -265,7 +265,7 @@
                    :disabled="!isCanDel"
                    type="danger"
                    size="mini"
                    @click="delteTim(scope.row)"
                    @click="delteTim(scope.row, 0)"
                    >删除</el-button
                  >
                </template>
@@ -363,7 +363,7 @@
                    :disabled="!isCanDel"
                    type="danger"
                    size="mini"
                    @click="delteTim(scope.row)"
                    @click="delteTim(scope.row, 1)"
                    >删除</el-button
                  >
                </template>
@@ -719,16 +719,17 @@
        // console.log(res.data, "===data", this.selectValue1);
        let newRoms = res.data.map((item) => {
          return {
            label: item.stationName,
            value: item.stationName,
            label: item,
            value: item
          };
        });
        let len = res.data.length;
        newRoms.unshift({
          label: `全部共${newRoms.length}种`,
          label: `全部共${len}种`,
          value: "",
        });
        this.newRoms = newRoms;
        this.selectPlace2 = `全部(共${newRoms.length}种)`;
        this.selectPlace2 = `全部(共${len}种)`;
      }
    },
    /* 蓄电池组 */
@@ -750,7 +751,7 @@
        this.selectPlace3 = `全部(共${options.length}种)`;
      }
      // 查询告警信息
      this.paramsAlram();
      this.pparamsAlram();
    },
    /* 告警信息 */
    paramsAlram() {
@@ -767,7 +768,6 @@
        }
      });
      let param = {
        // almClearedType: 0,
        almIdOne: params.usr_id,
        almIdTwo: params.fault_type_id,
        almIdThree: params.uname,
@@ -783,18 +783,13 @@
        almLevelTwo: params.Level_two_warn,
        almSignalIdOne: params.alm_id,
        almSignalIdTwo: params.alm_signal_id,
        // almStartTime: "",
        // almStartTime1: "",
        battGroupId: this.selectValue3 ? this.selectValue3 : 0,
        page: {
          // pageAll: 0,
          pageCurr: this.queryInfo1.pagenum,
          pageSize: this.queryInfo1.pagesize,
        },
        stationname: this.selectValue2,
        stationname1: this.selectValue1,
        // TODO
        // uid: 1002,
        stationname1: this.selectValue1
      };
      return param;
    },
@@ -890,7 +885,7 @@
      }
    },
    /* 删除 */
    async delteTim(val) {
    async delteTim(val, idx) {
      const confirmResult = await this.$confirm(
        "此操作将永久删除该文件, 是否继续?",
        "提示",
@@ -907,6 +902,15 @@
      let res = del.data;
      if (res.code) {
        this.$message.success("删除成功");
        if (idx) {
          if (this.queryInfo2.pagenum != 1 && this.table2.datas.length == 1) {
            this.queryInfo2.pagenum--;
          }
        } else {
          if (this.queryInfo1.pagenum != 1 && this.table1.datas.length == 1) {
            this.queryInfo1.pagenum--;
          }
        }
        /* 重新获取用户列表数据*/
        this.paramsAlram();
      } else {
src/views/alarmMager/js/batteryrHistoryquery.js
@@ -2,49 +2,22 @@
/* 电池告警历史页面查询 */
/* 查询历史告警记录
json={"page":{"pageCurr":1,"pageSize":10,"pageAll":0},"binf":{"StationName1":"","StationName":"",
"BattGroupId":"0"},"mainf":{"appoint_uid":"4","master_audit":"3","num":"1","BattGroupId":"2","usr_id":"119001",
"fault_type_id":"119002","fault_level":"119003","record_uid":"119004","maint_type_id":"119005","maint_done":"119006",
"maint_close":"119007","master_id":"0"},"adata_H":{"MonNum":"0","alm_id":1,"alm_start_time":"2000-1-1 00:00:00",
"alm_start_time1":"2020-09-11 23:59:59","alm_signal_id":0,"Record_Id":"0"}}
*/
export const historySeroom = (data) => {
    return axios({
        method: "post",
        url: "Battalarm_data_historyAction!serchByInfo",
        data: "json=" + JSON.stringify(data)
    })
}
//根据维护区查询站点   json={"UNote":""}
export const historyStation = (data) => {
    return axios({
        method: "post",
        url: "User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup",
        data: "json=" + JSON.stringify(data)
    })
}
/*
根据维护区和机房查询蓄电池组
json={"UNote":"","UName":""}
*/
export const historyBattery = (data) => {
    return axios({
        method: "post",
        url: "User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup",
        data: "json=" + JSON.stringify(data)
    method: "POST",
    url: "BattalarmDataHistoryAction/serchByInfo",
    data
    })
}
/* 删除 
json=[{"stationname":"上海市-市辖区-FBS-埔东新区-五莲沪新开关站-电池组1",
"num":561804,"note":"单体电压低"}]
num: []
*/
export const hisDelet = (data) => {
    return axios({
        method: "post",
        url: "Battalarm_data_historyAction!delete",
        data: "json=" + JSON.stringify(data)
    method: "POST",
    url: "BattalarmDataHistoryAction/delete",
    data
    })
}
src/views/alarmMager/js/batteryrTimequery.js
@@ -3,16 +3,15 @@
/**
 * 根据维护区查询机房站点
 * battInf/searchStationNameInGroup
 * {
 * stationName1 省
 * stationName2 市
 * stationName5 区
 * }
*/
export const roomsStation = (data) => {
  return axios({
    method: "GET",
    url: "battInf/searchAllStationName",
    url: "battInf/searchStationNameInGroup",
    params: data,
    data: null
  })