刷新访问不到数据，echarts去掉y轴缩放，添加加载等待

src/api/bridgeInfo.js

@@ -59,20 +59,13 @@ export function setUnreadToRead(params) {
// 未读报警
// 监测信息
export function getMonitorByDay(params) {
export function getMonitorByDay(params, flag) {
  return request({
    url: '/ajax/collect/wave/server/dayTime',
    url: flag ? '/ajax/collect/wave/server/time' : '/ajax/collect/wave/server/dayTime',
    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',

src/components/DefaultPage/index.vue

@@ -33,7 +33,7 @@ export default {
    width: 100%;
    height: 42%;
    z-index: 11;
    padding:40px;
    padding: 50px;
    box-sizing: border-box;
    display: flex;
    justify-content:center;

src/permission.js

@@ -23,6 +23,7 @@ router.beforeEach((to, from, next) => {
      next({ path: '/' })
      NProgress.done()
    } else {
      queryInfo.queryAllInfo()
      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
        // console.log(5555)
        store.dispatch('GetUserInfo').then(res => { // 拉取user_info
@@ -42,10 +43,9 @@ router.beforeEach((to, from, next) => {
        if (hasPermission(store.getters.roles, to.meta.roles)) {
          next()
        } else {
          console.log(777)
          // console.log(777)
        }
      }
      queryInfo.queryAllInfo()
    }
  } else {
    if (whiteList.indexOf(to.path) !== -1) {

src/styles/index.scss

@@ -88,4 +88,7 @@ a:hover {
    background-image: url('/static/touchwave.png');
    background-size: 300px 28px;
  }
}
.load-box{
  min-height:160px;
}

src/utils/queryInfo.js

@@ -10,7 +10,17 @@ var bridgeObj = {},
  serverList = [],
  deviceList = [],
  transducerList = [],
  listOk = false,
  cbArr = [],
  qaiCb = function(func) {
    if (listOk) {
      func()
    } else {
      cbArr.push(func)
    }
  },
  queryAllInfo = function() {
    // setTimeout(function() {
    if (!bridgeObj.server && store.getters.roles.indexOf('1') === -1) {
      request({
        url: '/ajax/all/byUser',
@@ -24,9 +34,14 @@ var bridgeObj = {},
          serverList = res.data.server
          deviceList = res.data.device
          transducerList = res.data.transducer
          listOk = true
          cbArr.forEach(function(item) {
            item()
          })
        }
      })
    }
    // }, 1)
  },
  queryServers = function(bid, flag) {
    const obj = serverList
@@ -75,7 +90,8 @@ var bridgeObj = {},
    queryAllInfo: queryAllInfo,
    queryServers: queryServers,
    queryDevices: queryDevices,
    queryTrans: queryTrans
    queryTrans: queryTrans,
    qaiCb: qaiCb
  }
export default ret

src/views/bridgesConsole/bridgeDanger/dangerDetail.vue

@@ -5,11 +5,13 @@
        <span>{{alarmTime}}</span>
        <span>{{alarmTit}}</span>
      </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" :historyM="historyM"></lineChart>
        </el-col>
      </el-row>
      <div class="load-box" v-loading="loadprogress">
        <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" :historyM="historyM"></lineChart>
          </el-col>
        </el-row>
      </div>
      <div class="pagination-container">
        <el-pagination
          background
@@ -38,7 +40,8 @@ export default {
      alarmRead: false,
      alarmList: [],
      pageSize: 6,
      pageNo: 1
      pageNo: 1,
      loadprogress: false
    }
  },
  components: {
@@ -68,8 +71,10 @@ export default {
      const param = {
        aid: this.alarmId
      }
      this.loadprogress = true
      getDangerDetail(param).then(res => {
        if (res.success && res.data) {
          that.loadprogress = false
          var rList = []
          var startTime = ''
          for (let i = 0; i < res.data.length; i++) {

src/views/bridgesConsole/bridgeDanger/dangerList.vue

@@ -4,16 +4,18 @@
      <div slot="header" class="block-title">
        <span>报警信息</span>
      </div>
      <ul class="item-ul" v-if="dangerList.length">
        <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
          <span>{{item.alarmTime}}</span>
          <span>{{item.device}}，请点击查看。</span>
          <span class="svg-container" v-if="!item.readed">
            <svg-icon icon-class="unread"></svg-icon>
          </span>
        </li>
      </ul>
      <DefaultPage v-if="!dangerList.length"></DefaultPage>
      <div class="load-box" v-loading="loadprogress">
        <ul class="item-ul" v-if="dangerList.length">
          <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
            <span>{{item.alarmTime}}</span>
            <span>{{item.device}}，请点击查看。</span>
            <span class="svg-container" v-if="!item.readed">
              <svg-icon icon-class="unread"></svg-icon>
            </span>
          </li>
        </ul>
        <DefaultPage v-if="!dangerList.length && !loadprogress"></DefaultPage>
      </div>
      <div class="pagination-container">
        <el-pagination
          background
@@ -45,6 +47,7 @@ export default {
    return {
      bridgeId: '',
      bridgeName: '',
      loadprogress: true,
      dangerList: [],
      pageSize: 20,
      pageNo: 1,
@@ -52,32 +55,40 @@ export default {
    }
  },
  created() {
    this.bridgeId = Cookies.get('bridgeId')
    this.bridgeName = Cookies.get('bridgeName')
    this.serverSeqArr = queryInfo.queryServers(this.bridgeId, true)
    if (this.serverSeqArr) {
      this.getDangerList()
    }
    var that = this
    that.bridgeId = Cookies.get('bridgeId')
    that.bridgeName = Cookies.get('bridgeName')
    queryInfo.qaiCb(function() {
      if (that.bridgeId) {
        that.serverSeqArr = queryInfo.queryServers(that.bridgeId, true)
        if (that.serverSeqArr.length) {
          that.getDangerList()
        }
      }
    })
  },
  methods: {
    getDangerList() {
      var that = this
      var arr = this.serverSeqArr
      const param = {
        seq: arr,
        pageSize: this.pageSize,
        pageNo: this.pageNo
      }
      that.loadprogress = true
      getDangerList(param).then(res => {
        if (res.success && res.data.data) {
          that.loadprogress = false
          const dataS = res.data.data
          this.total = res.data.total
          that.total = res.data.total
          for (let i = 0; i < dataS.length; i++) {
            if (dataS[i].alarmTime) {
              dataS[i].alarmTime = parseTime(dataS[i].alarmTime, true)
            }
            dataS[i].device = `${this.bridgeName}大桥${dataS[i].device}采集盒检测到异常情况`
            dataS[i].device = `${that.bridgeName}大桥${dataS[i].device}采集盒检测到异常情况`
          }
          this.dangerList = dataS
          that.dangerList = dataS
        }
      })
    },

src/views/bridgesConsole/bridgeDetail/components/BInfoDialog02.vue

@@ -81,7 +81,10 @@ export default {
      this.pageNo = val
    },
    queryServerList() {
      this.serverList = queryInfo.queryServers(this.$parent.bridgeId)
      var that = this
      queryInfo.qaiCb(function() {
        that.serverList = queryInfo.queryServers(that.$parent.bridgeId)
      })
    }
  }
}

src/views/bridgesConsole/bridgeDetail/components/BInfoDialog03.vue

@@ -79,7 +79,10 @@ export default {
      this.pageNo = val
    },
    queryDeviceList() {
      this.deviceList = queryInfo.queryDevices(this.$parent.bridgeId)
      var that = this
      queryInfo.qaiCb(function() {
        that.deviceList = queryInfo.queryDevices(that.$parent.bridgeId)
      })
    }
  }
}

src/views/bridgesConsole/bridgeDetail/components/BInfoDialog04.vue

@@ -84,7 +84,10 @@ export default {
      this.pageNo = val
    },
    queryTransList() {
      this.transducerList = queryInfo.queryTrans(this.$parent.bridgeId)
      var that = this
      queryInfo.qaiCb(function() {
        that.transducerList = queryInfo.queryTrans(that.$parent.bridgeId)
      })
    }
  }
}

src/views/bridgesConsole/bridgeDetail/index.vue

@@ -15,28 +15,32 @@
            <span>报警信息</span>
            <el-button type="text" @click="queryDangerInfo">查看全部</el-button>
          </div>
          <ul class="item-ul" v-if="dangerList.length">
            <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
              <span>{{item.alarmTime}}</span>
              <span>{{item.device}}，请点击查看。</span>
              <span class="svg-container" v-if="!item.readed">
                <svg-icon icon-class="unread"></svg-icon>
              </span>
            </li>
          </ul>
          <DefaultPage v-if="!dangerList.length"></DefaultPage>
          <div class="load-box" v-loading="loadprogress1">
            <ul class="item-ul" v-if="dangerList.length">
              <li :class="!item.readed ? 'readed-li' : ''" v-for="item in dangerList" :key="item.index" @click="alarmShow(item.aid, item.readed, item.alarmTime, item.device)">
                <span>{{item.alarmTime}}</span>
                <span>{{item.device}}，请点击查看。</span>
                <span class="svg-container" v-if="!item.readed">
                  <svg-icon icon-class="unread"></svg-icon>
                </span>
              </li>
            </ul>
            <DefaultPage v-if="!dangerList.length && !loadprogress1"></DefaultPage>
          </div>
        </el-card>
        <el-card class="box-card block-group">
          <div slot="header" class="block-title">
            <span>实时监测</span>
            <el-button v-if="serverSeqArr.length" type="text" @click="updateDataList">刷新</el-button>
          </div>
          <el-row class="line-chart-box" v-if="monitorList.length">
            <el-col :xs="24" :sm="24" :lg="24" v-for="item in monitorShowList" :key="item.index">
              <lineChart :chartData="item" :maxXcount="maxShowLength"></lineChart>
            </el-col>
          </el-row>
          <DefaultPage v-if="!monitorList.length"></DefaultPage>
          <div class="load-box" v-loading="loadprogress2">
            <el-row class="line-chart-box" v-if="monitorList.length">
              <el-col :xs="24" :sm="24" :lg="24" v-for="item in monitorShowList" :key="item.index">
                <lineChart :chartData="item" :maxXcount="maxShowLength"></lineChart>
              </el-col>
            </el-row>
            <DefaultPage v-if="!monitorList.length && !loadprogress2"></DefaultPage>
          </div>
          <div class="pagination-container">
            <el-pagination
              background
@@ -112,6 +116,8 @@ export default {
  },
  data() {
    return {
      loadprogress1: true,
      loadprogress2: true,
      bridgeId: '',
      bridgeName: '',
      dialogW: '860px',
@@ -123,21 +129,21 @@ export default {
      serverList: [],
      deviceList: [],
      transducerList: [],
      monitorList: [],
      currentNo: 1,
      currentSize: 4,
      currentTime: '',
      sysTime: '',
      localTimeiv: '',
      eastEightDistrict: 8 * 60 * 60 * 1000,
      jishiTime: null,
      maxShowLength: 300,
      monitorCache: []
      monitorList: [],
      monitorCache: [],
      jishiTime: null
    }
  },
  watch: {
    '$route'(to, from) {
      if (!(to.path === '/bridgeHome/bridgeDetail')) {
    $route(to, from) {
      if (to.path !== '/bridgeHome/bridgeDetail') {
        clearTimeout(this.jishiTime)
        this.jishiTime = null
      }
@@ -149,27 +155,32 @@ export default {
    }
  },
  created() {
    var that = this
    if (urlParse('id')) {
      this.bridgeId = urlParse('id')
      this.bridgeName = urlParse('name')
      that.bridgeId = urlParse('id')
      that.bridgeName = urlParse('name')
    } else {
      this.bridgeId = Cookies.get('bridgeId')
      this.bridgeName = Cookies.get('bridgeName')
      that.bridgeId = Cookies.get('bridgeId')
      that.bridgeName = Cookies.get('bridgeName')
    }
    this.getDictoryData()
    if (this.bridgeId) {
      this.serverSeqArr = queryInfo.queryServers(this.bridgeId, true)
      if (this.serverSeqArr.length) {
        this.updateDataList()
    that.getDictoryData()
    queryInfo.qaiCb(function() {
      if (that.bridgeId) {
        that.serverSeqArr = queryInfo.queryServers(that.bridgeId, true)
        if (that.serverSeqArr.length) {
          that.updateDataList()
          that.getDangerList()
        }
      }
    }
    })
  },
  methods: {
    updateDataList() {
      clearTimeout(this.jishiTime)
      this.jishiTime = null
      this.monitorList = []
      this.monitorCache = []
      this.getSysTime()
      this.getDangerList()
    },
    getDangerList() {
      var arr = this.serverSeqArr
@@ -178,8 +189,10 @@ export default {
        pageSize: 5,
        pageNo: 1
      }
      this.loadprogress1 = true
      getDangerList(param).then(res => {
        if (res.success && res.data.data) {
          this.loadprogress1 = false
          const dataS = res.data.data
          for (let i = 0; i < dataS.length; i++) {
            if (dataS[i].alarmTime) {
@@ -202,6 +215,8 @@ export default {
          that.localTimeiv = localTime - that.sysTime
          that.first_Q = true
          that.getTimingMonitor()
        } else {
          that.loadprogress2 = false
        }
      })
    },
@@ -217,13 +232,12 @@ export default {
      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 = []
        if (res.success && res.data) {
          if (that.first_Q) {
            that.loadprogress2 = false
            if (res.data.length) {
              that.first_Q = false
              var ftime = res.data[0].ctime

src/views/bridgesConsole/bridgeMonitor/index.vue

@@ -17,6 +17,7 @@
              :key="item.value"
              :label="item.label"
              :value="item.value"
              :disabled="item.disb"
              @change="changeTimeRange">
            </el-option>
          </el-select>
@@ -65,10 +66,10 @@ export default {
      bridgeId: '',
      pickerOptions0: {
        disabledDate(time) {
          return time.getTime() > Date.now() - 8.64e7
          return time.getTime() > Date.now()
        }
      },
      valueDate: this.formatTime(Date.now() - 8.64e7).substring(0, 8),
      valueDate: this.formatTime(Date.now()).substring(0, 8),
      TimeVal: '000000',
      optionsTime: [],
      serverSeqArr: [],
@@ -90,22 +91,38 @@ export default {
    }
  },
  created() {
    this.bridgeId = Cookies.get('bridgeId')
    this.optionsCreat()
    this.serverSeqArr = queryInfo.queryServers(this.bridgeId, true)
    if (this.serverSeqArr.length) {
      this.getMonitorByDay()
    }
    var that = this
    that.bridgeId = Cookies.get('bridgeId')
    that.optionsCreat()
    queryInfo.qaiCb(function() {
      if (that.bridgeId) {
        that.serverSeqArr = queryInfo.queryServers(that.bridgeId, true)
        if (that.serverSeqArr.length) {
          that.getMonitorByDay()
        }
      }
    })
  },
  methods: {
    optionsCreat() {
      var that = this
      that.optionsTime = []
      const nowHour = new Date().getHours()
      for (let i = 0; i < 24; i++) {
        var num = (i < 10 ? ('0' + i) : i)
        var numpre = ((i - 1) < 10 ? ('0' + (i - 1)) : (i - 1))
        var oPt = {
          value: `${num}0000`,
          label: `${num}:00:00 - ${num}:59:59`
          label: `${num}:00:00 - ${num}:59:59`,
          disb: false
        }
        this.optionsTime.push(oPt)
        if (nowHour === i) {
          that.TimeVal = `${numpre}0000`
        }
        if (nowHour <= i && that.valueDate === that.formatTime(Date.now()).substring(0, 8)) {
          oPt.disb = true
        }
        that.optionsTime.push(oPt)
      }
    },
    formatTime(time) {
@@ -118,11 +135,11 @@ export default {
      var that = this
      var clearInt = setInterval(function() {
        that.proBar = that.proBar + parseInt((Math.random() * 10), 10)
        if (that.proBar >= 84) {
          that.proBar = 84
        if (that.proBar >= 96) {
          that.proBar = 96
          clearInterval(clearInt)
        }
      }, 1000 * Math.random())
      }, 1500 * Math.random())
    },
    getMonitorByDay() {
      this.progressShow = true
@@ -134,8 +151,12 @@ export default {
      var sDate = that.valueDate + that.TimeVal
      var sDateForm = (new Date(parseTime(sDate, true, true))).getTime()
      var eDate = that.formatTime(sDateForm + 8 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000).substring(0, 14)
      var arr = this.serverSeqArr
      getMonitorByDay({ seq: arr, begin: sDate, end: eDate }).then(res => {
      var arr = that.serverSeqArr
      var flag = false
      if (that.valueDate === that.formatTime(Date.now()).substring(0, 8)) {
        flag = true
      }
      getMonitorByDay({ seq: arr, begin: sDate, end: eDate }, flag).then(res => {
        NProgress.inc()
        if (res.success && res.data) {
          this.progressShow = false
@@ -169,6 +190,7 @@ export default {
    },
    changeDate(val) {
      this.valueDate = val
      this.optionsCreat()
    },
    changeTimeRange(val) {
      this.TimeVal = val

src/views/bridgesConsole/lineChart/LineChart.vue

@@ -153,19 +153,6 @@ export default {
              xAxisIndex: [0],
              start: 0,
              end: 100
            },
            {
              type: 'slider',
              show: true,
              yAxisIndex: [0],
              start: 0,
              end: 100
            },
            {
              type: 'inside',
              yAxisIndex: [0],
              start: 0,
              end: 100
            }
          ]
        })

src/views/dashboard/other/index.vue

@@ -1,34 +1,36 @@
<template>
  <div class="dashboard-editor-container">
    <div v-if="!showComp">
      <el-row class="panel-group" :gutter="40">
        <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)">
          <div class='card-panel'>
            <div class="card-panel-icon-wrapper">
              <div class="card-image" :style="{ backgroundImage: 'url(/data/bridge'+ item.img +')'}"></div>
    <div class="load-box" v-loading="loadprogress">
      <div v-if="!showComp">
        <el-row class="panel-group" :gutter="40">
          <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)">
            <div class='card-panel'>
              <div class="card-panel-icon-wrapper">
                <div class="card-image" :style="{ backgroundImage: 'url(/data/bridge'+ item.img +')'}"></div>
              </div>
              <div class="card-panel-description">
                <div class="card-panel-text">桥梁名称 <span>{{item.shortName}}</span></div>
                <div class="card-panel-text" :class="item.alarmNum>0?'card-panel-text-red':''">未读报警 {{item.alarmNum ? item.alarmNum : alarmNum}}条</div>
              </div>
            </div>
            <div class="card-panel-description">
              <div class="card-panel-text">桥梁名称 <span>{{item.shortName}}</span></div>
              <div class="card-panel-text" :class="item.alarmNum>0?'card-panel-text-red':''">未读报警 {{item.alarmNum ? item.alarmNum : alarmNum}}条</div>
            </div>
          </div>
        </el-col>
      </el-row>
      <div class="pagination-container">
        <el-pagination
          background
          @current-change="handleCurrentChange"
          :page-size="9"
          layout="prev, pager, next, jumper"
          :total="total">
        </el-pagination>
          </el-col>
        </el-row>
        <div class="pagination-container" v-if="!loadprogress">
          <el-pagination
            background
            @current-change="handleCurrentChange"
            :page-size="9"
            layout="prev, pager, next, jumper"
            :total="total">
          </el-pagination>
        </div>
      </div>
    </div>
    <div class="defaut-container" v-if="showComp">
      <div>
        <img class="plat-pic" src="/static/touchwave.png" width="460">
        <p class="plat-tit">欢迎 <span>{{name}}</span> 使用声脉桥梁云监控平台</p>
        <p class="plat-tip">您目前没有任何桥梁数据，请联系管理员</p>
      <div class="defaut-container" v-if="showComp">
        <div>
          <img class="plat-pic" src="/static/touchwave.png" width="460">
          <p class="plat-tit">欢迎 <span>{{name}}</span> 使用声脉桥梁云监控平台</p>
          <p class="plat-tip">您目前没有任何桥梁数据，请联系管理员</p>
        </div>
      </div>
    </div>
  </div>
@@ -52,7 +54,8 @@ export default {
      pageSize: 10,
      pageNo: 1,
      dataList: [],
      showComp: false
      showComp: false,
      loadprogress: false
    }
  },
  computed: {
@@ -70,9 +73,11 @@ export default {
        pageSize: this.pageSize,
        pageNo: this.pageNo
      }
      this.loadprogress = true
      getBridgeList(param).then(res => {
        if (res.success) {
          var $data = res.data.data
          this.loadprogress = false
          if ($data.length > 0) {
            this.total = res.data.total
            for (let i = 0; i < $data.length; i++) {

src/views/layout/components/TopNavbar.vue

@@ -126,7 +126,7 @@ export default {
  right: 0;
  height: 50px;
  line-height: 50px;
  z-index:1002;
  z-index:2002;
  border-radius: 0px !important;
  background-color: #2d3a4b;
  border-bottom: 1px solid #e6e6e6;