Browse Source

修改bug

luyanan 6 years ago
parent
commit
55282ab5f8

+ 2 - 0
package.json

@ -14,8 +14,10 @@
14 14
  },
15 15
  "dependencies": {
16 16
    "axios": "0.17.1",
17
    "babel-polyfill": "^6.26.0",
17 18
    "echarts": "3.8.5",
18 19
    "element-ui": "2.3.4",
20
    "es6-promise": "^4.2.4",
19 21
    "js-cookie": "2.2.0",
20 22
    "normalize.css": "7.0.0",
21 23
    "nprogress": "0.2.0",

+ 3 - 0
src/main.js

@ -1,3 +1,5 @@
1
require('es6-promise').polyfill() // ES6的polyfill
2
1 3
import Vue from 'vue'
2 4
3 5
import 'normalize.css/normalize.css'// A modern alternative to CSS resets
@ -6,6 +8,7 @@ import ElementUI from 'element-ui'
6 8
import 'element-ui/lib/theme-chalk/index.css'
7 9
8 10
import '@/styles/index.scss' // global css
11
import 'babel-polyfill'
9 12
10 13
import App from './App'
11 14
import router from './router'

+ 2 - 6
src/views/bridgesConsole/bridgeDanger/dangerDetail.vue

@ -85,14 +85,10 @@ export default {
85 85
            var dataArr = JSON.parse('[' + String(res.data[i].data.split(',')) + ']')
86 86
            var timeArr = []
87 87
            for (var j = 0; j < dataArr.length; ++j) {
88
              if (j === 99) {
89
                startTime = that.addDate(startTime)
90
              } else if (j === 199) {
91
                startTime = that.addDate(startTime)
92
              } else if (j === 299) {
88
              if (j === 99 || j === 199 || j === 299) {
93 89
                startTime = that.addDate(startTime)
94 90
              }
95
              timeArr.push(startTime.substring(11, 19))
91
              timeArr.push(startTime)
96 92
            }
97 93
            rData.xData = timeArr
98 94
            rData.seData = dataArr

+ 4 - 5
src/views/bridgesConsole/bridgeDetail/index.vue

@ -124,7 +124,7 @@ export default {
124 124
      currentSize: 4,
125 125
      currentTime: '',
126 126
      sysTime: '',
127
      setTime: null,
127
      jishiTime: null,
128 128
      maxShowLength: 300,
129 129
      monitorCache: []
130 130
    }
@ -175,7 +175,7 @@ export default {
175 175
    getSysTime() {
176 176
      getSysTime().then(res => {
177 177
        if (res.success) {
178
          this.sysTime = 1536028430317 + (8 * 60 * 60 * 1000) + 160000
178
          this.sysTime = res.data + (8 * 60 * 60 * 1000)
179 179
          this.first_Q = true
180 180
          this.getTimingMonitor()
181 181
        }
@ -233,7 +233,7 @@ export default {
233 233
          }
234 234
          that.monitorList = mList
235 235
          that.sysTime += 1000
236
          that.setTime = setTimeout(function() {
236
          that.jishiTime = setTimeout(function() {
237 237
            that.getTimingMonitor()
238 238
          }, 1000)
239 239
        }
@ -293,8 +293,7 @@ export default {
293 293
    }
294 294
  },
295 295
  beforeDestroy() {
296
    clearTimeout(this.setTime)
297
    // clearInterval(this.setTime)
296
    clearTimeout(this.jishiTime)
298 297
  }
299 298
}
300 299
</script>

+ 6 - 3
src/views/dashboard/other/index.vue

@ -1,6 +1,6 @@
1 1
<template>
2 2
  <div class="dashboard-editor-container">
3
    <div v-show="dataList.length">
3
    <div v-if="!showComp">
4 4
      <el-row class="panel-group" :gutter="40">
5 5
        <el-col :xs="24" :sm="12" :lg="6" class="card-panel-col" v-for="item in dataList" :key="item.index" @click.native="goToDashboardC(item.id, item.shortName)">
6 6
          <div class='card-panel'>
@ -24,7 +24,7 @@
24 24
        </el-pagination>
25 25
      </div>
26 26
    </div>
27
    <div class="defaut-container" v-show="!dataList.length">
27
    <div class="defaut-container" v-if="showComp">
28 28
      <div>
29 29
        <img class="plat-pic" src="/static/touchwave.png" width="460">
30 30
        <p class="plat-tit">欢迎 <span>{{name}}</span> 使用声脉桥梁云监控平台</p>
@ -51,7 +51,8 @@ export default {
51 51
      total: 0,
52 52
      pageSize: 10,
53 53
      pageNo: 1,
54
      dataList: []
54
      dataList: [],
55
      showComp: false
55 56
    }
56 57
  },
57 58
  computed: {
@ -79,6 +80,8 @@ export default {
79 80
              this.getBridgeUnread($data[i], svrs)
80 81
            }
81 82
            this.dataList = $data
83
          } else {
84
            this.showComp = true
82 85
          }
83 86
        }
84 87
      })

+ 6 - 7
src/views/layout/components/TopNavbar.vue

@ -43,6 +43,12 @@ export default {
43 43
  watch: {
44 44
    '$route'(to, from) {
45 45
      if (to.path === '/dashboard') {
46
        var dataList = this.dataList
47
        for (let i = 0; i < dataList.length; i++) {
48
          dataList[i].disab = false
49
        }
50
        Cookies.remove('bridgeId')
51
        Cookies.remove('bridgeName')
46 52
        this.showName = ''
47 53
      } else {
48 54
        this.bridgeId = Cookies.get('bridgeId')
@ -59,13 +65,6 @@ export default {
59 65
  methods: {
60 66
    toHome() {
61 67
      this.$router.replace({ path: '/' })
62
      Cookies.remove('bridgeId')
63
      Cookies.remove('bridgeName')
64
      var dataList = this.dataList
65
      for (let i = 0; i < dataList.length; i++) {
66
        console.log(dataList[i].disab)
67
        dataList[i].disab = false
68
      }
69 68
    },
70 69
    toggleSideBar() {
71 70
      this.$store.dispatch('ToggleSideBar')

+ 3 - 3
src/views/login/index.vue

@ -9,21 +9,21 @@
9 9
        <span class="svg-container svg-container_login">
10 10
          <svg-icon icon-class="user" />
11 11
        </span>
12
        <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入您的手机号码" />
12
        <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入您的手机号码" maxlength="11" />
13 13
      </el-form-item>
14 14
      <el-form-item prop="password">
15 15
        <span class="svg-container">
16 16
          <svg-icon icon-class="password"/>
17 17
        </span>
18 18
        <el-input name="password" :type="pwdType" v-model="loginForm.password" autoComplete="on"
19
          placeholder="请输入您的登录密码"></el-input>
19
          placeholder="请输入您的登录密码" maxlength="24"></el-input>
20 20
          <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" v-show="!falg"/><svg-icon icon-class="password-view" v-show="falg"/></span>
21 21
      </el-form-item>
22 22
      <el-form-item prop="imgVerifyCode">
23 23
        <span class="svg-container">
24 24
          <svg-icon icon-class="msgvc"></svg-icon>
25 25
        </span>
26
        <el-input v-model="loginForm.imgVerifyCode" placeholder="请输入图形验证码" @keyup.enter.native="handleLogin" class="code-btn">
26
        <el-input v-model="loginForm.imgVerifyCode" placeholder="请输入图形验证码" @keyup.enter.native="handleLogin" class="code-btn" maxlength="4">
27 27
        <img slot="append" :src="imgVcUrl" @click="changeImgVc" /></el-input>
28 28
      </el-form-item>
29 29
      <el-form-item>