报警模块函数调整

src/network/network.js

@@ -214,8 +214,8 @@ export const alert = {
                         pagenum: searchCondition.pagenum,
                         pagesize: searchCondition.pagesize,
                         name: searchCondition.name,
-                        startTime: searchCondition.datetime.length==2 ? searchCondition.datetime[0].format(projectconfig.date.dayjsFomart)+'' : null,
-                        endTime: searchCondition.datetime.length==2 ? searchCondition.datetime[1].format(projectconfig.date.dayjsFomart)+'' : null
+                        startTime: searchCondition.datetime.length == 2 ? searchCondition.datetime[0].format(projectconfig.date.dayjsFomart) + '' : null,
+                        endTime: searchCondition.datetime.length == 2 ? searchCondition.datetime[1].format(projectconfig.date.dayjsFomart) + '' : null
                     },
                     headers: {
                         'content-type': 'application/json',
@@ -263,6 +263,27 @@ export const alert = {
                 console.log("getAllActiveAlert 异常:" + error);
             });
     },
+    async confirmAlert(alertMessage)
+    {
+        await Axios.post
+            (
+                projectconfig.restful.host + projectconfig.restful.alert.confirmAlertMessage, alertMessage,
+                {
+                    headers: {
+                        'content-type': 'application/json',
+                        'token': localStorage.getItem('token')
+                    }
+                }
+            )
+            .then(res =>
+            {
+                console.log(res);
+            })
+            .catch(error =>
+            {
+                console.log("confirmAlert 异常:" + error);
+            });
+        }
 }
 //#endregion
 export const nodes = {

src/views/alert/alarmMessagePopue.vue

@@ -120,30 +120,24 @@ export default {
       }, 30000);
     },
     closeOpen(faultInfo) {
-      //console.log(faultInfo) //----------------------------------------------------------------------->
-      if (this.$store.state.loginInformation.login != true)
-        return alert("请先登录!");
-      if (faultInfo.opened == false) {
-        console.log("faultInfo is open == false")
-        console.log(faultInfo)
-        /***
-         * snapid 是一对多的，alertMessageMap中的key是唯一的，但是可能会出现多个弹窗的snapid是相同的
-         * 所以在确定了一个弹窗要关闭的时候，则找到所有相同snapid相同的弹窗，然后移除这些弹窗
-         * 此处使用id传入
-         */
-        this.$store.dispatch("removeAlarm", faultInfo.id);
-      } else {
-        this.faultInfo = faultInfo;
-        this.$store.state.machinmeAlarmDetails = [];
-        this.clickid = "设备报警详情 -- [" + faultInfo.windturbineName + "]";
-        this.objectid = faultInfo.objectId;
-        this.searchCondition.objectId = this.objectid;
-        this.searchCondition.cateGory1 = faultInfo.category1;
-        this.searchCondition.cateGory1 =
-          this.searchCondition.cateGory1 == "FJ"
-            ? "windturbine"
-            : this.searchCondition.cateGory1;
-        alert.calcsubmitGetRealTimeAlarmList(this.searchCondition);
+      console.log(localStorage.getItem('token'))
+      //console.log(localStorage.getItem('token').length)
+      console.log(faultInfo)
+      
+      //console.log(token) //----------------------------------------------------------------------->
+      if(localStorage.getItem('token') && localStorage.getItem('token') == "")
+      {
+        this.$message.success("尚未登录");
+        this.$router.push("/login");
+      }
+      
+      if (faultInfo.opened == false) 
+      {
+        this.$store.dispatch("RemovePopupAlertMessage", faultInfo.infoId);
+      }
+      else 
+      {
+        alert.confirmAlert(faultInfo);
         this.devicealarmdetails = true;
       }
     },