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 0000000..4bedcc2
Binary files /dev/null and b/packDetail/static/login_fxmywr_icon_hi.png differ
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类型的标记