From 61e89d748cc7f5456c20866e672a4bde153534f1 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 21 四月 2025 17:18:53 +0800
Subject: [PATCH] 优化项目配置，重构项目URL管理逻辑，改为使用动态配置；更新灌溉组详情页面，添加详细信息展示和请求逻辑，提升用户体验；更新首页项目选择器，支持动态项目列表展示。
---
pages/irrigationDetail/irrigationDetail.wxml | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/pages/irrigationDetail/irrigationDetail.wxml b/pages/irrigationDetail/irrigationDetail.wxml
index cf8747a..fa70cf6 100644
--- a/pages/irrigationDetail/irrigationDetail.wxml
+++ b/pages/irrigationDetail/irrigationDetail.wxml
@@ -6,20 +6,38 @@
<text class="label">璁″垝缂栧彿锛�</text>
<text class="value">{{planCode}}</text>
</view>
- <image class="status-icon" src="/images/progress.svg" mode="aspectFit"></image>
+ <view class="plan-status {{planStatusClass}}">
+ <text>{{planStatusText}}</text>
+ </view>
</view>
<!-- 椤圭洰淇℃伅 -->
<view class="project-info">
<text class="label">椤圭洰鍚嶇О锛�</text>
- <text class="value">{{projects[0].name}}</text>
+ <text class="value">{{projectName}}</text>
</view>
<!-- 鐏屾簤鏃堕棿淇℃伅 -->
<view class="time-info">
<text class="label">鐏屾簤寮�濮嬫椂闂达細</text>
<text class="value">{{startTime}}</text>
</view>
-
-
+
+ <!-- 鏂板缁撴潫鏃堕棿淇℃伅 -->
+ <view class="time-info">
+ <text class="label">鐏屾簤缁撴潫鏃堕棿锛�</text>
+ <text class="value">{{stopTime}}</text>
+ </view>
+
+ <!-- 瀹為檯涓鏃堕棿淇℃伅 -->
+ <view class="time-info" wx:if="{{planStatusClass === 'terminated' && realStopTime}}">
+ <text class="label">瀹為檯涓鏃堕棿锛�</text>
+ <text class="value highlight-text">{{realStopTime}}</text>
+ </view>
+
+ <!-- 鍙栨按鍙ｅ懡浠ゅ彂甯冨け璐ユ暟 -->
+ <view class="time-info" wx:if="{{failureCount > 0}}">
+ <text class="label">鍛戒护鍙戝竷澶辫触鏁帮細</text>
+ <text class="value error-text">{{failureCount}}</text>
+ </view>
</view>
<!-- 杞亴缁勫垪琛� -->
@@ -31,18 +49,23 @@
refresher-triggered="{{isRefreshing}}"
bindrefresherrefresh="onPullDownRefresh">
<view class="scroll-content">
- <block wx:for="{{projects[0].groups}}" wx:key="id" wx:for-item="group">
- <view class="group-item {{group.status}}" bindtap="navigateToGroupDetail" data-project-name="{{projects[0].name}}" data-group-name="{{group.name}}" data-group-id="{{group.id}}" data-status="{{group.status}}">
- <!-- 杞亴缁勭姸鎬佹爣璇� -->
- <view class="group-status-indicator">
- <view class="status-dot"></view>
- <text class="status-text">{{group.statusText}}</text>
- </view>
-
+ <block wx:for="{{groupList}}" wx:key="id" wx:for-item="group">
+ <view class="group-item {{group.status}}" bindtap="navigateToGroupDetail" data-project-name="{{projectName}}" data-group-name="{{group.name}}" data-group-id="{{group.id}}" data-status="{{group.status}}">
<!-- 杞亴缁勪俊鎭� -->
<view class="group-info">
- <view class="group-name">{{group.name}}</view>
- <view class="group-time-info">
+ <view class="group-name-row">
+ <text class="group-index">{{index + 1}}.</text>
+ <text class="group-label">杞亴缁勶細</text>
+ <text class="group-name">{{group.name}}</text>
+ <!-- 杞亴缁勭姸鎬佹爣璇� -->
+ <view class="group-status-indicator">
+ <view class="status-dot"></view>
+ <text class="status-text">{{group.statusText}}</text>
+ </view>
+ </view>
+ <!-- 杞亴鏃堕棿淇℃伅 - 鍙湁鍦ㄥ彇娑堝紑闃�鐘舵�佹椂涓嶆樉绀烘椂闂翠俊鎭� -->
+ <!-- 鍏朵粬鎵�鏈夌姸鎬�(鍖呮嫭涓�斿叧闃�)閮芥樉绀烘椂闂翠俊鎭� -->
+ <view class="group-time-info" wx:if="{{group.status !== 'canceled'}}">
<view class="time-row">
<text class="time-label">寮�濮嬫椂闂达細</text>
<text class="time-value">{{group.startTime}}</text>
@@ -56,6 +79,24 @@
<text class="time-value">{{group.duration}}鍒嗛挓</text>
</view>
</view>
+
+ <!-- 鍙栨按鍙ｄ俊鎭� -->
+ <view class="intake-info" wx:if="{{group.publishResult && group.publishResult.length > 0}}">
+ <view class="intake-header">鍙栨按鍙ｄ俊鎭�</view>
+ <view class="intake-list">
+ <block wx:for="{{group.publishResult}}" wx:key="intakeName" wx:for-item="intake">
+ <view class="intake-item {{intake.code === 0 ? 'success' : 'error'}}">
+ <view class="intake-name">
+ <text class="intake-status-dot"></text>
+ <text>{{intake.intakeName}}</text>
+ </view>
+ <view class="intake-result" wx:if="{{intake.result}}">
+ <text>{{intake.result}}</text>
+ </view>
+ </view>
+ </block>
+ </view>
+ </view>
</view>
</view>
</block>
--
Gitblit v1.8.0