Bläddra i källkod

增加新状态

zhengkaixin 3 veckor sedan
förälder
incheckning
43500befe6

+ 6 - 0
assets/img/topspan/span6.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1024 1024" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M512 49.548387c255.405419 0 462.451613 207.046194 462.451613 462.451613S767.405419 974.451613 512 974.451613 49.548387 767.405419 49.548387 512 256.594581 49.548387 512 49.548387z m0 66.064516C293.07871 115.612903 115.612903 293.07871 115.612903 512s177.465806 396.387097 396.387097 396.387097 396.387097-177.465806 396.387097-396.387097S730.92129 115.612903 512 115.612903zM332.122839 330.322581a33.032258 33.032258 0 0 1 32.090838 25.236645l54.618839 224.916645 57.575226-225.296516A33.032258 33.032258 0 0 1 508.416 330.322581h17.061161a33.032258 33.032258 0 0 1 32.008258 24.856774l57.575226 225.296516 54.618839-224.916645A33.032258 33.032258 0 0 1 701.786839 330.322581h12.684387a29.217032 29.217032 0 0 1 28.110451 37.194322l-85.80129 302.146065A33.032258 33.032258 0 0 1 625.003355 693.677419h-19.059613a33.032258 33.032258 0 0 1-32.008258-24.87329L517.169548 445.935484 459.974194 668.853677A33.032258 33.032258 0 0 1 427.982452 693.677419h-19.555097a33.032258 33.032258 0 0 1-31.777032-24.047484l-85.371871-302.113032A29.233548 29.233548 0 0 1 319.438452 330.322581h12.684387z" fill="rgba(157,162,169,1)" p-id="4554" stroke="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/topspan/span7.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <rect x="6" y="6" width="36" height="36" rx="3" fill="none" stroke="rgba(157,162,169,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></rect><path d="M12 25H15L19 14L22 36L27 23L31 29L34 25H37" stroke="rgba(157,162,169,1)" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" fill="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/topspan/span8.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1024 1024" width="14" height="14" style="" filter="none">
+    
+    <g>
+    <path d="M256.004 132.967C588.39 171.923 852.077 435.61 891.033 767.995L256 768z" fill="#848C97" p-id="5609"></path><path d="M170.667 42.667v810.666h810.666v85.334h-896v-896z" fill="#848C97" p-id="5610"></path>
+    </g>
+  </svg>

+ 67 - 29
pages/deviceTab/dataLock.vue

@@ -37,9 +37,7 @@
 						<view class="line">
 							编号:{{info.lockNo}}
 						</view>
-						<view class="line" style="    color: #909399;">
-							更新时间:{{info.lastOnlineTime}}
-						</view>
+						
 					</view>
 					<view class="value" v-if="0">
 						<u-button type="primary" size="mini" shape="circle">
@@ -53,47 +51,83 @@
 					<view class="item-span">
 						<img src="@/assets/img/topspan/span1.png">
 						<span>地锁</span>
-						<span v-if="info.parkingStatus==1" style="color: #1677FF;" >有车</span>
-						<span v-else-if="info.parkingStatus==0" style="color: #00B962;" >无车</span>
+						<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-if="info.lockStatus==1" style="color: #1677FF;"  >升起</span>
-						<span v-else-if="info.lockStatus==2" style="color: #00B962;"  >降落</span>
-						<span v-else   >其他</span>
-						
+						<span style="color: red;" v-if="info.lockStatus==4||info.lockStatus==0">
+							错误</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">
+						<img src="@/assets/img/topspan/span4.png">
+						<span>网络</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/span3.png">
 						<span>电压</span>
-						<span v-if="info.batteryLevel">{{info.batteryLevel}}V</span>
+						<span v-if="info.batteryLevel||info.batteryLevel==0">{{info.batteryLevel}}V</span>
 						<span v-else>未知</span>
 					</view>
+				
+				
+				
+				
+				
 					<view class="item-span">
-						<img src="@/assets/img/topspan/span4.png">
-						<span>网络</span>
-						
-						<span v-if="info.status==1" style="color: #00B962;" >在线</span>
-						<span v-else-if="info.status==0" style="color: red" >离线</span>
-						
-						
+						<img src="@/assets/img/topspan/span6.svg">
+						<span>电流</span>
+				
+				
+						<span v-if="info.ampere||info.ampere==0">{{info.ampere}}A</span>
+						<span v-else>未知</span>
 					</view>
-					
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span7.svg">
+						<span>功率</span>
+				
+				
+						<span v-if="info.power||info.power==0">{{info.power}}W</span>
+						<span v-else>未知</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>
-						
-						
+				
+				
+						<span v-if="info.radarStatus==0" style="color: #00B962;">正常</span>
+						<span v-else-if="info.radarStatus==1" style="color: red">故障</span>
+				
+				
+					</view>
+				
+					<view class="item-span">
+						<img src="@/assets/img/topspan/span8.svg">
+						<span>限位器</span>
+				
+				
+						<span v-if="info.lockStatus==1||info.lockStatus==2||info.lockStatus==3"
+							style="color: #00B962;">正常</span>
+						<span v-else style="color: red">故障</span>
+				
+					</view>
+				
+				
+					<view class="line" style="    color: #909399;">
+						更新时间:{{info.lastOnlineTime}}
 					</view>
+				
 				</view>
 			</view>
 			<view class=" no_statistics">
@@ -1787,11 +1821,15 @@
 	
 		padding-top: 16rpx;
 		margin-top: 16rpx;
+		.line{
+			margin-top: 8rpx;
+			font-size: 24rpx;
+		}
 		.item-span{
 			white-space: pre;
 			    display: flex;
 			    align-items: center;
-				   margin-top: 4rpx;
+				margin-top: 8rpx;
 				width: 33%;
 				 font-size: 28rpx;
 				 span{