From 73cbc19a8a52cdac15fd5909d268a63bd4d9564b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=B9?= <>
Date: Wed, 22 Jan 2025 11:53:59 +0800
Subject: [PATCH] .

---
 pages/batch-control/edit.vue  | 33 +++++++++++++++----
 pages/batch-control/index.vue |  2 +-
 pages/irrigation/config.vue   | 62 +++++++++++++++--------------------
 3 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/pages/batch-control/edit.vue b/pages/batch-control/edit.vue
index c4f364d..87b37b6 100644
--- a/pages/batch-control/edit.vue
+++ b/pages/batch-control/edit.vue
@@ -44,16 +44,16 @@
 											</span>
 										</view>
 									</view>
-									<view class="check-box" v-if="child.deviceRelation">
-										<uni-forms-item v-if="[2,3].includes(child.deviceRelation.deviceTypeId)">
+									<uni-forms-item v-if="child.deviceRelation">
+										<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)" />
-										</uni-forms-item>
-										<uni-forms-item v-else-if="[13].includes(child.deviceRelation.deviceTypeId)">
+										</view>
+										<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)" />
-										</uni-forms-item>
-									</view>
+										</view>
+									</uni-forms-item>
 									<view class="no-data" v-else>
 										<view class="iconfont icon-wbd"></view>未绑定阀门
 									</view>
@@ -309,4 +309,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;
+						}
+	
+					}
+				}
+	
+			}
+		}
+	
 </style>
\ No newline at end of file
diff --git a/pages/batch-control/index.vue b/pages/batch-control/index.vue
index 1038c60..0113d88 100644
--- a/pages/batch-control/index.vue
+++ b/pages/batch-control/index.vue
@@ -6,7 +6,7 @@
 			<custom-nav-bar :left="true" @leftClick="" title="批量控制">
 				<template v-slot:right>
 					<view class="fixed">
-						<view align="right" class="icon iconfont icon-qiaojie" @click="share"></view>
+						<view align="right" class="icon iconfont icon-fenxiang" @click="share"></view>
 						<view align="right" class="icon iconfont icon-jia" @click="editItem()"></view>
 					</view>
 				</template>
diff --git a/pages/irrigation/config.vue b/pages/irrigation/config.vue
index 0f69df0..2e1e57f 100644
--- a/pages/irrigation/config.vue
+++ b/pages/irrigation/config.vue
@@ -36,19 +36,16 @@
 								</view>
 								<uni-forms-item>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open1" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open2" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open3" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 								</uni-forms-item>
 							</view>
@@ -59,24 +56,20 @@
 								</view>
 								<uni-forms-item>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open1" />
-										<text>轮灌组1</text>
+										<u-button type="success" size="small" text="1开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open2" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open3" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 									<view class="check-box">
-										<uni-data-checkbox mode="tag" v-model="baseFormData.hobby" multiple
-											:localdata="open4" />
-										<text>轮灌组1</text>
+										<u-button size="small" text="2开" />
+										<uni-tag :circle="true" text="轮灌组1" type="warning" />
 									</view>
 								</uni-forms-item>
 							</view>
@@ -166,6 +159,7 @@
 		padding-bottom: 38px !important;
 	}
 
+	// 按钮列表
 	::v-deep .uni-forms-item__content {
 		display: flex;
 		flex: none;
@@ -178,27 +172,23 @@
 			align-items: center;
 			flex-direction: column;
 
-			text {
-				font-size: 12px;
+			.uni-tag {
+				margin-top: 5px;
 			}
 
-			.uni-data-checklist {
-				.checklist-group {
-					width: fit-content !important;
-					padding: 0;
+			.u-button--small {
+				width: 50px;
+				height: 26px;
 
-					.checklist-box.is--tag.is-checked {
-						background-color: #39ac4f;
-						border-color: #39ac4f;
-					}
-
-					.checklist-box {
-						padding: 5px 15px;
-						margin: 0;
-					}
+				.u-button__text {
+					font-size: 14px !important;
 				}
 			}
 
+			.u-button--info {
+				border: 1px #DCDFE6 solid;
+				background-color: #f5f5f5;
+			}
 
 		}
 	}