样式更新

packDetail/pages/sjdyj/index.vue

@@ -23,11 +23,11 @@
 				@scrolltolower="lower"
 				v-if="List.length != 0">
 				<view class="itembox" v-for="(item,index) in List" :key="index">
-					<view class="itembox_top" v-if="item.stationName">
+					<view class="itembox_top" v-if="item.fullDeviceName">
 						<view class="itembox_lef">
 							<image src="../../static/fz.png" mode=""></image>
 							<view class="title">
-								{{item.stationName}}
+								{{item.fullDeviceName}}
 							</view>
 						</view>
 						<view class="itembox_right">
@@ -41,18 +41,18 @@
 									{{it}}
 								</view>
 							</view>
-							<view class="lists_item" v-for="(Item,Index) in item.alertContent" :key="Index">
+							<view class="lists_item" >
-								<view class="jczbs" v-if="Item.name">
+								<view class="jczbs">
-									{{Item.name}}
+									{{item.itemName?item.itemName:''}}
 								</view>
-								<view class="zbz" v-if="Item.val">
+								<view class="zbz" >
-									{{Item.val}}
+									{{item.survValue?item.survValue:''}}
 								</view>
-								<view class="sbsj" v-if="Item.valHeight" style="color: #FF4242;">
+								<view class="sbsj"  style="color: #FF4242;">
-									{{Item.valLow}}~{{Item.valHeight}}
+									{{item.normalValue?item.normalValue:''}}
 								</view>
-								<view class="szqss" v-if="Item.unit">
+								<view class="szqss" >
-									{{Item.unit}}
+									{{item.survUnit?item.survUnit:''}}
 								</view>
 							</view>
 						</block>
@@ -117,7 +117,7 @@
 			return {
 				List: [],
 				baseUrl: configService.apiUrl,
-				tabList: ['监测指标名称', '监测指标值', '阈值范围', '单位'],
+				tabList: ['监测项', '监测值', '阈值范围', '单位'],
 				array: [],
 				index: '',
 				sampTime: '',
@@ -320,7 +320,6 @@
 							} else {
 								this.List = this.List.concat(data);
 							}
