Browse Source

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

luyanan 6 years ago
parent
commit
8f1d1816f3
4 changed files with 28 additions and 14 deletions
  1. 5 4
      src/utils/index.js
  2. 12 0
      src/utils/queryInfo.js
  3. 1 1
      src/utils/request.js
  4. 10 9
      src/views/bridgesConsole/bridgeDetail/index.vue

+ 5 - 4
src/utils/index.js

@ -86,6 +86,9 @@ export function debounce(func, wait, immediate) {
86 86
  }
87 87
}
88 88
89
/**
90
 * 判断两个数组是否相等
91
 */
89 92
export function isEqualArr(arr1, arr2) {
90 93
  if (!arr1 || !arr2) {
91 94
    return false
@ -94,10 +97,8 @@ export function isEqualArr(arr1, arr2) {
94 97
    return false
95 98
  }
96 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 102
        return false
102 103
      }
103 104
    }

+ 12 - 0
src/utils/queryInfo.js

@ -19,6 +19,15 @@ var bridgeObj = {},
19 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 31
  queryAllInfo = function() {
23 32
    // setTimeout(function() {
24 33
    if (!bridgeObj.server && store.getters.roles.indexOf('1') === -1) {
@ -52,6 +61,7 @@ var bridgeObj = {},
52 61
        serverSeqArr.push(obj[i].seq)
53 62
      }
54 63
    }
64
    servers.sort(sortByCode)
55 65
    return flag ? serverSeqArr : servers
56 66
  },
57 67
  queryDevices = function(bid) {
@ -66,6 +76,7 @@ var bridgeObj = {},
66 76
        }
67 77
      }
68 78
    }
79
    devices.sort(sortByCode)
69 80
    return devices
70 81
  },
71 82
  queryTrans = function(bid) {
@ -84,6 +95,7 @@ var bridgeObj = {},
84 95
        }
85 96
      }
86 97
    }
98
    trans.sort(sortByCode)
87 99
    return trans
88 100
  },
89 101
  ret = {

+ 1 - 1
src/utils/request.js

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

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

@ -193,30 +193,31 @@ export default {
193 193
        pageNo: 1
194 194
      }
195 195
      if (that.first_Dan) {
196
        this.loadprogress1 = true
196
        that.loadprogress1 = true
197 197
      }
198 198
      getDangerList(param).then(res => {
199 199
        var dCache = that.dangerAidArr
200 200
        var DList = []
201 201
        if (res.success && res.data.data) {
202
          const dataS = res.data.data
203 202
          if (that.first_Dan) {
203
            var dataF = res.data.data
204 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 213
          } else {
214
            var dataS = res.data.data
214 215
            for (let i = 0; i < dataS.length; i++) {
215 216
              DList.push(dataS[i].aid)
216 217
              if (dataS[i].alarmTime) {
217 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 222
            if (!isEqualArr(DList, dCache)) {
222 223
              dCache = []