|
@@ -177,8 +177,8 @@
|
|
<text></text>
|
|
<text></text>
|
|
<text>报警通知</text>
|
|
<text>报警通知</text>
|
|
</view>
|
|
</view>
|
|
- <view class="note_li" style="margin-top:20rpx;" v-for="(item,index) in form.userLogVoList" :key="index">
|
|
|
|
- <text>{{item.name}}</text>
|
|
|
|
|
|
+ <view class="note_li-box" style="margin-top:20rpx;" v-for="(item,index) in form.userLogVoList" :key="index">
|
|
|
|
+ <text class="note-li-r-1">{{item.name}}</text>
|
|
<view class="note_li_r-2" v-if="item.isSuccess==1">
|
|
<view class="note_li_r-2" v-if="item.isSuccess==1">
|
|
<img :src="imagesUrl('commonality/icon_yjxx_ytz.png')" />
|
|
<img :src="imagesUrl('commonality/icon_yjxx_ytz.png')" />
|
|
<text>{{item.alarmType==1?'电话':'短信'}}已通知</text>
|
|
<text>{{item.alarmType==1?'电话':'短信'}}已通知</text>
|
|
@@ -787,42 +787,53 @@
|
|
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
|
border-radius: 20rpx 20rpx 20rpx 20rpx;
|
|
padding-bottom: 16rpx;
|
|
padding-bottom: 16rpx;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
-
|
|
|
|
- .note_li {
|
|
|
|
|
|
+ .note_li-box{
|
|
display: flex;
|
|
display: flex;
|
|
- justify-content: space-between;
|
|
|
|
margin: 0 30rpx;
|
|
margin: 0 30rpx;
|
|
-
|
|
|
|
- >text:nth-of-type(1) {
|
|
|
|
|
|
+ .note-li-r-1{
|
|
font-size: 28rpx;
|
|
font-size: 28rpx;
|
|
font-family: PingFang SC-Medium, PingFang SC;
|
|
font-family: PingFang SC-Medium, PingFang SC;
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
color: #333333;
|
|
color: #333333;
|
|
line-height: 60rpx;
|
|
line-height: 60rpx;
|
|
|
|
+ flex: 1 !important;;
|
|
}
|
|
}
|
|
-
|
|
|
|
- .note_li_r {
|
|
|
|
- width:140rpx;
|
|
|
|
|
|
+ .note_li_r-2 {
|
|
|
|
+ width:190rpx;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: flex-start;
|
|
justify-content: flex-start;
|
|
align-items: center;
|
|
align-items: center;
|
|
-
|
|
|
|
|
|
+
|
|
>img {
|
|
>img {
|
|
width: 28rpx;
|
|
width: 28rpx;
|
|
height: 28rpx;
|
|
height: 28rpx;
|
|
margin-right: 10rpx;
|
|
margin-right: 10rpx;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
font-size: 28rpx;
|
|
font-size: 28rpx;
|
|
font-family: PingFang SC-Medium,
|
|
font-family: PingFang SC-Medium,
|
|
PingFang SC;
|
|
PingFang SC;
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
color: #0183FA;
|
|
color: #0183FA;
|
|
line-height: 60rpx;
|
|
line-height: 60rpx;
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ .note_li {
|
|
|
|
+ display: flex;
|
|
|
|
+ justify-content: space-between;
|
|
|
|
+ margin: 0 30rpx;
|
|
|
|
|
|
|
|
+ >text:nth-of-type(1) {
|
|
|
|
+ font-size: 28rpx;
|
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
|
+ font-weight: 400;
|
|
|
|
+ color: #333333;
|
|
|
|
+ line-height: 60rpx;
|
|
}
|
|
}
|
|
- .note_li_r-2 {
|
|
|
|
- width:220rpx;
|
|
|
|
|
|
+
|
|
|
|
+ .note_li_r {
|
|
|
|
+ width:140rpx;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: flex-start;
|
|
justify-content: flex-start;
|
|
align-items: center;
|
|
align-items: center;
|