From 96f76359b5809b6eaf651ab3b21d68591c5b27c1 Mon Sep 17 00:00:00 2001
From: Iruka <1017819588@qq.com>
Date: Fri, 24 Jan 2025 10:51:49 +0800
Subject: [PATCH] .

---
 pages/irrigation/index.vue | 156 +++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 84 deletions(-)

diff --git a/pages/irrigation/index.vue b/pages/irrigation/index.vue
index 0400e88..7862afe 100644
--- a/pages/irrigation/index.vue
+++ b/pages/irrigation/index.vue
@@ -17,101 +17,84 @@
 		<view v-show="tab.current === 0">
 			<z-paging ref="pagingTask" @query="queryTask" v-model="task" :auto-show-system-loading="true"
 				:default-page-size="pageSize" empty-view-text="抱歉，暂时还没有相关数据！" class="custom-z-paging">
-				<view class="card-zd">
-					<uni-collapse>
-						<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true"
-							v-for="item in task">
-							<template v-slot:title>
-								<view class="cards-title">
-									<view>
-										<view class="text">任务名称：{{item.taskName}}</view>
-									</view>
-									<view class="title-r">
-										<!-- default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)、royal(紫色) -->
-										<uni-tag type="default" :circle="true" text="未轮灌" v-if="item.status == 0" />
-										<uni-tag type="primary" :circle="true" text="轮灌中"
-											v-else-if="item.status == 1" />
-										<uni-tag type="success" :circle="true" text="已完成"
-											v-else-if="item.status == 2" />
-										<uni-tag type="warning" :circle="true" text="已终止"
-											v-else-if="item.status == 3" />
-										<uni-tag type="royal" :circle="true" text="暂停" v-else-if="item.status == 4" />
-										<uni-tag type="error" :circle="true" text="未知" v-else />
-									</view>
+				<view class="card" v-for="item in task">
+					<view class="cards-title">
+						<view>
+							<view class="text">任务名称：{{item.taskName}}</view>
+						</view>
+						<view class="title-r">
+							<!-- default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)、royal(紫色) -->
+							<uni-tag type="default" :circle="true" text="未轮灌" v-if="item.status == 0" />
+							<uni-tag type="primary" :circle="true" text="轮灌中" v-else-if="item.status == 1" />
+							<uni-tag type="success" :circle="true" text="已完成" v-else-if="item.status == 2" />
+							<uni-tag type="warning" :circle="true" text="已终止" v-else-if="item.status == 3" />
+							<uni-tag type="royal" :circle="true" text="暂停" v-else-if="item.status == 4" />
+							<uni-tag type="error" :circle="true" text="未知" v-else />
+						</view>
+					</view>
+					<view class="content">
+						<view class="cards-content">
+							<view class="txt-list">
+								<view class="list1">
+									<view><text>轮灌方案：</text>{{item.scenarioName}}</view>
+									<view><text>轮灌组数：</text>{{item.groupNum}}</view>
+									<!-- <view><text>起始组：</text>{{item.startGroup}}</view> -->
+									<!-- <view><text>总时长：</text>{{item.irrigateTotalDuration}}</view> -->
+									<!-- <view><text>是否调压：</text>{{item.isAutoAdjust == 0 ? '否':'是'}}</view> -->
+									<!-- <view><text>压力：</text>{{`${item.pressureMin} - ${item.pressureMax}`}}</view> -->
+									<view><text>开始时间：</text>{{item.startTime}}</view>
+									<view><text>结束时间：</text>{{item.endTime}}</view>
 								</view>
-							</template>
-							<view class="content">
-								<view class="cards-content">
-									<view class="txt-list" @click="taskDetail(item)">
-										<view class="list1">
-											<view><text>轮灌方案：</text>{{item.scenarioName}}</view>
-											<view><text>轮灌组数：</text>{{item.groupNum}}</view>
-											<!-- <view><text>起始组：</text>{{item.startGroup}}</view> -->
-											<!-- <view><text>总时长：</text>{{item.irrigateTotalDuration}}</view> -->
-											<!-- <view><text>是否调压：</text>{{item.isAutoAdjust == 0 ? '否':'是'}}</view> -->
-											<!-- <view><text>压力：</text>{{`${item.pressureMin} - ${item.pressureMax}`}}</view> -->
-											<view><text>开始时间：</text>{{item.startTime}}</view>
-											<view><text>结束时间：</text>{{item.endTime}}</view>
-										</view>
-										<view class="right">
-											<view class="iconfont icon-you" />
-										</view>
-									</view>
-									<view class="card-font">
-										<u-button v-hasPermi="['system:irrigateTask:remove']" size="mini" type="error"
-											text="删除" @click="delTask(item)" v-if="item.status == 0" />
-									</view>
+								<view class="right" @click="taskDetail(item)"
+									v-hasPermi="['system:irrigateTask:query']">
+									<view class="iconfont icon-you" />
 								</view>
 							</view>
