From 1cce27996dc6a5b9972aa9e5769084141529c766 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Sat, 11 Oct 2025 10:37:07 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B5=B8=E6=B6=A6=E7=BA=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                  | 235 ++++++++++++++++++++++-----------------
 main.js                  |   6 +-
 manifest.json            |   2 +-
 pages/aqjc/jrxOptions.js |   6 +-
 4 files changed, 144 insertions(+), 105 deletions(-)

diff --git a/App.vue b/App.vue
index 1f25d15..000854b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,117 +1,152 @@
 <script>
-	export default {
-		onLaunch: function() {
-			const token = {
-				loginName: uni.getStorageSync('loginName'),
-				secretKey: uni.getStorageSync('secretKey'),
-			}
-			if (token.secretKey){
-				uni.reLaunch({
-					url: '/pages/homeIndex/index'
-				})
-				console.log(token.secretKey,'App Launch')
-			} else {
-				uni.reLaunch({
-					url: '/pages/login/login'
-					// url:'/pages/zhjs/index'
-				})
-				console.log(token.secretKey,'App Launch2')
-			}
-			
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
+export default {
+	methods: {
+		isHaveNetwork() {
+			uni.getNetworkType({
+				success: res => {
+					if (res.networkType == 'none') {
+						uni.showModal({
+							title: '网络不给力~',
+							content: '是否重新连接',
+							showCancel: true,
+							confirmText: '是',
+							cancelText: '不了',
+							success: res => {
+								if (res.confirm) {
+									setTimeout(() => {
+										isHaveNetwork()   //再次判断
+									}, 200)
+								}
+							}
+						});
+					}
+				},
+				fail: err => console.error('调用失败'),
+				complete: () => { }
+			})
 		}
+	},
+	onLaunch: function () {
+		const token = {
+			loginName: uni.getStorageSync('loginName'),
+			secretKey: uni.getStorageSync('secretKey'),
+		}
+		if (token.secretKey) {
+			uni.reLaunch({
+				url: '/pages/homeIndex/index'
+			})
+			console.log(token.secretKey, 'App Launch')
+		} else {
+			uni.reLaunch({
+				url: '/pages/login/login'
+				// url:'/pages/zhjs/index'
+			})
+			console.log(token.secretKey, 'App Launch2')
+		}
+
+	},
+	onShow: function () {
+		console.log('App Show')
+    this.isHaveNetwork()
+	},
+	onHide: function () {
+		console.log('App Hide')
 	}
+}
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	@import '@/uni_modules/uni-scss/index.scss';
-  @import "@/uni_modules/uview-ui/index.scss";
-	/* #ifndef APP-NVUE */
-	@import '@/static/customicons.css';
-	@import 'ol/ol.css';
-	// 设置整个项目的背景色
-	page {
-		// background: linear-gradient(-180deg, #64acf0 0%, #ffffff 62%,#EEF3F6 70%);
-	}
+/*每个页面公共css */
+@import '@/uni_modules/uni-scss/index.scss';
+@import "@/uni_modules/uview-ui/index.scss";
+/* #ifndef APP-NVUE */
+@import '@/static/customicons.css';
+@import 'ol/ol.css';
 
-	/* #endif */
-	.example-info {
-		font-size: 14px;
-		color: #333;
-		padding: 10px;
-	}
-	.userinfo{
-		border-radius: 5px;
-		display: flex;
-		flex-direction: row;
-		margin-top: 5vh;
-		margin-left: 2vw;
-		margin-bottom: 2vh;
-		align-items: center;
-		width: 95%;
-		height: 6vh;
-		background-color: #007afd;
-		
-	}
-	.icon{
-		width: 6vw;
-		height: 6vh;
-		align-items: center;
-		line-height: 6vh;
-	}
-	.Header{
-		display: flex;
-		flex-direction: row;
-		flex: 0.95;
-		justify-content: center;
-		color: white;
-		font-size: 20px;		
-	}
-	.align-center{
+// 设置整个项目的背景色
+page {
+	// background: linear-gradient(-180deg, #64acf0 0%, #ffffff 62%,#EEF3F6 70%);
+}
+
+/* #endif */
+.example-info {
+	font-size: 14px;
+	color: #333;
+	padding: 10px;
+}
+
+.userinfo {
+	border-radius: 5px;
+	display: flex;
+	flex-direction: row;
+	margin-top: 5vh;
+	margin-left: 2vw;
+	margin-bottom: 2vh;
+	align-items: center;
+	width: 95%;
+	height: 6vh;
+	background-color: #007afd;
+
+}
+
+.icon {
+	width: 6vw;
+	height: 6vh;
+	align-items: center;
+	line-height: 6vh;
+}
+
+.Header {
+	display: flex;
+	flex-direction: row;
+	flex: 0.95;
+	justify-content: center;
+	color: white;
+	font-size: 20px;
+}
+
+.align-center {
+	display: flex;
+	align-items: center;
+}
+
+.align-justufy-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	;
+}
+
+.justify-center {
+	display: flex;
+	justify-content: center;
+}
+
+.justify-between {
+	display: flex;
+	justify-content: space-between;
+}
+
+.time-ranger {
+	margin-bottom: 10px;
+
+	.start-time,
+	.end-time {
 		display: flex;
 		align-items: center;
-	}
-	.align-justufy-center{
-		display: flex;
-		align-items: center;
-		justify-content: center;;
-	}
-	.justify-center{
-		display: flex;
-		justify-content: center;
-	}
-	.justify-between{
-		display: flex;
-		justify-content: space-between;
+		padding: 10px 0;
+		border-bottom: 1px solid #dfdfdf;
 	}
 
-	 .time-ranger {
-      margin-bottom: 10px;
+	.search-btn {
+		margin: 3px 0 0 5px;
+		// color: #3399ef;
+	}
+}
 
-      .start-time,
-      .end-time {
-        display: flex;
-        align-items: center;
-        padding: 10px 0;
-        border-bottom: 1px solid #dfdfdf;
-      }
-
-      .search-btn {
-        margin: 3px 0 0 5px;
-        // color: #3399ef;
-      }
-    }
 // 	.amap-logo {
 //   display: none !important;
 // }
 // .amap-copyright {
 //   display: none !important;
-// }
-
-</style>
+// }</style>
diff --git a/main.js b/main.js
index fd774f1..d34ba69 100644
--- a/main.js
+++ b/main.js
@@ -8,8 +8,8 @@ import {
 } from '@escook/request-miniprogram'
 Vue.config.productionTip = false
 uni.$http = $http
-// $http.baseUrl = 'http://223.75.53.141:83'
-$http.baseUrl = 'http://local.gunshiiot.com:18083'
+$http.baseUrl = 'http://223.75.53.141:83'
+// $http.baseUrl = 'http://local.gunshiiot.com:18083'
 // $http.baseUrl = 'http://192.168.66.27:24105'
 // 请求拦截器
 $http.beforeRequest = function (options) {
@@ -28,7 +28,7 @@ $http.afterRequest = function (options) {
 	}
 	// uni.hideLoading()
 }
-uni.$showMsg = function (title = '', duration = 1500) {
+uni.$showMsg = function (title = '正请求中...', duration = 1500) {
 	return uni.showToast({
 		title,
 		duration,
diff --git a/manifest.json b/manifest.json
index d081ef4..49baf01 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "檀树岗水库",
     "appid" : "__UNI__33ED56F",
     "description" : "",
-    "versionName" : "1.0.1",
+    "versionName" : "1.0.0",
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {
diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js
index 4a5c0c5..35a9d41 100644
--- a/pages/aqjc/jrxOptions.js
+++ b/pages/aqjc/jrxOptions.js
@@ -427,11 +427,15 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
               symbol: 'none',
               symbolSize: 10,
               z: 1,
+                smooth: 0.6, // 设置平滑度
+            smoothMonotone: 'x', // 保持 x 方向的单调性
               itemStyle: {
                  color: '#5487FF'
               },
               lineStyle: {
-                  color: '#5487FF',
+                   color: '#5487FF',
+                width: 2,
+             curveness: 0.5 // 增加曲线程度
               },
               data: filteredArray
           },