Commit 1d4b60528fa7d052e0ff14a8f431263370c7e64d
1 parent
cfb34e50
fix:修改告警筛选页面弹窗滚动问题,修改告警详情处理和清除按钮居中
Showing
2 changed files
with
27 additions
and
3 deletions
@@ -71,11 +71,26 @@ | @@ -71,11 +71,26 @@ | ||
71 | </view> | 71 | </view> |
72 | <!-- #endif --> | 72 | <!-- #endif --> |
73 | <view style="margin-top: 44rpx;display: flex;align-items: center;justify-content: space-between;"> | 73 | <view style="margin-top: 44rpx;display: flex;align-items: center;justify-content: space-between;"> |
74 | - <view v-if="list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx"> | 74 | + <view |
75 | + :style="[ | ||
76 | + { position: list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK' ? 'relative' : '' }, | ||
77 | + { right: list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK' ? '-210rpx' : '' } | ||
78 | + ]" | ||
79 | + v-if="list.status !== 'CLEARED_ACK' && list.status !== 'ACTIVE_ACK'" | ||
80 | + class="u-flex" | ||
81 | + style="width: 260rpx" | ||
82 | + > | ||
75 | <u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button> | 83 | <u-button @click="handleSubmit" type="primary" shape="circle" text="处理"></u-button> |
76 | </view> | 84 | </view> |
77 | <view style="width: 30rpx;"></view> | 85 | <view style="width: 30rpx;"></view> |
78 | - <view v-if="list.status == 'ACTIVE_ACK'" class="u-flex" style="width: 260rpx"><u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button></view> | 86 | + <view |
87 | + :style="[{ position: list.status == 'ACTIVE_ACK' ? 'relative' : '' }, { right: list.status == 'ACTIVE_ACK' ? '207rpx' : '' }]" | ||
88 | + v-if="list.status == 'ACTIVE_ACK'" | ||
89 | + class="u-flex" | ||
90 | + style="width: 260rpx" | ||
91 | + > | ||
92 | + <u-button @click="handleRemove" type="error" shape="circle" text="清除"></u-button> | ||
93 | + </view> | ||
79 | </view> | 94 | </view> |
80 | </view> | 95 | </view> |
81 | </template> | 96 | </template> |
1 | <template> | 1 | <template> |
2 | - <view class="alert-page"> | 2 | + <view class="alert-page" :class="show ? 'pop-no-scroll' : ''"> |
3 | <!-- 公共组件-每个页面必须引入 --> | 3 | <!-- 公共组件-每个页面必须引入 --> |
4 | <public-module></public-module> | 4 | <public-module></public-module> |
5 | <!-- 吸顶组件 --> | 5 | <!-- 吸顶组件 --> |
@@ -278,6 +278,9 @@ export default { | @@ -278,6 +278,9 @@ export default { | ||
278 | } | 278 | } |
279 | }, | 279 | }, |
280 | methods: { | 280 | methods: { |
281 | + moveHandle() { | ||
282 | + return false; | ||
283 | + }, | ||
281 | inputChanged(e) { | 284 | inputChanged(e) { |
282 | this.resetData(); | 285 | this.resetData(); |
283 | this.topBack(); | 286 | this.topBack(); |
@@ -514,4 +517,10 @@ export default { | @@ -514,4 +517,10 @@ export default { | ||
514 | /deep/ .uni-calendar--fixed { | 517 | /deep/ .uni-calendar--fixed { |
515 | bottom: 172rpx !important; | 518 | bottom: 172rpx !important; |
516 | } | 519 | } |
520 | +.pop-no-scroll { | ||
521 | + overflow: hidden; | ||
522 | + position: fixed; | ||
523 | + height: 100%; | ||
524 | + width: 100%; | ||
525 | +} | ||
517 | </style> | 526 | </style> |