Merge branch 'master' of http://152.136.206.27:3000/dongjh/guan_client

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

@@ -276,21 +276,32 @@ export default {
       if(data.length === 0){
         return
       }
-      // 获取第一个时间
-      var isDelete = false
-      if(data.find(item => item.name === '当前温度值')){
+      var isWenduDelete = false
+      if(data.find(item => item.name === '温度实值-实时')){
+        // 获取第一个时间
         var startTime = data.filter(item => item.name === '温度实值-实时')[0].subList[0].logtime
+        // 获取最新时间
         var endTime = data.filter(item => item.name === '当前温度值')[0].subList[0].logtime
-        isDelete = this.getTimeDifference(startTime, endTime)
+        // 判断间隔是否大于4小时
+        isWenduDelete = this.getTimeDifference(startTime, endTime)
       }
-      // 获取最新时间
       var wendu = data.filter(item => item.name === '温度实值-实时' || item.name === '当前温度值')
       var nWendu = []
       for (let i = 0; i < wendu.length; i++) {
         const element = wendu[i];
         var item = element.subList
         nWendu = [...nWendu, ...item]
-        if(isDelete){nWendu.shift()}
+        console.log('isWenduDelete', isWenduDelete)
+        if(isWenduDelete){nWendu.shift()}
+      }
+      var isShiduDelete = false
+      if(data.find(item => item.name === '湿度实值-实时')){
+        // 获取第一个时间
+        var startTime = data.filter(item => item.name === '湿度实值-实时')[0].subList[0].logtime
+        // 获取最新时间
+        var endTime = data.filter(item => item.name === '当前湿度值')[0].subList[0].logtime
+        // 判断间隔是否大于4小时
+        isShiduDelete = this.getTimeDifference(startTime, endTime)
       }
       var shidu = data.filter(item => item.name === '湿度实值-实时' || item.name === '当前湿度值')
       var nShidu = []
@@ -298,6 +309,7 @@ export default {
         const element = shidu[i];
         var item = element.subList
         nShidu = [...nShidu, ...item]
+        if(isShiduDelete){nShidu.shift()}
       }
       // var fushe = data.find(item => item.name === '辐射强度值-实时')
       // var time = data.find(item => item.name === '实时曲线-时间分布')