From 42928bfe7fea4cd35eb122bc7708c54d828d2199 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 16 Jul 2024 10:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 socket/index.js                              | 20 ++++++++--------
 src/App.vue                                  | 23 ++++++++++++++++++-
 src/views/alarmRules/components/addRules.vue | 24 +++++++++++++-------
 src/views/homePage/warnMessage/index.vue     | 24 ++------------------
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/socket/index.js b/socket/index.js
index 6d581450..b08df317 100644
--- a/socket/index.js
+++ b/socket/index.js
@@ -88,16 +88,16 @@ const webSocketOnMessage = (e) => {
 // WebSocket关闭处理
 const closeWebsocket = (e) => {
   console.log("WebSocket连接已关闭:", e);
-  if (!hasShownNotification) {
-    Notification({
-      title: "告警",
-      message: "WebSocket连接已关闭",
-      position: "bottom-right",
-      type: "warning",
-      duration: 2000,
-    });
-    hasShownNotification = true; // 更新状态，防止再次显示
-  }
+  // if (!hasShownNotification) {
+  //   Notification({
+  //     title: "告警",
+  //     message: "WebSocket连接已关闭",
+  //     position: "bottom-right",
+  //     type: "warning",
+  //     duration: 2000,
+  //   });
+  //   hasShownNotification = true; // 更新状态，防止再次显示
+  // }
 
   // 清除所有定时器
   clearTimeout(timeoutObj);
diff --git a/src/App.vue b/src/App.vue
index c0e0ff38..5eae690f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import socketService from "../socket/index";
 export default {
   data() {
     return {
@@ -12,14 +13,31 @@ export default {
       htmlFontSize: 16, // 默认的html字体大小
     };
   },
-  mounted() {
+
+  async mounted() {
     this.setRemUnit();
     this.windowResize();
+    this.initWebSocket();
+    window.addEventListener("onmessageWS", this.getSocketData);
   },
   beforeDestroy() {
     window.removeEventListener("resize", this.windowResize);
   },
   methods: {
+    async initWebSocket() {
+      console.log(this.$websocket);
+      this.$websocket.initWebSocket();
+    },
+    getSocketData(res) {
+      console.log(res);
+      this.$notify({
+        title: "告警",
+        message: res.detail.data,
+        position: "bottom-right",
+        type: "warning",
+        duration: 0,
+      });
+    },
     setRemUnit() {
       // 设置所有的rem单位
       const remUnit = () => {
@@ -37,6 +55,9 @@ export default {
       document.documentElement.style.fontSize = `${remUnit()}px`;
     },
   },
+  destroyed() {
+    this.$websocket.close();
+  },
 };
 </script>
 <style lang="less">
diff --git a/src/views/alarmRules/components/addRules.vue b/src/views/alarmRules/components/addRules.vue
index ebc8079c..2e00b850 100644
--- a/src/views/alarmRules/components/addRules.vue
+++ b/src/views/alarmRules/components/addRules.vue
@@ -6,6 +6,7 @@
       :visible.sync="rulesDialogshow"
       width="520px"
       :close-on-click-modal="false"
+      @close="hide"
     >
       <el-form
         label-position="left"
@@ -31,7 +32,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="比较器：" prop="compareVal">
-          <el-select v-model="formInfo.compareVal" disabled>
+          <el-select v-model="formInfo.compareVal" @change="changecomVal">
             <el-option
               v-for="item in compareOptions"
               :key="item.type"
@@ -220,18 +221,25 @@ export default {
           console.log(err); //代码错误、请求失败捕获
         });
     },
+    changecomVal() {
+      this.getOperator();
+    },
     //获取比较符
     getOperator() {
       listOperatorApi({ name: this.formInfo.compareVal })
         .then((res) => {
           console.log(res);
-          this.operatorValOptions = Object.keys(res.data).map((key) => ({
-            value: key, // 值（键）
-            label: res.data[key], // 标签（显示的值）
-          }));
-          console.log(this.operatorValOptions);
-          if (this.formInfo.operatorVal == "") {
-            this.formInfo.operatorVal = this.operatorValOptions[0].value;
+          if (res.success) {
+            this.operatorValOptions = Object.keys(res.data).map((key) => ({
+              value: key, // 值（键）
+              label: res.data[key], // 标签（显示的值）
+            }));
+            console.log(this.operatorValOptions);
+            if (this.formInfo.operatorVal == "") {
+              this.formInfo.operatorVal = this.operatorValOptions[0].value;
+            }
+          } else {
+            this.formInfo.operatorVal = "";
           }
         })
         .catch((err) => {
diff --git a/src/views/homePage/warnMessage/index.vue b/src/views/homePage/warnMessage/index.vue
index d549154b..eaa947c2 100644
--- a/src/views/homePage/warnMessage/index.vue
+++ b/src/views/homePage/warnMessage/index.vue
@@ -93,7 +93,7 @@
 <script>
 import { warningListApi } from "@/utils/api/index";
 import warnDialog from "./components/warnDialog.vue";
-import socketService from "../../../../socket/index";
+
 export default {
   name: "warnmessage",
   components: {
@@ -125,25 +125,8 @@ export default {
     this.getwarnList();
   },
   created() {},
-  async mounted() {
-    this.initWebSocket();
-    window.addEventListener("onmessageWS", this.getSocketData);
-  },
-  methods: {
-    async initWebSocket() {
-      this.$websocket.initWebSocket();
-    },
-    getSocketData(res) {
-      console.log(res);
-      this.$notify({
-        title: "告警",
-        message: res.detail.data,
-        position: "bottom-right",
-        type: "warning",
-        duration: 0,
-      });
-    },
 
+  methods: {
     lookMore() {
       this.params.startTime = this.starttime;
       this.params.endTime = this.endtime;
@@ -171,9 +154,6 @@ export default {
         });
     },
   },
-  destroyed() {
-    this.$websocket.close();
-  },
 };
 </script>