Commit 9a34cc1956a74ce89a7ee382409cdb6f8edbce35
1 parent
f3aa509c
feat: mp android app两端,告警详情新增所属告警场景,和优化告警值内容太长,样式错乱
Showing
2 changed files
with
8 additions
and
2 deletions
| @@ -36,6 +36,11 @@ | @@ -36,6 +36,11 @@ | ||
| 36 | class="text-device-muted text-clip">{{ list.details == null ? '暂无数据' : formatDetailText(list.details.data) }}</text> | 36 | class="text-device-muted text-clip">{{ list.details == null ? '暂无数据' : formatDetailText(list.details.data) }}</text> |
| 37 | </view> | 37 | </view> |
| 38 | <view class="column"> | 38 | <view class="column"> |
| 39 | + <text class="text-org-bold">告警场景:</text> | ||
| 40 | + <text | ||
| 41 | + class="text-device-muted text-clip">{{ list.type == null ? '暂无数据' : list.type }}</text> | ||
| 42 | + </view> | ||
| 43 | + <view class="column"> | ||
| 39 | <text class="text-org-bold">告警时间:</text> | 44 | <text class="text-org-bold">告警时间:</text> |
| 40 | <text class="text-device-muted">{{ list.createdTime }}</text> | 45 | <text class="text-device-muted">{{ list.createdTime }}</text> |
| 41 | </view> | 46 | </view> |
| @@ -169,7 +174,7 @@ | @@ -169,7 +174,7 @@ | ||
| 169 | const jsonStr = JSON.stringify(e); | 174 | const jsonStr = JSON.stringify(e); |
| 170 | const str = jsonStr.substring(1, jsonStr.length - 1); | 175 | const str = jsonStr.substring(1, jsonStr.length - 1); |
| 171 | const newStr = str.replace(/\"/g, ''); | 176 | const newStr = str.replace(/\"/g, ''); |
| 172 | - return newStr; | 177 | + return newStr.slice(0,26); |
| 173 | } | 178 | } |
| 174 | } | 179 | } |
| 175 | }; | 180 | }; |
| @@ -481,7 +481,8 @@ | @@ -481,7 +481,8 @@ | ||
| 481 | organizationName: e.organizationName, | 481 | organizationName: e.organizationName, |
| 482 | details: e.details, | 482 | details: e.details, |
| 483 | createdTime: e.createdTime, | 483 | createdTime: e.createdTime, |
| 484 | - status: e.status | 484 | + status: e.status, |
| 485 | + type: e.type | ||
| 485 | }; | 486 | }; |
| 486 | uni.navigateTo({ | 487 | uni.navigateTo({ |
| 487 | url: '/alarmSubPage/alarmDetailPage/alarmDetail?data=' + JSON.stringify(obj) | 488 | url: '/alarmSubPage/alarmDetailPage/alarmDetail?data=' + JSON.stringify(obj) |