luyanan 6 lat temu
rodzic
commit
65698605ca

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

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

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

30
    },
30
    },
31
    maxXcount: {
31
    maxXcount: {
32
      type: Number
32
      type: Number
33
    },
34
    historyM: { // 判断是否需要坐标轴上的滚动条
35
      type: Boolean
33
    }
36
    }
34
  },
37
  },
35
  data() {
38
  data() {
82
          left: 10,
85
          left: 10,
83
          right: 10,
86
          right: 10,
84
          bottom: 20,
87
          bottom: 20,
85
          top: 30,
88
          top: 50,
86
          containLabel: true
89
          containLabel: true
87
        },
90
        },
88
        tooltip: {
91
        tooltip: {
144
          animationEasing: 'cubicInOut'
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
    initChart() {
180
    initChart() {
149
      this.chart = echarts.init(this.$el, 'macarons')
181
      this.chart = echarts.init(this.$el, 'macarons')