|
|
@@ -63,22 +63,14 @@ export default {
|
|
|
confirmLoading: false,
|
|
|
queryParam: {
|
|
|
searchType: '1',
|
|
|
- createdTimeEnd: this.BaseTool.Date.formatter(new Date(), this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
|
|
|
+ createdTimeEnd: ''
|
|
|
},
|
|
|
remoteOpc: null,
|
|
|
positionNum: null,
|
|
|
chart1: null,
|
|
|
dataList: [
|
|
|
{ time: '2009/7/20 0:00', value: 32, type: 'aa' },
|
|
|
- { time: '2009/7/20 1:00', value: 8, type: 'bb' },
|
|
|
- { time: '2009/7/20 2:00', value: 28, type: 'aa' },
|
|
|
- { time: '2009/7/20 2:00', value: 6, type: 'bb' },
|
|
|
- { time: '2009/7/20 4:00', value: 5, type: 'aa' },
|
|
|
- { time: '2009/7/20 4:00', value: 13, type: 'bb' },
|
|
|
- { time: '2009/7/20 6:00', value: 12, type: 'aa' },
|
|
|
- { time: '2009/7/20 6:00', value: 31, type: 'bb' },
|
|
|
- { time: '2009/7/20 8:00', value: 1, type: 'aa' },
|
|
|
- { time: '2009/7/20 8:00', value: 16, type: 'bb' }
|
|
|
+ { time: '2009/7/20 1:00', value: 8, type: 'bb' }
|
|
|
]
|
|
|
}
|
|
|
},
|
|
|
@@ -116,10 +108,12 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
const data = []
|
|
|
- res.data.filter(item => data.push({ time: item.createdTime, value: item.result, type: this.remoteOpc.sbName }))
|
|
|
+ res.data.forEach(item => data.push({ time: item.createdTime, value: item.result, type: this.remoteOpc.sbName }))
|
|
|
this.dataList = data
|
|
|
if (this.dataList != null && this.dataList.length > 0) {
|
|
|
- this.createChart(this.dataList)
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.createChart(this.dataList)
|
|
|
+ })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -173,10 +167,10 @@ export default {
|
|
|
},
|
|
|
handleCancel (e) {
|
|
|
console.log('Clicked cancel button')
|
|
|
- this.chart1 && this.chart1.destroy()
|
|
|
+ this.dataList = []
|
|
|
this.queryParam = {
|
|
|
- searchType: '1'
|
|
|
-
|
|
|
+ searchType: '1',
|
|
|
+ createdTimeEnd: ''
|
|
|
}
|
|
|
this.visible = false
|
|
|
}
|
