Commit 056b6bdf18509b309d28914ad7bdaf600fc96301
Merge branch 'fix/alarm-list-show' into 'main'
fix: 修复告警列表展示问题 See merge request yunteng/thingskit-app!117
Showing
1 changed file
with
3 additions
and
3 deletions
@@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
43 | </view> | 43 | </view> |
44 | <view class="item-text text-clip"> | 44 | <view class="item-text text-clip"> |
45 | <text | 45 | <text |
46 | - class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details.data) }}</text> | 46 | + class="text-muted">{{ item.details == null ? '暂无数据' : formatDetailText(item.details) }}</text> |
47 | </view> | 47 | </view> |
48 | <view class="item-text"> | 48 | <view class="item-text"> |
49 | <text class="text-muted"> | 49 | <text class="text-muted"> |
@@ -487,7 +487,7 @@ | @@ -487,7 +487,7 @@ | ||
487 | organizationName: e.organizationName, | 487 | organizationName: e.organizationName, |
488 | details: e.details, | 488 | details: e.details, |
489 | createdTime: e.createdTime, | 489 | createdTime: e.createdTime, |
490 | - status: e.status, | 490 | + status: e.status, |
491 | type: e.type | 491 | type: e.type |
492 | }; | 492 | }; |
493 | uni.navigateTo({ | 493 | uni.navigateTo({ |
@@ -496,7 +496,7 @@ | @@ -496,7 +496,7 @@ | ||
496 | }, | 496 | }, |
497 | formatDetailText(e) { | 497 | formatDetailText(e) { |
498 | //去除字符串双引号 | 498 | //去除字符串双引号 |
499 | - const jsonStr = JSON.stringify(e); | 499 | + const jsonStr = JSON.stringify(e.data?e.data:e); |
500 | const str = jsonStr.substring(1, jsonStr.length - 1); | 500 | const str = jsonStr.substring(1, jsonStr.length - 1); |
501 | const newStr = str.replace(/\"/g, ''); | 501 | const newStr = str.replace(/\"/g, ''); |
502 | return newStr; | 502 | return newStr; |