diff --git a/page_user/upload.vue b/page_user/upload.vue index 4432505..7cc1481 100644 --- a/page_user/upload.vue +++ b/page_user/upload.vue @@ -455,7 +455,11 @@ } }) console.log(showObject,'showObjectshowObject'); - this.xinpin = showObject.showArray[showObject.showArray.length - 1] + if(this.ver == 'ver290' || this.ver == 'ver290'){ + this.xinpin = showObject.showArray[showObject.showArray.length - 1] + }else{ + this.xinpin = showObject.showArray[showObject.showArray.length - 2] + } } break; case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START: diff --git a/pages/index/index.vue b/pages/index/index.vue index 34c1245..78079f7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1950,8 +1950,13 @@ nextTimeDiff: this.xctime, prevTime: this.sctimejs }); - this.xinp = this.showobj.showArray[this.showobj.showArray.length - 2] - this.dianya = this.showobj.showArray[this.showobj.showArray.length - 1] + if(this.ver == 'ver290' || this.ver == 'ver280'){ + this.xinp = this.showobj.showArray[this.showobj.showArray.length - 2] + this.dianya = this.showobj.showArray[this.showobj.showArray.length - 1] + }else{ + this.xinp = this.showobj.showArray[this.showobj.showArray.length - 1] + this.dianya = 0 + } console.log('息屏',this.xinp,'电压',this.dianya); this.getdianliang()