新增综合报警菜单，新增实时报警页面

package.json

@@ -35,6 +35,7 @@
     "jquery": "^3.6.0",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
+    "json-bigint": "^1.0.0",
     "jspdf": "^2.3.1",
     "jszip": "^3.7.1",
     "jszip-utils": "^0.1.0",

src/api/zhbj/index.js

@@ -1,5 +1,5 @@
 import request from "@/tools/request";
-
+import JSONBIG from "json-bigint";
 //获取设备报警列表数据
 export function GetDeviceTableData(data, timeout = 5000) {
   return request({
@@ -52,3 +52,931 @@ export const confirmAlart = (data) => {
     timeout: 60000,
   });
 };
+
+
+
+
+// 获取场站数据
+export function fetchStationListAll() {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `alertrule/querywpllist`,
+    method: "get",
+  });
+}
+
+//获取部件及预警类型列表
+export function fetchRelatePartAndAlarmType() {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/queryalarmtypellist",
+    method: "get",
+  });
+}
+//获取型号列表
+export const fetchModel = () => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/querywpbyymodellist",
+    method: "get",
+  });
+};
+//获取升压站列表
+export const fetchBooststation = () => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/querysubllist",
+    method: "get",
+  });
+};
+//查询自定义预警列表
+export function custombj_fetchTableData(params) {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/page",
+    method: "get",
+    params,
+  });
+}
+
+//根据场站编号，风机型号获取AI/DI测点
+export const fetchPointList = (wpId = "", modelId = "") => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `alertrule/querywtpointlist?wpId=${wpId}&modelId=${modelId}`,
+    method: "get",
+  });
+};
+//根据升压站编号获取AI/DI测点
+export const fetchPointListByBootst = (subId = "") => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `alertrule/querysubpointllist?subId=${subId}`,
+    method: "get",
+  });
+};
+//新增/修改自定义预警
+export const custombj_postSave = (form) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/save",
+    method: "post",
+    data: form,
+  });
+};
+//自定义预警模板下载
+export const custombj_importTemplate = () => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/get-import-template",
+    method: "get",
+    responseType: "blob",
+  });
+};
+
+//根据风场id获取所有风机
+export const fetchWindturbineList = (wpId = "") => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `alertrule/querywtlist?wpId=${wpId}`,
+    method: "get",
+  });
+};
+
+//根据structcode获取AI.DI测点
+export const fetchAIDIPointList = (
+  deviceId,
+  structcode,
+  stationId,
+  windturbineId,
+  pageNum,
+  pageSize
+) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "info/point",
+    method: "get",
+    params: {
+      deviceId,
+      structcode,
+      stationId,
+      windturbineId,
+      pageNum,
+      pageSize,
+    },
+  });
+};
+
+//字典维护列表
+export const get_datadictionary = (pageNum, pageSize, name, category) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+    url: `datadictionary/page?pageNum=${pageNum}&pageSize=${pageSize}&name=${name}&category=${category}`,
+  });
+};
+//字典维护 新增 修改
+export const post_saveorupdate = (data) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "post",
+    url: `datadictionary/save`,
+    data,
+  });
+};
+
+//实时报警列表
+export const alarm_snap_top = (params) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+    url: `alarm/history/findAlarmByTypelist`,
+    params: params,
+  });
+};
+//数据查询实时数据
+export const getAdapterLatest = (stationId, AIlist, stationType) => {
+  return request({
+    url: `ts/latest?uniformCodes=${AIlist}&thingId=${stationId}&thingType=windturbine`,
+    baseURL: `http://10.81.3.162:801${/FDC/.test(stationType) ? "1" : "2"}/`,
+    showLoading: {
+      statu: false,
+    },
+    timeout: 10000,
+    transformResponse: [
+      function (data) {
+        const json = JSONBIG({
+          storeAsString: true,
+        });
+        const res = json.parse(data);
+        return res;
+      },
+    ],
+  });
+};
+//数据查询 历史数据
+export const getAdapterHistory = (
+  stationId,
+  AIpoint,
+  startTs,
+  endTs,
+  cureentBaseUrl
+) => {
+  return request({
+    url: `ts/history/raw?uniformCode=${AIpoint}&thingId=${stationId}&thingType=windturbine&startTs=${startTs}&endTs=${endTs}`,
+    baseURL: cureentBaseUrl,
+  });
+};
+//数据查询 数据快照
+export const getAdapterHistorysnap = (
+  stationId,
+  AIpoint,
+  startTs,
+  endTs,
+  interval,
+  cureentBaseUrl
+) => {
+  return request({
+    url: `ts/history/snap?uniformCode=${AIpoint}&thingId=${stationId}&thingType=windturbine&startTs=${startTs}&endTs=${endTs}&interval=${interval}`,
+    baseURL: cureentBaseUrl,
+  });
+};
+
+
+
+// 风机原始数据统计
+// 列表接口
+export const getAlarmCountList = (params) => {
+  return request({
+    url: `alarm/history/findWtFeatureStat?timeType=${params.timeType}&begin=${params.begin}&end=${params.end}&stationid=${params.stationid}&components=${params.components}&modelId=${params.modelId}&alarmIds=${params.alarmIds}&alarmType=${params.alarmType}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};
+// 获取报警描述列表
+export const GetAlarmId = (params) => {
+  return request({
+    url: `alarmconfiguration/querywtalarmdesclist?components=${params.components}&modelId=${params.modelId}&wpId=${params.wpId}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};
+// 获取预警描述列表
+export const GetAlarmIdCustom = (params) => {
+  return request({
+    url: `alertrule/querywtalarmdesclist?components=${params.components}&modelId=${params.modelId}&wpId=${params.wpId}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};
+//报警修改日志
+export const fetchruleventLogs = (pagenum, pagesize, ruleName, ruleType) => {
+  return request({
+    url: "ruleupdate/page",
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    params: {
+      pagenum,
+      pagesize,
+      ruleName,
+      ruleType,
+    },
+  });
+};
+//风机报警列表
+export const windturbinebj_fetchTableData = (query) => {
+  console.log(111, query);
+  return request({
+    url: "alarmconfiguration/page",
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    params: query,
+  });
+};
+//获取服务端公钥
+export const getPublickey = (query) => {
+  return request({
+    url: "info/publickey",
+  });
+};
+// login
+export const loginRequest = (params) => {
+  return request({
+    url: "/admin-api/system/auth/login",
+    baseURL: "http://10.81.3.127:48080",
+    data: params,
+    method: "post",
+  });
+};
+export const Login = (params) => {
+  return request({
+    url: "auth/login",
+    baseURL: process.env.VUE_APP_ALARM,
+    data: params,
+    method: "post",
+  });
+};
+export function getUserinfo() {
+  return request({
+    baseURL: "http://10.81.3.127:48080",
+    url: "/admin-api/system/auth/get-permission-info",
+    method: "get",
+    headers: {
+      isUser: true,
+    },
+  });
+}
+export function logout(data) {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `auth/logout`,
+    method: "post",
+    data,
+  });
+}
+//register
+export const registerRequest = (params) => {
+  return request.post("user/registers", params);
+};
+// 报警配置缓存清理
+export const getRestart = () => {
+  return request({
+    url: `custom/restart`,
+    baseURL: "/custom/",
+  });
+};
+export const getRestart2 = () => {
+  return request({
+    url: `windturbine/restart`,
+    baseURL: "/windturbine/",
+  });
+};
+export const getRestart3 = () => {
+  return request({
+    url: `scadas/restart`,
+    baseURL: "/scadas/",
+  });
+};
+
+//----------------------------------------homePAge------------------------------------------------
+//根据风场id获取所有风机
+export const getintellList = (query) => {
+  return request({
+    url: "home/early/latest",
+    method: "get",
+    params: {
+      stationId: query,
+    },
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+export const getReportList = (params) => {
+  return request({
+    url: "earlyreport/list",
+    method: "get",
+    params: params,
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+export const getreportReviewList = (query) => {
+  return request({
+    url: "inspectorder/port/list",
+    method: "get",
+    params: {
+      stationId: query,
+    },
+  });
+};
+export const getHomeOrdercount = (query) => {
+  return request({
+    url: "home/ordercount",
+    method: "get",
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+//首页获取机型接口
+export const getHomeAlertrule = (params) => {
+  return request({
+    url: "home/alertrule",
+    method: "get",
+    params: params,
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+export const getHomeDangerHidden = (params) => {
+  return request({
+    url: "home/hidden/danger",
+    method: "get",
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+export const getHomeDurationTotal = (params) => {
+  return request({
+    url: "home/total/duration",
+    method: "get",
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+// 巡检计划
+export const getCheckList = (params) => {
+  return request({
+    url: "inspectorder/order/page",
+    method: "get",
+    params: params,
+  });
+};
+
+// 弹窗数据接口
+export const getDialogData = (params) => {
+  return request.get(
+    `windturbineAlarmCount/query/detail?stationid=${params.stationid}&starttime=${params.starttime}&endtime=${params.endtime}&windturbineid=${params.windturbineid}&parts=${params.parts}`
+  );
+};
+
+// 设备隐患评审报告
+export const postSubmitReport = (params) => {
+  return request.post("inspectorder/update", params);
+};
+
+// ----------------------------------------user------------------------------------------------
+export const getUserList = () => {
+  return request.get(`user/getall`);
+};
+export const editRequest = (params) => {
+  return request.post("user/edituser", params);
+};
+export const deleteUser = (data) => {
+  return request.delete(`user/${data}`);
+};
+// ----------------------------------------user------------------------------------------------
+// ----------------------------------------system------------------------------------------------
+
+// 获取故障弹窗
+export const getjumpwindow = () => {
+  return request.get(`userset/jumpwindow`);
+};
+//  获取语音播报
+export const getfaultread = () => {
+  return request.get(`userset/faultread`);
+};
+// 保存是否故障弹窗
+export const postjumpwindow = (params) => {
+  return request.post(`userset/jumpwindow?isjump=${params}`);
+};
+// 保存是否语音播报
+export const postfaultread = (params) => {
+  return request.post(`userset/faultread?isread=${params}`);
+};
+// ----------------------------------------system------------------------------------------------
+
+//获取所有风场
+export const fetchStationList = () => {
+  return request({
+    url: "info/station",
+    method: "get",
+  });
+};
+// //获取所有风场光伏
+// export const fetchStationListAll = () => {
+//   return request({
+//     url: "info/station/all",
+//     method: "get",
+//   });
+// };
+
+// ----------------------------------------安全生产- 报警记录------------------------------------------------
+
+//导出历史报警记录
+export const new_alarm_history = (params) => {
+  // return request.get(`alarm/history/export?stationid=${params.stationid}&starttime=${params.starttime}&endtime=${params.endtime}&windturbineid=&category1=&category2=&rank=&modelid=&snapid=&messagetype=&keyword=`)
+
+  return request({
+    method: "get",
+    url: `alarm/history/export?stationid=${params.stationid}&starttime=${params.starttime}&endtime=${params.endtime}&windturbineid=&category1=&category2=&rank=&modelid=&snapid=&messagetype=&keyword=`,
+    headers: {
+      "Content-Type": "application/json",
+    },
+    responseType: "blob",
+    showLoading: {
+      text: "拼命下载中...",
+    },
+    timeout: 99999999,
+  });
+};
+
+//查报警
+export const alarm_snap = (params) => {
+  return request({
+    url: `alarm/snap`,
+    params: params,
+  });
+};
+// ----------------------------------------安全生产- 实时报警------------------------------------------------
+
+//实时故障 最高级
+export const alarm_fault_recent = (params) => {
+  return request({
+    url: `fault/recent`,
+    params: params,
+    showLoading: {
+      statu: false,
+    },
+    transformResponse: [
+      function (data) {
+        const json = JSONBIG({
+          storeAsString: true,
+        });
+        const res = json.parse(data);
+        return res;
+      },
+    ],
+  });
+};
+//实时故障 第一次请求
+export const alarm_fault_top = (params) => {
+  return request({
+    url: `fault/snap/top`,
+    params: params,
+  });
+};
+
+//报警确认
+export const get_fault_confirm = (params) => {
+  return request({
+    url: `fault/confirm`,
+    params: params,
+  });
+};
+
+// ----------------------------------------安全生产- 实时数据查询------------------------------------------------
+
+// get 实时data
+
+// 批量导出
+export const AdapterHistoryExport = (activeAI, activeWT, startTs, endTs) => {
+  return request({
+    url: `ts/history/raw?uniformCode=${activeAI}&thingId=${activeWT}&thingType=windturbine&startTs=${startTs}&endTs=${endTs}`,
+    baseURL: "/adapter/",
+  });
+};
+// ----------------------------------------基础数据- 设备管理------------------------------------------------
+//查询全部设备型号接口
+export const device_list = () => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+    url: `device/model/list`,
+  });
+};
+//获取结构tree
+export function tree(params) {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "device/structure/tree/windturbine",
+    method: "get",
+    transformResponse: [
+      function (data) {
+        const json = JSONBIG({
+          storeAsString: true,
+        });
+        const res = json.parse(data);
+        return res;
+      },
+    ],
+  });
+}
+//根据结构获取测点
+export function point(
+  code,
+  pagenum,
+  pagesize,
+  categorydata,
+  keyword,
+  deviceId,
+  model
+) {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/metrics/page?pageNum=${pagenum}&pageSize=${pagesize}&deviceId=${deviceId}&categorydata=${categorydata}&keyword=${keyword}&model=${model}&structureCode=${code}`,
+    method: "get",
+  });
+}
+//测点新增
+export function metrics(data) {
+  return request.post(`device/metrics/single`, data);
+}
+//测点删除
+export function delmetrics(params) {
+  return request({
+    method: "delete",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/metrics/single/delete/${params}`,
+  });
+}
+//测点导入
+
+//tree新增 添加一个设备结构节点
+export function treeAdd(data) {
+  return request({
+    method: "post",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/structure`,
+    data,
+  });
+}
+//tree删除 tree删除一个设备结构节点
+export function treeDel(params) {
+  return request({
+    method: "delete",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/structure/delete/${params}`,
+  });
+}
+
+// 故障模式
+// get All
+export const faultmode_windturbine = () => {
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/faultmode/windturbine`,
+  });
+};
+// 根据 structurecode get
+export const faultmode_structurecode = (params) => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/faultmode/windturbine/${params}`,
+    method: "get",
+  });
+};
+// 根据 id delete
+export const faultmode_delete = (params) => {
+  return request({
+    method: "delete",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/faultmode/delete/${params}`,
+  });
+};
+
+// 新增 修改
+export const faultmode_add_edit = (data) => {
+  return request({
+    method: "post",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `device/faultmode`,
+    data,
+  });
+};
+
+// ---------------------------------------- 报警配置- 自定义预警------------------------------------------------
+
+// 获取机型
+export function getStationinfo(params) {
+  return request({
+    url: `info/stationinfo?stationId=${params}`,
+    method: "get",
+    showLoading: {
+      statu: false,
+    },
+  });
+}
+
+// 获取规则
+export function alertrule2_list() {
+  return request.get(`alertrule2/list/`);
+}
+
+//根据场站编号，风机型号获取DI测点new
+export const getDIPointList = (minModel) => {
+  return request({
+    url: "testingpointDI/point",
+    method: "get",
+    params: {
+      minModel,
+    },
+  });
+};
+//根据场站编号，获取电气DI测点
+export const fetchElectricDIPointList = (stationId) => {
+  return request({
+    url: "info/electrical_point_di",
+    method: "get",
+    params: {
+      stationId: stationId,
+    },
+  });
+};
+//根据电气测点，获取测点信息
+export const fetchElectricDIPointByPointId = (pointId) => {
+  return request({
+    url: "info/electrical_point_di/byId",
+    method: "get",
+    params: {
+      pointId: pointId,
+    },
+  });
+};
+
+//根据风场编号获取电气AI测点
+export const fetch_electrical_point_ai = (stationId) => {
+  return request({
+    url: "info/electrical_point_ai",
+    method: "get",
+    params: {
+      stationId: stationId,
+    },
+  });
+};
+//根据风场编号获取电气DI测点
+export const fetch_electrical_point_di = (stationId) => {
+  return request({
+    url: "info/electrical_point_di",
+    method: "get",
+    params: {
+      stationId: stationId,
+    },
+  });
+};
+//获取报警类型
+export const fetchWarningType = () => {
+  return request({
+    url: "info/warning_type",
+    method: "get",
+  });
+};
+
+//获取报警种类
+export const fetchWarningClassify = () => {
+  return request({
+    url: "info/warning_classify",
+    method: "get",
+  });
+};
+export const custombj_batchImport = (list) => {
+  return request.post("alertrule2/save-batch", list);
+};
+
+//******************************end****************************************//
+
+//******************************升压站报警API************************************//
+
+export const scadabj_fetchTableData = (query) => {
+  return request({
+    url: "scadabj/page",
+    method: "get",
+    params: query,
+    timeout: 20000,
+    transformResponse: [
+      // 处理17位数字精度问题
+      function (data) {
+        const json = JSONBIG({
+          storeAsString: true,
+        });
+        const res = json.parse(data);
+        return res;
+      },
+    ],
+  });
+};
+export const scadabj_postSave = (objData) => {
+  return request.post("scadabj/save", objData);
+};
+export const scadabj_batchImport = (list) => {
+  return request.post("scadabj/save-batch", list);
+};
+//********************************************end********************************//\
+
+//********************************************报警记录日志********************************//\
+
+//********************************************end********************************//\
+
+//******************************风机报警API************************************//
+
+export const windturbinebj_postSave = (form) => {
+  return request.post("warning2/save", form);
+};
+export const windturbinebj_batchImport = (list) => {
+  return request.post("warning2/save-batch", list);
+};
+
+export const fetchLeaf = () => {
+  return request({
+    url: "warning2/page",
+    method: "get",
+    params: {
+      pagenum: 1,
+      pagesize: 10000,
+      isLeaf: 0,
+    },
+  });
+};
+
+//根据风机型号获取DI测点统一编码相关数据 testingpointdi2
+export const getDIPointByModelId = (query) => {
+  return request({
+    url: "info/testing_point_di",
+    method: "get",
+    params: query,
+  });
+};
+
+//******************************end*******************************************//
+//******************************预警统计*******************************************//
+export const statistics_querymap = (params) => {
+  return request.get(`alarm/count/querymap2`, { params: params });
+};
+export const statistics_querybyname = (params) => {
+  return request.get("alarm/count/querybyname2", { params: params });
+};
+export const statistics_lineandproject = (params) => {
+  return request.get("alarm/count/lineandproject2", { params: params });
+};
+//******************************end*******************************************//
+
+//******************************预警分析*******************************************//
+export const warning_query_new = (params) => {
+  return request.get(`alarm/count/query/new2`, { params: params });
+};
+export const warning_detail = (params) => {
+  return request({
+    url: `analysis/detail`,
+    params: params,
+    timeout: 60000,
+  });
+};
+// export const statistics_lineandproject = params => {
+//     return request.get('alarm/count/lineandproject', { params: params })
+// };
+
+//******************************end*******************************************//
+
+//*****************************旧诊断报告*******************************************//
+export const earlywarnscore_list = (params) => {
+  return request.get(`earlywarnscore/list`, { params: params });
+};
+export const warning_query_new3 = (params) => {
+  return request.get(`alarm/count/query/new3`, { params: params });
+};
+//******************************end*******************************************//
+
+//*****************************新诊断报告*******************************************//
+export const getList = (params) => {
+  return request.get(
+    `earlyreport/list?pagenum=${params.pagenum}&pagesize=${params.pagesize}&stationId=${params.stationId}&keyword=&starttime=&endtime=`
+  );
+};
+
+export const getReportDetail = (id) => {
+  return request({
+    url: `earlyreport/info?id=${id}`,
+    method: "get",
+    showLoading: {
+      statu: false,
+    },
+  });
+};
+
+//******************************end*******************************************//
+
+export const getAlarmConfig = () => {
+  // return request.get(`/alertrule/queryalarmtypellist`);
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/queryalarmtypellist",
+  });
+};
+
+
+export const getAlartConfig = () => {
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alarmswitch/queryAll",
+  });
+};
+
+export const saveAlartConfig = (data) => {
+  return request({
+    method: "post",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alarmswitch/save",
+    data,
+  });
+};
+
+export const getWtModel = (wpId = "") => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+    url: `alertrule/querymodellist?wpId=${wpId}`,
+  });
+};
+
+export const getWpList = (types = "") => {
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: `alertrule/querywpllist?types=${types}`,
+  });
+};
+export const getBpList = () => {
+  return request({
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+    url: `alertrule/querysubllist`,
+  });
+};
+
+export const getPointList = (params) => {
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alertrule/querysubpointllist",
+    params,
+  });
+};
+export const saveAlarmconfiguration = (data) => {
+  return request({
+    method: "post",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "alarmconfiguration/save",
+    data,
+  });
+};
+
+export const getStopQueryTableData = (params) => {
+  return request({
+    method: "get",
+    baseURL: process.env.VUE_APP_ALARM,
+    url: "shutdownevent2/queryshutdowneventlist",
+    params,
+  });
+};
+
+export const getWarningCountList = (params) => {
+  return request({
+    url: `alarm/history/findCtFeatureStat?timeType=${params.timeType}&begin=${
+      params.begin
+    }&end=${params.end}&stationid=${
+      params.stationid
+    }&components=${params.components.toString()}&modelId=${
+      params.modelId
+    }&alarmIds=${params.alarmIds}&deviceType=${params.deviceType}`,
+    baseURL: process.env.VUE_APP_ALARM,
+    method: "get",
+  });
+};

