普通用户相关bug

src/views/bridgesConsole/bridgeDanger/dangerDetail.vue

@@ -37,8 +37,7 @@ export default {
      alarmRead: false,
      alarmList: [],
      pageSize: 6,
      pageNo: 1,
      intervalTime: (3 * 1000) / 300
      pageNo: 1
    }
  },
  components: {
@@ -60,6 +59,9 @@ export default {
    }
  },
  methods: {
    addDate(time) {
      return turnTime(new Date(+new Date(time) + 1000), 'time', true)
    },
    getDangerDetail() {
      var that = this
      const param = {
@@ -75,15 +77,22 @@ export default {
            var rData = {
              tit: '',
              xData: [],
              seData: []
              seData: [],
              xInterval: 99
            }
            rList.push(rData)
            rData.tit = str
            var dataArr = JSON.parse('[' + String(res.data[i].data.split(',')) + ']')
            var timeArr = []
            for (var j = 0; j < dataArr.length; j++) {
              startTime = turnTime(new Date(+new Date(startTime) + that.intervalTime), 'time', true)
              timeArr.push(startTime)
            for (var j = 0; j < dataArr.length; ++j) {
              if (j === 99) {
                startTime = that.addDate(startTime)
              } else if (j === 199) {
                startTime = that.addDate(startTime)
              } else if (j === 299) {
                startTime = that.addDate(startTime)
              }
              timeArr.push(startTime.substring(11, 19))
            }
            rData.xData = timeArr
            rData.seData = dataArr

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

@@ -23,13 +23,13 @@
              <el-form-item label="桥梁开通日期">{{dataInfo.serviceDay}}</el-form-item>
            </el-col>
            <el-col :span="24">
              <el-form-item label="维护单位">{{dataInfo.org}}</el-form-item>
              <el-form-item label="维护机构">{{dataInfo.org}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="维护单位电话">{{dataInfo.phone}}</el-form-item>
              <el-form-item label="联系电话">{{dataInfo.phone}}</el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="维护单位电邮">{{dataInfo.email}}</el-form-item>
              <el-form-item label="联系电邮">{{dataInfo.email}}</el-form-item>
            </el-col>
          </el-row>
        </el-col>
@@ -39,7 +39,7 @@
          </div>
        </el-col>
        <el-col :span="24" v-if="dataInfo.descp">
          <el-form-item label="大桥描述" class="el-to-block"><br />
          <el-form-item label="详细描述" class="el-to-block"><br />
            <div class="textarea-div">{{dataInfo.descp}}</div>
          </el-form-item>
        </el-col>
@@ -97,7 +97,7 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped>
  .el-form-item{
    margin: 0;
    margin: 8px;
  }
  .textarea-div{
    line-height: 26px;

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

@@ -9,11 +9,14 @@
                <el-form-item label="服务器编号">{{item.code}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="采集器数量">{{item.devices}}</el-form-item>
                <el-form-item label="采集盒数量">{{item.devices}}</el-form-item>
              </el-col>
              <el-col :span="24">
              <el-col :span="12">
                <el-form-item label="所属桥梁">{{bridgeName}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="内部编号">{{item.seq}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="备注" class="el-to-block"><br />
                  <div class="textarea-div">{{item.remark}}</div>

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

@@ -9,10 +9,13 @@
                <el-form-item label="采集盒编号">{{item.code}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="采集盒信道数量">{{item.channels}}</el-form-item>
                <el-form-item label="所属服务器编号">{{item.serverCode}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="采集盒所属服务器编号">{{item.serverCode}}</el-form-item>
              <el-col :span="12">
                <el-form-item label="信道数量">{{item.channels}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="内部编号">{{item.seq}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="备注" class="el-to-block"><br />

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

@@ -6,16 +6,19 @@
          <div class="list-item">
            <el-row>
              <el-col :span="12">
                <el-form-item label="采集盒编号">{{item.deviceCode}}</el-form-item>
                <el-form-item label="传感器编号">{{item.code}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="传感器编号">{{item.code}}</el-form-item>
                <el-form-item label="所属采集盒编号">{{item.deviceCode}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="所属主缆">{{childCableMain[item.cableType]}}</el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="传感器位置">{{childAddr[item.locType]}}</el-form-item>
                <el-form-item label="所属位置">{{childAddr[item.locType]}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="内部编号">{{item.seq}}</el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="备注" class="el-to-block"><br />

src/views/bridgesConsole/bridgeDetail/components/style.scss

@@ -1,6 +1,6 @@
.form-main{
  .el-form-item{
    margin: 0;
    margin: 8px;
  }
}
.textarea-div{
@@ -11,6 +11,6 @@
  border: 1px solid #ccc;
  margin-bottom: 20px;
  padding: 10px 15px;
  height: 200px;
  height: 256px;
  overflow: hidden;
}

src/views/bridgesConsole/lineChart/LineChart.vue

@@ -102,17 +102,17 @@ export default {
        },
        xAxis: {
          data: datastr.xData,
          max: this.maxXcount // x轴最多显示个数
          max: this.maxXcount
        },
        yAxis: {
          name: '毫伏(mv)',
          type: 'value'
        },
        legend: {
          data: ['波动值']
          data: ['信号值']
        },
        series: [{
          name: '波动值', itemStyle: {
          name: '信号值', itemStyle: {
            normal: {
              color: this.lineColorNow,
              lineStyle: {
@@ -128,6 +128,15 @@ export default {
          animationEasing: 'cubicInOut'
        }]
      })
      if (datastr.xInterval) {
        this.chart.setOption({
          xAxis: {
            axisLabel: {
              interval: datastr.xInterval
            }
          }
        })
      }
      if (this.historyM) {
        this.chart.setOption({
          dataZoom: [

src/views/dashboard/other/index.vue

@@ -1,26 +1,35 @@
<template>
  <div class="dashboard-editor-container">
    <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 v-show="dataList.length">
      <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">
        <el-pagination
          background
          @current-change="handleCurrentChange"
          :page-size="9"
          layout="prev, pager, next, jumper"
          :total="total">
        </el-pagination>
      </div>
    </div>
    <div class="defaut-container" v-show="!dataList.length">
      <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>
</template>
@@ -33,6 +42,7 @@ import {
import '@/styles/roleuser.scss'
import Cookies from 'js-cookie'
import queryInfo from '@/utils/queryInfo'
import { mapGetters } from 'vuex'
export default {
  data() {
@@ -44,6 +54,11 @@ export default {
      dataList: []
    }
  },
  computed: {
    ...mapGetters([
      'name'
    ])
  },
  created() {
    this.getBridgeLists()
  },
@@ -97,3 +112,32 @@ export default {
  }
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.defaut-container {
  display: flex;
  align-items: center;
  justify-content: center;
  flex-direction: column;
  text-align: center;
  height: 100%;
  padding: 12% 0;
  background: #fff;
  .plat-pic{
    margin: 40px auto 0;
  }
  .plat-tit{
    font-size: 34px;
    line-height: 40px;
    letter-spacing: 2px;
    span{
      color: #0f76c4;
    }
  }
  .plat-tip{
    font-size: 26px;
    line-height: 20px;
    letter-spacing: 2px;
    color: #f90000;
  }
}
</style>

src/views/layout/components/TopNavbar.vue

@@ -61,6 +61,11 @@ export default {
      this.$router.replace({ path: '/' })
      Cookies.remove('bridgeId')
      Cookies.remove('bridgeName')
      var dataList = this.dataList
      for (let i = 0; i < dataList.length; i++) {
        console.log(dataList[i].disab)
        dataList[i].disab = false
      }
    },
    toggleSideBar() {
      this.$store.dispatch('ToggleSideBar')