Showing
3 changed files
with
22 additions
and
12 deletions
@@ -29,17 +29,17 @@ | @@ -29,17 +29,17 @@ | ||
29 | <u-line length="90%" margin="0 auto" v-if="commandDetail.additionalInfo.cmdType"></u-line> | 29 | <u-line length="90%" margin="0 auto" v-if="commandDetail.additionalInfo.cmdType"></u-line> |
30 | <view class="detail-item"> | 30 | <view class="detail-item"> |
31 | <view class="detail-label">响应类型</view> | 31 | <view class="detail-label">响应类型</view> |
32 | - <view class="detail-value">{{commandDetail.request.oneway?'oneway':'towway'}}</view> | 32 | + <view class="detail-value">{{ commandDetail.request.oneway ? 'oneway' : 'towway' }}</view> |
33 | </view> | 33 | </view> |
34 | <u-line length="90%" margin="0 auto"></u-line> | 34 | <u-line length="90%" margin="0 auto"></u-line> |
35 | <view class="detail-item"> | 35 | <view class="detail-item"> |
36 | <view class="detail-label">下发结果</view> | 36 | <view class="detail-label">下发结果</view> |
37 | - <view class="detail-value">{{commandDetail.status==='SUCCESSFUL'?'成功':'失败'}}</view> | 37 | + <view class="detail-value">{{ commandDetail.status === 'SUCCESSFUL' ? '成功' : '失败' }}</view> |
38 | </view> | 38 | </view> |
39 | <u-line length="90%" margin="0 auto"></u-line> | 39 | <u-line length="90%" margin="0 auto"></u-line> |
40 | <view class="detail-item"> | 40 | <view class="detail-item"> |
41 | <view class="detail-label">响应结果</view> | 41 | <view class="detail-label">响应结果</view> |
42 | - <view class="detail-value">{{commandDetail.response?'成功':'失败'}}</view> | 42 | + <view class="detail-value">{{ commandDetail.response ? '成功' : '失败' }}</view> |
43 | </view> | 43 | </view> |
44 | </view> | 44 | </view> |
45 | <view class="command">命令内容</view> | 45 | <view class="command">命令内容</view> |
@@ -70,14 +70,13 @@ export default { | @@ -70,14 +70,13 @@ export default { | ||
70 | format(date) { | 70 | format(date) { |
71 | return formatToDate(date, 'YYYY-MM-DD HH:mm:ss'); | 71 | return formatToDate(date, 'YYYY-MM-DD HH:mm:ss'); |
72 | }, | 72 | }, |
73 | - formatValue(value){ | ||
74 | - return JSON.stringify(value) | 73 | + formatValue(value) { |
74 | + return JSON.stringify(value); | ||
75 | } | 75 | } |
76 | }, | 76 | }, |
77 | onLoad(options) { | 77 | onLoad(options) { |
78 | const { data } = options; | 78 | const { data } = options; |
79 | this.commandDetail = JSON.parse(data); | 79 | this.commandDetail = JSON.parse(data); |
80 | - console.log(this.commandDetail, '---------'); | ||
81 | } | 80 | } |
82 | }; | 81 | }; |
83 | </script> | 82 | </script> |
@@ -39,7 +39,15 @@ | @@ -39,7 +39,15 @@ | ||
39 | }" | 39 | }" |
40 | > | 40 | > |
41 | {{ | 41 | {{ |
42 | - item.severity === 'CRITICAL' ? '危险' : item.severity === 'MAJOR' ? '重要' : item.severity === 'MINOR' ? '次要' : item.severity === 'WARNING' ? '警告' : '不确定' | 42 | + item.severity === 'CRITICAL' |
43 | + ? '危险' | ||
44 | + : item.severity === 'MAJOR' | ||
45 | + ? '重要' | ||
46 | + : item.severity === 'MINOR' | ||
47 | + ? '次要' | ||
48 | + : item.severity === 'WARNING' | ||
49 | + ? '警告' | ||
50 | + : '不确定' | ||
43 | }} | 51 | }} |
44 | </text> | 52 | </text> |
45 | </view> | 53 | </view> |
@@ -50,7 +58,13 @@ | @@ -50,7 +58,13 @@ | ||
50 | </view> | 58 | </view> |
51 | <view v-if="item.status"> | 59 | <view v-if="item.status"> |
52 | 告警状态:{{ | 60 | 告警状态:{{ |
53 | - item.status === 'CLEARED_UNACK' ? '清除未确认' : item.status === 'CLEARED_ACK' ? '清除已确认' : item.status === 'ACTIVE_UNACK' ? '激活未确认' : '激活已确认' | 61 | + item.status === 'CLEARED_UNACK' |
62 | + ? '清除未确认' | ||
63 | + : item.status === 'CLEARED_ACK' | ||
64 | + ? '清除已确认' | ||
65 | + : item.status === 'ACTIVE_UNACK' | ||
66 | + ? '激活未确认' | ||
67 | + : '激活已确认' | ||
54 | }} | 68 | }} |
55 | </view> | 69 | </view> |
56 | <view class="time">{{ item.createdTime }}</view> | 70 | <view class="time">{{ item.createdTime }}</view> |
@@ -261,7 +275,6 @@ export default { | @@ -261,7 +275,6 @@ export default { | ||
261 | .then(res => { | 275 | .then(res => { |
262 | this.total = res.total; | 276 | this.total = res.total; |
263 | uni.stopPullDownRefresh(); | 277 | uni.stopPullDownRefresh(); |
264 | - console.log('获取后端数据', res); | ||
265 | //方法一(推荐): 后台接口有返回列表的总页数 totalPage | 278 | //方法一(推荐): 后台接口有返回列表的总页数 totalPage |
266 | this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数) | 279 | this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数) |
267 | if (pageNo == 1) { | 280 | if (pageNo == 1) { |
@@ -116,9 +116,7 @@ export default { | @@ -116,9 +116,7 @@ export default { | ||
116 | // 隐藏原生的tabbar | 116 | // 隐藏原生的tabbar |
117 | uni.hideTabBar(); | 117 | uni.hideTabBar(); |
118 | }, | 118 | }, |
119 | - mounted() { | ||
120 | - console.log(this.deviceDetail); | ||
121 | - }, | 119 | + mounted() {}, |
122 | methods: { | 120 | methods: { |
123 | showModal() { | 121 | showModal() { |
124 | this.showModel = true; | 122 | this.showModel = true; |