-							
 							// 更新分页状态
 							const total = res.data.data.total || 0;
 							if (total > 0) {
@@ -615,10 +614,12 @@
 		background-color: white;
 		padding: 10rpx 30rpx;
 		margin-top: 20rpx;
+		border-bottom: 20rpx solid #f3f3f3;
 	}
 
 	.itembox:first-child {
 		margin-top: 0;
+		border-top: 20rpx solid #f3f3f3;
 	}
 
 	.itembox_top {
@@ -736,6 +737,7 @@
 		font-family: Source Han Sans SC;
 		font-weight: 400;
 		color: #667482;
+		text-align: center;
 	}
 
 	.zbz {
@@ -784,10 +786,12 @@
 		color: #2F3841;
 		display: inline-block;
 		padding-bottom: 8rpx;
+		text-align: center;
 	}
 
 	.tabitem:first-child {
-		width: 31%;
+		width: 32%;
+		text-align: center;
 	}
 
 	.tabitem:nth-child(2) {

pages/maps/index - 副本.vue

@@ -1,194 +1,355 @@
 <template>
 	<view class="container">
-		<!-- <image src="../../static/zddt.jpg" mode="" class="bgimg"  @click="todetail()"></image> -->
+		<map id="map" ref="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="111.436625"
-		<map
+			latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
-		 id="map"
+		</map>
-		 style="width: 100%; height:2000rpx;"
+		<view class="zdxq">
-		 scale="13"
+			<view class="zdxqitem" @click="switch2Change('团柏河')">
-		 :markers="markers"
-		 longitude="110.628279"
-		 latitude="35.546105"
-		 show-location
-		 @markertap="markertap"
-		 @callouttap="callouttap">
-		 <cover-view slot="callout">
-		 		<cover-view  v-for="(item,index) in markers" :key="index" class="customCallout" :marker-id="item.id">
-					<cover-image class="imgs" src="@/static/zhandian_icon_xuqin_title.png" v-if="item.stationType == 'livestock'"></cover-image>
-					<cover-image class="imgs" src="@/static/zhandian_icon_nongtian_title.png" v-if="item.stationType == 'orient'"></cover-image>
-		 			<cover-view class="content" v-if="item.stationType == 'livestock' || item.stationType == 'orient'">
-		 				{{item.stationName}}
-		 			</cover-view>
-		 		</cover-view>
-		 </cover-view>
-		 </map>
-		 <view class="zdxq">
-		 	<view class="zdxqitem">
-		 		<image src="../../static/zhandian_sahchong_dingwei.png" mode=""></image>
-				<view class="textss">
-					联网式太阳能杀虫灯
-				</view>
-		 	</view>
-			<view class="zdxqitem">
-				<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
-				<view class="textss">
-					畜禽养殖污染监测站
-				</view>
-			</view>
-			<view class="zdxqitem">
 				<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
 				<view class="textss">
-					农田面源污染监测站
+					团柏河典型小流域监测站
+				</view>
+				<!-- <view class="crildon" :style="!issscd?'background:#00ff37':'background: #ccc;'"></view> -->
+			</view>
+			<view class="zdxqitem" @click="switch2Change('对竹河')">
+				<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
+				<view class="textss">
+					对竹河典型小流域监测站
+				</view>
+				<!-- <view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view> -->
+			</view>
+			<view class="zdxqitem" @click="switch2Change('土壤')">
+				<image src="../../static/iconsheturangzs.png" mode=""></image>
+				<view class="textss">
+					土壤监测
 				</view>
 			</view>
-		 </view>
+		</view>
-		 <view class="switchs">
-			 <selectSwitch @change="switch1Change" :defaultSwitch="isscd" checked_bj_color="#13ce66"/>
-		 	<!-- <switch style="margin-right: 10rpx;" :checked="isscd" @change="switch1Change" /> -->
-			<!-- 显示/隐藏杀虫灯	 -->
-		 </view>
 	</view>
 </template>
 
 <script>
 	import api from '@/api/api'
-	import selectSwitch from "@/components/xuan-switch/xuan-switch.vue";
+	import configService from '@/common/service/config.service.js';
 	export default {
-		components: {	
-			selectSwitch
-		},
 		data() {
 			return {
+				baseUrl:configService.staticDomainURL,
 				markers: [],
-				list:[],
+				list: [],
-				pointers:[],
+				issscd: false,  // 团柏河显示状态 (false表示显示)
-				imgurl1:'@/static/zhandian_icon_nongtian_title.png',
+				isssscd: false, // 对竹河显示状态 (false表示显示)
-				imgurl2:'@/static/zhandian_icon_xuqin_title.png',
+				stationInfo: [],
-				isscd:true,
+				cusLocation: [],
+				stationlist: [],
+				stationTwolist:[],
+				mapCtx: null // 添加地图上下文
 			};
 		},
 		onLoad() {
-			// this.isscd = true
+			this.$nextTick(() => {
-			// this.getList()
-		},
-		onShow() {
-			this.isscd = true
-			this.$nextTick(()=>{
 				this.getList()
 			})
 		},
+		onReady() {
+			// 在onReady中初始化地图上下文
+			this.mapCtx = uni.createMapContext('map', this);
+		},
+		onShow() {
+			if (!uni.getStorageSync('third_session')) {
+				uni.reLaunch({
+					url: '/pages/loginindex'
+				})
+			}
+		},
 		methods: {
-			getList(){
+			getList() {
 				this.markers = []
-				this.pointers = []
 				this.list = []
+				this.stationInfo = []
+				this.cusLocation = []
+				this.stationlist = []
+				this.stationTwolist = []
+				
 				uni.showLoading({
 					title: '加载中'
 				});
-				this.$http.get('/applet/survStationInfo/stationMap').then(res =>{					
+				
-					if(this.isscd == true){
+				this.$http.get('/applet/survStationInfo/stationMap').then(res => {
-						this.list = []
+					// 合并 stationInfo 和 deviceList
-					}else if(this.isscd == false){
+					const combinedList = [...res.data.data.stationInfo, ...res.data.data.deviceList];
-						this.list = res.data.data.pestlight
+					this.stationlist = combinedList;
-					}
+					this.stationTwolist = [...res.data.data.stationInfo];
-					var stationlist = res.data.data.stationInfo
+					
-					if(this.list.length!=0){
+					console.log("合并后的stationlist+++++", this.stationlist);
-						for(var i=0;i<this.list.length;i++){
+					
-							this.list[i].stationType = this.list[i].inType
+					// 处理所有标记点
+					this.stationlist.forEach((item, index) => {
+						item.id = index;
+						
+						// 统一字段名称，处理 deviceList 和 stationInfo 的字段差异
+						const markerItem = {
+							id: item.id,
+							latitude: Number(item.latitude || item.stationLatitude),
+							longitude: Number(item.longitude || item.stationLongitude),
+							stationType: item.stationType || 'device', // deviceList 没有 stationType，默认为 'device'
+							sortNo: item.sortNo || index,
+							stationName: item.name || item.stationName,
+							stationCode: item.ids || item.stationCode || item.id,
+							// 添加分组信息
+							groupName: item.groupName || '',
+							// 设备类型
+							deviceType: item.type || null
+						};
+						
+						this.list.push(markerItem);
+						
+						// 分类处理
+						if (item.stationType === 'cusLocaltion') {
+							this.cusLocation.push(item);
 						}
-					}
+						if (item.stationType === 'orient' || item.stationType === 'livestock') {
-					if(stationlist){
+							this.stationInfo.push(item);
-						for(var k=0;k<stationlist.length;k++){
-							this.list.push({
-								latitude:stationlist[k].stationLatitude,
-								longitude:stationlist[k].stationLongitude,
-								stationType:stationlist[k].stationType,
-								sortNo:stationlist[k].sortNo,
-								stationName:stationlist[k].stationName,
-								stationCode:stationlist[k].stationCode
-							})
 						}
-					}
+					});
-					console.log(this.list,'数组')
+					
-					// return
+					this.issscd = false
-					if(this.list.length != 0){
+					this.isssscd = false
-						for(var i=0;i<this.list.length;i++){
+					this.qiyeChange()
-							if(this.list[i].stationType == 'pestlight'){
+					this.list1query()
-								this.list[i].iconPath = '/static/zhandian_sahchong_dingwei.png'
+					this.addDeviceMarkers() // 添加设备标记
-								this.list[i].latitude = Number(this.list[i].latitude)
+					
-								this.list[i].longitude = Number(this.list[i].longitude)
+					// 延迟执行以确保标记已经添加到地图
-								this.list[i].width = 15
+					setTimeout(() => {
-								this.list[i].height = 20
+						this.adjustMapToFitAllMarkers();
-							}else if(this.list[i].stationType == 'orient'){
+					}, 500);
-								this.list[i].iconPath = '/static/zhandian_nongtian_dingwei.png'
+					
-								this.list[i].latitude = Number(this.list[i].latitude)
-								this.list[i].longitude = Number(this.list[i].longitude)
-								this.list[i].width = 35
-								this.list[i].height = 52
-							}else if(this.list[i].stationType == 'livestock'){
-								this.list[i].iconPath = '/static/zhandian_xuqin_dingwei.png'
-								this.list[i].latitude = Number(this.list[i].latitude)
-								this.list[i].longitude = Number(this.list[i].longitude)
-								this.list[i].width = 35
-								this.list[i].height = 52
-							}
-							this.pointers.push({
-								id:i,
-								iconPath:this.list[i].iconPath,
-								latitude:this.list[i].latitude,
-								longitude:this.list[i].longitude,
-								width:this.list[i].width,
-								height:this.list[i].height,
-								customCallout: {
-									anchorY: 0, // Y轴偏移量
-									anchorX: 0, // X轴偏移量
-									display: 'ALWAYS' ,// 一直展示								
-								},
-								stationType:this.list[i].stationType,
-								stationName:this.list[i].stationName,
-								stationCode:this.list[i].stationCode,
-							})
-						}
-					}	
-					this.markers = this.pointers
-					console.log(this.markers,1523)
 					uni.hideLoading();
 				})
 			},
-			markertap(e){
+			
-				console.log(e,'点击')
+			// 添加设备标记
-				var index = e.detail.markerId
+			addDeviceMarkers() {
-				if(this.list[index].stationType == 'orient' || this.list[index].stationType == 'livestock'){
+				this.stationlist.forEach((item, index) => {
-					uni.navigateTo({
+					// 如果是 deviceList 中的设备（有 type 字段但没有 stationType 字段）
-						url:'/packDetail/pages/Site/detail?item='+ encodeURIComponent(JSON.stringify(this.list[index]))
+					if (item.type && !item.stationType) {
-					})
+						let iconPath = '';
+						let width = 35;
+						let height = 35;
+						
+						// 根据设备类型设置不同的图标
+						switch(item.type) {
+							case 'soil':
+								iconPath = this.baseUrl + '/icon/device/soil.png';
+								width = 40;
+								height = 40;
+								break;
+							case 'camera':
+								iconPath = this.baseUrl + '/icon/device/cam.png';
+								width = 45;
+								height = 45;
+								break;
+							default:
+								iconPath = this.baseUrl + '/icon/device/default.png';
+						}
+						
+						const markerItem = {
+							id: item.id,
+							iconPath: iconPath,
+							latitude: Number(item.latitude),
+							longitude: Number(item.longitude),
+							width: width,
+							height: height,
+							customCallout: {
+								anchorY: 0,
+								anchorX: 0,
+								display: 'ALWAYS'
+							},
+							stationType: 'device',
+							stationName: item.name,
+							stationCode: item.ids,
+							deviceType: item.type,
+							joinCluster: true
+						};
+						this.markers.push(markerItem);
+					}
+				});
+			},
+			
+			// 调整地图视野以包含所有标记点
+			adjustMapToFitAllMarkers() {
+				if (this.mapCtx && this.list.length > 0) {
+					this.mapCtx.includePoints({
+						points: this.list.map(item => ({
+							latitude: item.latitude,
+							longitude: item.longitude
+						})),
+						padding: [40, 40, 40, 40] // 上下左右的边距
+					});
 				}
 			},
-			callouttap(e){
+			
-				console.log(e,'点击111')
+			// 调整地图视野到特定区域的标记点
-				var index = e.detail.markerId
+			adjustMapToRegion(regionName) {
-				if(this.list[index].stationType == 'orient' || this.list[index].stationType == 'livestock'){
+				let points = [];
-					uni.navigateTo({
+				
-						url:'/packDetail/pages/Site/detail?item='+ encodeURIComponent(JSON.stringify(this.list[index]))
+				if (regionName === '团柏河') {
-					})
+					// 获取团柏河区域的所有标记点
+					points = this.stationTwolist
+						.filter(item => item.groupName === '团柏河')
+						.map(item => ({
+							latitude: Number(item.stationLatitude),
+							longitude: Number(item.stationLongitude)
+						}));
+				} else if (regionName === '对竹河') {
+					// 获取对竹河区域的所有标记点
+					points = this.stationTwolist
+						.filter(item => item.groupName === '对竹河')
+						.map(item => ({
+							latitude: Number(item.stationLatitude),
+							longitude: Number(item.stationLongitude)
+						}));
+				}
+				
+				if (points.length > 0 && this.mapCtx) {
+					this.mapCtx.includePoints({
+						points: points,
+						padding: [60, 60, 60, 60] // 可以调整边距以获得更好的显示效果
+					});
 				}
 			},
-			todetails(item){
+			
-				console.log(item,'还是个然后')
+			markertap(e) {
+				const index = e.detail.markerId
+				const marker = this.markers.find(m => m.id === index);
+				if (marker) {
+					if (['orient', 'livestock'].includes(marker.stationType)) {
+						uni.navigateTo({
+							url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
+						})
+					} else if (marker.stationType === 'device') {
+						// 处理设备点击事件
+						uni.showToast({
+							title: `设备: ${marker.stationName}`,
+							icon: 'none'
+						});
+						// 可以在这里添加设备详情页面的跳转逻辑
+					}
+				}
+			},
+			
+			callouttap(e) {
+				const index = e.detail.markerId
+				const marker = this.markers.find(m => m.id === index);
+				if (marker) {
+					if (['orient', 'livestock'].includes(marker.stationType)) {
+						uni.navigateTo({
+							url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
+						})
+					} else if (marker.stationType === 'device') {
+						// 处理设备点击事件
+						uni.showToast({
+							title: `设备: ${marker.stationName}`,
+							icon: 'none'
+						});
+					}
+				}
+			},
+			
+			qiyeChange() {
+				for (let i = 0; i < this.cusLocation.length; i++) {
+					const item = this.cusLocation[i];
+					item.iconPath = '/static/qiyeIcon.png';
+					item.latitude = Number(item.stationLatitude);
+					item.longitude = Number(item.stationLongitude);
+					item.width = 35;
+					item.height = 52;
+					
+					const markerItem = {
+						id: item.id,
+						iconPath: item.iconPath,
+						latitude: item.latitude,
+						longitude: item.longitude,
+						width: item.width,
+						height: item.height,
+						customCallout: {
+							anchorY: 0,
+							anchorX: 0,
+							display: 'ALWAYS'
+						},
+						stationType: item.stationType,
+						stationName: item.stationName,
+						stationCode: item.stationCode,
+						joinCluster: true
+					};
+					this.markers.push(markerItem);
+				}
+			},
+			
+			switch2Change(name) {
+			    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类型的标记
+				this.markers = this.markers.filter(item => item.stationType !== 'orient');
+				
+				if (!this.issscd) {
+					for (let i = 0; i < this.stationlist.length; i++) {
+						const item = this.stationlist[i];
+						if (item.stationType === 'orient') {
+							item.iconPath = this.baseUrl +'/'+ item.stationIcon;
+							item.latitude = Number(item.stationLatitude);
+							item.longitude = Number(item.stationLongitude);
+							item.width = 172;
+							item.height = 148;
+							
+							const markerItem = {
+								id: item.id,
+								iconPath: item.iconPath,
+								latitude: item.latitude,
+								longitude: item.longitude,
+								width: item.width,
+								height: item.height,
+								customCallout: {
+									anchorY: 0,
+									anchorX: 0,
+									display: 'ALWAYS'
+								},
+								stationType: item.stationType,
+								stationName: item.stationName,
+								stationCode: item.stationCode,
+								joinCluster: true
+							};
+							this.markers.push(markerItem);
+						}
+					}
+				}
 			},
-			switch1Change(e){
-				console.log(e,'gwgweg')
-				this.isscd = e
-				// this.isscd = e.detail.value
-				this.$nextTick(()=>{
-					this.getList()
-				})
-			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.bgimg{
+	/* 样式保持不变 */
+	.bgimg {
 		position: fixed;
 		// z-index: -99;
 		top: 0;
@@ -196,7 +357,8 @@
 		width: 100%;
 		height: 100%;
 	}
-	.customCallout{
+
+	.customCallout {
 		width: 349rpx;
 		height: 49rpx;
 		color: #fff;
@@ -210,7 +372,8 @@
 		align-items: center;
 		justify-content: center;
 	}
-	.customCallout1{
+
+	.customCallout1 {
 		width: 349rpx;
 		height: 49rpx;
 		color: #fff;
@@ -224,12 +387,14 @@
 		align-items: center;
 		justify-content: center;
 	}
-	.zdxq{
+
+	.zdxq {
 		position: fixed;
 		left: 33rpx;
 		bottom: 36rpx;
 	}
-	.zdxqitem{
+
+	.zdxqitem {
 		padding: 8rpx 0 7rpx 17rpx;
 		display: flex;
 		align-items: center;
@@ -238,42 +403,55 @@
 		font-family: Source Han Sans SC;
 		font-weight: 500;
 		color: #FFFFFF;
-		text-shadow: 0rpx 1rpx 0rpx rgba(4,49,52,0.55);
+		text-shadow: 0rpx 1rpx 0rpx rgba(4, 49, 52, 0.55);
-		width: 299rpx;
+		width: 359rpx;
-		background: rgba(0,0,0,0.52);
+		background: rgba(0, 0, 0, 0.52);
 		border: 1px solid #4B677C;
 		border-radius: 6rpx;
 		margin-bottom: 10rpx;
 		position: relative;
 	}
-	.zdxqitem:last-child{
+
+	.crildon {
+		width: 10rpx;
+		height: 10rpx;
+		border-radius: 50%;
+		margin-right: 15rpx;
+	}
+
+	.zdxqitem:last-child {
 		margin-bottom: 0;
 	}
-	.zdxqitem image{
+
+	.zdxqitem image {
 		width: 33rpx;
 		height: 50rpx;
 		margin-right: 15rpx;
 	}
-	.zdxqitem:first-child image{
+
+	.zdxqitem:first-child image {
 		width: 30rpx;
 		height: 40rpx;
 		margin-right: 15rpx;
 	}
-	.textss{
+
+	.textss {
 		flex: 1;
 		text-align: left;
 	}
-	.imgs{
+
+	.imgs {
 		position: absolute;
 		width: 100%;
 		height: 100%;
 		z-index: -9;
 	}
-	.switchs{
+
+	.switchs {
 		position: fixed;
-		top:36rpx;
+		top: 36rpx;
 		right: 40rpx;
 		display: flex;
-		align-items: center;		
+		align-items: center;
 	}
 </style>

pages/maps/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<map id="map" ref="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="111.436625"
+		<map id="map" ref="map" style="width: 100%; height: calc(100vh + 50rpx);" scale="13" :markers="markers" longitude="111.436625"
 			latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
 		</map>
 		<view class="zdxq">
@@ -9,14 +9,18 @@
 				<view class="textss">
 					团柏河典型小流域监测站
 				</view>
-				<view class="crildon" :style="!issscd?'background:#00ff37':'background: #ccc;'"></view>
 			</view>
 			<view class="zdxqitem" @click="switch2Change('对竹河')">
 				<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
 				<view class="textss">
 					对竹河典型小流域监测站
 				</view>
-				<view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view>
+			</view>
+			<view class="zdxqitem" @click="switch2Change('土壤')">
+				<image src="../../static/iconsheturangzs.png" mode=""></image>
+				<view class="textss">
+					土壤监测
+				</view>
 			</view>
 		</view>
 	</view>
@@ -33,6 +37,7 @@
 				list: [],
 				issscd: false,  // 团柏河显示状态 (false表示显示)
 				isssscd: false, // 对竹河显示状态 (false表示显示)
+				isSoilShow: false, // 土壤显示状态 (false表示显示)
 				stationInfo: [],
 				cusLocation: [],
 				stationlist: [],
@@ -109,6 +114,7 @@
 					
 					this.issscd = false
 					this.isssscd = false
+					this.isSoilShow = false
 					this.qiyeChange()
 					this.list1query()
 					this.addDeviceMarkers() // 添加设备标记
@@ -203,6 +209,14 @@
 							latitude: Number(item.stationLatitude),
 							longitude: Number(item.stationLongitude)
 						}));
+				} else if (regionName === '土壤') {
+					// 获取所有土壤设备标记点
+					points = this.stationlist
+						.filter(item => item.type === 'soil' || item.deviceType === 'soil')
+						.map(item => ({
+							latitude: Number(item.latitude || item.stationLatitude),
+							longitude: Number(item.longitude || item.stationLongitude)
+						}));
 				}
 				
 				if (points.length > 0 && this.mapCtx) {
@@ -210,6 +224,12 @@
 						points: points,
 						padding: [60, 60, 60, 60] // 可以调整边距以获得更好的显示效果
 					});
+				} else if (points.length === 0) {
+					// 如果没有找到对应的标记点，显示提示
+					uni.showToast({
+						title: `未找到${regionName}相关的监测点`,
+						icon: 'none'
+					});
 				}
 			},
 			
@@ -281,24 +301,35 @@
 			},
 			
 			switch2Change(name) {
-			    if (name === "团柏河") {
+				// 更新对应区域的状态
-			        this.issscd = !this.issscd;
+				const stateMap = {
-			    } else {
+					'团柏河': 'issscd',
-			        this.isssscd = !this.isssscd;
+					'对竹河': 'isssscd', 
-			    }
+					'土壤': 'isSoilShow'
-			    
+				};
-			    // 根据当前状态调整地图视野
+				
-			    if ((name === "团柏河" && !this.issscd) || (name === "对竹河" && !this.isssscd)) {
+				if (stateMap[name]) {
-			        // 如果是显示状态（绿色圆点），调整到指定区域
+					this[stateMap[name]] = !this[stateMap[name]];
-			        setTimeout(() => {
+				}
-			            this.adjustMapToRegion(name);
+				
-			        }, 300);
+				// 判断是否要聚焦到特定区域
-			    } else {
+				const shouldFocus = {
-			        // 如果是隐藏状态（灰色圆点），调整到所有标记点
+					'团柏河': !this.issscd,
-			        setTimeout(() => {
+					'对竹河': !this.isssscd,
-			            this.adjustMapToFitAllMarkers();
+					'土壤': !this.isSoilShow
-			        }, 300);
+				};
-			    }
+				
+				if (shouldFocus[name]) {
+					// 聚焦到特定区域
+					setTimeout(() => {
+						this.adjustMapToRegion(name);
+					}, 300);
+				} else {
+					// 恢复显示所有标记点
+					setTimeout(() => {
+						this.adjustMapToFitAllMarkers();
+					}, 300);
+				}
 			},
 			
 			list1query() {