修正过后

src/api/sensorAdmin.js

@@ -46,10 +46,11 @@ export function pageQueryDevice(params) {
}
/*  传感器所属采集盒编号列表 */
export function DeviceOfservice() {
export function DeviceOfservice(params) {
  return request({
    url: '/ajax/envData/server/typeCode',
    method: 'get'
    method: 'get',
    params
  })
}

src/components/Detection/index.vue

@@ -7,7 +7,7 @@
          <div class="tagCardText">
            <span>{{item.name}}</span>
          </div>
          <p style="position: absolute;top: 80px;left:100px;font-size: 24px;">{{item.lastValue}}<span style="font-size:14px;">{{unitObj[item.unit]}}</span></p>
          <p style="position: absolute;top: 80px;left:70px;font-size: 24px;">{{item.lastValue}}<span style="font-size:14px;">{{unitObj[item.unit]}}</span></p>
        </el-card>
      </div>
    </div>
@@ -26,11 +26,14 @@
          '01': '℃',
          '02': '%',
          '03': 'kPa',
          '04': 'm3/h'
          '04': 'm³/h'
        }
      }
    },
    created() {
      this.list.sort((a, b) => {
        return a.unit - b.unit
      })
      for (let i = 0; i < this.list.length; i++) {
        this.arr[this.list[i].code] = this.list[i].unit
      }

src/router/index.js

@@ -111,7 +111,7 @@ export const asyncRouterMapGeneralUser = [
  {
    path: '',
    name: 'account',
    component: com,
    component: Layout,
    hidden: true,
    meta: { title: '账户设置' },
    children: [
@@ -198,17 +198,16 @@ export const asyncRouterMapAdmin = [
    component: Layout,
    name: 'peoplesManage',
    meta: {
      title: '用户管理系统',
      icon: 'peoples',
      title: '',
      roles: ['1']
    },
    alwaysShow: true,
    alwaysShow: false,
    children: [
      {
        path: 'infoManage',
        name: 'infoManage',
        component: () => import('@/views/peoplesManage/infoManage/index'),
        meta: { title: '用户信息管理' }
        meta: { title: '用户信息管理', icon: 'peoples' }
      }
    ]
  },
@@ -234,7 +233,7 @@ export const asyncRouterMapAdmin = [
    component: Layout,
    name: 'BaseInfoManage',
    meta: {
      title: '声脉系统',
      title: '音频监测系统',
      icon: 'list',
      roles: ['1']
    },
@@ -264,7 +263,7 @@ export const asyncRouterMapAdmin = [
    component: Layout,
    name: 'arefactionManage',
    meta: {
      title: '除湿系统',
      title: '除湿监测系统',
      icon: 'arefaction',
      roles: ['1']
    },

src/views/dashboard/other/index.vue

@@ -64,7 +64,6 @@ export default {
    ])
  },
  created() {
    console.log(this.$store)
    this.getBridgeLists()
  },
  methods: {

src/views/dehumidificationSystem/airClamp.vue

@@ -1,7 +1,7 @@
<template>
  <div class="app-container" style="padding-bottom: 0px;padding-top: 0px;">
    <h4>气夹监测系统</h4>
    <div class="filter-container" style="overflow: auto;" v-loading="loadprogress">
    <div class="filter-container" style="overflow: auto;" v-loading="loadprogress" v-if="blockShow">
      <div class="airItem">
        <p class="pText">上游气夹监测</p>
        <div class="imgBox">
@@ -83,6 +83,7 @@
      return {
        saddleObj: {},
        loadprogress: true,
        blockShow: false,
        bridgeId: '',
        arr1obj: {
          txt: '浦口侧上游排气夹',
@@ -176,6 +177,10 @@
      this.bridgeId = Cookies.get('bridgeId')
      byBridgeAll(this.bridgeId, (res) => {
        this.loadprogress = false
        if (res.server.length === 0) {
          return
        }
        this.blockShow = true
        const array1 = ['', '', '']
        const array2 = ['', '', '']
        const array3 = ['', '']

src/views/dehumidificationSystem/airPreparationStation.vue

@@ -24,6 +24,9 @@
      this.bridgeId = Cookies.get('bridgeId')
      byBridgeAll(this.bridgeId, (res) => {
        this.loadprogress = false
        if (res.server.length === 0) {
          return
        }
        this.saddleObj = res['04']
      })
    },

src/views/dehumidificationSystem/anchorChamber.vue

@@ -37,8 +37,11 @@
        }
        byBridgeAll(this.bridgeId, (res) => {
          this.loadprogress = false
          if (res.server.length === 0) {
            return
          }
          const obj = {}
          const oFl = { '01': '上游', '02': '下游' }
          const oFl = { '01': '上游', '02': '下游', '99': '' }
          Object.keys(res['03']).forEach((key) => {
            res['03'][key].forEach((item) => {
              const index = this.arr.indexOf(item.position)

src/views/dehumidificationSystem/history.vue

@@ -6,8 +6,8 @@
      </div>
      <div class="load-box" v-loading="loadprogress">
        <el-row class="line-chart-box">
          <el-col :xs="24" :sm="24" :lg="24" v-for="item in alarmList" :key="item.index">
            <lineChart :chartData="item" :historyM="historyM"></lineChart>
          <el-col :xs="24" :sm="24" :lg="24">
            <lineChart :chartData="echartsObj"></lineChart>
          </el-col>
        </el-row>
      </div>
@@ -29,7 +29,13 @@
        alarmList: [],
        loadprogress: false,
        array: [],
        truObject: {}
        truObject: {},
        echartsObj: {
          legend: [],
          xAxis: [],
          yAxis: [],
          series: []
        }
      }
    },
    components: {
@@ -44,6 +50,31 @@
      this.getDustrurDetail()
    },
    methods: {
      seriesFun(name, stringType, idx, ydata) {
        return {
          name: name,
          type: stringType,
          yAxisIndex: idx,
          data: ydata
        }
      },
      yAxisFun(name, min, max, position, color, unit) {
        return {
          type: 'value',
          name: name,
          min: min,
          max: max,
          position: position,
          axisLine: {
            lineStyle: {
              color: color
            }
          },
          axisLabel: {
            formatter: '{value} ' + unit
          }
        }
      },
      getDustrurDetail() {
        this.loadprogress = true
        request({
@@ -56,84 +87,67 @@
        }).then(res => {
          if (res.success) {
            const $data = res.data
            const rList = []
            const rWsata = {
              tit: '',
              arr: [],
              xData: [],
              weData: [],
              seData: [],
              xInterval: 0
            let flag = false
            const echObj = {
              color: [],
              legend: [],
              xAxis: [],
              yAxis: [],
              series: []
            }
            let sf = false
            Object.keys($data).forEach(key => {
              const rData = {
                tit: '',
                arr: [],
                xData: [],
                seData: [],
                xInterval: 0
              }
              if (this.truObject[key] === '01' || this.truObject[key] === '02') {
                if (this.truObject[key] === '01') {
                  rWsata.arr.push('温度')
                  rWsata.tit = '温度℃ '
                } else {
                  rWsata.arr.push('湿度')
                  if (rWsata.tit) {
                    rWsata.tit += '/ 湿度%'
                  } else {
                    rWsata.tit += '湿度%'
              const idx = echObj.legend.length
              switch (this.truObject[key]) {
                case '01':
                  echObj.color.push('#5793f3')
                  echObj.yAxis.push(this.yAxisFun('温度', -50, 100, 'left', '#5793f3', '℃'))
                  echObj.series.push(this.seriesFun('温度', 'line', idx, []))
                  echObj.legend.push('温度')
                  break
                case '02':
                  const yAxisItem = this.yAxisFun('湿度', 0, 100, 'left', '#d14a61', '%')
                  if (idx === 1) {
                    yAxisItem.offset = 60
                  }
                }
                if (!sf) {
                  rList.push(rWsata)
                  sf = true
                }
              } else {
                if (this.truObject[key] === '03') {
                  rData.arr.push('压力')
                  rData.tit = '压力kPa'
                } else {
                  rData.arr.push('风量')
                  rData.tit = '风量m3/h'
                }
                rList.push(rData)
                  echObj.color.push('#d14a61')
                  echObj.yAxis.push(yAxisItem)
                  echObj.series.push(this.seriesFun('湿度', 'line', idx, []))
                  echObj.legend.push('湿度')
                  break
                case '03':
                  echObj.color.push('#675bba')
                  echObj.yAxis.push(this.yAxisFun('压力', 0, 250, 'right', '#675bba', 'kPa'))
                  echObj.series.push(this.seriesFun('压力', 'bar', idx, []))
                  echObj.legend.push('压力')
                  break
                case '04':
                  const yItem = this.yAxisFun('风量', 0, 250, 'right', '#67C23A', 'm³/h')
                  if (echObj.color.indexOf('#675bba') >= 0) {
                    yItem.offset = 80
                  }
                  echObj.color.push('#67C23A')
                  echObj.yAxis.push(yItem)
                  echObj.series.push(this.seriesFun('风量', 'bar', idx, []))
                  echObj.legend.push('风量')
                  break
              }
              if (this.truObject[key] === '01' || this.truObject[key] === '02') {
                rWsata.xData = []
                $data[key].forEach((item, index) => {
                  if (index % 2 === 0) {
              $data[key].forEach((item, index) => {
                if (index % 2 === 0) {
                  if (!flag) {
                    const startTime = parseTime(item.createTime, true, true).substr(0, 16)
                    rWsata.xData.unshift(startTime)
                    if (this.truObject[key] === '02') {
                      rWsata.weData.unshift(item.itemValue)
                    } else {
                      rWsata.seData.unshift(item.itemValue)
                    }
                  } else {
                    rWsata.xData.unshift('')
                    if (this.truObject[key] === '02') {
                      rWsata.weData.unshift(item.itemValue)
                    } else {
                      rWsata.seData.unshift(item.itemValue)
                    }
                    echObj.xAxis.unshift(startTime)
                  }
                })
              } else {
                $data[key].forEach((item, index) => {
                  if (index % 2 === 0) {
                    const startTime = parseTime(item.createTime, true, true).substr(0, 16)
                    rData.xData.unshift(startTime)
                    rData.seData.unshift(item.itemValue)
                  } else {
                    rData.xData.unshift('')
                    rData.seData.unshift(item.itemValue)
                  echObj.series[idx].data.unshift(item.itemValue)
                } else {
                  if (!flag) {
                    echObj.xAxis.unshift('')
                  }
                })
              }
                  echObj.series[idx].data.unshift(item.itemValue)
                }
              })
              flag = true
            })
            this.alarmList = rList
            this.echartsObj = echObj
            this.loadprogress = false
          }
        })

src/views/dehumidificationSystem/lineChart/LineChart.vue

@@ -6,13 +6,9 @@
  import echarts from 'echarts'
  require('echarts/theme/macarons') // echarts theme
  import { debounce } from '@/utils'
  export default {
    props: {
      lineColor: {
        type: Number,
        default: 0
      },
      className: {
        type: String,
        default: 'chart'
@@ -23,7 +19,7 @@
      },
      height: {
        type: String,
        default: '350px'
        default: '600px'
      },
      autoResize: {
        type: Boolean,
@@ -41,7 +37,6 @@
    },
    data() {
      return {
        lineColorNow: this.lineColor % 2 === 0 ? '#FF005A' : '#3888fa',
        chart: null
      }
    },
@@ -78,90 +73,49 @@
    methods: {
      setOptions(datastr) {
        this.chart.setOption({
          title: {
            text: datastr.tit,
            textStyle: {
              color: '#333',
              fontSize: 14
            },
            top: '0'
          },
          grid: {
            left: 10,
            right: 10,
            bottom: 20,
            top: 60,
            containLabel: true
          },
          color: [],
          tooltip: {
            trigger: 'axis',
            axisPointer: {
              type: 'cross'
            },
            padding: [5, 10]
          },
          xAxis: {
            data: datastr.xData,
            max: this.maxXcount
            }
          },
          yAxis: {
            type: 'value',
            max: 100,
            min: -90
          grid: {
            right: '20%'
          },
          legend: {
            data: datastr.arr
          }
            data: []
          },
          xAxis: [
            {
              type: 'category',
              axisTick: {
                alignWithLabel: true
              },
              data: []
            }
          ],
          yAxis: {},
          series: [
          ]
        })
        if (datastr.arr.length === 2) {
          this.chart.setOption({
            series: [
              {
                name: datastr.arr[0], itemStyle: {
                  normal: {
                    color: this.lineColorNow,
                    lineStyle: {
                      color: this.lineColorNow,
                      width: 2
                    }
                  }
                },
                smooth: true,
                type: 'line',
                data: datastr.seData,
                animationDuration: 2800,
                animationEasing: 'cubicInOut'
              }, {
                name: datastr.arr[1],
                type: 'line',
                data: datastr.weData
              }
            ]
          })
        } else {
        if (!this.historyM) {
          this.chart.setOption({
            series: [
            color: datastr.color,
            series: datastr.series,
            legend: {
              data: datastr.legend
            },
            xAxis: [
              {
                name: datastr.arr[0], itemStyle: {
                  normal: {
                    color: this.lineColorNow,
                    lineStyle: {
                      color: this.lineColorNow,
                      width: 2
                    }
                  }
                type: 'category',
                axisTick: {
                  alignWithLabel: true
                },
                smooth: true,
                type: 'line',
                data: datastr.seData,
                animationDuration: 2800,
                animationEasing: 'cubicInOut'
                data: datastr.xAxis
              }
            ]
          })
        }
        if (this.historyM) {
          this.chart.setOption({
            ],
            yAxis: datastr.yAxis,
            dataZoom: [
              {
                type: 'slider',

src/views/dehumidificationSystem/saddleRoom.vue

@@ -24,6 +24,9 @@
      this.bridgeId = Cookies.get('bridgeId')
      byBridgeAll(this.bridgeId, (res) => {
        this.loadprogress = false
        if (res.server.length === 0) {
          return
        }
        this.saddleObj = res['02']
      })
    },

src/views/dehumidificationSystem/steelBoxGirder.vue

@@ -24,6 +24,9 @@
      this.bridgeId = Cookies.get('bridgeId')
      byBridgeAll(this.bridgeId, (res) => {
        this.loadprogress = false
        if (res.server.length === 0) {
          return
        }
        this.saddleObj = res['05']
      })
    },

src/views/dehumidificationSystemAdmin/sensor.vue

@@ -54,7 +54,7 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="所属组" prop="organize">
              <el-select v-model="ruleForm2.organize" placeholder="请选择所属系统">
              <el-select v-model="ruleForm2.organize" placeholder="请选择所属组">
                <el-option v-for="item in 100" :key="item" :value="item">
                </el-option>
              </el-select>
@@ -78,7 +78,7 @@
          <el-col :span="8">
            <el-form-item label="所属方位" prop="position">
              <el-autocomplete class="inline-input" v-model="ruleForm2.position" :fetch-suggestions="querySearch"
                placeholder="请输入内容" @select="handleSelect">
                placeholder="请输入所属方位" @select="handleSelect">
              </el-autocomplete>
            </el-form-item>
          </el-col>
@@ -253,7 +253,7 @@
      }
    },
    created() {
      DeviceOfservice().then(res => {
      DeviceOfservice({ active: 1 }).then(res => {
        if (res.success) {
          this.serverList = res.data
        }

src/views/layout/components/TopNavbar.vue

@@ -68,7 +68,11 @@
          Cookies.remove('bridgeName')
          this.showName = ''
        } else {
          this.dashFalg = true
          if (to.path === '/modifyPassword' || to.path === '/modifyData') {
            this.dashFalg = false
          } else {
            this.dashFalg = true
          }
          this.bridgeId = Cookies.get('bridgeId')
          this.showName = Cookies.get('bridgeName')
          this.getBridgeLists()
@@ -79,7 +83,11 @@
      if (this.$route.name === 'dashboard') {
        this.dashFalg = false
      } else {
        this.dashFalg = true
        if (this.$route.name === 'modifyPassword' || this.$route.name === 'modifyData') {
          this.dashFalg = false
        } else {
          this.dashFalg = true
        }
      }
      this.bridgeId = Cookies.get('bridgeId')
      this.showName = Cookies.get('bridgeName')