From 6ae0924bdb44e8b1f569b6f1cdb6ff403e1d2ce3 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 28 四月 2025 10:15:33 +0800
Subject: [PATCH] 优化首页和灌溉页面的样式，添加当前项目显示；重构项目配置，确保项目登录需求一致性；更新登录页面逻辑，简化项目选择和信息展示，提升用户体验。
---
pages/groupDetail/groupDetail.js | 180 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 132 insertions(+), 48 deletions(-)
diff --git a/pages/groupDetail/groupDetail.js b/pages/groupDetail/groupDetail.js
index ad8fb75..edec131 100644
--- a/pages/groupDetail/groupDetail.js
+++ b/pages/groupDetail/groupDetail.js
@@ -1,80 +1,164 @@
const app = getApp();
+const { get } = require('../../api/request');
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- projectId: '',
projectName: '',
- groupId: '',
groupName: '',
- valveList: [
- // 妯℃嫙鏁版嵁锛屽疄闄呭簲浠嶢PI鑾峰彇
- { id: '1', name: '闃�鎺у櫒1', status: 'online', location: '浣嶇疆A' },
- { id: '2', name: '闃�鎺у櫒2', status: 'offline', location: '浣嶇疆B' },
- { id: '3', name: '闃�鎺у櫒3', status: 'online', location: '浣嶇疆C' },
- { id: '4', name: '闃�鎺у櫒4', status: 'online', location: '浣嶇疆D' },
- { id: '5', name: '闃�鎺у櫒5', status: 'offline', location: '浣嶇疆E' }
- ],
- loading: false
+ groupId: '',
+ waterOutletList: [],
+ refreshing: false,
+ isIrrigating: false // 鏄惁姝ｅ湪鐏屾簤涓�
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
+ console.log('鎺ユ敹鍒扮殑鍙傛暟:', options);
+
if (options) {
+ // 鐩存帴浣跨敤浼犻�掔殑isIrrigating鍙傛暟锛岃�屼笉鏄牴鎹畇tatus鍒ゆ柇
+ const isIrrigating = options.isIrrigating === 'true';
+ console.log('鐏屾簤鐘舵�佸垽鏂�:', options.status, '鏄惁姝ｅ湪鐏屾簤:', isIrrigating);
+
+ // 澶勭悊鎺ユ敹鍒扮殑鍙傛暟
this.setData({
- projectId: options.projectId || '',
projectName: options.projectName || '',
+ groupName: options.groupName || '',
groupId: options.groupId || '',
- groupName: options.groupName || ''
+ isIrrigating: isIrrigating
});
- wx.setNavigationBarTitle({
- title: this.data.groupName || '杞亴缁勮鎯�'
- });
+ console.log('璁剧疆鍚庣殑鏁版嵁:', this.data);
- // 鑾峰彇闃�鎺у櫒鍒楄〃
- this.fetchValveList();
+ this.loadWaterOutletData();
}
},
/**
- * 鑾峰彇闃�鎺у櫒鍒楄〃
+ * 鍔犺浇鍙栨按鍙ｆ暟鎹�
*/
- fetchValveList: function () {
- this.setData({ loading: true });
+ loadWaterOutletData: function() {
+ this.setData({
+ refreshing: true
+ });
- // 杩欓噷搴旇鏄疄闄呯殑API璇锋眰
- // 妯℃嫙API璇锋眰寤惰繜
- setTimeout(() => {
- this.setData({ loading: false });
- // 瀹為檯鏁版嵁宸插湪data涓垵濮嬪寲锛岃繖閲屽彧鏄ā鎷熻姹傚畬鎴�
- }, 1000);
+ get({
+ url: '/wx/irrigation/getGroupDetails',
+ data: {
+ groupId: this.data.groupId
+ },
+ isShowLoding: true
+ }).then(res => {
+ console.log('杞亴缁勮鎯呮帴鍙ｈ繑鍥�:', res);
+
+ if (res.success) {
+ this.handleGroupDetailsResponse(res);
+ } else {
+ wx.showToast({
+ title: res.msg || '鑾峰彇鏁版嵁澶辫触',
+ icon: 'none'
+ });
+ this.setData({
+ refreshing: false
+ });
+ }
+ }).catch(err => {
+ console.error('璇锋眰澶辫触:', err);
+ wx.showToast({
+ title: '缃戠粶閿欒',
+ icon: 'none'
+ });
+ this.setData({
+ refreshing: false
+ });
+ });
+ },
+
+ /**
+ * 澶勭悊杞亴缁勮鎯呭搷搴旀暟鎹�
+ */
+ handleGroupDetailsResponse: function(response) {
+ const data = response.content;
- // 瀹為檯API璇锋眰绀轰緥
- // wx.request({
- // url: 'your-api-url',
- // data: {
- // projectId: this.data.projectId,
- // groupId: this.data.groupId
- // },
- // success: (res) => {
- // this.setData({
- // valveList: res.data,
- // loading: false
- // });
- // },
- // fail: () => {
- // this.setData({ loading: false });
- // wx.showToast({
- // title: '鑾峰彇鏁版嵁澶辫触',
- // icon: 'none'
- // });
- // }
- // });
+ // 澶勭悊鍙栨按鍙ｆ暟鎹�
+ const waterOutletList = data.intakes.map(item => {
+ return {
+ id: item.rtuAddr, // 浣跨敤rtuAddr浣滀负ID
+ name: item.intakeName,
+ rtuAddr: item.rtuAddr,
+ status: item.isOnLine ? 'online' : 'offline'
+ };
+ });
+
+ this.setData({
+ projectName: data.projectName || this.data.projectName,
+ groupName: data.groupName || this.data.groupName,
+ waterOutletList: waterOutletList,
+ refreshing: false
+ });
+
+ console.log('璁剧疆鍙栨按鍙ｆ暟鎹畬鎴�:', this.data.waterOutletList);
+ },
+
+ /**
+ * 涓嬫媺鍒锋柊澶勭悊鍑芥暟
+ */
+ onRefresh: function() {
+ this.loadWaterOutletData();
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage: function () {
+
},
/**
--
Gitblit v1.8.0