.

pages/batch-control/edit.vue

@@ -45,11 +45,12 @@
 										</view>
 									</view>
 									<uni-forms-item v-if="child.deviceRelation">
-										<view class="check-box"  v-if="[2,3].includes(child.deviceRelation.deviceTypeId)">
+										<view class="check-box"
+											v-if="[2,3].includes(child.deviceRelation.deviceTypeId)">
 											<uni-data-checkbox mode="tag" :multiple="true" :localdata="valve"
 												:value="select.newV[child.id]" @change="itemChange($event,child)" />
 										</view>
-										<view class="check-box"  v-if="[13].includes(child.deviceRelation.deviceTypeId)">
+										<view class="check-box" v-if="[13].includes(child.deviceRelation.deviceTypeId)">
 											<uni-data-checkbox mode="tag" :multiple="true" :localdata="fiveValve"
 												:value="select.newV[child.id]" @change="itemChange($event,child)" />
 										</view>
@@ -94,10 +95,10 @@
 			"4": "close",
 		},
 		"fiveValve": {
-			"1": "open1",
-			"2": "open2",
-			"3": "open3",
-			"4": "open4",
+			"1": "open",
+			"2": "open",
+			"3": "open",
+			"4": "open",
 		}
 	}
 
@@ -115,35 +116,32 @@
 				valve: [{
 						text: '①开',
 						value: 1,
-						key: "open1"
 					},
 					{
 						text: '②开',
 						value: 2,
-						key: "open2"
 					},
 					{
 						text: '全开',
 						value: 3,
-						key: "open"
 					}
 				],
 				// 多通阀
 				fiveValve: [{
 						text: '①开',
-						value: 1
+						value: 1,
 					},
 					{
 						text: '②开',
-						value: 2
+						value: 2,
 					},
 					{
 						text: '③开',
-						value: 3
+						value: 3,
 					},
 					{
 						text: '④开',
-						value: 4
+						value: 4,
 					}
 				],
 			}
@@ -309,25 +307,25 @@
 		width: 50px;
 		padding-left: 5px !important;
 	}
-	
-	
+
+
 	// 按钮列表
-		::v-deep .uni-forms-item__content {
-			
-			.check-box {
-				
-				.uni-data-checklist {
-					.checklist-group {
-						justify-content: space-around;
-						.checklist-box.is--tag.is-checked {
-							background-color: #39ac4f;
-							border-color: #39ac4f;
-						}
-	
+	::v-deep .uni-forms-item__content {
+
+		.check-box {
+
+			.uni-data-checklist {
+				.checklist-group {
+					justify-content: space-around;
+
+					.checklist-box.is--tag.is-checked {
+						background-color: #39ac4f;
+						border-color: #39ac4f;
 					}
+
 				}
-	
 			}
+
 		}
-	
+	}
 </style>

pages/batch-control/index.vue

@@ -38,14 +38,16 @@
 							<view class="greybar" v-for="wo in item.wos">
 								<view>出水口：<span>{{ wo.woName }}</span></view>
 								<view v-if="wo.deviceTypeKey == 'valve'">三通阀
-									<span>{{valveKey[wo.deviceTypeKey][wo.angleKey]}}</span>
+									<span>{{valveKey[wo.deviceTypeKey][wo.valveNo]}}</span>
 									<span v-if="wo.angle">
-										({{`${valveKey[wo.deviceTypeKey][wo.angle.angleKey]}-${wo.angle.angle}`}})
+										({{`${valveKey[wo.deviceTypeKey][wo.angle.valveNo]}-${wo.angle.anglePercent}`}})
 									</span>
 								</view>
 								<view v-if="wo.deviceTypeKey == 'fiveValve'">五通阀
-									<span>{{valveKey[wo.deviceTypeKey][wo.angleKey]}}</span>
-									<span>{{valveKey[wo.deviceTypeKey][wo.angleKey]}}</span>
+									<span>{{valveKey[wo.deviceTypeKey][wo.valveNo]}}开</span>
+									<span v-if="wo.angle">
+										({{`${wo.angle.angleKey == 'open' ? '开':'关'}-${wo.angle.anglePercent}`}})
+									</span>
 								</view>
 							</view>
 							<view class="card-font">
@@ -75,16 +77,16 @@
 				dataList: [],
 				valveKey: {
 					"valve": {
-						"close": "全关",
-						"open1": "①开",
-						"open2": "②开",
-						"open": "全开 ",
+						"1": "①开",
+						"2": "②开",
+						"3": "全开 ",
+						"4": "全关",
 					},
 					"fiveValve": {
-						"open1": "①开",
-						"open2": "②开",
-						"open3": "③开",
-						"open4": "④开",
+						"1": "①",
+						"2": "②",
+						"3": "③",
+						"4": "④",
 					}
 				},
 				disabled: false