From e2ed7cb4ef578d970beca80aea4903e9b13cd1f8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Apr 2021 17:21:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue
---
public/map/widgets/supervisoryMap/SupervisoryMap.js | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/public/map/widgets/supervisoryMap/SupervisoryMap.js b/public/map/widgets/supervisoryMap/SupervisoryMap.js
index 8278c4e..6d5fb1f 100644
--- a/public/map/widgets/supervisoryMap/SupervisoryMap.js
+++ b/public/map/widgets/supervisoryMap/SupervisoryMap.js
@@ -816,11 +816,47 @@
type: 'GET',
dataType: 'JSON',
success: function (data) {
- var result = data.data;
- console.log(result)
+ var oldData = data.data
+ var result = [];
+ // console.log(result)
var str = '';
that.entitysData = [];
that.analysisAddEntitys.clear();
+
+
+ if(deviceType == ''){
+ result = oldData;
+ }else if(deviceType == '在线'){
+ for (var key in oldData){
+ // console.log(oldData[key]);
+ if(oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus == 1){
+ result.push(oldData[key]);
+ }
+ }
+ }else if(deviceType == '离线'){
+ for (var key in oldData){
+ // console.log(oldData[key]);
+ if(oldData[key].state == '' && oldData[key].jtype != 1 && oldData[key].onlineStatus != 1){
+ result.push(oldData[key]);
+ }
+ }
+ }else if(deviceType == '警报'){
+ for (var key in oldData){
+ // console.log(oldData[key]);
+ if(oldData[key].state == '' && oldData[key].jtype == 1){
+ result.push(oldData[key]);
+ }
+ }
+ }else if(deviceType == '故障'){
+ for (var key in oldData){
+ // console.log(oldData[key]);
+ if(oldData[key].state != ''){
+ result.push(oldData[key]);
+ }
+ }
+ }
+
+
for (var a, i = 0; i < result.length; i++) {
that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '设备信息', {
lgtd: result[i].jd,
--
Gitblit v1.9.3