9901

pages.json

@@ -1907,7 +1907,7 @@
 			"plugins": {
 			  "issuer-plugin": {
 			   // "version": "1.0.0",
-			   "version": "dev-47ce1fc942b7e3193e8f53fb5d1b7130",
+			   "version": "dev-2f855e9490191286c4ba66724f31184c",
 			   "provider": "wxa2d9acdd1054e69b"
 			  }
 			 },

subpackage/carPark/etc/etcDeviceInfo.vue

@@ -89,7 +89,7 @@
 				<view class="cell-left">车牌颜色</view>
 				<view class="cell-right">{{ obu.vehiclePlateColor }}</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="obu.vin">
 				<view class="cell-left">核定载人数</view>
 				<view class="cell-right">{{ obu.approvedCount }}</view>
 			</view>
@@ -97,10 +97,6 @@
 				<view class="cell-left">车辆识别代号</view>
 				<view class="cell-right">{{ obu.vin }}</view>
 			</view>
-			<view class="cell">
-				<view class="cell-left">车牌发动机号</view>
-				<view class="cell-right">{{ obu.engineNum }}</view>
-			</view>
 			<view class="cell">
 				<view class="cell-left">车轴数</view>
 				<view class="cell-right">{{ obu.axleCount }}</view>
@@ -117,26 +113,14 @@
 				<view class="cell-left">外廓尺寸</view>
 				<view class="cell-right">{{ obu.outsideDimensions }}mm</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="obu.startTime">
 				<view class="cell-left">启用时间</view>
 				<view class="cell-right">{{ obu.startTime }}</view>
 			</view>
-			<view class="cell">
+			<view class="cell" v-if="obu.endTime">
 				<view class="cell-left">结束时间</view>
 				<view class="cell-right">{{ obu.endTime }}</view>
 			</view>
-			<view class="cell">
-				<view class="cell-left">是否激活</view>
-				<view class="cell-right">{{ obu.isJH }}</view>
-			</view>
-			<view class="cell">
-				<view class="cell-left">版本号</view>
-				<view class="cell-right">{{ obu.version }}</view>
-			</view>
-			<view class="cell">
-				<view class="cell-left">签状态</view>
-				<view class="cell-right">{{getCodeName('OBU_STATE_TYPE',state.obuStatus)}}</view>
-			</view>
 		</view>
 		<view class="btn" @click="back">返回订单列表</view>
 	</view>
@@ -401,26 +385,18 @@
 					console.log("===========", obu.num, res[1].substring(0, res[1].length -
 						4))
 					decryptObuVehicleInfo(obu.num, res[1].substring(0, res[1].length - 4),function(res) {
-							console.log("obu信息", '车辆类型', res, res.substring(28, 30),
-								HexToInt(res.substring(28, 30)));
-							obu.approvedCount = HexToInt(res.substring(48, 54));
-							obu.axleCount = HexToInt(res.substring(42, 44));
-							obu.axleDistance = HexToInt(res.substring(44, 48));
-							obu.engineNum = HexToStrig(res.substring(86, 118));
-							obu.type = getVehicleType(HexToInt(res.substring(28, 30)));
-							obu.userType = HexToInt(res.substring(30, 32)) == 1 ?
-								"个人用户" :
-								"单位用户";
-							obu.vehiclePlate = HexToStrig(res.substring(0, 24), 2);
+							
+							obu.approvedCount =res.approvedCount;
+							obu.axleCount = res.axleCount;
+							obu.axleDistance = res.axleDistance;
+							obu.type = getVehicleType(res.type);
+							obu.userType = res.userType == 0 ?"个人用户" :"单位用户";
+							obu.vehiclePlate =res.plateNum;
 							//获取车牌颜色
-							obu.vehiclePlateColor = getVehiclePlateColor(HexToInt(res
-								.substring(24, 28)));
-							obu.vin = HexToStrig(res.substring(54, 86));
-							obu.wheelCount = HexToInt(res.substring(40, 42));
-							obu.outsideDimensions = HexToInt(res.substring(32, 36)) +
-								"x" +
-								HexToInt(res.substring(36, 38)) + "x" + HexToInt(res
-									.substring(38, 40))
+							obu.vehiclePlateColor = getVehiclePlateColor(res.piateColor);
+							obu.vin = res.vin;
+							obu.wheelCount = res.wheelCount;
+							obu.outsideDimensions = res.outsideDimensions
 							tools.hideLoadingAlert();
 					});
 					bluetoothUtil.disconnectDevice();
@@ -452,7 +428,7 @@
 		request(decrypt9901, options).then((res) => {
 			const data = stringToJson(res.bizContent)
 			console.log("decrypt9901",data)
-			const FileData = data.data.FileData
+			const FileData = data.data
 			func(FileData)
 		});
 	};
@@ -497,23 +473,7 @@
 			console.log("152", result)
 		})
 	}
-	const getObuList = () => {
-		var data = {
-			obuId: obu.num
-		};
-		const options = {
-			type: 2,
-			data: data,
-			method: "POST",
-			showLoading: true,
-		};
-		request(searchObuInfo, options).then((res) => {
-			tools.hideLoadingAlert();
-			let result = stringToJson(res.bizContent);
-			console.log("153", result)
-			state.obuStatus = result.data[0].obuStatus
-		})
-	}
+	
 </script>
 
 <style scoped>