From 2c66f71e0451f3a61084c8955826949fd442b403 Mon Sep 17 00:00:00 2001
From: "978184212@qq.com" <978184212@qq.com>
Date: Sat, 22 Nov 2025 11:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packDetail/pages/analysis/index.vue        |  43 ++++++++++++---------
 packDetail/pages/sjdyj/index.vue           |   5 ++-
 packDetail/static/login_fxmywr_icon_hi.png | Bin 0 -> 776 bytes
 pages/maps/index.vue                       |  40 +++++++++----------
 4 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 packDetail/static/login_fxmywr_icon_hi.png

diff --git a/packDetail/pages/analysis/index.vue b/packDetail/pages/analysis/index.vue
index 77552d8..d9f98aa 100644
--- a/packDetail/pages/analysis/index.vue
+++ b/packDetail/pages/analysis/index.vue
@@ -51,6 +51,9 @@
 				  type="line"
 				  :opts="opts"
 				  :chartData="chartData"
+				  :enableScroll="true"
+				  :ontouch="true"
+				  canvas2d
 				/>
 			</view>
 		</view>
@@ -158,9 +161,14 @@
 					enableScroll: true,
 					legend: {},
 					xAxis: {
-					  disableGrid: true,
-					  scrollShow: true,
-					   itemCount: 4
+					   disableGrid: true, // 禁用网格线
+					   type: 'grid', // 网格类型
+					   gridType: 'dash', // 虚线样式
+					   itemCount: 3, // 单屏显示数据数量
+					   scrollShow: true, // 显示滚动条
+					   scrollAlign: 'left', // 滚动条初始位置
+					   scrollBackgroundColor: '#F7F7FF', // 滚动条背景色
+					   scrollColor: '#DEE7F7' // 滚动条颜色
 					},
 					yAxis: {
 					  gridType: "dash",
@@ -1089,7 +1097,7 @@
 			padding: 16rpx 32rpx;
 			border-radius: 12rpx;
 			transition: all 0.3s ease;
-			
+			// background: #F6F9FF;
 			&:active {
 				background: rgba(15, 110, 254, 0.1);
 			}
@@ -1122,21 +1130,20 @@
 	}
 	
 	// 适配暗色模式
