于涵王雅慧——数据优化

src/views/modules_guAn/visualization/index.vue

@@ -146,7 +146,7 @@ export default {
   },
   data () {
     return {
-      titleName: '',
+      titleName: '高温高湿试验项目',
       eqRealData: [],
       yuzhiData: [],
       yuzhiMarkData: [],
@@ -252,12 +252,26 @@ export default {
       console.log(66666,redata)
       // 接收数据之后操作
       this.eqRealData = redata['设备实时值']
+      if (redata['设备实时值']) {
+        var titleObj = redata['设备实时值'].find(item => item.Name === '试验名称')
+        console.log('我要找名字',titleObj.Value)
+        if(titleObj != -1){this.titleName = titleObj.Value}
+      } 
       // this.curveData = redata['设备历史值'] // 原来第一版后端传数格式
-      this.realTimeData = [...this.realTimeData, ...redata['实时曲线']]
-      this.fullData = [...this.fullData, ...redata['全程曲线']]
+      if(redata['预制曲线']) {
+        this.realTimeData = redata['实时曲线']
+        this.fullData = redata['全程曲线']
+      } else {
+        this.realTimeData = [...this.realTimeData, ...redata['实时曲线']]
+        this.fullData = [...this.fullData, ...redata['全程曲线']]
+      }
       if(this.isFullWebSocket){
         // this.fullModelData = redata['设备历史值'] // 原来第一版后端传数格式
-        this.fullModelData = [...this.fullModelData, ...redata['全程曲线']]
+        if (redata['预制曲线']) {
+          this.fullModelData = redata['全程曲线']
+        } else {
+          this.fullModelData = [...this.fullModelData, ...redata['全程曲线']]
+        }
       }
       // 旧版本
       // this.newAlarmData = redata['最新一条报警信息']
@@ -268,9 +282,9 @@ export default {
       if(redata['预制曲线'].length > 0) {this.yuzhiData = redata['预制曲线']}
       if(redata['预制曲线线段'].length > 0) {this.yuzhiMarkData = redata['预制曲线线段']}
       // this.$refs.yuzhiCurve.markData = this.yuzhiMarkData
-      var titleObj = redata['设备实时值'].find(item => item.Name === '试验名称')
-      console.log(titleObj)
-      this.titleName = titleObj ? titleObj.Value : '高温高湿试验项目'
+      // var titleObj = redata['设备实时值'].find(item => item.Name === '试验名称')
+      // console.log(titleObj)
+      // this.titleName = titleObj ? titleObj.Value : '高温高湿试验项目'
     },
     // websocket连接后发送数据(send发送)
     websocketonopen () {