Browse Source

报警详情

luyanan 6 years ago
parent
commit
ac0ceafaee

+ 4 - 2
src/permission.js

@ -24,7 +24,7 @@ router.beforeEach((to, from, next) => {
24 24
      NProgress.done()
25 25
    } else {
26 26
      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
27
        console.log(5555)
27
        // console.log(5555)
28 28
        store.dispatch('GetUserInfo').then(res => { // 拉取user_info
29 29
          const roles = [res.data.type.toString()]
30 30
          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
@ -38,9 +38,11 @@ router.beforeEach((to, from, next) => {
38 38
          })
39 39
        })
40 40
      } else {
41
        console.log(4444)
41
        // console.log(4444)
42 42
        if (hasPermission(store.getters.roles, to.meta.roles)) {
43 43
          next()
44
        } else {
45
          console.log(777)
44 46
        }
45 47
      }
46 48
      queryInfo.queryAllInfo()

+ 0 - 1
src/router/index.js

@ -28,7 +28,6 @@ export const constantRouterMap = [
28 28
  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
29 29
  { path: '/findPwd', component: () => import('@/views/findPwd/index'), hidden: true },
30 30
  { path: '/404', component: () => import('@/views/404'), hidden: true },
31
32 31
  {
33 32
    path: '/',
34 33
    component: Layout,

+ 1 - 1
src/utils/request.js

@ -5,7 +5,7 @@ import { comUrl } from '@/utils/index'
5 5
// 创建axios实例
6 6
const service = axios.create({
7 7
  baseURL: comUrl, // api的base_url
8
  timeout: 5000, // 请求超时时间
8
  // timeout: 5000, // 请求超时时间
9 9
  paramsSerializer: function(params) {
10 10
    return qs.stringify(params, { arrayFormat: 'repeat' })
11 11
  }

+ 5 - 1
src/views/bridgesConsole/bridgeDanger/dangerDetail.vue

@ -34,6 +34,7 @@ export default {
34 34
    return {
35 35
      alarmId: '',
36 36
      alarmTit: '',
37
      alarmRead: false,
37 38
      alarmList: [],
38 39
      pageSize: 6,
39 40
      pageNo: 1,
@ -46,8 +47,11 @@ export default {
46 47
  created() {
47 48
    this.alarmId = urlParse('aid')
48 49
    this.alarmTit = urlParse('msg')
50
    this.alarmRead = urlParse('flag')
49 51
    this.getDangerDetail()
50
    this.setUnreadToRead()
52
    if (this.alarmRead === 'false') {
53
      this.setUnreadToRead()
54
    }
51 55
  },
52 56
  computed: {
53 57
    alarmTime() {

+ 3 - 3
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.device)">
8
        <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerShowList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.device)">
9 9
          <span>{{item.alarmTime}}</span>
10 10
          <span>{{item.device}},请点击查看。</span>
11 11
          <span class="svg-container" v-if="!item.readed">
@ -84,10 +84,10 @@ export default {
84 84
        }
85 85
      })
86 86
    },
87
    alarmShow(id, msg) {
87
    alarmShow(id, flag, msg) {
88 88
      this.$router.replace({
89 89
        name: 'dangerDetail',
90
        query: { aid: id, msg: msg }
90
        query: { aid: id, msg: msg, flag: flag }
91 91
      })
92 92
    },
93 93
    handleCurrentChange(val) {

+ 3 - 3
src/views/bridgesConsole/bridgeDetail/index.vue

@ -16,7 +16,7 @@
16 16
            <el-button type="text" @click="queryDangerInfo">查看全部</el-button>
17 17
          </div>
18 18
          <ul class="item-ul" v-if="dangerList.length">
19
            <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.device)">
19
            <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.device)">
20 20
              <span>{{item.alarmTime}}</span>
21 21
              <span>{{item.device}},请点击查看。</span>
22 22
              <span class="svg-container" v-if="!item.readed">
@ -237,10 +237,10 @@ export default {
237 237
    handleCurrentChange(val) {
238 238
      this.currentNo = val
239 239
    },
240
    alarmShow(id, msg) {
240
    alarmShow(id, flag, msg) {
241 241
      this.$router.replace({
242 242
        name: 'dangerDetail',
243
        query: { aid: id, msg: msg }
243
        query: { aid: id, msg: msg, flag: flag }
244 244
      })
245 245
    },
246 246
    queryDangerInfo() {

+ 3 - 2
src/views/bridgesConsole/bridgeMonitor/index.vue

@ -65,13 +65,14 @@ export default {
65 65
    this.bridgeId = Cookies.get('bridgeId')
66 66
    this.serverSeqArr = queryInfo.queryServers(this.bridgeId, true)
67 67
    if (this.serverSeqArr.length) {
68
      this.getMonitorByDay(this.serverSeqArr)
68
      this.getMonitorByDay()
69 69
    }
70 70
  },
71 71
  methods: {
72
    getMonitorByDay(arr) {
72
    getMonitorByDay() {
73 73
      var that = this
74 74
      var date = that.valueDate
75
      var arr = this.serverSeqArr
75 76
      var param = {
76 77
        seq: arr,
77 78
        day: date