-	@media (prefers-color-scheme: dark) {
-		.radio-group {
-			background: #1a1a1a;
-			
-			.radio-label {
-				.radio-text {
-					color: #999;
-				}
+	// @media (prefers-color-scheme: dark) {
+	// 	.radio-group {
+	// 		background: #1a1a1a;
+	// 		.radio-label {
+	// 			.radio-text {
+	// 				color: #fff;
+	// 			}
 				
-				.radio-item[checked] + .radio-text {
-					color: #0f6efe;
-				}
-			}
-		}
-	}
+	// 			.radio-item[checked] + .radio-text {
+	// 				color: #0f6efe;
+	// 			}
+	// 		}
+	// 	}
+	// }
 	.qstim{
 		width: 40%;
 		display: block;
diff --git a/packDetail/pages/sjdyj/index.vue b/packDetail/pages/sjdyj/index.vue
index 1bfe587..9166b77 100644
--- a/packDetail/pages/sjdyj/index.vue
+++ b/packDetail/pages/sjdyj/index.vue
@@ -28,7 +28,7 @@
 					<view class="qushicov" v-for="(item,index) in resolt" :key="index">
 						<text class="quname">{{item.itemName}}{{item.unit}}</text>
 						<view class="charts-box">
-							<qiun-data-charts type="area" :opts="opts" :chartData="item.chartData" />
+							<qiun-data-charts type="area" :opts="opts" :chartData="item.chartData"  :enableScroll="true" :ontouch="true" canvas2d />
 						</view>
 					</view>
 				</view>
@@ -794,10 +794,11 @@
 
 	.charts-box {
 		width: 100%;
-		height: 200px;
+		height: 400rpx;
 		/* 适当增加高度 */
 		overflow-x: auto;
 		/* 允许横向滚动 */
+		display: block;
 	}
 
 	.qushicov {
diff --git a/packDetail/static/login_fxmywr_icon_hi.png b/packDetail/static/login_fxmywr_icon_hi.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bedcc21d37860840045170d8bc9f8598286d579
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0008LNkl<Zcmb?d
zJ8KkC6#nkrhbu{DRw0F=;v<NiuZVVng@vevVqqtWPuSoekYpR%Xd)^pv<--$Hi}k~
zG(qC4k)VjCiz3M+E74?jj^CMOlii)ky2<8p&YnBpIrn_`+!t$6uU(Q<TTV{6IT>)f
z<gL>sKWGb~&B-YH_p;aJ6c|@8O+3jt$uRL%Cxh?S;28`qGRa;8w9~eP)?gp|S0un=
z#(iV_W#nWHv4})SoNLnIIv8f+yG*trG9m_G+(yRVcMOJfd~HY-2}|E&k{D&se(JJ?
zWCu9@T{b7XD+e!-u-qLieTYtn+KjXc@R}3eT24|TDXrxo!B%SXV&Db=2FrUCk~o43
zT+`0xvoB`g(j9bx^NLtKe#W8)@r{+E5aX)Ew6Af|FoV42x7iGi)2m05CL&`+!S*Ut
zQ1JSo`!=t*Z_vS6f6{)8w!3R_(sByNVw`2jPbLs1D+6Ni8!#M(0BqKW&kvv7co7`c
zJz3Sgh%gB{wUW&dM`HjB_<tZP-=dZ95G)-$l|_MTex$6tOQ)BPj`g^FnlKydssICn
zbXiRTrMuKn9RMdcV?{8IIxRbeR&Mi)3VjZ65eyon!MIj3Qir2?m*9=%d|s|FQ)86~
zURlrJ35g~V-%|b`q-$ITJ>f;MU<(8(8daKzOn4J`YSC~0a$oWhcL~^;NaJg%yZGx)
zVu~A@0b4SOFEqQTQ4w_Gk(mo;Go8W!BR)`Tg}KmD3qsIVfvI2PDj*&WV8mOGhYE%y
z=ryxk;4=jHWbk)&<QDQ~PE(ag*qiP%pJ@(L^;M;5PFUJa@V|m)Ss>95ug{F~(&=0F
zQNNqiZEhQKnxl$DftlN8%uC=94}%8$RBXj+aRc3wj*x^2d(G^0zq#YB!zL->EU^dF
z_uRK%RG$+lHlzWDk;nW$00030|5b+}U;qFB21!IgR09B+H0qQFyTmsD0000<MNUMn
GLSTZJ30`sl

literal 0
HcmV?d00001

diff --git a/pages/maps/index.vue b/pages/maps/index.vue
index df46a5c..54e5ad5 100644
--- a/pages/maps/index.vue
+++ b/pages/maps/index.vue
@@ -31,8 +31,8 @@
 				baseUrl:configService.staticDomainURL,
 				markers: [],
 				list: [],
-				issscd: true,
-				isssscd: true,
+				issscd: false,  // 团柏河显示状态 (false表示显示)
+				isssscd: false, // 对竹河显示状态 (false表示显示)
 				stationInfo: [],
 				cusLocation: [],
 				stationlist: [],
@@ -196,24 +196,24 @@
 				}
 			},
 			switch2Change(name) {
-				// 切换显示状态
-				if (name === "团柏河") {
-					this.stationlist = this.issscd ? 
-						this.stationTwolist.filter(item => item.groupName !== "团柏河") : 
-						this.stationTwolist;
-				} else {
-					this.stationlist = this.isssscd ? 
-						this.stationTwolist.filter(item => item.groupName !== "对竹河") : 
-						this.stationTwolist;
-				}
-				
-				// 更新标记显示
-				this.list1query();
-				
-				// 调整地图视野到指定区域
-				setTimeout(() => {
-					this.adjustMapToRegion(name);
-				}, 300);
+			    if (name === "团柏河") {
+			        this.issscd = !this.issscd;
+			    } else {
+			        this.isssscd = !this.isssscd;
+			    }
+			    
+			    // 根据当前状态调整地图视野
+			    if ((name === "团柏河" && !this.issscd) || (name === "对竹河" && !this.isssscd)) {
+			        // 如果是显示状态（绿色圆点），调整到指定区域
+			        setTimeout(() => {
+			            this.adjustMapToRegion(name);
+			        }, 300);
+			    } else {
+			        // 如果是隐藏状态（灰色圆点），调整到所有标记点
+			        setTimeout(() => {
+			            this.adjustMapToFitAllMarkers();
+			        }, 300);
+			    }
 			},
 			list1query() {
 				// 先清除所有orient类型的标记