From a53f3b0645e3b0455a8c9a4a1cd0f061a8106c8d Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 19 一月 2021 19:49:59 +0800
Subject: [PATCH] 轨迹图实时查询逻辑更新(去除过滤)
---
src/pages/panoramicView/components/TracePlot.vue | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/pages/panoramicView/components/TracePlot.vue b/src/pages/panoramicView/components/TracePlot.vue
index bf9d33e..2ef6feb 100644
--- a/src/pages/panoramicView/components/TracePlot.vue
+++ b/src/pages/panoramicView/components/TracePlot.vue
@@ -125,6 +125,7 @@
});
return;
}
+ clearInterval(this.timer);
//鍒ゆ柇鏄惁鏄煡鍘嗗彶鏁版嵁
if (Date.parse(this.searchTime[1]) < Date.now()) {
this.filterData()
@@ -140,6 +141,7 @@
page: 1,
size: 5000,
searchTime: this.searchTime,
+ timeMark: null,
alarmlevel: [],
inputValue: '',
tabs: [],
@@ -147,7 +149,7 @@
treeNodes: [],
isAll: false
};
- clearInterval(this.timer);
+ //clearInterval(this.timer);
getSearchList(param).then(res => {
_this.actObjs = [];
if (!res.data.datalist) {
@@ -222,6 +224,7 @@
})
},
drawTracePath () {
+ console.log(this.actObjs)
let canvas = this.$refs['trackArea'];
let ctx = canvas.getContext('2d');
ctx.clearRect(0, 0, canvas.width, canvas.height);
@@ -266,9 +269,14 @@
treeNodes: [],
isAll: false
};
+ if((new Date() - _this.timeMark)<_this.intervalTime){
+ return
+ }
getSearchList(param).then(res => {
+ _this.activeObjHashMap = {};
+ _this.actObjs = [];
if (!res.data.datalist) {
- _this.activeObjHashMap = {};
+ //_this.activeObjHashMap = {};
//_this.actObj = {};
_this.actObjs = [];
this.$notify({
@@ -298,7 +306,8 @@
//filterArr.push(obj)
});
- filterArr.forEach(item => {
+ //filterArr.forEach(item => {
+ res.data.datalist.forEach(item => {
item.activeObject.targetInfo.forEach(target => {
if (target.targetType == 'UniquelID') {
let attribute = JSON.parse(target.attribute);
@@ -323,15 +332,6 @@
_this.searchStartTimeStamp = Date.parse(_this.searchTime[0]);
_this.searchEndTimeStamp = Date.parse(_this.searchTime[1]);
- // for (var target in _this.actObj) {
- // _this.actObj[target] = _this.actObj[target].filter(item =>
- // item.timeStamp >= _this.searchStartTimeStamp && item.timeStamp <= _this.searchEndTimeStamp
- // )
- // if (_this.actObj[target].length == 0) {
- // delete _this.actObj[target]
- // }
- // }
-
for (var i = 0; i < _this.actObjs.length; i++) {
_this.actObjs[i].posInfo = _this.actObjs[i].posInfo.filter(item => item.timeStamp >= _this.searchStartTimeStamp && item.timeStamp <= _this.searchEndTimeStamp)
@@ -343,14 +343,8 @@
}
console.log(new Date(), _this.actObjs);
- // var keyArr = Object.keys(_this.actObj);
- // for (var i = 0; i < keyArr.length; i++) {
- // _this.actObj[keyArr[i]].forEach(dot => {
- // dot.color = _this.colorArr[i % 10];
- // })
- // }
- // console.log(new Date(), _this.actObj)
_this.drawTracePath();
+ _this.timeMark = new Date();
_this.timer = setTimeout(() => {
_this.searchData()
}, _this.intervalTime)
--
Gitblit v1.8.0