更新SVG图标样式，优化灌溉计划和取水口页面逻辑，添加状态处理和信息提示功能；调整界面样式，提升用户体验。

zuoxiao

2025-04-09 50433e86b718fab0d94ea1410724b29b5f53fa0a

 pages/irrigation/irrigation.wxml

@@ -18,54 +18,74 @@
    </view>
    <view class="scroll-bg">
      <block wx:if="{{currentList.length > 0}}">
        <!-- 统一显示所有列表项，不再按状态分组 -->
        <view class="list-item" wx:for="{{currentList}}" wx:key="id" bindtap="onItemTap" data-id="{{item.id}}" data-status="{{item.status}}">
          <view class="item-header">
            <view class="info-row title-row">
              <view class="info-label">编号：</view>
              <view class="info-value">{{item.title}}</view>
            </view>
            <!-- 根据状态显示不同的图标 -->
            <view class="item-status">
              <block wx:if="{{item.status === '已发布'}}">
                <image class="status-icon" src="/images/published-icon.svg" mode="aspectFit"></image>
              </block>
              <block wx:elif="{{item.status === '执行中'}}">
                <image class="status-icon" src="/images/progress.svg" mode="aspectFit"></image>
              </block>
              <block wx:elif="{{item.status === '未发布'}}">
                <text>{{item.status}}</text>
              </block>
            </view>
          <!-- 状态标签 -->
          <view class="status-tag {{item.status === '1' ? 'draft' : item.status === '2' ? 'published' : item.status === '3' ? 'executing' : item.status === '5' ? 'terminated' : 'completed'}}">
            {{item.status === '1' ? '草稿' : item.status === '2' ? '未执行' : item.status === '3' ? '执行中' : item.status === '5' ? '已终止' : '已完成'}}
          </view>
          <view class="item-info">
            <view class="info-row">
              <view class="info-label">灌溉时间：</view>
              <view class="info-value">{{item.irrigationTime}}</view>
          
          <!-- 主要内容区 -->
          <view class="item-content">
            <!-- 标题区域 -->
            <view class="item-header">
              <view class="title-section">
                <view class="plan-title">{{item.title}}</view>
                <view class="project-name">{{item.projectName}}</view>
              </view>
            </view>
            <!-- 仅在执行中状态显示额外信息 -->
            <block wx:if="{{item.status === '执行中'}}">
              <view class="info-row irrigated-row">
                <view class="info-label">已灌溉时间：</view>
                <view class="info-value-time">{{item.irrigatedTime}}</view>

            <!-- 信息区域 -->
            <view class="info-section">
              <!-- 草稿状态(1)时横向排列，其他状态纵向排列 -->
              <view class="info-grid {{item.status === '1' ? '' : 'vertical-layout'}} {{currentTab === 1 ? 'history-grid' : ''}}">
                <view class="info-item">
                  <view class="info-icon">
                    <image src="/images/time-icon.svg" mode="aspectFit"></image>
                  </view>
                  <view class="info-content">
                    <view class="info-label">灌溉时间</view>
                    <view class="info-value">{{(item.planStartTime ? item.planStartTime : '手动发布') + (item.planStopTime ? ' - ' + item.planStopTime : '')}}</view>
                  </view>
                </view>
                <view class="info-item">
                  <view class="info-icon duration-icon">
                    <image src="/images/hourglass.svg" mode="aspectFit"></image>
                  </view>
                  <view class="info-content">
                    <view class="info-label">灌溉时长</view>
                    <view class="info-value">{{item.duration}}分钟</view>
                  </view>
                </view>
              </view>
              <view class="info-row irrigated-row">
                <view class="info-label">已灌溉轮组：</view>
                <view class="info-value-time">{{item.irrigatedGroups}}</view>
              </view>
            </block>
          </view>
          <view class="item-actions" catchtap="stopPropagation">
            <!-- 根据状态显示不同的按钮 -->
            <block wx:if="{{item.status === '未发布'}}">
              <button class="action-button publish-button" hover-class="publish-button-hover" bindtap="onPublish" data-id="{{item.id}}">发布</button>
            </block>
            <block wx:if="{{item.status === '执行中' || item.status === '已发布'}}">
              <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">终止</button>
            </block>
            <block wx:if="{{item.status === '已发布'}}">
              <button class="action-button execute-button" hover-class="execute-button-hover" bindtap="onExecute" data-id="{{item.id}}">立即执行</button>
            </block>
            </view>

            <!-- 操作按钮区域 -->
            <view class="action-section" catchtap="stopPropagation" wx:if="{{item.status !== '4'}}">
              <block wx:if="{{item.status === '1'}}">
                <view class="action-buttons">
                  <button class="action-button publish-button" hover-class="publish-button-hover" bindtap="onPublish" data-id="{{item.id}}">
                    <image src="/images/publish-icon.svg" mode="aspectFit"></image>
                    <text>发布</text>
                  </button>
                </view>
              </block>
              <block wx:if="{{item.status === '2'}}">
                <view class="action-buttons">
                  <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">
                    <image src="/images/stop-icon.svg" mode="aspectFit"></image>
                    <text>终止</text>
                  </button>
                </view>
              </block>
              <block wx:if="{{item.status === '3'}}">
                <view class="action-buttons">
                  <button class="action-button stop-button" hover-class="stop-button-hover" bindtap="onStop" data-id="{{item.id}}">
                    <image src="/images/stop-icon.svg" mode="aspectFit"></image>
                    <text>终止</text>
                  </button>
                </view>
              </block>
            </view>
          </view>
        </view>
      </block>
@@ -81,6 +101,9 @@

  <!-- 底部新建按钮 -->
  <view class="bottom-button">
    <button class="add-button" hover-class="add-button-hover" bindtap="onAddIrrigation">创建灌溉计划</button>
    <button class="add-button" hover-class="add-button-hover" bindtap="onAddIrrigation">
      <image src="/images/add-icon.svg" mode="aspectFit"></image>
      <text>创建灌溉计划</text>
    </button>
  </view>
</view>