diff --git a/pages/work/user/device.vue b/pages/work/user/device.vue
index 60c2e13..b0e0988 100644
--- a/pages/work/user/device.vue
+++ b/pages/work/user/device.vue
@@ -24,19 +24,28 @@
 						<view>
 							<text>{{ item.showName }}</text>
 						</view>
-						<view style="margin-left: 50px;height: 25px;">
+						<view style="margin-left: 30px;height: 25px;">
 							<u-checkbox-group class="checkBox" style="margin: 0;" iconPlacement="left" placement="row"
 								@change="handleChangeRow($event, item)">
 								<u-checkbox activeColor="#35842E" label="全选"
 									v-if="item.landWaterOutletPermissionVo.deviceTypeKey == 'valve'"
 									:checked="item.landWaterOutletPermissionVo.valveClose==0 && item.landWaterOutletPermissionVo.valveOpen==0 && item.landWaterOutletPermissionVo.valveOneOpen==0 && item.landWaterOutletPermissionVo.valveTwoOpen==0"
-									:name="'all_'+item.id"></u-checkbox>
+									name="all"></u-checkbox>
 								<u-checkbox activeColor="#35842E" label="全选"
 									v-if="item.landWaterOutletPermissionVo.deviceTypeKey == 'fiveValve'"
 									:checked="item.landWaterOutletPermissionVo.valveOneOpen==0 && item.landWaterOutletPermissionVo.valveTwoOpen==0 && item.landWaterOutletPermissionVo.valveThreeOpen==0 && item.landWaterOutletPermissionVo.valveFourOpen==0"
-									:name="'all_'+item.id"></u-checkbox>
+									name="all"></u-checkbox>
 							</u-checkbox-group>
 						</view>
+						<view style="margin-left: 95px;height: 25px;">
+							<u-radio-group class="checkBox" style="margin: 0;" iconPlacement="left" placement="row" v-model="item.landWaterOutletPermissionVo.deviceTypeKey"
+								@change="handleChangeDeviceType($event, item)">
+								<u-radio activeColor="#35842E" label="三通"
+									name="valve"></u-radio>
+								<u-radio activeColor="#35842E" label="五通"
+									name="fiveValve"></u-radio>
+							</u-radio-group>
+						</view>
 					</view>
 					<u-gap height="1" bgColor="#D2D2D2"></u-gap>
 					<view v-if="item.landWaterOutletPermissionVo.deviceTypeKey == 'valve'">
@@ -137,6 +146,8 @@
 			//提交
 			submit() {
 				let saveObj = {
+					landId:this.query.landId,
+					userId:this.query.userId,
 					landWaterOutlets: this.dataList
 				}
 				plugin.modal.loading("设置中...")
@@ -194,10 +205,7 @@
 			},
 			//单行全选
 			handleChangeRow(e, row) {
-				const index = this.dataList.findIndex(x => x.id === row.id);
-				if (index === -1) return; // 如果没有找到对应的行，直接返回
-				const item = this.dataList[index];
-				const permissions = item.landWaterOutletPermissionVo;
+				const permissions = row.landWaterOutletPermissionVo;
 				const valveDefaults = {
 					valveClose: 1,
 					valveOpen: 1,
@@ -224,15 +232,38 @@
 						valveFourOpen: 0
 					}
 				};
-				const deviceType = item.landWaterOutletPermissionVo.deviceTypeKey;
+				const deviceType = row.landWaterOutletPermissionVo.deviceTypeKey;
 				const settings = e && e.length ? valveSettings[deviceType] : {};
 				Object.assign(permissions, valveDefaults, settings);
 			},
+			//更改设备类型
+			handleChangeDeviceType(e, obj){
+				const permissions = obj.landWaterOutletPermissionVo;
+				permissions.deviceTypeKey = e;
+				const valveSettings = {
+					valve: {
+						valveClose: 1,
+						valveOpen: 1,
+						valveOneOpen: 1,
+						valveTwoOpen: 1,
+						valveThreeOpen: 1,
+						valveFourOpen: 1
+					},
+					fiveValve: {
+						valveClose: 1,
+						valveOpen: 1,
+						valveOneOpen: 1,
+						valveTwoOpen: 1,
+						valveThreeOpen: 1,
+						valveFourOpen: 1
+					}
+				};
+				const settings = e ? valveSettings[e] : {};
+				Object.assign(permissions, settings);
+			},
 			//当用户点击权限开关之后
 			handleChange(e, obj) {
-				let index = this.dataList.findIndex(x => x.id == obj.id);
-				let item = this.dataList[index];
-				this.judgeValue(e, item);
+				this.judgeValue(e, obj);
 			},
 			judgeValue(e, itemSample) {
 				const valveProperties = [