|
@@ -187,17 +187,17 @@ export default {
|
|
alarmData: {
|
|
alarmData: {
|
|
handler(newValue, oldValue) {
|
|
handler(newValue, oldValue) {
|
|
// console.log('7878999',newValue, oldValue)
|
|
// console.log('7878999',newValue, oldValue)
|
|
-
|
|
|
|
var isYuan = newValue && newValue.length === 1 && newValue[0] === '原数据'
|
|
var isYuan = newValue && newValue.length === 1 && newValue[0] === '原数据'
|
|
if (isYuan) return
|
|
if (isYuan) return
|
|
- this.inform = newValue.map((res) => {
|
|
|
|
- return res.tagname
|
|
|
|
- })
|
|
|
|
- this.time = newValue.map((res) => {
|
|
|
|
- return res.logtime
|
|
|
|
- })
|
|
|
|
- this.showData()
|
|
|
|
-
|
|
|
|
|
|
+ if(newValue){
|
|
|
|
+ this.inform = newValue.map((res) => {
|
|
|
|
+ return res.tagname
|
|
|
|
+ })
|
|
|
|
+ this.time = newValue.map((res) => {
|
|
|
|
+ return res.logtime
|
|
|
|
+ })
|
|
|
|
+ this.showData()
|
|
|
|
+ }
|
|
// var hasAlarm = newValue
|
|
// var hasAlarm = newValue
|
|
// var options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric' };
|
|
// var options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric' };
|
|
// // this.information = hasAlarm ? newValue.tagname : '暂无数据'
|
|
// // this.information = hasAlarm ? newValue.tagname : '暂无数据'
|