Commit cd0435b8ab2e35d6c592aa3d9248e20dd5417db8
Merge branch 'fix/DEFECT-1337' into 'main_dev'
fix: 小程序设备命令记录筛选条件只有成功和失败,而且筛选出来都为空 See merge request yunteng/thingskit-app!106
Showing
1 changed file
with
5 additions
and
4 deletions
... | ... | @@ -303,8 +303,9 @@ |
303 | 303 | const formatS = curTime.getTime(); |
304 | 304 | let addMinute = new Date(curTime.setMinutes(curTime.getMinutes() - this.selectTimeVal)); |
305 | 305 | const formatE = addMinute.getTime(); |
306 | - this.timeData.getTimeGapS = formatS; | |
307 | - this.timeData.getTimeGapE = formatE; | |
306 | + this.timeData.getTimeGapS = i>0?formatS:''; | |
307 | + this.timeData.getTimeGapE = i>0?formatE:''; | |
308 | + console.log(this.timeData.getTimeGapS,'this.timeData.getTimeGapS',this.timeData.getTimeGapE) | |
308 | 309 | }, |
309 | 310 | queryData() { |
310 | 311 | this.topBack(); |
... | ... | @@ -345,8 +346,8 @@ |
345 | 346 | this.current4 = 0; |
346 | 347 | this.selectTimeVal = ''; |
347 | 348 | this.timeData.selectTime = []; |
348 | - this.timeDatagetTimeGapS = ''; | |
349 | - this.timeDatagetTimeGapE = ''; | |
349 | + this.timeData.getTimeGapS = ''; | |
350 | + this.timeData.getTimeGapE = ''; | |
350 | 351 | this.range = []; |
351 | 352 | this.searchAlarmText = ''; |
352 | 353 | this.startTimeVa = ''; | ... | ... |