Showing
1 changed file
with
10 additions
and
4 deletions
| ... | ... | @@ -44,7 +44,10 @@ |
| 44 | 44 | </text> |
| 45 | 45 | </view> |
| 46 | 46 | </view> |
| 47 | - <view>{{ Object.entries(item.details.data)[0][0] }} : <text style="font-weight: bold; margin-left:4rpx;">{{ Object.entries(item.details.data)[0][1] }}</text></view> | |
| 47 | + <view> | |
| 48 | + {{ Object.entries(item.details.data)[0][0] }} : | |
| 49 | + <text style="font-weight: bold; margin-left:4rpx;">{{ Object.entries(item.details.data)[0][1] }}</text> | |
| 50 | + </view> | |
| 48 | 51 | <view v-if="item.status"> |
| 49 | 52 | 告警状态:{{ |
| 50 | 53 | item.status === 'CLEARED_UNACK' ? '清除未确认' : item.status === 'CLEARED_ACK' ? '清除已确认' : item.status === 'ACTIVE_UNACK' ? '激活未确认' : '激活已确认' |
| ... | ... | @@ -55,8 +58,8 @@ |
| 55 | 58 | </view> |
| 56 | 59 | </mescroll-body> |
| 57 | 60 | <!-- 告警筛选 --> |
| 58 | - <u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"> | |
| 59 | - <view class="filter"> | |
| 61 | + <u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20" @touchmove.stop.prevent="disabledScroll"> | |
| 62 | + <view class="filter" @touchmove.stop.prevent="disabledScroll"> | |
| 60 | 63 | <view class="filter-title"><text>筛选条件</text></view> |
| 61 | 64 | <FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem> |
| 62 | 65 | <FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem> |
| ... | ... | @@ -208,7 +211,7 @@ export default { |
| 208 | 211 | { |
| 209 | 212 | checked: false, |
| 210 | 213 | name: '近一天', |
| 211 | - type: '1440000' | |
| 214 | + type: '86400000' | |
| 212 | 215 | } |
| 213 | 216 | ], |
| 214 | 217 | downOption: { |
| ... | ... | @@ -221,6 +224,9 @@ export default { |
| 221 | 224 | }; |
| 222 | 225 | }, |
| 223 | 226 | methods: { |
| 227 | + disabledScroll(){ | |
| 228 | + return; | |
| 229 | + }, | |
| 224 | 230 | /*下拉刷新的回调 */ |
| 225 | 231 | downCallback() { |
| 226 | 232 | //联网加载数据 | ... | ... |