From 18d47efa0853d4435477b6d60842c715d89bccb9 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期四, 12 十月 2023 23:48:20 +0800
Subject: [PATCH] 代码更新
---
src/assets/js/mapMsg.js | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/assets/js/mapMsg.js b/src/assets/js/mapMsg.js
index b8e2beb..cd523b1 100644
--- a/src/assets/js/mapMsg.js
+++ b/src/assets/js/mapMsg.js
@@ -16,23 +16,30 @@
init() {
var that = this;
window.addEventListener("message", res => {
- if (this.setTimeInterval) {
- clearInterval(this.setTimeInterval);
- this.setTimeInterval = null;
-
- }
if (res.data.status === "ok") {
that.setMsgMatching(res.data.params);
}
- this.setTimeInterval = setTimeout((res) => {
- vueEvents.$emit("queryData", false);
- rpc.setClearAllMsg();
- rpc.setLineRoaming()
- clearInterval(this.setTimeInterval);
- this.setTimeInterval = null;
- }, 90000)
-
});
+ },
+ clearTime(){
+ if (this.setTimeInterval) {
+ clearInterval(this.setTimeInterval);
+ this.setTimeInterval = null;
+ }
+ this.setTime();
+ },
+ setTime(){
+ if(this.setTimeInterval){
+ clearInterval(this.setTimeInterval);
+ this.setTimeInterval = null;
+ }
+ this.setTimeInterval = setTimeout((res) => {
+ vueEvents.$emit("queryData", false);
+ rpc.setClearAllMsg();
+ rpc.setLineRoaming()
+ clearInterval(this.setTimeInterval);
+ this.setTimeInterval = null;
+ }, 90000)
},
//娑堟伅鍖归厤
setMsgMatching(result) {
@@ -40,6 +47,7 @@
var rest = mapData.msgMach.rest;
var rom = mapData.msgMach.lineRoam;
var closeRomData = mapData.msgMach.closeRoam;
+ var acceptData =mapData.msgMach.acceptMsg;
var valRest = rest.filter((rs) => {
if (param.indexOf(rs) > -1) {
return rs;
@@ -48,7 +56,7 @@
// 鍦板浘澶嶄綅
if (valRest.length > 0) {
-
+ this.clearTime();
vueEvents.$emit("queryData", false);
rpc.setClearAllMsg();
rpc.setMapRest();
@@ -63,6 +71,7 @@
if (valRom.length > 0) {
vueEvents.$emit("queryData", false);
+ this.clearTime();
rpc.setClearAllMsg();
rpc.setLineRoaming()
return
@@ -74,11 +83,28 @@
}
});
if (closeRom.length > 0) {
+ this.clearTime();
rpc.setCloseLineRomaing();
return
}
+ var accept = acceptData.filter(res => {
+ if (param.indexOf(res) > -1) {
+ return res;
+ }
+ })
+ if (accept.length > 0) {
+ this.clearTime();
+ rpc.getFuzzyQuery(result)
+ }
+
+
+ // else{
+ // vueEvents.$emit("queryData", false);
+ // rpc.setClearAllMsg();
+ // rpc.setMapRest();
+ // }
- rpc.getFuzzyQuery(result)
+
},
};
--
Gitblit v1.9.3