|
|
@@ -123,17 +123,6 @@
|
|
|
}}
|
|
|
</view>
|
|
|
</view>
|
|
|
-<<<<<<< HEAD
|
|
|
- <view
|
|
|
- class="shareTitleTwo"
|
|
|
- v-if="alarmRetentionLists.length == 1"
|
|
|
- >
|
|
|
- <view class="shareTitle">
|
|
|
- {{ alarmRetentionLists[0].devName }}检测到有{{
|
|
|
- getEventTypeName(alarmRetentionLists[0].eventType)
|
|
|
- }}
|
|
|
- </view>
|
|
|
-=======
|
|
|
<view class="shareTitleTwo" v-else>
|
|
|
<template v-if="alarmRetentionLists.length == 1">
|
|
|
<view class="shareTitle">
|
|
|
@@ -144,7 +133,6 @@
|
|
|
}}
|
|
|
</view>
|
|
|
</template>
|
|
|
->>>>>>> twoMqtt
|
|
|
</view>
|
|
|
</view>
|
|
|
<image src="../../static/arrFour.png" class="warmImage"></image>
|
