修改实时报警查询参数，修复点击弹窗跳转bug

src/components/alarmPopupa/index.vue

@@ -389,7 +389,7 @@ export default {
         modelId: "",
         components: "",
         description: "",
-        begin: `${dayJs().format("YYYY-MM-DD")} 00:00:00`,
+        begin: dayJs().add(-1, "hour").format("YYYY-MM-DD HH:mm:ss"),
         end: dayJs().format("YYYY-MM-DD HH:mm:ss"),
         isclose: false,
       };
@@ -397,7 +397,12 @@ export default {
         params.alarmType == "windturbine" ||
         (params.alarmType == "custom" && params.deviceType == "windturbine")
       ) {
-        params.stationid = "SXJ_KGDL_GJY_FDC_STA";
+        params.stationid = "SXJ_KGDL_DJY_FDC_STA";
+      } else if (
+        params.alarmType == "inverter" ||
+        (params.alarmType == "custom" && params.deviceType == "inverter")
+      ) {
+        params.stationid = "SXJ_KGDL_JR_GDC_STA";
       }
       return alarm_history(params, 12000);
     },
@@ -594,8 +599,21 @@ export default {
       }
     },
 
-    goToAlertDescPage({ deviceId, alarmId }) {
-      this.$router.push(`/safe/historywaring/${deviceId}/${alarmId}`);
+    goToAlertDescPage({ deviceId, alarmId, deviceType,alarmType }) {
+      if (alarmType == "custom") {
+        this.$router.push(
+          `/safe/customWarning/${deviceId}/${alarmId}/${deviceType}`
+        );
+      } else if (alarmType == "booststation") {
+        this.$router.push(
+          `/safe/historywaring/${wpName}/${alarmId}/${deviceType}`
+        );
+      } else {
+        this.$router.push(
+          `/safe/historywaring/${deviceId}/${alarmId}/${deviceType}`
+        );
+      }
+    //   this.$router.push(`/safe/historywaring/${deviceId}/${alarmId}`);
     },
 
     getConfigItem(lv) {

src/main.js

@@ -7,10 +7,10 @@ import "element-plus/lib/theme-chalk/index.css";
 import "./assets/css/icon.css";
 import "./assets/font/iconfont.css";
 import "default-passive-events";
-import dialogDrag from "/@/assets/js/dialogDrag.js"; // 地址就是dialogDrag.js在位置
-
-import * as ElementPlusIconsVue from "@element-plus/icons-vue";
+import dialogDrag from "@/assets/js/dialogDrag"; // 地址就是dialogDrag.js在位置
 
+// import * as ElementPlusIconsVue from "@element-plus/icons-vue";
+import ElementPlusIconsVue from "element-plus";
 
 import "animate.css";
 
@@ -26,39 +26,41 @@ import basicTool from "@tools/basicTool";
  * 调用姿势：new Date().formatDate("yyyy-MM-dd hh:mm:ss");
  */
 Date.prototype.formatDate = function (fmt) {
-    let o = {
-        "M+": this.getMonth() + 1, //月份 
-        "d+": this.getDate(), //日 
-        "h+": this.getHours(), //小时 
-        "m+": this.getMinutes(), //分 
-        "s+": this.getSeconds(), //秒 
-        "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-        "S": this.getMilliseconds() //毫秒 
-    };
-    if (/(y+)/.test(fmt)) {
-        fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    }
-    for (let k in o) {
-        if (new RegExp("(" + k + ")").test(fmt)) {
-            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-        }
-
+  let o = {
+    "M+": this.getMonth() + 1, //月份
+    "d+": this.getDate(), //日
+    "h+": this.getHours(), //小时
+    "m+": this.getMinutes(), //分
+    "s+": this.getSeconds(), //秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+    S: this.getMilliseconds(), //毫秒
+  };
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(
+      RegExp.$1,
+      (this.getFullYear() + "").substr(4 - RegExp.$1.length)
+    );
+  }
+  for (let k in o) {
+    if (new RegExp("(" + k + ")").test(fmt)) {
+      fmt = fmt.replace(
+        RegExp.$1,
+        RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
+      );
     }
-    return fmt;
-}
+  }
+  return fmt;
+};
 
 const app = createApp(App);
 
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
-    app.component(key, component);
+  app.component(key, component);
 }
 
-app.use(router)
-    .use(store)
-    .use(dialogDrag)
-    .use(ElementPlus, { size: "small" })
+app.use(router).use(store).use(dialogDrag).use(ElementPlus, { size: "small" });
 // .use(Antd)
 
 app.config.globalProperties.BASE = basicTool; //全局注册
 
-app.mount("#app");
+app.mount("#app");