Browse Source

历史监控

luyanan 6 years ago
parent
commit
65698605ca

+ 12 - 1
src/views/bridgesConsole/bridgeMonitor/index.vue

@ -8,11 +8,19 @@
8 8
            value-format="yyyyMMdd"
9 9
            @change="changeDate">
10 10
          </el-date-picker>
11
          <!-- <el-date-picker
12
            v-model="dateRange"
13
            type="datetimerange"
14
            align="right"
15
            start-placeholder="开始日期"
16
            end-placeholder="结束日期"
17
            :default-time="['12:00:00', '08:00:00']">
18
          </el-date-picker> -->
11 19
          <el-button type="primary" @click="getMonitorByDay">查询</el-button>
12 20
      </div>
13 21
      <el-row class="line-chart-box" v-if="alarmList.length">
14 22
        <el-col :xs="24" :sm="24" :lg="24" v-for="item in alarmShowList" :key="item.index">
15
          <lineChart2 :chartData="item"></lineChart2>
23
          <lineChart2 :chartData="item" :historyM="historyM"></lineChart2>
16 24
        </el-col>
17 25
      </el-row>
18 26
      <DefaultPage v-if="!alarmList.length"></DefaultPage>
@ -44,8 +52,10 @@ import DefaultPage from '@/components/DefaultPage'
44 52
export default {
45 53
  data() {
46 54
    return {
55
      historyM: true,
47 56
      bridgeId: '',
48 57
      valueDate: new Date().toISOString().substring(0, 10).replace(/-/g, ''),
58
      dateRange: '',
49 59
      serverSeqArr: [],
50 60
      alarmList: [],
51 61
      pageSize: 2,
@ -105,6 +115,7 @@ export default {
105 115
            monitorData.seData.min.push(res.data[i].lvalue)
106 116
          }
107 117
          that.alarmList = monitorList
118
          console.log(that.alarmList)
108 119
        }
109 120
      })
110 121
    },

+ 33 - 1
src/views/bridgesConsole/lineChart/LineChart2.vue

@ -30,6 +30,9 @@ export default {
30 30
    },
31 31
    maxXcount: {
32 32
      type: Number
33
    },
34
    historyM: { // 判断是否需要坐标轴上的滚动条
35
      type: Boolean
33 36
    }
34 37
  },
35 38
  data() {
@ -82,7 +85,7 @@ export default {
82 85
          left: 10,
83 86
          right: 10,
84 87
          bottom: 20,
85
          top: 30,
88
          top: 50,
86 89
          containLabel: true
87 90
        },
88 91
        tooltip: {
@ -144,6 +147,35 @@ export default {
144 147
          animationEasing: 'cubicInOut'
145 148
        }]
146 149
      })
150
      if (this.historyM) {
151
        this.chart.setOption({
152
          dataZoom: [
153
            {
154
              type: 'slider',
155
              show: true,
156
              start: 94,
157
              end: 100,
158
              handleSize: 8
159
            },
160
            {
161
              type: 'inside',
162
              start: 94,
163
              end: 100
164
            },
165
            {
166
              type: 'slider',
167
              show: true,
168
              yAxisIndex: 0,
169
              filterMode: 'empty',
170
              width: 12,
171
              height: '70%',
172
              handleSize: 8,
173
              showDataShadow: false,
174
              left: '98%'
175
            }
176
          ]
177
        })
178
      }
147 179
    },
148 180
    initChart() {
149 181
      this.chart = echarts.init(this.$el, 'macarons')