From b0862808be397892e57b7e20d0859040effd01b4 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期五, 15 八月 2025 10:46:58 +0800
Subject: [PATCH] 更新项目配置，添加监测站相关数据和状态管理；优化首页和监测页面的逻辑，提升用户体验；新增SVG图标资源，更新样式以增强可视化效果。
---
pages/home/home.js | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 9c4b282..2f960f6 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -61,7 +61,7 @@
icon: 'error',
duration: 2000
});
-
+
// 鑾峰彇椤圭洰閰嶇疆
const projectConfig = PROJECT_CONFIG[currentProject];
if (projectConfig) {
@@ -82,7 +82,7 @@
return;
}
}
-
+
// 宸茬櫥褰曟垨涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾墽琛屽紑闃�鎿嶄綔
wx.navigateTo({
url: '/pages/waterIntake/waterIntake',
@@ -226,7 +226,7 @@
const projectConfig = PROJECT_CONFIG[project];
if (projectConfig) {
getApp().globalData.tag = projectConfig.tag;
-
+
// 鏍规嵁椤圭洰鏄惁闇�瑕佺櫥褰曪紝璁剧疆涓嶅悓鐨剈serName
if (projectConfig.needLogin === false) {
// 涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾樉绀洪」鐩悕绉�
@@ -359,7 +359,7 @@
this.setData({
isFromLogin: true
});
-
+
// 鐧诲綍鎴愬姛鍚庡埛鏂版暟鎹�
console.log('鐧诲綍鎴愬姛鍚庡埛鏂版暟鎹�');
this.initData();
@@ -373,7 +373,7 @@
// 鍒濆鍖栧鐞�
if (fromLogin || this.data.isFromLogin) {
console.log('onShow: 浠庣櫥褰曢〉杩斿洖锛屼笉杩涜鐧诲綍妫�鏌�');
-
+
// 濡傛灉鏄粠鐧诲綍椤佃繑鍥烇紝閲嶆柊鍔犺浇鏁版嵁
this.initData();
} else {
@@ -463,7 +463,7 @@
icon: 'error',
duration: 2000
});
-
+
// 鑾峰彇椤圭洰閰嶇疆
const projectConfig = PROJECT_CONFIG[currentProject];
if (projectConfig) {
@@ -484,7 +484,7 @@
return;
}
}
-
+
// 宸茬櫥褰曟垨涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾墽琛屾煡鐪嬭褰曟搷浣�
wx.navigateTo({
url: '/pages/valveList/valveList',
@@ -510,7 +510,7 @@
icon: 'error',
duration: 2000
});
-
+
// 鑾峰彇椤圭洰閰嶇疆
const projectConfig = PROJECT_CONFIG[currentProject];
if (projectConfig) {
@@ -529,9 +529,25 @@
});
}
return;
+ } else if (!PROJECT_CONFIG[currentProject].monitor) {
+ // 鏈櫥褰曪紝鏄剧ず鎻愮ず骞堕樆姝㈡搷浣�
+ wx.showToast({
+ title: '褰撳墠椤圭洰涓嶅彲鐢�',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
}
+ } else if (!PROJECT_CONFIG[currentProject].monitor) {
+ // 鏈櫥褰曪紝鏄剧ず鎻愮ず骞堕樆姝㈡搷浣�
+ wx.showToast({
+ title: '褰撳墠椤圭洰涓嶅彲鐢�',
+ icon: 'error',
+ duration: 2000
+ });
+ return;
}
-
+
// 宸茬櫥褰曟垨涓嶉渶瑕佺櫥褰曠殑椤圭洰锛岃烦杞埌缁煎悎绔欑洃娴嬮〉闈�
wx.navigateTo({
url: '/pages/stationMonitor/stationMonitor',
@@ -596,7 +612,7 @@
icon: 'error',
duration: 2000
});
-
+
// 鑾峰彇椤圭洰閰嶇疆
const projectConfig = PROJECT_CONFIG[currentProject];
if (projectConfig) {
@@ -617,7 +633,7 @@
return;
}
}
-
+
// 宸茬櫥褰曟垨涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾墽琛岃疆鐏屾搷浣�
wx.navigateTo({
url: '/pages/irrigation/irrigation',
@@ -882,7 +898,7 @@
icon: 'error',
duration: 2000
});
-
+
// 鑾峰彇椤圭洰閰嶇疆
const projectConfig = PROJECT_CONFIG[currentProject];
if (projectConfig) {
@@ -903,7 +919,7 @@
return;
}
}
-
+
// 宸茬櫥褰曟垨涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾墽琛屾壂鐮佹搷浣�
const that = this;
wx.scanCode({
@@ -1027,7 +1043,7 @@
app.globalData.clientId = jsonObj.clientId || clientId;
app.globalData.tag = jsonObj.tag;
app.globalData.isLoggedIn = true;
-
+
// 鐩存帴浠巙serData璁剧疆鐢ㄦ埛淇℃伅
if (jsonObj.clientName && jsonObj.phone) {
this.setData({
@@ -1038,7 +1054,7 @@
// 濡傛灉userData涓病鏈夌敤鎴蜂俊鎭紝璋冪敤鎺ュ彛鑾峰彇
this.getUserDataBySession();
}
-
+
console.log("userData宸插姞杞�:", userData);
} catch (e) {
console.error('userData瑙ｆ瀽澶辫触:', e);
@@ -1056,14 +1072,14 @@
app.globalData.isLoggedIn = true;
this.getUserDataBySession();
}
-
+
// 鏃犺濡備綍閮藉皾璇曡幏鍙栧紑闃�鍒楄〃
this.getOpenList();
}).catch(err => {
console.error('鎭㈠鐧诲綍鐘舵�佸け璐�:', err);
this.getOpenList();
});
-
+
return;
}
@@ -1526,7 +1542,7 @@
// 姝ゅ涓嶅仛璺宠浆锛屾敞閲婃帀鍘熸湁浠ｇ爜
// const projectInfo = PROJECT_CONFIG[currentProject];
// const loginType = projectInfo?.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
// if (loginType === 'account') {
// // 璐﹀彿瀵嗙爜鐧诲綍
// wx.navigateTo({
@@ -1568,7 +1584,7 @@
// 姝ゅ涓嶅仛璺宠浆锛屾敞閲婃帀鍘熸湁浠ｇ爜
// const projectInfo = PROJECT_CONFIG[currentProject];
// const loginType = projectInfo?.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
// if (loginType === 'account') {
// // 璐﹀彿瀵嗙爜鐧诲綍
// wx.navigateTo({
@@ -1660,7 +1676,7 @@
const currentProject = getApp().globalData.selectedProject;
if (currentProject && PROJECT_CONFIG[currentProject]) {
const projectConfig = PROJECT_CONFIG[currentProject];
-
+
if (!projectConfig.needLogin) {
console.log('wxLogin: 褰撳墠椤圭洰涓嶉渶瑕佺櫥褰�:', currentProject);
// 涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾樉绀洪」鐩悕绉�
@@ -1693,7 +1709,7 @@
// 鏈粦瀹氳处鍙凤紝鏍规嵁椤圭洰閰嶇疆鐨刲oginType璺宠浆鍒扮浉搴旂殑鐧诲綍椤甸潰
const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
const loginType = projectInfo?.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
if (loginType === 'account') {
// 璐﹀彿瀵嗙爜鐧诲綍
wx.navigateTo({
@@ -1753,7 +1769,7 @@
// 鏈粦瀹氳处鍙凤紝鏍规嵁椤圭洰閰嶇疆鐨刲oginType璺宠浆鍒扮浉搴旂殑鐧诲綍椤甸潰
const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
const loginType = projectInfo?.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
if (loginType === 'account') {
// 璐﹀彿瀵嗙爜鐧诲綍
wx.navigateTo({
@@ -1775,11 +1791,11 @@
}).catch(error => {
wx.hideLoading();
console.error('鐧诲綍璇锋眰澶辫触:', error);
- if(error.code==="1003"){
+ if (error.code === "1003") {
// 鏈粦瀹氳处鍙凤紝鏍规嵁椤圭洰閰嶇疆鐨刲oginType璺宠浆鍒扮浉搴旂殑鐧诲綍椤甸潰
const projectInfo = PROJECT_CONFIG[this.data.selectedProject];
const loginType = projectInfo?.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
if (loginType === 'account') {
// 璐﹀彿瀵嗙爜鐧诲綍
wx.navigateTo({
@@ -1791,7 +1807,7 @@
url: `/pages/login/login?project=${this.data.selectedProject}&projectName=${projectInfo.displayName}`
});
}
- }else{
+ } else {
wx.showToast({
title: '鐧诲綍澶辫触锛岃閲嶈瘯',
icon: 'none'
@@ -2063,7 +2079,7 @@
const currentProject = app.globalData.selectedProject;
if (currentProject && PROJECT_CONFIG[currentProject]) {
const projectConfig = PROJECT_CONFIG[currentProject];
-
+
if (!projectConfig.needLogin) {
console.log('handleUserTap: 褰撳墠椤圭洰涓嶉渶瑕佺櫥褰�:', currentProject);
// 涓嶉渶瑕佺櫥褰曠殑椤圭洰锛屾樉绀洪」鐩悕绉�
@@ -2072,10 +2088,10 @@
});
return;
}
-
+
// 鏍规嵁椤圭洰閰嶇疆鐨刲oginType鍐冲畾璺宠浆鍒板摢涓櫥褰曢〉闈�
const loginType = projectConfig.loginType || 'code'; // 榛樿浣跨敤楠岃瘉鐮佺櫥褰�
-
+
if (loginType === 'account') {
// 璐﹀彿瀵嗙爜鐧诲綍
wx.navigateTo({
--
Gitblit v1.8.0