From 5f9cf32984bb26a99e3fe0359e295c7a27cd5069 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期二, 22 四月 2025 14:17:13 +0800
Subject: [PATCH] 重构灌溉组详情页面的请求逻辑，改用请求库简化API调用；更新WXML以优化组名展示样式，提升用户体验。
---
pages/irrigationDetail/irrigationDetail.wxss | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 205 insertions(+), 10 deletions(-)
diff --git a/pages/irrigationDetail/irrigationDetail.wxss b/pages/irrigationDetail/irrigationDetail.wxss
index eb5eac0..49b79e4 100644
--- a/pages/irrigationDetail/irrigationDetail.wxss
+++ b/pages/irrigationDetail/irrigationDetail.wxss
@@ -30,21 +30,43 @@
.plan-code .label {
color: #666;
font-size: 28rpx;
+ margin-right: 8rpx;
}
.plan-code .value {
color: #333;
- font-size: 28rpx;
+ font-size: 32rpx;
font-weight: 500;
}
-.status-icon {
- width: 80rpx;
- height: 80rpx;
+/* 鐘舵�佹爣绛炬牱寮� */
+.plan-status {
+ padding: 4rpx 16rpx;
+ border-radius: 20rpx;
+ font-size: 24rpx;
+ color: #fff;
+ text-align: center;
margin-left: 20rpx;
- flex-shrink: 0;
- margin-top: -10rpx;
- margin-bottom: -10rpx;
+}
+
+.plan-status.draft {
+ background-color: #9E9E9E;
+}
+
+.plan-status.published {
+ background-color: #90CAF9;
+}
+
+.plan-status.executing {
+ background-color: #2196F3;
+}
+
+.plan-status.completed {
+ background-color: #4CAF50;
+}
+
+.plan-status.terminated {
+ background-color: #F44336;
}
.time-info, .project-info {
@@ -61,6 +83,26 @@
.time-info .value, .project-info .value {
color: #333;
font-size: 28rpx;
+ font-weight: 500;
+}
+
+/* 瀹為檯涓鏃堕棿楂樹寒鏍峰紡 */
+.time-info .highlight-text {
+ color: #F44336;
+ font-weight: bold;
+ background-color: rgba(244, 67, 54, 0.1);
+ padding: 4rpx 12rpx;
+ border-radius: 4rpx;
+}
+
+/* 鍛戒护鍙戝竷澶辫触鏁版牱寮� */
+.time-info .error-text {
+ color: #ff4d4f;
+ font-weight: bold;
+ background-color: rgba(255, 77, 79, 0.1);
+ padding: 4rpx 12rpx;
+ border-radius: 4rpx;
+ display: inline-block;
}
/* 椤圭洰鍒楄〃鏍峰紡 */
@@ -150,7 +192,10 @@
.group-status-indicator {
display: flex;
align-items: center;
- margin-bottom: 16rpx;
+ margin-left: auto;
+ background-color: #f5f7fa;
+ padding: 4rpx 10rpx;
+ border-radius: 8rpx;
}
.status-dot {
@@ -158,6 +203,7 @@
height: 16rpx;
border-radius: 50%;
margin-right: 8rpx;
+ flex-shrink: 0;
}
.group-item.pending .status-dot {
@@ -172,9 +218,59 @@
background-color: #2196F3;
}
+.group-item.terminated .status-dot {
+ background-color: #F44336;
+}
+
+.group-item.canceled .status-dot {
+ background-color: #9E9E9E;
+}
+
.status-text {
font-size: 26rpx;
color: #666;
+ flex-shrink: 0;
+}
+
+.group-item.pending .status-text {
+ color: #e6c100;
+}
+
+.group-item.in_progress .status-text {
+ color: #4CAF50;
+}
+
+.group-item.completed .status-text {
+ color: #2196F3;
+}
+
+.group-item.terminated .status-text {
+ color: #F44336;
+}
+
+.group-item.canceled .status-text {
+ color: #9E9E9E;
+}
+
+/* 鏍规嵁涓嶅悓鐘舵�佹樉绀轰笉鍚岃儗鏅壊 */
+.group-item.pending .group-status-indicator {
+ background-color: rgba(255, 215, 0, 0.1);
+}
+
+.group-item.in_progress .group-status-indicator {
+ background-color: rgba(76, 175, 80, 0.1);
+}
+
+.group-item.completed .group-status-indicator {
+ background-color: rgba(33, 150, 243, 0.1);
+}
+
+.group-item.terminated .group-status-indicator {
+ background-color: rgba(244, 67, 54, 0.1);
+}
+
+.group-item.canceled .group-status-indicator {
+ background-color: rgba(158, 158, 158, 0.1);
}
/* 杞亴缁勪俊鎭牱寮� */
@@ -182,11 +278,31 @@
margin-top: 12rpx;
}
+.group-name-row {
+ display: flex;
+ align-items: center;
+ margin-bottom: 12rpx;
+ width: 100%;
+}
+
+.group-index {
+ color: #1890FF;
+ margin-right: 8rpx;
+ font-size: 32rpx;
+}
+
+.group-label {
+ font-size: 32rpx;
+ color: #666;
+ margin-right: 8rpx;
+ flex-shrink: 0;
+}
+
.group-name {
font-size: 32rpx;
font-weight: 500;
color: #333;
- margin-bottom: 12rpx;
+ flex-shrink: 0;
}
.group-time-info {
@@ -203,10 +319,89 @@
.time-label {
color: #666;
font-size: 26rpx;
- width: 160rpx;
+ width: 140rpx;
+ flex-shrink: 0;
}
.time-value {
color: #333;
font-size: 26rpx;
+}
+
+/* 鍙栨按鍙ｄ俊鎭牱寮� */
+.intake-info {
+ margin-top: 20rpx;
+ border-top: 1rpx dashed #e0e0e0;
+ padding-top: 16rpx;
+}
+
+.intake-header {
+ font-size: 28rpx;
+ color: #333;
+ font-weight: 500;
+ margin-bottom: 12rpx;
+}
+
+.intake-list {
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+}
+
+.intake-item {
+ background-color: #f9f9f9;
+ border-radius: 8rpx;
+ padding: 12rpx 16rpx;
+}
+
+.intake-item.success {
+ border-left: 4rpx solid #4CAF50;
+}
+
+.intake-item.error {
+ border-left: 4rpx solid #F44336;
+}
+
+.intake-name {
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ color: #333;
+}
+
+.intake-status-dot {
+ width: 12rpx;
+ height: 12rpx;
+ border-radius: 50%;
+ margin-right: 8rpx;
+}
+
+.intake-item.success .intake-status-dot {
+ background-color: #4CAF50;
+}
+
+.intake-item.error .intake-status-dot {
+ background-color: #F44336;
+}
+
+.intake-result {
+ margin-top: 6rpx;
+ font-size: 24rpx;
+ color: #F44336;
+ padding-left: 20rpx;
+}
+
+.failure-count {
+ margin-top: 10rpx;
+ font-size: 28rpx;
+}
+
+.failure-count .label {
+ color: #666;
+}
+
+.failure-count .error-text {
+ color: #ff4d4f;
+ font-weight: bold;
+ margin-left: 8rpx;
}
\ No newline at end of file
--
Gitblit v1.8.0