Browse Source

传感器echarts显示按照code自然排序,msg列表局部刷新

luyanan 6 years ago
parent
commit
8f1d1816f3

+ 5 - 4
src/utils/index.js

86
  }
86
  }
87
}
87
}
88
88
89
/**
90
 * 判断两个数组是否相等
91
 */
89
export function isEqualArr(arr1, arr2) {
92
export function isEqualArr(arr1, arr2) {
90
  if (!arr1 || !arr2) {
93
  if (!arr1 || !arr2) {
91
    return false
94
    return false
94
    return false
97
    return false
95
  }
98
  }
96
  for (var i = 0; i < arr1.length; i++) {
99
  for (var i = 0; i < arr1.length; i++) {
97
    if (arr1[i] instanceof Array && arr2[i] instanceof Array) {
98
      if (!isEqualArr(arr1[i], arr2[i])) {
99
        return false
100
      } else if (arr1[i] !== arr2[i]) {
100
    if (arr1 instanceof Array && arr2 instanceof Array) {
101
      if (arr1[i] !== arr2[i]) {
101
        return false
102
        return false
102
      }
103
      }
103
    }
104
    }

+ 12 - 0
src/utils/queryInfo.js

19
      cbArr.push(func)
19
      cbArr.push(func)
20
    }
20
    }
21
  },
21
  },
22
  sortByCode = function(a, b) {
23
    var s = a.code.toLowerCase()
24
    var t = b.code.toLowerCase()
25
    if (s > t) {
26
      return 1
27
    } else {
28
      return -1
29
    }
30
  },
22
  queryAllInfo = function() {
31
  queryAllInfo = function() {
23
    // setTimeout(function() {
32
    // setTimeout(function() {
24
    if (!bridgeObj.server && store.getters.roles.indexOf('1') === -1) {
33
    if (!bridgeObj.server && store.getters.roles.indexOf('1') === -1) {
52
        serverSeqArr.push(obj[i].seq)
61
        serverSeqArr.push(obj[i].seq)
53
      }
62
      }
54
    }
63
    }
64
    servers.sort(sortByCode)
55
    return flag ? serverSeqArr : servers
65
    return flag ? serverSeqArr : servers
56
  },
66
  },
57
  queryDevices = function(bid) {
67
  queryDevices = function(bid) {
66
        }
76
        }
67
      }
77
      }
68
    }
78
    }
79
    devices.sort(sortByCode)
69
    return devices
80
    return devices
70
  },
81
  },
71
  queryTrans = function(bid) {
82
  queryTrans = function(bid) {
84
        }
95
        }
85
      }
96
      }
86
    }
97
    }
98
    trans.sort(sortByCode)
87
    return trans
99
    return trans
88
  },
100
  },
89
  ret = {
101
  ret = {

+ 1 - 1
src/utils/request.js

44
    }
44
    }
45
    if (!(data instanceof Object)) {
45
    if (!(data instanceof Object)) {
46
      // 判断data不是Object时,解析成Object
46
      // 判断data不是Object时,解析成Object
47
      data = JSON.parse(data)
47
      // data = JSON.parse(data)
48
    }
48
    }
49
    if (!response.data.success && response.data.code === 1) {
49
    if (!response.data.success && response.data.code === 1) {
50
      store.dispatch('FedLogOut').then(() => {
50
      store.dispatch('FedLogOut').then(() => {

+ 10 - 9
src/views/bridgesConsole/bridgeDetail/index.vue

193
        pageNo: 1
193
        pageNo: 1
194
      }
194
      }
195
      if (that.first_Dan) {
195
      if (that.first_Dan) {
196
        this.loadprogress1 = true
196
        that.loadprogress1 = true
197
      }
197
      }
198
      getDangerList(param).then(res => {
198
      getDangerList(param).then(res => {
199
        var dCache = that.dangerAidArr
199
        var dCache = that.dangerAidArr
200
        var DList = []
200
        var DList = []
201
        if (res.success && res.data.data) {
201
        if (res.success && res.data.data) {
202
          const dataS = res.data.data
203
          if (that.first_Dan) {
202
          if (that.first_Dan) {
203
            var dataF = res.data.data
204
            that.first_Dan = false
204
            that.first_Dan = false
205
            for (let i = 0; i < dataS.length; i++) {
206
              dCache.push(dataS[i].aid)
207
              if (dataS[i].alarmTime) {
208
                dataS[i].alarmTime = parseTime(dataS[i].alarmTime, true)
205
            for (let i = 0; i < dataF.length; i++) {
206
              dCache.push(dataF[i].aid)
207
              if (dataF[i].alarmTime) {
208
                dataF[i].alarmTime = parseTime(dataF[i].alarmTime, true)
209
              }
209
              }
210
              dataS[i].device = `${this.bridgeName}大桥${dataS[i].device}采集盒检测到异常情况`
210
              dataF[i].device = `${that.bridgeName}大桥${dataF[i].device}采集盒检测到异常情况`
211
            }
211
            }
212
            that.dangerList = dataS
212
            that.dangerList = dataF
213
          } else {
213
          } else {
214
            var dataS = res.data.data
214
            for (let i = 0; i < dataS.length; i++) {
215
            for (let i = 0; i < dataS.length; i++) {
215
              DList.push(dataS[i].aid)
216
              DList.push(dataS[i].aid)
216
              if (dataS[i].alarmTime) {
217
              if (dataS[i].alarmTime) {
217
                dataS[i].alarmTime = parseTime(dataS[i].alarmTime, true)
218
                dataS[i].alarmTime = parseTime(dataS[i].alarmTime, true)
218
              }
219
              }
219
              dataS[i].device = `${this.bridgeName}大桥${dataS[i].device}采集盒检测到异常情况`
220
              dataS[i].device = `${that.bridgeName}大桥${dataS[i].device}采集盒检测到异常情况`
220
            }
221
            }
221
            if (!isEqualArr(DList, dCache)) {
222
            if (!isEqualArr(DList, dCache)) {
222
              dCache = []
223
              dCache = []