src/components/alarm-badge/index.vue

@@ -41,7 +41,7 @@
 import deligoAlarmList from "@/components/deligoAlarmList";
 import alarmSetting from "@/components/alarm-badge/alarm-setting.vue";
 import { ElNotification } from "element-plus";
-import { GetDeviceTableData } from "@/api/zhbj/index.js";
+import { alarm_history } from "@/api/zhbj/index.js";
 import dayjs from "dayjs";
 export default {
   name: "alarmBadge",
@@ -88,6 +88,7 @@ export default {
       socketLeaveFlag1: false, // 离开标记（解决 退出登录再登录 时出现的 多次相同推送 问题，出现的本质是多次建立了WebSocket连接）
       alarmList: [],
       dialogList: [],
+      realList: [],
       //实时报警图标相关
       x: null,
       y: null,
@@ -118,6 +119,14 @@ export default {
           alarmType: "windturbine",
           deviceType: "",
         },
+        {
+          alarmType: "custom",
+          deviceType: "inverter",
+        },
+        {
+          alarmType: "custom",
+          deviceType: "windturbine",
+        },
       ],
       alarmConfigArray: [],
       displaySetting: false,
@@ -141,22 +150,26 @@ export default {
     this.x = window.innerWidth - 82;
     this.y = window.innerHeight - 32;
     let requestResult = [];
-    this.requestAlarmHistoryParams.forEach(({ alarmType }) => {
-      requestResult.push(this.getAlarmHistory(alarmType));
+    this.requestAlarmHistoryParams.forEach(({ alarmType, deviceType }) => {
+      requestResult.push(this.getAlarmHistory(alarmType, deviceType));
     });
 
     Promise.all(requestResult)
       .then((promiseResult) => {
         promiseResult.forEach(({ data }) => {
-          data?.records?.forEach((ele) => {
+          data?.ls?.forEach((ele) => {
             this.pushALarmItem(ele);
           });
         });
         this.dialogList.sort((a, b) => {
-          return b.lv - a.lv;
+          return b.ts - a.ts;
+        });
+        this.realList.sort((a, b) => {
+          return b.ts - a.ts;
         });
         this.$store.commit("changeAlarmlist", this.alarmList);
         this.$store.commit("setWarning", this.dialogList);
+        this.$store.commit("setWarningList", this.realList);
         if (!this.socketLeaveFlag) {
           // 没有离开——重连
           // websocket重连
@@ -360,27 +373,28 @@ export default {
       }
     },
     //查历史报警
-    getAlarmHistory(alarmType) {
+    getAlarmHistory(alarmType, deviceType) {
       let params = {
         pageNum: 1,
-        pageSize: 5000,
+        pageSize: 50,
         alarmId: "",
         alarmType,
+        deviceType,
         stationid: "",
         deviceid: "",
         modelId: "",
         components: "",
         description: "",
         isclose: false,
-        begin: "",
-        end: "",
+        begin: dayjs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),
+        end: dayjs().format("YYYY-MM-DD HH:mm:ss"),
       };
       if (params.alarmType == "windturbine") {
         params.stationid = "SXJ_KGDL_DJY_FDC_STA";
       } else if (params.alarmType == "inverter") {
         params.stationid = "SXJ_KGDL_JR_GDC_STA";
       }
-      return GetDeviceTableData(params, 12000);
+      return alarm_history(params, 12000);
     },
     pushALarmItem(alarmItem, type) {
       const configItem = this.getConfigItem(alarmItem.rank);
@@ -451,10 +465,9 @@ export default {
         }
       }
       if (
-        (configItem.isAlarmSound ||
-          configItem.isAlart ||
-          configItem.isContinuousAlarm) &&
-        alarmOption.deviceType != "custom"
+        configItem.isAlarmSound ||
+        configItem.isAlart ||
+        configItem.isContinuousAlarm
       ) {
         if (type && type == "ws") {
           this.dialogList.unshift(alarmOption);
@@ -462,6 +475,13 @@ export default {
           this.dialogList.push(alarmOption);
         }
       }
+      if (type && type == "ws") {
+        this.realList.unshift(alarmOption);
+      } else {
+        this.realList.push(alarmOption);
+      }
+
+      //    && alarmOption.deviceType != "custom"
       this.playAudioEffect();
     },
     getConfigItem(lv) {
@@ -603,6 +623,7 @@ export default {
           //   });
           this.$store.commit("changeAlarmlist", this.alarmList);
           this.$store.commit("setWarning", this.dialogList);
+          this.$store.commit("setWarningList", this.realList);
         }
       }
     },

src/router/index.js

@@ -544,6 +544,40 @@ export const asyncRoutes = [
       }*/
     ],
   },
+  {
+    path: "/integratedAlarm",
+    component: () => import("@/views/IntegratedAlarm"),
+    name: "integratedAlarm",
+    meta: {
+      title: "综合报警",
+      icon: "",
+      permissions: ["jn_stateMonitor"],
+    },
+    children: [
+      {
+        path: "safe", // 基础矩阵
+        name: "safe",
+        component: () => import("@/views/IntegratedAlarm/safe"),
+        meta: {
+          title: "综合报警",
+          icon: "svg-matrix",
+          permissions: ["jn_jcjz"],
+        },
+        children: [
+          {
+            path: "realwarning", // 基础矩阵
+            name: "realwarning",
+            component: () => import("@/views/IntegratedAlarm/safe/realWarning"),
+            meta: {
+              title: "综合报警",
+              icon: "svg-matrix",
+              permissions: ["jn_jcjz"],
+            },
+          },
+        ],
+      },
+    ],
+  },
   //经济运行
   {
     path: "/economicsOperation",
@@ -1412,9 +1446,8 @@ export const asyncRoutes = [
   },
   // 智能报表
   {
-    path: "/others",
-    redirect: "/others/report/gjyrbb",
-    name: "others",
+    path: "/report",
+    name: "report",
     meta: {
       title: "智能报表",
       icon: "",
@@ -1464,16 +1497,16 @@ export const asyncRoutes = [
               permissions: ["jn_zdz_scrb"],
             },
           },
-        //   {
-        //     path: "gjyrbb",
-        //     name: "gjyrbb",
-        //     component: () => import("@/views/report/stationReport/rbb"),
-        //     meta: {
-        //       title: "日报表",
-        //       icon: "",
-        //       permissions: ["jn_zdz_rbb"],
-        //     },
-        //   },
+          //   {
+          //     path: "gjyrbb",
+          //     name: "gjyrbb",
+          //     component: () => import("@/views/report/stationReport/rbb"),
+          //     meta: {
+          //       title: "日报表",
+          //       icon: "",
+          //       permissions: ["jn_zdz_rbb"],
+          //     },
+          //   },
 
           {
             path: "fczybb",

src/store/index.js

@@ -19,7 +19,10 @@ const state = {
   boosterAlarm: JSON.parse(localStorage.getItem("boosterAlarm")) || 0,
   drawer: JSON.parse(localStorage.getItem("drawer")) || false,
   alarmList: JSON.parse(localStorage.getItem("alarmList")) || [],
-  warnList: [],
+  warnList: [], //弹窗报警列表
+  warningList: [], //实时报警列表
+  //实时报警列表最大长度
+  warningListLimitLength: 30,
   setConfig: 1,
   menuState: 1,
 };
@@ -39,12 +42,7 @@ const mutations = {
   update(state, newData) {
     state.windturbineMap = newData.data;
   },
-  changeMenuData(state, newData) {
-    state.menuData = newData;
-  },
-  changeModuleName(state, newData) {
-    state.moudleName = newData;
-  },
+  //首次加载请求公共数据
   changeBooster(state, data) {
     state.boosterList = data;
     localStorage.setItem("boosterList", JSON.stringify(data));
@@ -57,21 +55,19 @@ const mutations = {
     state.boosterAlarm = data;
     localStorage.setItem("boosterAlarm", JSON.stringify(data));
   },
+  //升压站报警列表弹窗
   changeDrawer(state, data) {
     state.drawer = data;
     localStorage.setItem("drawer", data);
   },
+  //修改升压站报警列表
   changeAlarmlist(state, data) {
     state.alarmList = data;
     localStorage.setItem("alarmList", JSON.stringify(state.alarmList));
   },
+  //修改弹窗报警列表事件
   setWarning(state, data) {
     state.warnList = data;
-    // localStorage.setItem("warnList", JSON.stringify(state.warnList));
-  },
-  changeWarning(state, data) {
-    state.warnList.unshift(data);
-    // localStorage.setItem("warnList", JSON.stringify(state.warnList));
   },
   removeWarning(state, data) {
     if (Array.isArray(data)) {
@@ -93,6 +89,63 @@ const mutations = {
   emptyWarning(state) {
     state.warnList = [];
   },
+  //修改实时报警列表事件
+  setWarningList(state, data) {
+    state.warningList = data;
+  },
+  removeWarningList(state, data) {
+    // if (Array.isArray(data)) {
+    //   data.forEach((ele) => {
+    //     for (let i = 0; i < state.warningList.length; i++) {
+    //       if (
+    //         `${ele.id}${ele.ts}` ===
+    //         `${state.warningList[i].id}${state.warningList[i].ts}`
+    //       ) {
+    //         setTimeout(() => {
+    //           state.warningList.splice(i, 1);
+    //         }, 0);
+    //         break;
+    //       }
+    //     }
+    //   });
+    // }
+    if (Array.isArray(data)) {
+      data.forEach((ele) => {
+        for (let i = 0; i < state.warningList.length; i++) {
+          if (
+            `${ele.id}${ele.ts}` ===
+            `${state.warningList[i].id}${state.warningList[i].ts}`
+          ) {
+            setTimeout(() => {
+              state.warningList.splice(i, 1);
+            }, 0);
+            break;
+          }
+        }
+      });
+    } else {
+      for (let i = 0; i < state.warningList.length; i++) {
+        if (
+          `${state.warningList[i].id}${state.warningList[i].ts}` ===
+          `${data.id}${data.ts}`
+        ) {
+          state.warningList.splice(i, 1);
+          break;
+        }
+      }
+    }
+  },
+  emptyWarningList(state, data) {
+    state.warningList = [];
+  },
+
+  //菜单相关
+  changeMenuData(state, newData) {
+    state.menuData = newData;
+  },
+  changeModuleName(state, newData) {
+    state.moudleName = newData;
+  },
   changeMenuState(state) {
     state.menuState++;
   },

src/views/IntegratedAlarm/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <router-view />
+</template>
+
+<script>
+export default {
+  name: "integratedAlarm", //综合报警
+};
+</script>
+
+<style></style>

src/views/IntegratedAlarm/safe/components/safecomponent.vue

@@ -0,0 +1,450 @@
+<template>
+  <div class="safeCom" @click="clickAlarmItem">
+    <div class="safeCom_head">
+      <i
+        :class="['iconfont', iconfonts()]"
+        style="font-size: 24px; margin-right: 10px"
+      ></i>
+      <div style="display: flex; justify-content: space-between; width: 100%">
+        <div class="safeCom_title">{{ title }}</div>
+        <div
+          style="font-size: 14px; position: relative; right: 35px; top: 15px"
+        >
+          <!-- 共{{ alarmList.length }}/{{ fullTableData.length }}条 -->
+          {{ alarmList.length }}条
+        </div>
+      </div>
+    </div>
+    <el-table :data="alarmList" style="width: 100%" height="calc(100% - 51px)">
+      <el-table-column
+        prop="tsName"
+        label="报警时间"
+        width="120"
+        show-overflow-tooltip
+        align="center"
+      />
+      <el-table-column
+        prop="wpName"
+        label="场站"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        v-if="deviceType != 'booststation'"
+        align="center"
+        prop="deviceName"
+        label="设备"
+        width="50"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="description"
+        label="报警信息"
+        align="center"
+        show-overflow-tooltip
+      />
+      <!-- <el-table-column label="级别" width="80" show-overflow-tooltip>
+        <template #default="scope">
+          <el-tag
+            class="ml-2"
+            :type="
+              scope.row.lv === 5
+                ? 'danger'
+                : scope.row.lv === 4
+                ? 'warning'
+                : 'info'
+            "
+            >{{ scope.row.lvName }}</el-tag
+          >
+        </template>
+      </el-table-column> -->
+
+      <el-table-column
+        label="状态"
+        width="75"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="scope">
+          <span
+            :style="`color:${
+              scope.row.isClose
+                ? 'var(--el-color-success)'
+                : 'var(--el-color-danger)'
+            }`"
+            >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog
+      v-model="showDialog"
+      top="50px"
+      width="90%"
+      modal-class="alarmDialog"
+      :show-close="true"
+      draggable
+      @close="
+        () => {
+          stopUpdate = false;
+        }
+      "
+    >
+      <template #title>
+        <div class="dialog-title">
+          <div class="title">{{ title }}</div>
+        </div>
+      </template>
+      <el-card>
+        <el-table
+          :data="dialogTableData"
+          style="width: 100%"
+          height="620px"
+          border
+          stripe
+        >
+          <el-table-column
+            prop="fullTsName"
+            label="报警时间"
+            width="220"
+            align="center"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="wpName"
+            label="场站"
+            width="180"
+            align="center"
+            show-overflow-tooltip
+          />
+
+          <el-table-column
+            prop="code"
+            label="报警设备"
+            width="100"
+            align="center"
+            show-overflow-tooltip
+          />
+          <!-- <el-table-column
+            prop="characteristic"
+            label="报警特征"
+            width="100"
+            show-overflow-tooltip
+          /> -->
+          <el-table-column label="报警描述" align="center">
+            <template #default="scope">
+              <span
+                class="alertDescCursor"
+                @click="goToAlertDescPage(scope.row)"
+                >{{ scope.row.description }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="faultCause"
+            label="报警故障原因"
+            align="center"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop=""
+            label="报警解除时间"
+            align="center"
+            width="220"
+            show-overflow-tooltip
+          >
+            <template #default="scope">
+              <span>{{ scope.row.endts || scope.row.closeTime }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
+            prop="resolvent"
+            label="报警解决方法"
+            show-overflow-tooltip
+          /> -->
+          <!-- <el-table-column label="级别" width="100" show-overflow-tooltip>
+            <template #default="scope">
+              <el-tag
+                class="ml-2"
+                :type="
+                  scope.row.lv === 5
+                    ? 'danger'
+                    : scope.row.lv === 4
+                    ? 'warning'
+                    : 'info'
+                "
+                >{{ scope.row.lvName }}</el-tag
+              >
+            </template>
+          </el-table-column> -->
+          <el-table-column
+            label="报警是否解除"
+            width="120"
+            align="center"
+            show-overflow-tooltip
+          >
+            <template #default="scope">
+              <span
+                :style="`color:${
+                  scope.row.isClose
+                    ? 'var(--el-color-success)'
+                    : 'var(--el-color-danger)'
+                }`"
+                >{{ scope.row.isClose ? "已解除" : "未解除" }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="100" align="center">
+            <template #default="scope">
+              <el-button type="text" size="small" @click="confirm(scope.row)"
+                >确认本条</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+      <template #footer>
+        <el-button
+          type="info"
+          plain
+          @click="confirmAll"
+          :disabled="!dialogTableData.length"
+          >确认所有报警</el-button
+        >
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { confirmAlart } from "@/api/zhbj/index.js";
+export default {
+  props: {
+    title: {
+      type: String,
+      default: () => {
+        return "";
+      },
+    },
+    deviceType: {
+      type: String,
+      default: () => {
+        return "";
+      },
+    },
+    alarmType: {
+      type: String,
+      default: () => {
+        return "";
+      },
+    },
+  },
+
+  data() {
+    return {
+      alarmList: [],
+      iconfontsObj: {
+        booststation: "iconIOTtubiao_huabanfuben",
+        windturbine: "iconfengji",
+        custom: "iconzidingyi",
+        inverter: "iconzidingyi",
+      },
+      showDialog: false,
+      dialogTableData: [],
+      fullTableData: [],
+      stopUpdate: false,
+    };
+  },
+
+  created() {
+    this.initWarningList();
+  },
+
+  methods: {
+    iconfonts() {
+      return this.iconfontsObj[this.deviceType];
+    },
+
+    initWarningList() {
+      let alarmList = [];
+      // let fullTableData = [];
+      let dialogTableData = [];
+      this.$store.state.warningList.forEach((ele) => {
+        if (
+          this.deviceType === ele.deviceType &&
+          this.alarmType === ele.alarmType
+        ) {
+          alarmList?.length < this.$store.state.warningListLimitLength &&
+            alarmList.push(ele);
+          dialogTableData?.length < 50 && dialogTableData.push(ele);
+          // fullTableData.push(ele);
+        }
+      });
+      alarmList.sort((a, b) => {
+        return b.ts - a.ts;
+      });
+      dialogTableData.sort((a, b) => {
+        return b.ts - a.ts;
+      });
+      // fullTableData.sort((a, b) => {
+      //   return b.ts - a.ts;
+      // });
+      this.alarmList = alarmList;
+      if (!this.stopUpdate) {
+        this.dialogTableData = dialogTableData;
+      }
+      // this.fullTableData = fullTableData;
+    },
+
+    clickAlarmItem() {
+      this.showDialog = true;
+    },
+
+    confirm(alarmItem) {
+      this.stopUpdate = true;
+      this.$confirm("您确定要执行此操作吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          confirmAlart([alarmItem])
+            .then((res) => {
+              if (res.code === 200) {
+                this.BASE.showMsg({
+                  type: "success",
+                  msg: `${this.title}确认成功`,
+                });
+                this.$store.commit("removeWarningList", alarmItem);
+              }
+              this.stopUpdate = false;
+            })
+            .catch(() => {
+              this.BASE.showMsg({
+                msg: "确认失败，请重试",
+              });
+            });
+        })
+        .catch(() => {
+          this.stopUpdate = false;
+        });
+    },
+
+    confirmAll() {
+      this.stopUpdate = true;
+      this.$confirm("您确定要执行此操作吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          confirmAlart(this.dialogTableData)
+            .then((res) => {
+              if (res.code === 200) {
+                this.BASE.showMsg({
+                  type: "success",
+                  msg: `全部${this.title}确认成功`,
+                });
+                this.$store.commit("removeWarningList", this.dialogTableData);
+              }
+              this.stopUpdate = false;
+            })
+            .catch(() => {
+              this.BASE.showMsg({
+                msg: "确认失败，请重试",
+              });
+            });
+        })
+        .catch(() => {
+          this.stopUpdate = false;
+        });
+    },
+
+    goToAlertDescPage(alertItem) {
+      if (this.alarmType == "custom") {
+        this.$router.push(
+          `/safe/customWarning/${alertItem.deviceId}/${alertItem.alarmId}/${this.deviceType}`
+        );
+      } else if (this.alarmType == "booststation") {
+        this.$router.push(
+          `/safe/historywaring/${alertItem.wpName}/${alertItem.alarmId}/${this.deviceType}`
+        );
+      } else {
+        this.$router.push(
+          `/safe/historywaring/${alertItem.deviceId}/${alertItem.alarmId}/${this.deviceType}`
+        );
+      }
+    },
+  },
+
+  watch: {
+    "$store.state.warningList.length"() {
+      this.initWarningList();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.safeCom {
+  width: 100%;
+  height: calc(100% - 20px);
+  cursor: pointer;
+  .safeCom_head {
+    height: 50px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1.5px solid rgb(221, 221, 221);
+    .safeCom_title {
+      font-size: 24px;
+      text-align: center;
+    }
+    .safeCom_fifter {
+      flex: 1;
+    }
+  }
+}
+
+.currentAlartDialogHeader {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>
+<style lang="scss">
+.alarmDialog {
+  .el-dialog__body {
+    height: 700px;
+    max-height: 700ox;
+    padding: 0;
+    overflow: hidden;
+    .el-card {
+      width: calc(100% - 40px);
+      height: calc(100% - 40px);
+      margin: 20px;
+
+      .alertDescCursor {
+        cursor: pointer;
+        transition: 0.2s;
+
+        &:hover {
+          color: var(--el-color-primary);
+          text-decoration: underline;
+          transition: 0.2s;
+        }
+      }
+    }
+
+    .confirmAllBtn {
+      position: absolute;
+      right: 20px;
+      top: 20px;
+    }
+  }
+}
+</style>
+<style lang="scss">
+.alarmDialog {
+  z-index: 1100 !important;
+}
+</style>

src/views/IntegratedAlarm/safe/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <router-view />
+</template>
+
+<script>
+export default {
+  name: "safe", //综合报警
+};
+</script>
+
+<style></style>

src/views/IntegratedAlarm/safe/realWarning/index.vue

@@ -0,0 +1,175 @@
+<template>
+  <div class="safe">
+    <div class="bottomCard">
+      <div class="cardLine">
+        <div class="lineItem card">
+          <Safecom
+            title="风机报警"
+            deviceType="windturbine"
+            alarmType="windturbine"
+          />
+        </div>
+        <div class="lineItem card">
+          <Safecom
+            title="风机预警"
+            deviceType="windturbine"
+            alarmType="custom"
+          />
+        </div>
+      </div>
+      <div class="cardLine">
+        <div class="lineItem card">
+          <Safecom
+            title="光伏报警"
+            deviceType="inverter"
+            alarmType="inverter"
+          />
+        </div>
+
+        <div class="lineItem card">
+          <Safecom title="光伏预警" deviceType="inverter" alarmType="custom" />
+        </div>
+        <!-- <div class="lineItem card">
+          <Safecom
+            title="升压站事件"
+            deviceType="booststation"
+            alarmType="custom"
+          />
+        </div> -->
+      </div>
+      <div class="cardLine">
+        <div class="lineItem card" style="height: 100%">
+          <Safecom
+            title="升压站报警"
+            deviceType="booststation"
+            alarmType="booststation"
+          />
+        </div>
+        <!-- <div class="lineItem card">
+          <Safecom
+            title="升压站事件"
+            deviceType="booststation"
+            alarmType="custom"
+          />
+        </div> -->
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+import dayjs from "dayjs";
+import Safecom from "@/views/IntegratedAlarm/safe/components/safecomponent.vue";
+</script>
+
+<style lang="less" scoped>
+.safe {
+  width: 100%;
+  height: 100%;
+  padding: 20px 10px;
+  //   .topCard {
+  //     height: 24vh;
+  //     overflow-y: auto;
+  //     display: flex;
+  //     flex-wrap: wrap;
+  //     justify-content: flex-start;
+  //     align-content: flex-start;
+
+  //     .item {
+  //       width: 194px;
+  //       height: 90px;
+  //       padding: 6px 10px;
+  //       margin: 5px;
+  //       display: flex;
+  //       background-color: #f55d5d;
+  //       flex-direction: column;
+  //       -moz-user-select: none;
+  //       -webkit-user-select: none;
+  //       user-select: none;
+  //       cursor: pointer;
+
+  //       .title {
+  //         color: #fff;
+  //         font-size: 14px;
+  //       }
+
+  //       .warn_content {
+  //         flex: 1;
+  //         font-size: 12px;
+  //         color: rgb(133, 133, 133);
+  //         line-height: 1.3;
+  //         color: #fff;
+  //         overflow: hidden;
+  //         text-overflow: ellipsis;
+  //         display: -webkit-box;
+  //         -webkit-line-clamp: 2;
+  //         -webkit-box-orient: vertical;
+  //       }
+
+  //       .warn_btn {
+  //         display: flex;
+  //         justify-content: space-between;
+  //         font-size: 14px;
+  //         color: #fff;
+
+  //         .el-button--mini {
+  //           min-height: 20px;
+  //           padding: 0px;
+  //         }
+  //       }
+  //     }
+  //   }
+
+  .bottomCard {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+    justify-content: space-around;
+    .cardLine {
+      width: calc(100% / 3 - 15px);
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+      .lineItem {
+        width: 100%;
+        height: calc(100% / 2 - 10px);
+      }
+    }
+  }
+}
+
+.card {
+  padding: 10px;
+  border-radius: 4px;
+  background-color: #161f1e;
+  overflow: hidden;
+  color: #fff;
+  -webkit-transition: 0.3s;
+  transition: 0.3s;
+  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+}
+</style>
+<style lang="scss">
+.notificatBox {
+  width: 100%;
+
+  .notificatP {
+    color: rgb(7, 7, 7);
+  }
+
+  .btn {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+
+.scrollbarC {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-content: flex-start;
+}
+</style>

src/views/layout/Header.vue

@@ -78,6 +78,12 @@ export default {
           isActive: true,
         },
         {
+          id: "integratedAlarm",
+          text: "综合报警",
+          path: "/integratedAlarm",
+          isActive: true,
+        },
+        {
           id: "economicsOperation",
           text: "经济运行",
           path: "/economicsOperation",
@@ -90,38 +96,10 @@ export default {
           path: "/health",
           isActive: false,
         },
-        // {
-        //   id: "decision",
-        //   text: "决策支持",
-        //   path: "/decision/decision1",
-        //   isActive: false,
-        // },
-        // {
-        //   id: "save",
-        //   text: "安全管控",
-        //   path: "/save",
-        //   isActive: false,
-        // },
-        // {
-        //   id: "znbb",
-        //   text: "智能报表",
-        //   path: "/znbb/reportPandect",
-        //   isActive: false,
-        // },
-        // {
-        //   id: "zhbj",
-        //   text: "综合报警",
-        //   path: "",
-        // },
-        // {
-        //   id: "fdnlpt",
-        //   text: "发电能力分析",
-        //   path: "",
-        // },
         {
-          id: "others",
+          id: "report",
           text: "智能报表",
-          path: "/others",
+          path: "/report",
           isActive: false,
         },
       ],

src/views/layout/Menu.vue

@@ -235,6 +235,11 @@ export default {
           data: [],
         },
         {
+          id: "integratedAlarm",
+          text: "综合报警",
+          data: [],
+        },
+        {
           id: "health",
           text: "智慧检修",
           data: [],

src/views/report/index.vue

@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  name: "others", //智能报表
+  name: "report", //智能报表
 };
 </script>