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

zuoxiao

2025-04-09 50433e86b718fab0d94ea1410724b29b5f53fa0a

 pages/irrigation/irrigation.js

@@ -46,16 +46,20 @@
      url: '/wx/plan/getNotCompletePlans'
    }).then(res => {
      if (res.success) {
        const activeList = res.content.map(item => ({
          id: item.planId,
          title: item.planName,
          projectName: item.projectName || '未分配项目',
          status: item.planState,
          planStartTime: item.planStartTime,
          planStopTime: item.planStopTime,
          duration: item.duration,
          startupMode: item.startupMode
        }));
        const activeList = res.content.map(item => {
          // 确保将planState转换为字符串
          const planState = String(item.planState);
          return {
            id: item.planId,
            title: item.planName,
            projectName: item.projectName || '未分配项目',
            status: planState,
            planStartTime: item.planStartTime,
            planStopTime: item.planStopTime,
            duration: item.duration,
            startupMode: item.startupMode
          };
        });

        console.log('轮灌计划数据：', activeList);

@@ -91,16 +95,20 @@
      url: '/wx/plan/getCompletedPlans'
    }).then(res => {
      if (res.success) {
        const completedList = res.content.map(item => ({
          id: item.planId,
          title: item.planName,
          projectName: item.projectName || '未分配项目',
          status: item.planState,
          planStartTime: item.planStartTime,
          planStopTime: item.planStopTime,
          duration: item.duration,
          startupMode: item.startupMode
        }));
        const completedList = res.content.map(item => {
          // 确保将planState转换为字符串
          const planState = String(item.planState);
          return {
            id: item.planId,
            title: item.planName,
            projectName: item.projectName || '未分配项目',
            status: planState,
            planStartTime: item.planStartTime,
            planStopTime: item.planStopTime,
            duration: item.duration,
            startupMode: item.startupMode
          };
        });

        console.log('已完成轮灌计划数据：', completedList);

@@ -153,9 +161,22 @@
    const id = e.currentTarget.dataset.id;
    const status = e.currentTarget.dataset.status;
    
    console.log('点击项目状态:', status, '类型:', typeof status);
    
    // 判断计划状态，如果是1(未发布)，则提示用户
    if (status === '1' || status === 1) {
      wx.showModal({
        title: '提示',
        content: '当前计划未发布，请发布后查看',
        showCancel: false,
        confirmText: '确认'
      });
      return;
    }
    
    // 导航到灌溉详情页面，并传递参数
    wx.navigateTo({
      url: `/pages/irrigationDetail/irrigationDetail?id=${id}&fromList=true`
      url: `/pages/irrigationDetail/irrigationDetail?planId=${id}&fromList=true`
    });
  },

@@ -213,17 +234,42 @@
      content: '确定要终止该轮灌计划吗？',
      success: (res) => {
        if (res.confirm) {
          // 这里应该调用API终止轮灌计划
          wx.showToast({
            title: '已终止',
            icon: 'success'
          });
          // 刷新数据
          this.loadIrrigationData();
            this.postStop(id)
        }
      }
    });
  },
  //终止轮灌计划
   postStop(planID){
    post({
        url: '/wx/plan/terminatePlan',
        data: {
          planId: planID,
          operatorId: app.globalData.clientId
        },
        isShowLoding: true
      }).then(res => {
        if (res.success) {
          wx.showToast({
            title: '终止成功',
            icon: 'success'
          });
          // 刷新数据
          this.loadIrrigationData();
        } else {
          wx.showToast({
            title: res.msg || '终止失败',
            icon: 'none'
          });
        }
      }).catch(err => {
        console.error('终止失败：', err);
        wx.showToast({
          title: '终止失败',
          icon: 'none'
        });
      });
   },

  /**
   * 点击立即执行按钮