wy

components/PannelTitle/PannelTitle.vue

@@ -7,11 +7,14 @@
 		<view class="frame" @click="words=='车牌号'?ShowEditCar(value):''">
 			<span :class="[Isblue?'frameText':flag?'':'isflag']">{{value || '—'}}</span>
 			<view class="shinning"></view>
+			
 		</view>
 		<view v-if="words=='车牌号'" @click="refresh" class="submit">刷新</view>
 		<view v-if="words=='在线车辆'" @click="handleCarShow" class="submit">查看</view>
-		<view class="submit" v-if="words=='解锁状态'" @click="HandlerDownLock">解锁</view>
-		<view class="submit" v-if="words=='解锁状态'" @click="HandleOnLock">上锁</view>
+		<view class="btnBox">
+			<view class="submit" v-if="words=='解锁状态'" @click="HandlerDownLock">解锁</view>
+			<view class="submit unlock" v-if="words=='解锁状态'" @click="HandleOnLock">上锁</view>
+		</view>
 	</view>
 </template>
 
@@ -108,6 +111,7 @@
 		display: flex;
 		width: 100%;
 		align-items: center;
+		position: relative;
 		.circle {
 			width: 24px;
 			height: 24px;
@@ -126,11 +130,13 @@
 			text-shadow: 0px 0px 4px rgba(39,69,201,0.5);
 		}
 		.carTitle{
-			width: 68px !important;
+			width: 75px !important;
 		}
 		.frameText {
 			color: #C7D2DF;
 			text-shadow: 0px 0px 4px #0027D8;
+			position: relative;
+			left: -4px;
 		}
 	
 		.frame {
@@ -203,4 +209,19 @@
 			}
 		}
 	}
+	.btnBox{
+		display: flex;
+		position: absolute;
+		right: 0;
+		.submit{
+			width: 45px;
+			height: 26px;
+			line-height: 26px;
+			margin-left: 0px;
+			margin-right: 10px;
+		}
+		.unlock{
+			margin-right: 0px;
+		}
+	}
 </style>

pages/equipment-monitoring/components/StorageInfo.vue

@@ -33,7 +33,7 @@
                     <BatteryInfo :num="chargerInfoVo.demandVoltage" unit="V" text="需求电压"></BatteryInfo>
                     <BatteryInfo :num="chargerInfoVo.chgCurrent" unit="A" text="充电电流"></BatteryInfo>
                     <BatteryInfo :num="chargerInfoVo.chgVoltage" unit="V" text="充电电压"></BatteryInfo>
-                    <BatteryInfo :num="chargerInfoVo.chgCapacity" unit="kwh" text="累计充电电量"></BatteryInfo>
+                    <BatteryInfo :num="chargerInfoVo.chgCapacity" unit="kWh" text="累计充电电量"></BatteryInfo>
                     <view class="info-right" :style="chargerColor">
                         <image class="s1" :src="require('../../../static/equipment/'+`s${chargerState[0]}`+'.png')"><text>{{chargerState[1]}}</text>
                     </view>

pages/equipment-monitoring/components/chargerDrawe.vue

@@ -1,28 +1,28 @@
 <template>
 	<view>
 		<uni-forms :modelValue="infodata">
-			<uni-forms-item label="连接状态:" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="连接状态:" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.comState==1?'通讯正常':'通讯异常' || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
-			<uni-forms-item label="落座信号:" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="落座信号:" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.storeState ==0?'空仓':infodata.storeState ==1?'有电池':'连接异常'" placeholder="请输入" disabled/>
 			</uni-forms-item>
-			<uni-forms-item label="充电状态:" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="充电状态:" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.title || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
-			<uni-forms-item label="充电电压(V):" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="充电电压(V):" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.chgVoltage || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
-			<uni-forms-item label="充电电流(A):" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="充电电流(A):" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.chgCurrent || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
-			<uni-forms-item label="充电电量(kwh):" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="累计充电电量(kWh):" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.chgCapacity || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
 			<!-- <uni-forms-item label="已充时长:" name="name" label-align="right" label-width="120px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.name || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item> -->
-			<uni-forms-item label="充满预计还需:" name="name" label-align="right" label-width="120px">
+			<uni-forms-item label="充满预计还需:" name="name" label-align="right" label-width="140px">
 				<uni-easyinput type="text" v-model="infodata.chargerInfoVo.chgEstimatedTime || '-'" placeholder="请输入" disabled/>
 			</uni-forms-item>
 		</uni-forms>

pages/power-changer/index.scss

@@ -41,10 +41,10 @@ $titColor:#192233;
 		display: flex;
 		justify-content: space-between;
 		.carInfo{
-			width: 564px !important;
+			width: 584px !important;
 		}
 		.machineStatus {
-			width: 460px;
+			width: 440px;
 			height: 230px;
 			background-color: #111827;
 			display: flex;

pages/power-changer/index.vue

@@ -36,7 +36,7 @@
 				<view class="bottom">
 					<view class="list">
 						<view class="carLeft">
-							<PannelTitle words="车牌号" :value="vehicleInfo.plate" Isblue="true" :circle="false"
+							<PannelTitle words="车牌号" :value="vehicleInfo.plate" Isblue="true" :circle="true"
 								:flag="vehicleInfo.plateState" @ShowCarline="ShowCarline" />
 						</view>
 						<view class="carRight">
@@ -46,27 +46,38 @@
 					</view>
 					<view class="list">
 						<view class="carLeft">
-							<PannelTitle words="车牌识别" :value="vehicleInfo.plateComState ? '成功' : '未识别'"
+							<PannelTitle words="车牌识别器" :value="vehicleInfo.plateComState ? '正常' : '异常'"
 								:flag="vehicleInfo.plateComState" />
 						</view>
 						<view class="carRight">
-							<PannelTitle words="鉴权状态" :value="vehicleInfo.authState ? '已通过' : '未通过'"
-								:flag="vehicleInfo.authState" />
+							<PannelTitle words="车牌识别" :value="vehicleInfo.plateState ? '成功' : '未识别'"
+								:flag="vehicleInfo.plateComState" />
 						</view>
+						
 					</view>
 					<view class="list">
 						<view class="carLeft">
+							<PannelTitle words="车辆到位" :value="vehicleInfo.sensorState ? '已到位' : '未到位'"
+								:flag="vehicleInfo.sensorState" />
+						</view>
+						<view class="carRight">
 							<PannelTitle words="连接状态" :value="vehicleInfo.conState ? '已连接' : '未连接'"
 								:flag="vehicleInfo.conState" />
 						</view>
+						
+					</view>
+					<view class="list">
+						<view class="carLeft">
+							<PannelTitle words="鉴权状态" :value="vehicleInfo.authState ? '已通过' : '未通过'"
+								:flag="vehicleInfo.authState" />
+						</view>
 						<view class="carRight">
-							<PannelTitle words="车辆到位" :value="vehicleInfo.sensorState ? '已到位' : '未到位'"
-								:flag="vehicleInfo.sensorState" />
+							<PannelTitle circle="false" words="解锁状态"
+								:value="vehicleInfo.lockState==null ? '—': vehicleInfo.lockState?'已上锁' : '已解锁'"
+								@ExchangeMessage="ExchangeMessage" :flag="!vehicleInfo.lockState" />
 						</view>
 					</view>
-					<PannelTitle circle="false" words="解锁状态"
-						:value="vehicleInfo.lockState==null ? '—': vehicleInfo.lockState?'已上锁' : '已解锁'"
-						@ExchangeMessage="ExchangeMessage" :flag="!vehicleInfo.lockState" />
+					
 				</view>
 			</view>
 		</view>