于涵——判断实时曲线超四小时自动删除

src/views/modules_guAn/visualization/modules/EquipmentInfo.vue

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

src/views/modules_guAn/visualization/modules/RealTimeCurve.vue

@@ -277,9 +277,9 @@ export default {
         return
       }
       var isWenduDelete = false
-      if(data.find(item => item.name === '温度实值-实时')){
+      if(data.find(item => item.name === '当前温度值')){
         // 获取第一个时间
-        var startTime = data.filter(item => item.name === '温度实值-实时')[0].subList[0].logtime
+        var startTime = data.filter(item => item.name === '湿度实值-实时')[0].subList[0].logtime
         // 获取最新时间
         var endTime = data.filter(item => item.name === '当前温度值')[0].subList[0].logtime
         // 判断间隔是否大于4小时
@@ -295,7 +295,7 @@ export default {
         if(isWenduDelete){nWendu.shift()}
       }
       var isShiduDelete = false
-      if(data.find(item => item.name === '湿度实值-实时')){
+      if(data.find(item => item.name === '当前湿度值')){
         // 获取第一个时间
         var startTime = data.filter(item => item.name === '湿度实值-实时')[0].subList[0].logtime
         // 获取最新时间