echarts

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
module.exports = merge(prodEnv, {
  NODE_ENV: '"development"',
  BASE_API: '"http://localhost:90"'
  BASE_API: '""'
})

config/prod.env.js

@@ -1,5 +1,5 @@
'use strict'
module.exports = {
  NODE_ENV: '"production"',
  BASE_API: '"http://touchwave.cn"'
  BASE_API: '""'
}

src/api/bridgeInfo.js

@@ -66,13 +66,13 @@ export function getMonitorByDay(params) {
    params
  })
}
export function getSysTime(params) {
  return request({
    url: '/ajax/sys/serviceTime',
    method: 'get',
    params
  })
}
// export function getSysTime(params) {
//   return request({
//     url: '/ajax/sys/serviceTime',
//     method: 'get',
//     params
//   })
// }
export function getMonitorByTime(params) {
  return request({
    url: '/ajax/collect/wave/server/time',
@@ -80,7 +80,7 @@ export function getMonitorByTime(params) {
    params
  })
}
export function getTimingMonitor(params) {
export function getSysTime(params) {
  return request({
    url: '/ajax/collect/wave/curr',
    method: 'get',

src/views/bridgesConsole/bridgeDanger/dangerDetail.vue

@@ -7,7 +7,7 @@
      </div>
      <el-row class="line-chart-box">
        <el-col :xs="24" :sm="24" :lg="24" v-for="(item, index) in alarmShowList" :key="item.index">
          <lineChart :chartData="item" :lineColor="index"></lineChart>
          <lineChart :chartData="item" :lineColor="index" :historyM="historyM"></lineChart>
        </el-col>
      </el-row>
      <div class="pagination-container">
@@ -32,6 +32,7 @@ import lineChart from '../lineChart/LineChart'
export default {
  data() {
    return {
      historyM: true,
      alarmId: '',
      alarmTit: '',
      alarmRead: false,

src/views/bridgesConsole/bridgeDetail/index.vue

@@ -186,13 +186,17 @@ export default {
      })
    },
    getSysTime() {
      getSysTime().then(res => {
        if (res.success) {
          this.sysTime = res.data + this.eastEightDistrict - (5 * 60 * 1000)
          const localTime = new Date().getTime() + this.eastEightDistrict
          this.localTimeiv = localTime - this.sysTime
          this.first_Q = true
          this.getTimingMonitor()
      var that = this
      var arr = this.serverSeqArr
      getSysTime({ seq: arr }).then(res => {
        if (res.success && res.data && res.data.length > 0) {
          // that.sysTime = res.data + that.eastEightDistrict - (5 * 60 * 1000)
          const nowt = parseTime(res.data[0].ctime, true, true)
          that.sysTime = (new Date(nowt)).getTime() + that.eastEightDistrict - 2 * 60 * 1000
          const localTime = new Date().getTime() + that.eastEightDistrict
          that.localTimeiv = localTime - that.sysTime
          that.first_Q = true
          that.getTimingMonitor()
        }
      })
    },
@@ -204,11 +208,12 @@ export default {
    },
    getTimingMonitor() {
      var that = this
      var preTime = 2 * 60 * 1000
      var arr = this.serverSeqArr
      var startTime = this.formatTime(this.first_Q ? (this.sysTime - preTime) : this.sysTime)
      var startTime = this.formatTime(this.sysTime)
      var endTime = this.formatTime(this.sysTime)
      that.sysTime += 1000
      // var startTime = this.formatTime(this.first_Q ? (this.sysTime - preTime) : this.sysTime)
      // var endTime = this.formatTime(this.sysTime)
      getMonitorByTime({ seq: arr, begin: startTime, end: endTime }).then(res => {
        var mCache = that.monitorCache
        var mList = []
@@ -219,7 +224,7 @@ export default {
              var ftime = res.data[0].ctime
              monModel.construct(mCache, res.data)
              var f_q_t = that.sysTime - preTime
              var f_q_t = that.sysTime
              for (;;) {
                var fts = that.formatTime(f_q_t)
@@ -253,10 +258,6 @@ export default {
          if (iv < 0) {
            iv = 1
          }
          // console.log('upNow:' + that.sysTime)
          // console.log('now:' + st)
          // console.log('interval:' + iv)
          // console.log(typeof(iv))
          that.jishiTime = setTimeout(() => {
            that.getTimingMonitor()
          }, iv)

src/views/bridgesConsole/lineChart/LineChart.vue

@@ -105,8 +105,9 @@ export default {
          max: this.maxXcount
        },
        yAxis: {
          name: '毫伏(mv)',
          type: 'value'
          type: 'value',
          max: 8191,
          min: -8192
        },
        legend: {
          data: ['信号值']
@@ -142,26 +143,27 @@ export default {
          dataZoom: [
            {
              type: 'slider',
              show: true,
              start: 94,
              end: 100,
              handleSize: 8
              xAxisIndex: 0,
              start: 0,
              end: 100
            },
            {
              type: 'inside',
              start: 94,
              xAxisIndex: 0,
              start: 0,
              end: 100
            },
            {
              type: 'slider',
              show: true,
              yAxisIndex: 0,
              filterMode: 'empty',
              width: 12,
              height: '70%',
              handleSize: 8,
              showDataShadow: false,
              left: '98%'
              start: 0,
              end: 100
            },
            {
              type: 'inside',
              yAxisIndex: 0,
              start: 0,
              end: 100
            }
          ]
        })

src/views/layout/Layout.vue

@@ -7,6 +7,14 @@
      <navbar></navbar>
      <app-main></app-main>
    </div>
    <div class="main-footer">
      <div style="margin:0 auto; padding:8px 0;">
        <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802027571" style="display:inline-block;text-decoration:none;margin-top:10px">
          <img src="./img/beian.png" width="18" style="float:left;"/>
          <p style="float:left;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;">京公网安备 11010802027571号</p>
        </a>
      </div>
    </div>
  </div>
</template>
@@ -72,4 +80,16 @@ export default {
    position: absolute;
    z-index: 999;
  }
  .main-footer{
    z-index: 2002;
    position:fixed;
    background: rgba(48, 65, 86, 1);
    border-top:1px solid #e6e6e6;
    bottom:0;
    left:0;
    right:0;
    font-size:14px;
    text-align: center;
    color: #333;
  }
</style>

src/views/layout/components/AppMain.vue

@@ -24,5 +24,6 @@ export default {
  min-height: 100%;
  position: relative;
  overflow: hidden;
  padding-bottom: 50px;
}
</style>