diff --git a/components/custom-index-adc/custom-index-adc.vue b/components/custom-index-adc/custom-index-adc.vue
index de9b7c4..06b7e58 100644
--- a/components/custom-index-adc/custom-index-adc.vue
+++ b/components/custom-index-adc/custom-index-adc.vue
@@ -3,8 +3,8 @@
 		<view class="jz-info" style="width: 80vw;">
 			<view style="font-size: 16px;font-weight: 600;margin-bottom: 10px;">{{title}}</view>
 			<view v-for="item in items">
-				<text>{{ item.title }}</text>
-				<text>{{ item.value }}{{ item.unit }}</text>
+				<text style="text-align: center;">{{ item.title }}</text>
+				<text style="text-align: center;">{{ item.value }}{{ item.unit }}</text>
 			</view>
 		</view>
 	</u-popup>
@@ -49,33 +49,23 @@
 						value: data?.adc?.charging ? '充电中' : '未充电',
 						unit: null
 					});
-					this.items.push({
-						title: "电池ADC",
-						value: data?.thingData?.adcProperty?.b,
-						unit: "V"
-					});
 					this.items.push({
 						title: "电池",
-						value: data?.b,
-						unit: "%"
+						value: `${data?.b || ''}%(${data?.thingData?.adcProperty?.b || ''}V)`,
+						unit: null
 					});
 					this.items.push({
 						title: "433信号强度",
 						value: data?.thingData?.ls.value,
 						unit: null
 					});
-					this.items.push({
-						title: "433ADC",
-						value: data?.thingData?.adcProperty?.l,
-						unit: "V"
-					});
 					this.items.push({
 						title: "4G信号强度",
 						value: data?.rssi,
 						unit: null
 					});
 					this.items.push({
-						title: "4G供电ADC",
+						title: "4G供电",
 						value: data?.thingData?.adcProperty?.g,
 						unit: "V"
 					});
@@ -117,33 +107,65 @@
 						value: data?.adc?.charging ? '充电中' : '未充电',
 						unit: null
 					});
-					this.items.push({
-						title: "电池ADC",
-						value: data?.thingData?.adcProperty?.b,
-						unit: "V"
-					});
 					this.items.push({
 						title: "电池",
-						value: data?.adc?.b,
-						unit: "%"
+						value: `${data?.adc?.b || ''}%(${data?.thingData?.adcProperty?.b || ''}V)`,
+						unit: null
 					});
 					this.items.push({
-						title: "温度ADC",
+						title: "舱内温度",
 						value: data?.adc?.t,
 						unit: "℃"
 					});
 					this.items.push({
-						title: "压力ADC",
-						value: data?.adc?.p.toString(),
-						unit: null
+						title: "舱内湿度",
+						value: data?.adc?.h,
+						unit: "%"
 					});
-					let angel = "";
+					let angel = "",
+						angelAdc = "";
 					switch (row.device.deviceTypeKey) {
 						case "butterflyValve":
 							break;
 						case "valve":
+							if (data.btnObj) {
+								if (data.btnObj.close.switchOn) {
+									angel = `全关(${data?.thingData?.va?.value})`;
+								} else if (data.btnObj.open.switchOn) {
+									angel = `全开(${data?.thingData?.va?.value})`;
+								} else if (data.btnObj.open1.switchOn) {
+									angel = `①开${data.btnObj.open1.openAngle}%`;
+								} else if (data.btnObj.open2.switchOn) {
+									angel = `②开${data.btnObj.open2.openAngle}%`;
+								} else {
+									angel = "-";
+								}
+								angelAdc = data?.thingData?.va?.value;
+							} else {
+								angel = "-";
+								angelAdc = "";
+							}
+							break;
 						case "fiveValve":
-							angel = data?.thingData?.va?.value;
+							if (data.btnObj) {
+								let va = JSON.parse(data.thingData.va.value);
+								if (data.btnObj.open1.switchOn) {
+									angel = angel + `①开${data.btnObj.open1.openAngle}%`;
+								}
+								if (data.btnObj.open2.switchOn) {
+									angel = angel + `,②开${data.btnObj.open2.openAngle}%`;
+								}
+								if (data.btnObj.open3.switchOn) {
+									angel = angel + `,③开${data.btnObj.open3.openAngle}%`;
+								}
+								if (data.btnObj.open4.switchOn) {
+									angel = angel + `,④开${data.btnObj.open4.openAngle}%`;
+								}
+								angelAdc = va.toString();
+							} else {
+								angel = "-";
+								angelAdc = "";
+							}
 							break;
 					}
 					this.items.push({
@@ -151,43 +173,43 @@
 						value: angel,
 						unit: null
 					});
+					this.items.push({
+						title: "原始角度",
+						value: angelAdc,
+						unit: null
+					});
+					this.items.push({
+						title: "压力",
+						value: data?.adc?.p.toString(),
+						unit: null
+					});
 					this.items.push({
 						title: "MCU",
 						value: data?.thingData?.adcProperty?.mcu,
 						unit: null
 					});
 					this.items.push({
-						title: "充电电流ADC",
+						title: "充电电流",
 						value: data?.thingData?.adcProperty?.cc,
 						unit: "mA"
 					});
 					this.items.push({
-						title: "充电电压ADC",
+						title: "充电电压",
 						value: data?.thingData?.adcProperty?.ps,
 						unit: "V"
 					});
+					if (row.device.deviceTypeKey == "valve") {
+						this.items.push({
+							title: "电机最大功率",
+							value: data?.thingData?.adcProperty?.ma,
+							unit: null
+						});
+					}
 					this.items.push({
 						title: "数据上报时间",
 						value: data?.date,
 						unit: null
 					});
-					// if (data?.latestOperation && data?.latestOperation.length) {
-					// 	this.items.push({
-					// 		title: "最近操作",
-					// 		value: data.latestOperation[0].operContent,
-					// 		unit: data.latestOperation[0].operResult ? '【成功】' : '【失败】',
-					// 	});
-					// 	this.items.push({
-					// 		title: "最近操作人",
-					// 		value: data.latestOperation[0].userName,
-					// 		unit: null,
-					// 	});
-					// 	this.items.push({
-					// 		title: "最近操作时间",
-					// 		value: timestampFormat(data.latestOperation[0].time),
-					// 		unit: null,
-					// 	});
-					// }
 				}
 				this.open = true;
 			},