修复实时报警跳转报警记录和预警查询页面bug，隐藏升压站预警

src/api/api.js

@@ -189,7 +189,7 @@ export const getAdapterHistorysnap = (
 };
 
 //查询历史报警记录
-export const alarm_history = (params, timeout = 2000) => {
+export const alarm_history = (params, timeout = 9000) => {
   return request({
     url: `alarm/history/findAlarmlist`,
     params: params,

src/api/apiConfig.js

@@ -1,2 +1,2 @@
-// export const baseURL = "http://192.168.1.110:6015/";
+// export const baseURL = "http://192.168.1.103:6015/";
 export const baseURL = "http://10.81.3.154:6015/";

src/pages/alarmConfig/bj_custom/custom.vue

@@ -54,11 +54,11 @@
           @change="categorychanged"
         >
           <el-option key="1" label="风机报警" value="windturbine"></el-option>
-          <el-option
+          <!-- <el-option
             key="2"
             label="升压站报警"
             value="booststation"
-          ></el-option>
+          ></el-option> -->
           <el-option key="3" label="光伏报警" value="inverter"></el-option>
         </el-select>
         <el-select

src/pages/customWarning/index.vue

@@ -49,7 +49,7 @@
       <div class="search-input" v-if="state.isshowwindturbineName">
         <span class="lable">机组：</span>
         <el-select
-          v-model="state.windturbineId"
+          v-model="state.deviceId"
           clearable
           size="mini"
           placeholder="全部"
@@ -163,7 +163,7 @@
           header-align="center"
         >
           <template #default="scope">
-            <p :style="item.style && item.style(item)">
+            <p :style="item.style && item.style(scope.row)">
               <span v-if="item.code == 'rank'">
                 {{ tableFilter(scope.row.rank) }}
               </span>
@@ -211,7 +211,7 @@
           header-align="center"
         >
           <template #default="scope">
-            <p :style="item.style && item.style(item)">
+            <p :style="item.style && item.style(scope.row)">
               <span v-if="item.code == 'rank'">
                 {{ tableFilter(scope.row.rank) }}
               </span>
@@ -270,7 +270,16 @@
 </template>
 
 <script setup>
-import { watch, reactive, nextTick, computed, onMounted, ref } from "vue";
+import {
+  watch,
+  reactive,
+  nextTick,
+  computed,
+  onMounted,
+  ref,
+  onActivated,
+  onUpdated,
+} from "vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import {
@@ -302,6 +311,7 @@ onMounted(() => {
   getequipmentmodel_list();
   getfetchRelatePart();
 });
+
 // 机型
 const getequipmentmodel_list = async () => {
   const { data } = await fetchModel();
@@ -347,10 +357,10 @@ const getColumnStyle = (columnItem) => {
 
 const state = reactive({
   typeList: [
-    {
-      label: "升压站",
-      value: "booststation",
-    },
+    // {
+    //   label: "升压站",
+    //   value: "booststation",
+    // },
     // {
     //   label: "自定义",
     //   value: "custom",
@@ -369,7 +379,7 @@ const state = reactive({
   alarmId: "",
   typeVal: "windturbine",
   windturbineList: [],
-  windturbineId: "",
+  deviceId: "",
   modelListAll: {},
   fetchListAll: {},
   modelId: "", //型号
@@ -421,6 +431,19 @@ const stationList = ref([]);
 const getStationList = async () => {
   const { data } = await getWpList(state.typeVal);
   stationList.value = data;
+  if (state.deviceId) {
+    let station = data.find((i) => {
+      let st = i.id.split("_")[2];
+      let dt = state.deviceId.split("_")[2];
+      if (st == dt) {
+        return i;
+      }
+    });
+    state.stationId = station?.id;
+  } else {
+    state.stationId =
+      state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data[0]?.id;
+  }
 };
 
 watch(
@@ -428,7 +451,6 @@ watch(
   (val, old) => {
     val?.value?.length &&
       nextTick(async () => {
-        state.stationId = val.value[0]?.id;
         await getWindturbineList();
         await getAlarmHistoryt();
       });
@@ -443,11 +465,11 @@ watch(
   (val, old) => {
     state.deviceId = route.params.deviceId || "";
     state.alarmId = route.params.alarmId || "";
-    nextTick(async () => {
-      if (route.params.deviceId && route.params.alarmId) {
-        await getAlarmHistoryt();
-      }
-    });
+    // nextTick(async () => {
+    //   if (route.params.deviceId && route.params.alarmId) {
+    //     await getAlarmHistoryt();
+    //   }
+    // });
   },
   {
     deep: true,
@@ -456,37 +478,29 @@ watch(
 );
 //型号列表
 const modelList = computed(() => {
-  if (state.typeVal == "windturbine") {
-    if (state.stationId == "") {
-      return [];
-    } else {
-      state.modelId = state.modelListAll[state.stationId]?.[0]?.id || "";
-      return state.modelListAll[state.stationId];
-    }
-  } else {
+  if (state.stationId == "") {
     return [];
+  } else {
+    state.modelId = route.params.deviceId
+      ? ""
+      : state.modelListAll[state.stationId]?.[0]?.id || "";
+    return state.modelListAll[state.stationId];
   }
 });
 //部件列表
 const componentList = computed(() => {
-  if (state.typeVal == "windturbine") {
-    if (state.stationId == "") {
-      return [];
+  if (state.stationId == "") {
+    return [];
+  } else {
+    if (state.stationId.includes("FDC")) {
+      return state.fetchListAll?.fjbj;
     } else {
-      if (state.stationId.includes("FDC")) {
-        return state.fetchListAll?.fjbj;
-      } else {
-        return state.fetchListAll?.gfbj;
-      }
+      return state.fetchListAll?.gfbj;
     }
-  } else {
-    return [];
   }
 });
 //get 风机
 const getWindturbineList = async () => {
-  state.windturbineList = [];
-  state.windturbineId = "";
   const { data } = await fetchWindturbineList(state.stationId);
   state.windturbineList = data;
 };
@@ -498,9 +512,9 @@ const query = reactive({
 
 // 获取历史记录表
 const getAlarmHistoryt = async () => {
-  if (route.params.deviceId && route.params.alarmId) {
-    state.stationId = "";
-  }
+  //   if (route.params.deviceId && route.params.alarmId) {
+  //     state.stationId = "";
+  //   }
   let params = {
     pageNum: query.page,
     pageSize: query.limit,
@@ -509,8 +523,7 @@ const getAlarmHistoryt = async () => {
     deviceType: state.typeVal,
     stationid: state.stationId,
     deviceid:
-      state.deviceId ||
-      (state.typeVal == "booststation" ? "" : state.windturbineId),
+      state.deviceId || (state.typeVal == "booststation" ? "" : state.deviceId),
     modelId: state.typeVal == "booststation" ? "" : state.modelId,
     components: state.components,
     description: state.description,
@@ -527,6 +540,8 @@ const getAlarmHistoryt = async () => {
 };
 //报警类型变化
 const typechange = () => {
+  state.alarmId = "";
+  state.deviceId = "";
   state.isshowwindturbineName = state.typeVal == "booststation" ? false : true;
 };
 
@@ -537,7 +552,7 @@ const export2Excel = async () => {
     pageSize: query.pageTotal,
     alarmType: state.typeVal,
     stationid: state.stationId,
-    deviceid: state.typeVal == "booststation" ? "" : state.windturbineId,
+    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
     modelId: state.modelId,
     components: state.components,
     description: state.description,

src/pages/faultDiagnosis/warning.vue

@@ -241,10 +241,10 @@ const changZhanArray = ref([]);
 const state = reactive({
   typeVal: "windturbine",
   typeList: [
-    {
-      label: "升压站",
-      value: "booststation",
-    },
+    // {
+    //   label: "升压站",
+    //   value: "booststation",
+    // },
     // {
     //   label: "自定义",
     //   value: "custom",
@@ -290,14 +290,9 @@ const changeType = async (value) => {
 const getWpArray = async () => {
   const { data } = await getWpList(state.typeVal);
   changZhanArray.value = data;
-  if (state.typeVal != "booststation") {
-    state.changZhan =
-      state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : "";
-  } else {
-    state.changZhan = "";
-    state.modelId = "";
-    // getTableList();
-  }
+
+  state.changZhan =
+    state.typeVal == "windturbine" ? "SXJ_KGDL_DJY_FDC_STA" : data[0]?.id;
 };
 // 机型
 const getequipmentmodel_list = async () => {
@@ -332,21 +327,19 @@ const componentList = computed(() => {
 watch(
   () => [modelList, componentList],
   (val) => {
-    if (state.typeVal != "booststation") {
-      let arr = val.map((item) => item.value);
-      if (arr[0] && arr[0].length && arr[1] && arr[1].length) {
-        state.modelId = [arr[0][0]?.nemCode];
-        let componenDefaultSelect =
-          arr[1]?.find((ele) => {
-            return ele.nemCode === "FDJ";
-          })?.nemCode || "";
-        componenDefaultSelect
-          ? (state.components = [componenDefaultSelect])
-          : arr[1]?.[0]?.nemCode
-          ? (state.components = [arr[1]?.[0]?.nemCode])
-          : (state.components = []);
-        getAlarmId();
-      }
+    let arr = val.map((item) => item.value);
+    if (arr[0] && arr[0].length && arr[1] && arr[1].length) {
+      state.modelId = [arr[0][0]?.nemCode];
+      let componenDefaultSelect =
+        arr[1]?.find((ele) => {
+          return ele.nemCode === "FDJ";
+        })?.nemCode || "";
+      componenDefaultSelect
+        ? (state.components = [componenDefaultSelect])
+        : arr[1]?.[0]?.nemCode
+        ? (state.components = [arr[1]?.[0]?.nemCode])
+        : (state.components = []);
+      getAlarmId();
     }
   },
   {
@@ -364,9 +357,7 @@ function changeComponents(val) {
 }
 function changeChangzhan(val) {
   state.changZhan = val;
-  if (state.typeVal != "booststation") {
-    getAlarmId();
-  }
+  getAlarmId();
 }
 function getAlarmId() {
   GetAlarmIdCustom({
@@ -380,9 +371,8 @@ function getAlarmId() {
       data.length <= 5
         ? data.map((item) => item.alarmId)
         : data.slice(0, 5).map((item) => item.alarmId);
-    if (state.alarmIds.length) {
-      getTableList();
-    }
+
+    getTableList();
   });
 }
 // 获取列表数据 调用接口

src/pages/safe/historywaring.vue

@@ -48,7 +48,7 @@
       <div class="search-input" v-if="state.isshowwindturbineName">
         <span class="lable">机组：</span>
         <el-select
-          v-model="state.windturbineId"
+          v-model="state.deviceId"
           clearable
           size="mini"
           placeholder="全部"
@@ -162,7 +162,7 @@
           header-align="center"
         >
           <template #default="scope">
-            <p :style="item.style && item.style(item)">
+            <p :style="item.style && item.style(scope.row)">
               <span v-if="item.code == 'rank'">
                 {{ tableFilter(scope.row.rank) }}
               </span>
@@ -213,7 +213,7 @@
           header-align="center"
         >
           <template #default="scope">
-            <p :style="item.style && item.style(item)">
+            <p :style="item.style && item.style(scope.row)">
               <span v-if="item.code == 'rank'">
                 {{ tableFilter(scope.row.rank) }}
               </span>
@@ -301,8 +301,17 @@ onMounted(() => {
     dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
     dayjs().format("YYYY-MM-DD HH:mm:ss"),
   ];
-  state.deviceId = route.params.deviceId || "";
-  state.alarmId = route.params.alarmId || "";
+  if (route.params.typeVal != "booststation") {
+    state.deviceId = route.params.deviceId || "";
+    state.alarmId = route.params.alarmId || "";
+    state.typeVal = route.params.typeVal || "windturbine";
+  } else {
+    state.stationName = route.params.deviceId;
+    state.deviceId = "";
+    state.alarmId = route.params.alarmId || "";
+    state.typeVal = route.params.typeVal || "booststation";
+  }
+  state.isshowwindturbineName = state.typeVal == "booststation" ? false : true;
   getStationList();
   getequipmentmodel_list();
   getfetchRelatePart();
@@ -371,9 +380,10 @@ const state = reactive({
   ],
   typeVal: "windturbine",
   stationId: "",
+  stationName: "",
   alarmId: "",
   windturbineList: [],
-  windturbineId: "",
+  deviceId: "",
   modelListAll: {},
   fetchListAll: {},
   modelId: "", //型号
@@ -425,6 +435,21 @@ const stationList = ref([]);
 const getStationList = async () => {
   const { data } = await getWpList(state.typeVal);
   stationList.value = data;
+  if (state.deviceId && state.typeVal != "booststation") {
+    let station = data.find((i) => {
+      let st = i.id.split("_")[2];
+      let dt = state.deviceId.split("_")[2];
+      if (st == dt) {
+        return i;
+      }
+    });
+    state.stationId = station?.id;
+  } else if (state.typeVal == "booststation") {
+    let station = data.find((i) => i.name == state.stationName);
+    state.stationId = station ? station?.id : data[0]?.id;
+  } else {
+    state.stationId = data[0]?.id;
+  }
 };
 
 watch(
@@ -432,9 +457,7 @@ watch(
   (val, old) => {
     val?.value?.length &&
       nextTick(async () => {
-        state.stationId = val.value[0]?.id;
         await getWindturbineList();
-        await getAlarmHistoryt();
       });
   },
   {
@@ -445,13 +468,18 @@ watch(
 watch(
   () => route,
   (val, old) => {
-    state.deviceId = route.params.deviceId || "";
-    state.alarmId = route.params.alarmId || "";
-    nextTick(async () => {
-      if (route.params.deviceId && route.params.alarmId) {
-        await getAlarmHistoryt();
-      }
-    });
+    if (route.params.typeVal != "booststation") {
+      state.deviceId = route.params.deviceId || "";
+      state.alarmId = route.params.alarmId || "";
+      state.typeVal = route.params.typeVal || "windturbine";
+    } else {
+      state.stationName = route.params.deviceId;
+      state.deviceId = "";
+      state.alarmId = route.params.alarmId || "";
+      state.typeVal = route.params.typeVal || "booststation";
+    }
+    state.isshowwindturbineName =
+      state.typeVal == "booststation" ? false : true;
   },
   {
     deep: true,
@@ -464,7 +492,9 @@ const modelList = computed(() => {
     if (state.stationId == "") {
       return [];
     } else {
-      state.modelId = state.modelListAll[state.stationId]?.[0]?.id || "";
+      state.modelId = route.params.deviceId
+        ? ""
+        : state.modelListAll[state.stationId]?.[0]?.id || "";
       return state.modelListAll[state.stationId];
     }
   } else {
@@ -489,10 +519,9 @@ const componentList = computed(() => {
 });
 //get 风机
 const getWindturbineList = async () => {
-  state.windturbineList = [];
-  state.windturbineId = "";
   const { data } = await fetchWindturbineList(state.stationId);
   state.windturbineList = data;
+  await getAlarmHistoryt();
 };
 const query = reactive({
   page: 1,
@@ -502,18 +531,16 @@ const query = reactive({
 
 // 获取历史记录表
 const getAlarmHistoryt = async () => {
-  if (route.params.deviceId && route.params.alarmId) {
-    state.stationId = "";
-  }
+  //   if (route.params.deviceId && route.params.alarmId) {
+  //     state.stationId = "";
+  //   }
   let params = {
     pageNum: query.page,
     pageSize: query.limit,
     alarmId: state.alarmId,
     alarmType: state.typeVal,
     stationid: state.stationId,
-    deviceid:
-      state.deviceId ||
-      (state.typeVal == "booststation" ? "" : state.windturbineId),
+    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
     modelId: state.typeVal == "booststation" ? "" : state.modelId,
     components: state.components,
     description: state.description,
@@ -537,6 +564,8 @@ const getAlarmHistoryt = async () => {
 };
 //报警类型变化
 const typechange = () => {
+  state.alarmId = "";
+  state.deviceId = "";
   state.isshowwindturbineName = state.typeVal == "booststation" ? false : true;
 };
 
@@ -547,7 +576,7 @@ const export2Excel = async () => {
     pageSize: query.pageTotal,
     alarmType: state.typeVal,
     stationid: state.stationId,
-    deviceid: state.typeVal == "booststation" ? "" : state.windturbineId,
+    deviceid: state.typeVal == "booststation" ? "" : state.deviceId,
     modelId: state.modelId,
     components: state.components,
     description: state.description,

src/pages/safe/safecomponent.vue

@@ -344,9 +344,19 @@ export default {
     },
 
     goToAlertDescPage(alertItem) {
-      this.$router.push(
-        `/safe/historywaring/${alertItem.deviceId}/${alertItem.alarmId}`
-      );
+      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}`
+        );
+      }
     },
   },
 

src/router/index.js

@@ -64,7 +64,7 @@ const routes = [
               ),
           },
           {
-            path: "/safe/historywaring/:deviceId?/:alarmId?",
+            path: "/safe/historywaring/:deviceId?/:alarmId?/:typeVal?",
             name: "safehistorywaring",
             isshow: "super_admin,common",
             meta: {
@@ -77,7 +77,7 @@ const routes = [
               ),
           },
           {
-            path: "/safe/customWarning/:deviceId?/:alarmId?",
+            path: "/safe/customWarning/:deviceId?/:alarmId?/:typeVal?",
             name: "customWarning",
             isshow: "super_admin,common",
             meta: {