diff --git a/pages/work/user/device.vue b/pages/work/user/device.vue
index a3aa278..60c2e13 100644
--- a/pages/work/user/device.vue
+++ b/pages/work/user/device.vue
@@ -83,7 +83,6 @@
 		</z-paging>
 	</view>
 </template>
-
 <script>
 	import plugin from "@/plugins"
 	import {
@@ -154,64 +153,80 @@
 			//全选
 			handleChangeAllRow() {
 				this.selectAll = !this.selectAll;
+				const selectAll = this.selectAll;
+				const valveDefaults = {
+					valveClose: 1,
+					valveOpen: 1,
+					valveOneOpen: 1,
+					valveTwoOpen: 1,
+					valveThreeOpen: 1,
+					valveFourOpen: 1
+				};
+				const valveSettings = {
+					valve: {
+						true: {
+							valveClose: 0,
+							valveOpen: 0,
+							valveOneOpen: 0,
+							valveTwoOpen: 0,
+							valveThreeOpen: 1,
+							valveFourOpen: 1
+						},
+						false: {}
+					},
+					fiveValve: {
+						true: {
+							valveClose: 1,
+							valveOpen: 1,
+							valveOneOpen: 0,
+							valveTwoOpen: 0,
+							valveThreeOpen: 0,
+							valveFourOpen: 0
+						},
+						false: {}
+					}
+				};
 				this.dataList.forEach(item => {
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "valve") {
-						item.landWaterOutletPermissionVo.valveClose = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveOneOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveTwoOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveThreeOpen = 1;
-						item.landWaterOutletPermissionVo.valveFourOpen = 1;
-					}
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "fiveValve") {
-						item.landWaterOutletPermissionVo.valveClose = 1;
-						item.landWaterOutletPermissionVo.valveOpen = 1;
-						item.landWaterOutletPermissionVo.valveOneOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveTwoOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveThreeOpen = this.selectAll ? 0 : 1;
-						item.landWaterOutletPermissionVo.valveFourOpen = this.selectAll ? 0 : 1;
-					}
+					const deviceType = item.landWaterOutletPermissionVo.deviceTypeKey;
+					const settings = valveSettings[deviceType][selectAll];
+					Object.assign(item.landWaterOutletPermissionVo, valveDefaults, settings);
 				});
 			},
 			//单行全选
 			handleChangeRow(e, row) {
-				let index = this.dataList.findIndex(x => x.id == row.id);
-				let item = this.dataList[index];
-				if (e && e.length) {
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "valve") {
-						item.landWaterOutletPermissionVo.valveClose = 0;
-						item.landWaterOutletPermissionVo.valveOpen = 0;
-						item.landWaterOutletPermissionVo.valveOneOpen = 0;
-						item.landWaterOutletPermissionVo.valveTwoOpen = 0;
-						item.landWaterOutletPermissionVo.valveThreeOpen = 1;
-						item.landWaterOutletPermissionVo.valveFourOpen = 1;
+				const index = this.dataList.findIndex(x => x.id === row.id);
+				if (index === -1) return; // 如果没有找到对应的行，直接返回
+				const item = this.dataList[index];
+				const permissions = item.landWaterOutletPermissionVo;
+				const valveDefaults = {
+					valveClose: 1,
+					valveOpen: 1,
+					valveOneOpen: 1,
+					valveTwoOpen: 1,
+					valveThreeOpen: 1,
+					valveFourOpen: 1
+				};
+				const valveSettings = {
+					valve: {
+						valveClose: 0,
+						valveOpen: 0,
+						valveOneOpen: 0,
+						valveTwoOpen: 0,
+						valveThreeOpen: 1,
+						valveFourOpen: 1
+					},
+					fiveValve: {
+						valveClose: 1,
+						valveOpen: 1,
+						valveOneOpen: 0,
+						valveTwoOpen: 0,
+						valveThreeOpen: 0,
+						valveFourOpen: 0
 					}
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "fiveValve") {
-						item.landWaterOutletPermissionVo.valveClose = 1;
-						item.landWaterOutletPermissionVo.valveOpen = 1;
-						item.landWaterOutletPermissionVo.valveOneOpen = 0;
-						item.landWaterOutletPermissionVo.valveTwoOpen = 0;
-						item.landWaterOutletPermissionVo.valveThreeOpen = 0;
-						item.landWaterOutletPermissionVo.valveFourOpen = 0;
-					}
-				} else {
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "valve") {
-						item.landWaterOutletPermissionVo.valveClose = 1;
-						item.landWaterOutletPermissionVo.valveOpen = 1;
-						item.landWaterOutletPermissionVo.valveOneOpen = 1;
-						item.landWaterOutletPermissionVo.valveTwoOpen = 1;
-						item.landWaterOutletPermissionVo.valveThreeOpen = 1;
-						item.landWaterOutletPermissionVo.valveFourOpen = 1;
-					}
-					if (item.landWaterOutletPermissionVo.deviceTypeKey == "fiveValve") {
-						item.landWaterOutletPermissionVo.valveClose = 1;
-						item.landWaterOutletPermissionVo.valveOpen = 1;
-						item.landWaterOutletPermissionVo.valveOneOpen = 1;
-						item.landWaterOutletPermissionVo.valveTwoOpen = 1;
-						item.landWaterOutletPermissionVo.valveThreeOpen = 1;
-						item.landWaterOutletPermissionVo.valveFourOpen = 1;
-					}
-				}
+				};
+				const deviceType = item.landWaterOutletPermissionVo.deviceTypeKey;
+				const settings = e && e.length ? valveSettings[deviceType] : {};
+				Object.assign(permissions, valveDefaults, settings);
 			},
 			//当用户点击权限开关之后
 			handleChange(e, obj) {
@@ -219,44 +234,19 @@
 				let item = this.dataList[index];
 				this.judgeValue(e, item);
 			},
-			//判断开关值属性
 			judgeValue(e, itemSample) {
-				if (e.indexOf('valveClose') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveClose = 0;
-				}
-				if (e.indexOf('valveClose') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveClose = 1;
-				}
-				if (e.indexOf('valveOpen') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveOpen = 0;
-				}
-				if (e.indexOf('valveOpen') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveOpen = 1;
-				}
-				if (e.indexOf('valveOneOpen') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveOneOpen = 0;
-				}
-				if (e.indexOf('valveOneOpen') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveOneOpen = 1;
-				}
-				if (e.indexOf('valveTwoOpen') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveTwoOpen = 0;
-				}
-				if (e.indexOf('valveTwoOpen') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveTwoOpen = 1;
-				}
-				if (e.indexOf('valveThreeOpen') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveThreeOpen = 0;
-				}
-				if (e.indexOf('valveThreeOpen') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveThreeOpen = 1;
-				}
-				if (e.indexOf('valveFourOpen') != -1) {
-					itemSample.landWaterOutletPermissionVo.valveFourOpen = 0;
-				}
-				if (e.indexOf('valveFourOpen') == -1) {
-					itemSample.landWaterOutletPermissionVo.valveFourOpen = 1;
-				}
+				const valveProperties = [
+					'valveClose',
+					'valveOpen',
+					'valveOneOpen',
+					'valveTwoOpen',
+					'valveThreeOpen',
+					'valveFourOpen'
+				];
+				const permissions = itemSample.landWaterOutletPermissionVo;
+				valveProperties.forEach(property => {
+					permissions[property] = e.includes(property) ? 0 : 1;
+				});
 			}
 		}
 	}