Merge branch 'develop' of http://code.nyzhwlw.com:10202/yf_zhb/bigdata_WX into develop

pages/bzy/components/deviceData.vue

@@ -365,8 +365,10 @@ export default {
           newVal.forEach(item=>{
             this.historyData.push(item.d_h_t)
           })
+          this.objItem = this.historyData[0]
+        }else{
+          this.objItem = {}
         }
-        this.objItem = this.historyData[0]
       },
       deep:true,
       immediate:true,

pages/scd/components/deviceData.vue

@@ -363,8 +363,10 @@ export default {
           newVal.forEach(item=>{
             this.historyData.push(item.d_h_t)
           })
+          this.objItem = this.historyData[0]
+        }else{
+          this.objItem = {}
         }
-        this.objItem = this.historyData[0]
       },
       deep:true,
       immediate:true,