-						</uni-collapse-item>
-					</uni-collapse>
+							<view class="card-font">
+								<u-button v-hasPermi="['system:irrigateTask:remove']" size="mini" type="error" text="删除"
+									@click="delTask(item)" v-if="item.status == 0" />
+							</view>
+						</view>
+					</view>
 				</view>
 			</z-paging>
-		</view> 
+		</view>
 		<view v-show="tab.current === 1">
 			<z-paging ref="pagingScenario" @query="queryScenario" v-model="scenario" :auto-show-system-loading="true"
 				:default-page-size="pageSize" empty-view-text="抱歉，暂时还没有相关数据！" class="custom-z-paging">
-				<view class="card-zd">
-					<uni-collapse>
-						<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true"
-							v-for="item in scenario">
-							<template v-slot:title>
-								<view class="cards-title">
-									<view>
-										<view class="text">方案名称：{{item.scenarioName}}</view>
-									</view>
-									<view class="title-r">
-										<uni-tag class="bg-green" :circle="true" text="启用" v-if="item.delFlag == '0'" />
-										<uni-tag class="bg-red" :circle="true" text="禁用" v-else />
-									</view>
+				<view class="card" v-for="item in scenario">
+					<view class="cards-title">
+						<view>
+							<view class="text">方案名称：{{item.scenarioName}}</view>
+						</view>
+						<view class="title-r">
+							<uni-tag class="bg-green" :circle="true" text="启用" v-if="item.delFlag == '0'" />
+							<uni-tag class="bg-red" :circle="true" text="禁用" v-else />
+						</view>
+					</view>
+					<view class="content">
+						<view class="cards-content">
+							<view class="txt-list">
+								<view class="list2">
+									<view><text>轮灌组数量：</text>{{item.groupNum}}</view>
+									<view><text>总时长：</text>{{item.irrigateTotalDuration}}</view>
+									<view><text>自动调压：</text>{{item.isAutoAdjust == 0 ? '否':'是'}}</view>
+									<view><text>压力：</text>{{`${item.pressureMin} - ${item.pressureMax}`}}</view>
 								</view>
-							</template>
-							<view class="content">
-								<view class="cards-content">
-									<view class="txt-list" @click="irrigationgroup(item)">
-										<view class="list2">
-											<view><text>轮灌组数量：</text>{{item.groupNum}}</view>
-											<view><text>总时长：</text>{{item.irrigateTotalDuration}}</view>
-											<view><text>自动调压：</text>{{item.isAutoAdjust == 0 ? '否':'是'}}</view>
-											<view><text>压力：</text>{{`${item.pressureMin} - ${item.pressureMax}`}}</view>
-										</view>
-										<view class="right">
-											<view class="iconfont icon-you" />
-										</view>
-									</view>
-									<view class="card-font">
-										<u-button v-hasPermi="['irrigate:irrigateScenario:saveIrrigateScenario']"
-											type="success" size="mini" text="编辑" @click="editScenario(item)" />
-										<u-button v-hasPermi="['irrigate:irrigateScenario:delFlag']" size="mini"
-											type="error" text="禁用" @click="updateScenario(item,true)"
-											v-if="item.delFlag == '0'" />
-										<u-button v-hasPermi="['irrigate:irrigateScenario:delFlag']" size="mini"
-											type="success" text="启用" @click="updateScenario(item,false)" v-else />
-									</view>
+								<view class="right" @click="irrigationgroup(item)">
+									<view class="iconfont icon-you" />
 								</view>
 							</view>
-						</uni-collapse-item>
-					</uni-collapse>
+							<view class="card-font">
+								<u-button v-hasPermi="['irrigate:irrigateScenario:saveIrrigateScenario']" type="success"
+									size="mini" text="编辑" @click="editScenario(item)" />
+								<u-button v-hasPermi="['irrigate:irrigateScenario:delFlag']" size="mini" type="error"
+									text="禁用" @click="updateScenario(item,true)" v-if="item.delFlag == '0'" />
+								<u-button v-hasPermi="['irrigate:irrigateScenario:delFlag']" size="mini" type="success"
+									text="启用" @click="updateScenario(item,false)" v-else />
+							</view>
+						</view>
+					</view>
 				</view>
 			</z-paging>
 		</view>
@@ -272,6 +255,11 @@
 	}
 
 	.custom-z-paging {
+		/* #ifdef H5 */
 		margin-top: 80px;
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		margin-top: 105px;
+		/* #endif */
 	}
 </style>
\ No newline at end of file