Browse Source

报警详情

luyanan 6 years ago
parent
commit
ac0ceafaee

+ 4 - 2
src/permission.js

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

+ 0 - 1
src/router/index.js

28
  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
28
  { path: '/login', component: () => import('@/views/login/index'), hidden: true },
29
  { path: '/findPwd', component: () => import('@/views/findPwd/index'), hidden: true },
29
  { path: '/findPwd', component: () => import('@/views/findPwd/index'), hidden: true },
30
  { path: '/404', component: () => import('@/views/404'), hidden: true },
30
  { path: '/404', component: () => import('@/views/404'), hidden: true },
31
32
  {
31
  {
33
    path: '/',
32
    path: '/',
34
    component: Layout,
33
    component: Layout,

+ 1 - 1
src/utils/request.js

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

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

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

+ 3 - 3
src/views/bridgesConsole/bridgeDanger/dangerList.vue

5
        <span>报警信息</span>
5
        <span>报警信息</span>
6
      </div>
6
      </div>
7
      <ul class="item-ul" v-if="dangerList.length">
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
          <span>{{item.alarmTime}}</span>
9
          <span>{{item.alarmTime}}</span>
10
          <span>{{item.device}},请点击查看。</span>
10
          <span>{{item.device}},请点击查看。</span>
11
          <span class="svg-container" v-if="!item.readed">
11
          <span class="svg-container" v-if="!item.readed">
84
        }
84
        }
85
      })
85
      })
86
    },
86
    },
87
    alarmShow(id, msg) {
87
    alarmShow(id, flag, msg) {
88
      this.$router.replace({
88
      this.$router.replace({
89
        name: 'dangerDetail',
89
        name: 'dangerDetail',
90
        query: { aid: id, msg: msg }
90
        query: { aid: id, msg: msg, flag: flag }
91
      })
91
      })
92
    },
92
    },
93
    handleCurrentChange(val) {
93
    handleCurrentChange(val) {

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

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

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

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