枪添加属性

pages/deviceTab/bindLock.vue

@@ -221,7 +221,7 @@
 				API.add( this.bindInfo ).then((res) => {
 				
 					uni.redirectTo({
-						url:"/pages/mylock/bindLockStatus?id="+res.applicationRecord.id
+						url:"/pages/mylock/bindLockStatus?id="+res.data.applicationRecord.id
 					})
 						uni.hideLoading();
 					

pages/deviceTab/dataLock.vue

@@ -36,6 +36,9 @@
 						</view>
 						<view class="line">
 							编号：{{info.lockNo}}
+						</view>
+						<view class="line" style="    color: #909399;">
+							更新时间：{{info.lastOnlineTime}}
 						</view>
 					</view>
 					<view class="value" v-if="0">
@@ -47,18 +50,22 @@
 				</view>
 				
 				<view class="top-span">
-					<!-- <view class="item-span">
+					<view class="item-span">
 						<img src="@/assets/img/topspan/span1.png">
 						<span>车位</span>
-						<span>空闲</span>
-					</view> -->
+						<span v-if="info.parkingStatus==1" style="color: #1677FF;" >有车</span>
+						<span v-else-if="info.parkingStatus==0" style="color: #00B962;" >无车</span>
+					</view>
 					<view class="item-span">
 						<img src="@/assets/img/topspan/span2.png">
 						<span>地锁</span>
 						<span  style="color: red;"
 						v-if="info.lockStatus==4||info.lockStatus==0">
 						错误</span>
-						<span v-else :class="info.lockStatus==1?'lockStatusX1':'lockStatusX2'" >{{info.lockStatus==1?'升起':'降落'}}</span>
+						<span v-else-if="info.lockStatus==1" style="color: #1677FF;"  >升起</span>
+						<span v-else-if="info.lockStatus==2" style="color: #00B962;"  >降落</span>
+						<span v-else   >其他</span>
+						
 					</view>
 					
 					<view class="item-span">
@@ -70,7 +77,22 @@
 					<view class="item-span">
 						<img src="@/assets/img/topspan/span4.png">
 						<span>网络</span>
-						<span  :class="info.status==1?'statusX1':'statusX2'" >{{info.status==0?'离线':'在线'}}</span>
+						
+						<span v-if="info.status==1" style="color: #00B962;" >在线</span>
+						<span v-else-if="info.status==0" style="color: red" >离线</span>
+						
+						
+					</view>
+					
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span5.png">
+						<span>雷达</span>
+						
+						
+						<span v-if="info.radarStatus==0" style="color: #00B962;" >正常</span>
+						<span v-else-if="info.radarStatus==1" style="color: red" >故障</span>
+						
+						
 					</view>
 				</view>
 			</view>
@@ -89,7 +111,7 @@
 							<view class="name">
 								使用率
 							</view>
-							<view class="value">
+							<view class="value" v-if="lockUsageRateData&&lockUsageRateData.usageRate">
 								{{lockUsageRateData.usageRate=='∞'?'/':lockUsageRateData.usageRate+'%'}}
 							</view>
 						</view>
@@ -729,13 +751,14 @@
 		onLoad(op) {
 			if(op.id){
 				this.id=op.id
+				this.init();
 			}
 			this.body0data.tabsFrom.showIndex=new Date().getFullYear()+'-'+(new Date().getMonth()+1)
 		},
 		onReady() {
-			if(this.id){
-				this.init();
-			}
+			// if(this.id){
+				
+			// }
 			
 		},
 		methods: {
@@ -1737,7 +1760,7 @@
 		.item-span{
 			    display: flex;
 			    align-items: center;
-				   
+				   margin-top: 4rpx;
 				width: 30%;
 				 font-size: 28rpx;
 				 span{

pages/deviceTab/deviceList.vue

@@ -38,7 +38,7 @@
 					</view>
 					<view class="goto">
 						<view class="dian" :class="'status'+item.status"></view>
-						<view  class="text" :class="'status'+item.status" >{{item.status==1?'在线':'离线'}}</view>
+						<view  class="text" :class="'statusText'+item.status" >{{item.status==1?'在线':'离线'}}</view>
 						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
 					</view>
 				</view>
@@ -67,8 +67,8 @@
 				
 			</view>
 			
-			<view class="floating-button" v-if="false"
-			  @click="gotoUrl('/pages/deviceTab/bindLock')">
+			<view class="floating-button" v-if="0"
+			  @click="gotoUrl('/pages/deviceTab/bindLock?companyId='+listForm.companyId)">
 				<view class="button">
 					<img class="img" src="@/assets/img/deviceTab/index2-2.svg" alt="">
 			
@@ -126,8 +126,8 @@
 			};
 		},
 		onLoad(op) {
-			if(op.id){
-				this.listForm.parkingId=op.id
+			if(op.companyId){
+				this.listForm.companyId=op.companyId
 			}
 			this.getList()
 		},
@@ -198,6 +198,10 @@
 							background-color: #4CAF50;
 							color:#4CAF50;
 						}
+						.statusText1{
+							
+							color:#4CAF50;
+						}
 						.text{
 							 margin-right: 16rpx;
 							 font-size: 24rpx;

pages/index/index.vue

@@ -185,7 +185,7 @@
 								</view>
 								<view class="goto">
 									<view  :class="'statusN statusN'+item.status">
-										{{item.statusN}}
+										{{item.status==1?'在线':'离线'}}
 											
 									</view>
 									<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>