Browse Source

备案,报警list,实时提前2s

luyanan 6 years ago
parent
commit
7fe8aee327

+ 11 - 13
src/views/bridgesConsole/bridgeDanger/dangerList.vue

@ -5,7 +5,7 @@
5 5
        <span>报警信息</span>
6 6
      </div>
7 7
      <ul class="item-ul" v-if="dangerList.length">
8
        <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerShowList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
8
        <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
9 9
          <span>{{item.alarmTime}}</span>
10 10
          <span>{{item.device}},请点击查看。</span>
11 11
          <span class="svg-container" v-if="!item.readed">
@ -21,7 +21,7 @@
21 21
          :current-page.sync="pageNo"
22 22
          :page-size="pageSize"
23 23
          layout="prev, pager, next, jumper"
24
          :total="dangerList.length">
24
          :total="total">
25 25
        </el-pagination>
26 26
      </div>
27 27
    </el-card>
@ -46,13 +46,9 @@ export default {
46 46
      bridgeId: '',
47 47
      bridgeName: '',
48 48
      dangerList: [],
49
      pageSize: 4,
50
      pageNo: 1
51
    }
52
  },
53
  computed: {
54
    dangerShowList() {
55
      return this.dangerList.slice((this.pageNo - 1) * this.pageSize, this.pageNo * this.pageSize)
49
      pageSize: 20,
50
      pageNo: 1,
51
      total: 0
56 52
    }
57 53
  },
58 54
  created() {
@ -60,15 +56,16 @@ export default {
60 56
    this.bridgeName = Cookies.get('bridgeName')
61 57
    this.serverSeqArr = queryInfo.queryServers(this.bridgeId, true)
62 58
    if (this.serverSeqArr) {
63
      this.getDangerList(this.serverSeqArr)
59
      this.getDangerList()
64 60
    }
65 61
  },
66 62
  methods: {
67
    getDangerList(arr) {
63
    getDangerList() {
64
      var arr = this.serverSeqArr
68 65
      const param = {
69 66
        seq: arr,
70
        pageSize: 18,
71
        pageNo: 1
67
        pageSize: this.pageSize,
68
        pageNo: this.pageNo
72 69
      }
73 70
      getDangerList(param).then(res => {
74 71
        if (res.success && res.data.data) {
@ -92,6 +89,7 @@ export default {
92 89
    },
93 90
    handleCurrentChange(val) {
94 91
      this.pageNo = val
92
      this.getDangerList()
95 93
    }
96 94
  }
97 95
}

+ 1 - 2
src/views/bridgesConsole/bridgeDetail/index.vue

@ -196,9 +196,8 @@ export default {
196 196
      var arr = this.serverSeqArr
197 197
      getSysTime({ seq: arr }).then(res => {
198 198
        if (res.success && res.data && res.data.length > 0) {
199
          // that.sysTime = res.data + that.eastEightDistrict - (5 * 60 * 1000)
200 199
          const nowt = parseTime(res.data[0].ctime, true, true)
201
          that.sysTime = (new Date(nowt)).getTime() + that.eastEightDistrict - 10 * 1000
200
          that.sysTime = (new Date(nowt)).getTime() + that.eastEightDistrict - 2 * 1000
202 201
          const localTime = new Date().getTime() + that.eastEightDistrict
203 202
          that.localTimeiv = localTime - that.sysTime
204 203
          that.first_Q = true

+ 4 - 3
src/views/layout/Layout.vue

@ -8,10 +8,11 @@
8 8
      <app-main></app-main>
9 9
    </div>
10 10
    <div class="main-footer">
11
      <div style="margin:0 auto; padding:8px 0;">
12
        <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802027571" style="display:inline-block;text-decoration:none;margin-top:10px">
11
      <div style="margin:0 auto;line-height:20px;color:#939393; padding:12px 0;overflow: hidden;width:380px">
12
        <a style="margin: 0 5px 0 0;float:left">京ICP备16026450号-2 |</a>
13
        <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802027571" style="display:inline-block;text-decoration:none;float:left">
13 14
          <img src="./img/beian.png" width="18" style="float:left;"/>
14
          <p style="float:left;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;">京公网安备 11010802027571号</p>
15
          <p style="float:left;margin: 0 0 0 5px;">京公网安备 11010802027571号</p>
15 16
        </a>
16 17
      </div>
17 18
    </div>