Showing
1 changed file
with
5 additions
and
3 deletions
| @@ -29,10 +29,11 @@ | @@ -29,10 +29,11 @@ | ||
| 29 | canvas2d | 29 | canvas2d |
| 30 | canvasId="daskujdhasljkdcnzjkdfhuoqwlqwjhkdsamjczxnmdasd123321" | 30 | canvasId="daskujdhasljkdcnzjkdfhuoqwlqwjhkdsamjczxnmdasd123321" |
| 31 | :chartData="chartData" | 31 | :chartData="chartData" |
| 32 | - :opts="{ xAxis: { disabled: true }, legend: { show: false } }" | 32 | + :ontouch="true" |
| 33 | + :opts="{ xAxis: { disabled: true, itemCount: 6, scrollShow: true }, legend: { show: false }, enableScroll: true }" | ||
| 33 | /> | 34 | /> |
| 34 | </view> | 35 | </view> |
| 35 | - <mescroll-empty v-if="!historyData.length"/> | 36 | + <mescroll-empty v-if="!historyData.length" /> |
| 36 | </view> | 37 | </view> |
| 37 | <view class="historyData-bottom" v-show="historyData.length"> | 38 | <view class="historyData-bottom" v-show="historyData.length"> |
| 38 | <view class="table"> | 39 | <view class="table"> |
| @@ -306,7 +307,8 @@ export default { | @@ -306,7 +307,8 @@ export default { | ||
| 306 | this.timeData.getTimeGap = ''; | 307 | this.timeData.getTimeGap = ''; |
| 307 | this.timeData.getType = ''; | 308 | this.timeData.getType = ''; |
| 308 | this.startTs = formatToDate(date[0], 'x'); | 309 | this.startTs = formatToDate(date[0], 'x'); |
| 309 | - this.endTs = formatToDate(date[date.length - 1], 'x'); | 310 | + // 最后时间的最后一秒 |
| 311 | + this.endTs = formatToDate(`${date[date.length - 1]} 23:59:59`, 'x'); | ||
| 310 | }, | 312 | }, |
| 311 | calendarClose() { | 313 | calendarClose() { |
| 312 | this.showCalendar = false; | 314 | this.showCalendar = false; |