统计趋势图修改

App.vue

@@ -190,12 +190,20 @@
 
 		},
 		onLoad() {
-      console.log('App onLoad!')
+			if(!uni.getStorageSync('third_session')){
+				uni.reLaunch({
+					url:'/packDetail/pages/login/login'
+				})
+			}else{
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			}
 		},
 		onShow: function() {
 		},
 		onHide: function() {
-			console.log('App Hide1')
+			console.log('App Hide')
 		}
 
 	}

api/api.js

@@ -1,6 +1,5 @@
 import { http } from '@/common/service/service.js'
 import configService from '@/common/service/config.service.js';
-import indexData from "@/pages/index/indexData";
 const apiService = {
 
 	 /**
@@ -38,55 +37,7 @@ const apiService = {
 	    }else{
 	        return configService.staticDomainURL + "/" + avatar;
 	    }
-	},
+	}
-	// 检查登录并执行：api.checkLogin(()=>{}, () => {});
-	checkLogin(successCallback,failCallback){
-		let that = this;
-		if (uni.getStorageSync('userInfo') && uni.getStorageSync('third_session')) {
-			if(successCallback){
-				successCallback();
-			}
-		} else {
-			uni.login({
-				success: function(res) {
-					let params = {}
-					params.jsCode = res.code
-					that.wxlogin(params).then(res => {
-						that.loginCallback(res, successCallback, failCallback);
-					})
-				}
-			});
-		}
-	},
-	loginCallback(res, successCallback, failCallback){
-		let that = this;
-		if (res.data.code == 0) {
-			let userInfo = res.data.data;
-			if (!userInfo.id) {
-				console.error('登录失败',userInfo)
-				that.loginFail();
-				if(failCallback){
-					failCallback();
-				}
-			} else {
-				console.warn('登录成功',userInfo)
-				uni.setStorageSync('userInfo', userInfo);
-				uni.setStorageSync('third_session', userInfo.thirdSession);
-				if(successCallback){
-					successCallback();
-				}
-			}
-		} else {
-			that.loginFail();
-			if(failCallback){
-				failCallback();
-			}
-		}
-	},
-	loginFail () {
-		uni.removeStorageSync('third_session')
-		uni.removeStorageSync('userInfo');
-	},
 };
 
 export default apiService;

common/service/service.js

@@ -22,12 +22,10 @@ let apiUrl = configService.apiUrl;
 
 const http = new Request()
 http.setConfig((config) => { /* 设置全局配置 */
-  config.baseUrl = apiUrl; /* 根域名不同 */
+  config.baseUrl = apiUrl /* 根域名不同 */
   config.header = {
     ...config.header
-  };
+  }
-  console.log(config)
-  // config.headers['X-Access-Token'] = localStorage.getItem("token")
   return config
 })
 
@@ -47,8 +45,8 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
      // 'X-Access-Token':getTokenStorage()
 	 'app-id' : uni.getAccountInfoSync().miniProgram.appId,
 	 "client-type" : "MA",
-	 'third-session' : uni.getStorageSync('third_session')||'123',
+	 'third-session' : uni.getStorageSync('third_session'),
-	 'X-Tenant-Id' : '1004'
+	  'X-Tenant-Id' : '1001'
   }
   /*
   if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行

manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "农业面源污染监测系统",
+    "name" : "汾西小流域面源污染监测",
-    "appid" : "__UNI__A58A5D7",
+    "appid" : "__UNI__44A8AB0",
     "description" : "",
     "versionName" : "2.2.22",
     "versionCode" : 233,
@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx2fb61322f3042141",
+        "appid" : "wx54f76f700fe3a498",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

packDetail/pages/Site/detail.vue

@@ -102,7 +102,7 @@
 				</view>
 				<view class="jczb_bot">
 					<view>
-						<view class="jccontent" v-if="orientlist && orientlist.length != 0">
+						<view class="jccontent" v-if="orientlist.length != 0">
 							<view class="titles">
 								重要污染物监测
 							</view>
@@ -120,7 +120,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="jccontent" v-if="livelist && livelist.length != 0">
+						<view class="jccontent" v-if="livelist.length != 0">
 							<view class="titles">
 								重要污染物监测
 							</view>
@@ -260,12 +260,14 @@
 		},
 		onLoad(options) {
 			this.item = JSON.parse(decodeURIComponent(options.item));
+			console.log("...........",this.item)
 			uni.getSystemInfo({
 				success: res => {
 					var pxToRpxScale  = 750 / res.windowWidth
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
@@ -291,7 +293,6 @@
 						this.livelist = res.data.data.liveSurvData
 						this.stinklist = res.data.data.stinkSurvData
 						this.survCamera = res.data.data.survCamera
-						this.survItemList = res.data.data.stationInfo.survColorItems
 					}
 					uni.hideLoading();
 				})
@@ -305,7 +306,6 @@
 				let items = item.deployCode.split('-')
 				var obj = {
 					url: "https://m.ilhzn.cn/#/pages/cameraView/ysyCamera",
-					// url: "https://m.ilhzn.cn/#/pages/cameraView/cameraView",
 					deployDes: item.deployDes + '-' + '',
 					ysToken: this.token,
 					deviceIotUrl: item.deviceUrl
@@ -327,6 +327,7 @@
 				 })
 			},
 			tosjdetail(item,index){
+				console.log(item,'gegwg')
 				uni.navigateTo({
 					url:'/packDetail/pages/Site/sjdetail?item=' + encodeURIComponent(JSON.stringify(item)) + '&stationCode='+this.details.stationCode + '&stationName=' + this.details.stationName
 				})

packDetail/pages/Site/index.vue

@@ -9,7 +9,6 @@
 					<view class="list_item_top">
 						<view class="list_item_left">
 							<image v-if="item.stationType == 'livestock'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
-							<image v-else-if="item.stationType == 'watershed'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
 							<image v-else src="../../static/zd.png" mode=""></image>
 							<view class="item_right" v-if="item.stationName">
 								<view class="right_top">
@@ -87,7 +86,6 @@
 				pageNo:1,
 				pageSize:4,
 				isRefresher: false, //下拉刷新状态
-				isLoading: false, // 添加加载状态锁
 			}
 		},
 		onLoad() {
@@ -97,6 +95,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
@@ -112,69 +111,71 @@
 			refresherpullingFun() {
 				this.isRefresher= true
 			},
-			getList(isRefresh = false) {
+			getList(){
-			        // 防止重复请求
+				let params = {}
-			        if (this.isLoading) return
+				params.pageNo = this.pageNo
-			        this.isLoading = true
+				params.pageSize = this.pageSize
-			        
+				uni.showLoading({
-			        let params = {
+					title: '加载中'
-			            pageNo: this.pageNo,
+				});
-			            pageSize: this.pageSize
+				this.List = []
-			        }
+				this.$http.get('/applet/survStationInfo/page',{params:params}).then(res =>{
-			        
+					if(res.data.code == 0){
-			        // 只有首次加载才显示全局loading
+						var data = res.data.data.records
-			        if (this.pageNo === 1 && !isRefresh) {
+						this.List = this.List.concat(data)
-			            uni.showLoading({ title: '加载中' })
+						for(var i=0;i<this.List.length;i++){
-			        }
+							if(this.List[i].deviceCount >= 10000 && this.List[i].deviceCount < 100000000){
-			        
+								this.List[i].deviceCount = (this.List[i].deviceCount /10000).toFixed(1) + '万'
-			        // 首次加载清空列表，下拉刷新时不清空
+							}
-			        if (this.pageNo === 1 && !isRefresh) {
+							if(this.List[i].deviceCount >= 100000000){
-			            this.List = []
+								this.List[i].deviceCount = (this.List[i].deviceCount /100000000).toFixed(1) + '亿'
-			        }
+							}
-			        
+							if(this.List[i].survObj.length >= 10000 && this.List[i].survObj.length < 100000000){
-			        this.$http.get('/applet/survStationInfo/page', { params }).then(res => {
+								this.List[i].survObj.length = (this.List[i].survObj.length /10000).toFixed(1) + '万'
-			            this.isLoading = false
+							}
-			            uni.hideLoading()
+							if(this.List[i].survObj.length >= 100000000){
-			            this.isRefresher = false
+								this.List[i].survObj.length = (this.List[i].survObj.length /100000000).toFixed(1) + '亿'
-			            
+							}
-			            if (res.data.code === 0) {
+							if(this.List[i].survDataCount >= 10000 && this.List[i].survDataCount < 100000000){
-			                let data = res.data.data.records || []
+								this.List[i].survDataCount = (this.List[i].survDataCount /10000).toFixed(1) + '万'
-			                if (this.pageNo === 1) {
+							}
-			                    this.List = data
+							if(this.List[i].survDataCount >= 100000000){
-			                } else {
+								this.List[i].survDataCount = (this.List[i].survDataCount /100000000).toFixed(1) + '亿'
-			                    this.List = this.List.concat(data)
+							}
-			                }
+						}
-			                
+						console.log(this.List,'35415')
-			                // 格式化数据
+						if(res.data.data.total != 0){
-			                this.formatData()
+							this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
-			                
+							console.log(this.allNum,'总页数')
-			                // 更新分页状态
+							if(this.allNum.indexOf('.') == -1) {
-			                this.updatePaginationStatus(res.data.data.total)
+								this.allNum = this.allNum;
-			            }
+								console.log(this.allNum,'if')
-			        }).catch(err => {
+							} else {
-			            this.isLoading = false
+								this.allNum = parseInt(Number(this.allNum)+1);
-			            uni.hideLoading()
+								console.log(this.allNum,'else')
-			            this.isRefresher = false
+							}
-			        })
+							console.log(this.pageNo,this.allNum,'156156')
-			    },
+							if(this.pageNo == this.allNum) {
-				formatData() {
+								this.isLastpage = true;
-				        // 将数据格式化逻辑提取出来
+								 this.loadStatus='nomore'
-				        this.List.forEach(item => {
+								console.log(this.isLastpage,'true','nomore')
-				            item.deviceCount = this.formatNumber(item.deviceCount)
+							} else {
-				            item.survObj.length = this.formatNumber(item.survObj.length)
+								this.isLastpage = false;
-				            item.survDataCount = this.formatNumber(item.survDataCount)
+								// this.isLoadMore=true
-				        })
+								this.loadStatus = 'more'
-				    },
+								console.log(this.isLastpage,'false')
-				    
+							}
-				    formatNumber(num) {
+						}else{
-				        if (num >= 100000000) {
+							this.isLastpage = true;
-				            return (num / 100000000).toFixed(1) + '亿'
+							this.loadStatus='nomore'
-				        } else if (num >= 10000) {
+						}
-				            return (num / 10000).toFixed(1) + '万'
+					}
-				        }
+					uni.hideLoading();
-				        return num || 0
+					this.isRefresher= false
-				    },
+				})
+			},
 			lower() {
+				console.log("最后一页了，取消下拉功能");
 				// 最后一页了，取消下拉功能
 				if (this.isLastpage) {
 					return
@@ -184,6 +185,7 @@
 				this.intervalId = setInterval(() => {
 					num = num+1;
 				},1000)
+					console.log(this.intervalId,num)
 				this.pageNo = this.pageNo + 1;
 				let params = {}
 				params.pageNo = this.pageNo
@@ -196,10 +198,12 @@
 							if(this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								 this.loadStatus='nomore'
+								console.log(this.isLastpage,'true')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage,'false')
 							}
 						}else{
 							this.isLastpage = true;

packDetail/pages/Site/sjdetail.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="container">
 		<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar
-			:title="details.name"/>
+			:title="details.name" />
-		<view class="contant" v-if="details.icon || details.name">
+		<view class="contant">
 			<view class="list_item">
 				<view class="list_item_top">
 					<view class="list_item_left">
-						<image :src="baseUrl + '/' + details.icon" mode=""></image>
+						<image :src="details.icon" mode=""></image>
 						<view class="item_right">
 							<view class="right_top" v-if="details.name">
 								监测指标-{{details.name}}
@@ -64,14 +64,12 @@
 <script>
 	import uniEcCanvas from '../../components/uni-ec-canvas/uni-ec-canvas.vue'
 	import * as echarts from '../../components/uni-ec-canvas/echarts.js'
-  import configService from "@/common/service/config.service";
 	export default {
 		components: {
 			uniEcCanvas,
 		},
 		data() {
 			return {
-        baseUrl:configService.staticDomainURL,
 				items: {},
 				details: {},
 				list: [],
@@ -132,6 +130,8 @@
 											value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2),
 											dataDateTime:data[i].dataDateTime
 										})
+										console.log(data[i].codelist, '数据')
+										console.log(data, '数据全部')
 									}
 								}
 							}
@@ -139,19 +139,26 @@
 					}
 					// this.list = data
 					this.list = this.list.concat(data)
+					// console.log(this.list, '数据all')
 					if(res.data.data.total != 0){
 						this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
+						console.log(this.allNum,'总页数')
 						if(this.allNum.indexOf('.') == -1) {
 							this.allNum = this.allNum;
+							console.log(this.allNum,'if')
 						} else {
 							this.allNum = parseInt(Number(this.allNum)+1);
+							console.log(this.allNum,'else')
 						}
+						console.log(this.pageNo,this.allNum,'156156')
 						if(this.pageNo == this.allNum) {
 							this.isLastpage = true;
 							 this.loadStatus='nomore'
+							console.log(this.isLastpage,'true','nomore')
 						} else {
 							this.isLastpage = false;
 							this.loadStatus = 'more'
+							console.log(this.isLastpage,'false')
 						}
 					}else{
 						this.isLastpage = true;
@@ -160,6 +167,7 @@
 				})
 			},
 			lower() {
+				console.log("最后一页了，取消下拉功能");
 				// 最后一页了，取消下拉功能
 				if (this.isLastpage) {
 					return
@@ -169,6 +177,7 @@
 				this.intervalId = setInterval(() => {
 					num = num+1;
 				},1000)
+					console.log(this.intervalId,num)
 				this.pageNo = this.pageNo + 1;
 				let params = {}
 				params.pollutionCode = this.details.code
@@ -190,6 +199,8 @@
 												value: (Math.floor(Object.values(data[i])[k] * 100) / 100).toFixed(2),
 												dataDateTime:data[i].dataDateTime
 											})
+											console.log(data[i].codelist, '数据')
+											console.log(data, '数据全部')
 										}
 									}
 								}
@@ -201,10 +212,12 @@
 							if(this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								 this.loadStatus='nomore'
+								console.log(this.isLastpage,'true')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage,'false')
 							}
 						}else{
 							this.isLastpage = true;

packDetail/pages/analysis/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container" ref="pageContainer">
+	<view class="container">
 		<!-- <image src="../../static/sjfx.png" mode="" class="bgimg"></image> -->
 		<view class="pj">
 			<view class="pjtitle">
@@ -28,8 +28,8 @@
 			</view>
 			<view class="sxbox wrwCov">
 				<view class="leftsxbox">
-					<picker @change="bindPickerChange" :value="index" :range="stationNameList">
+					<picker @change="bindPickerChange" :value="index" :range="array">
-						<view class="uni-input">{{stationNameList[index]}}
+						<view class="uni-input">{{array[index]}}
 							<image src="../../static/data_btn_sanjiao_xia.png"></image>
 						</view>
 					</picker>
@@ -43,29 +43,21 @@
 			<!-- 年月日选择器 -->
 			<view class="uni-form-item uni-column">
 			  <radio-group class="radio-group" @change="radioChange">
-			    <label class="radio-label" v-for="(item, index) in timList" :key="item.value" :class="{ 'checked': current === index }">
+			    <label class="radio-label" v-for="(item, index) in timList" :key="item.value">
-			      <radio :value="item.value" :checked="index === current" class="radio-item" color="#0f6efe" />
+			      <radio :value="item.value" :checked="index === current" class="radio-item" />
 			      <view class="radio-text">{{item.name}}</view>
 			    </label>
 			  </radio-group>
 			</view>
-			<view class="qstcontent" id="chartContainer" ref="chartContainer">
+			<view class="qstcontent">
-				<!-- 有数据时显示图表 -->
 				<qiun-data-charts 
-				  :key="chartKey"
-				  v-if="hasChartData && chartData.series && chartData.series.length > 0"
 				  type="line"
 				  :opts="opts"
 				  :chartData="chartData"
 				  :enableScroll="true"
 				  :ontouch="true"
 				  canvas2d
-				  @finished="onChartFinished"
 				/>
-				<!-- 无数据时显示占位 -->
-				<view v-else class="empty-chart">
-					<text class="empty-text">暂无数据</text>
-				</view>
 			</view>
 		</view>
 		<view class="znyj">
@@ -79,8 +71,8 @@
 			</view>
 			<view class="sxbox">
 				<view class="leftsxbox">
-					<picker @change="bindPickerChange1" :value="index1" :range="deviceNameList">
+					<picker @change="bindPickerChange1" :value="index1" :range="array1">
-						<view class="uni-input1">{{deviceNameList[index1]}}
+						<view class="uni-input1">{{array1[index1]}}
 							<image src="../../static/data_btn_sanjiao_xia.png"></image>
 						</view>
 					</picker>
@@ -134,30 +126,16 @@
 				height: 0,
 				scorllheight: 0,
 				zt: '',
-				date: new Date().getFullYear().toString(),
+				date: new Date().getFullYear(),
-				
+				array: [],
-				// ===== 趋势图相关数据 =====
+				index: 0,  // 改为0，默认选择第一个
-				stationNameList: [],        // 站点名称列表（用于趋势图选择器）
+				index1: 0,
-				stationList: [],            // 站点完整列表 [{label, value: stationCode}]
+				array1: [],
-				index: 0,                   // 趋势图选中的站点索引
+				arrays: [],
-				stationCode: '',            // 当前选中的站点编码（趋势图接口参数）
-				
-				// ===== 预警相关数据 =====
-				deviceNameList: ['全部监测设备'], // 设备名称列表（用于预警选择器）
-				deviceList: [{              // 设备完整列表 [{label, value: deployId}]
-					label: '全部监测设备',
-					value: ''
-				}],
-				index1: 0,                  // 预警选中的设备索引
-				deployId: '',               // 当前选中的设备部署ID（预警接口参数）
-				
 				list: [],
 				tabList: ['站点名称', '告警指标', '指标值', '告警时间'],
 				pjlist: [],
-				chartData: {
+				chartData: {},
-					categories: [],
-					series: []
-				},
 				opts: {
 					color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
 					padding: [15,10,0,15],
@@ -204,9 +182,15 @@
 				top: 0,
 				total: 0,
 				yearStr: null,
+				stationName1: '',
+				stationCode1: null,
+				stationCode: '',  // 趋势图站点编码
+				arrays1: [],
+				zxtdata: [],
 				timList: [{
 						value: 'yearMonth',
-						name: '年'
+						name: '年',
+						checked: 'true'
 					},
 					{
 						value: 'monthDays',
@@ -218,16 +202,11 @@
 					},
 				],
 				current: 0,
-				dateqs: new Date().getFullYear().toString(),
+				dateqs: new Date().getFullYear().toString(), // 改为字符串
 				datetwo: currentDate,
 				riqinumber: 'yearMonth',
-				startDate: '2000-01-01',
+				startDate: '',  // 添加起始日期
-				endDate: '2030-12-31',
+				endDate: '',    // 添加结束日期
-				// 新增：加载状态和数据状态
-				isLoadingTrend: false,
-				hasChartData: false,
-				chartKey: 0,
-				isChartRendered: false,
 			}
 		},
 		onLoad() {
@@ -240,79 +219,88 @@
 					this.scorllheight = this.height
 				}
 			});
-			this.index = 0
+			
-			this.index1 = 0
+			// 设置日期范围
+			const currentYear = new Date().getFullYear();
+			this.startDate = `${currentYear - 10}-01-01`;
+			this.endDate = `${currentYear + 10}-12-31`;
+			
+			// 先获取评价数据
 			this.getpj()
-			this.getStationList()      // 获取站点列表（趋势图用）
+			// 获取站点列表（内部会调用趋势图）
-			this.getDeviceList()       // 获取设备列表（预警用）
+			this.importWyw()
+			// 获取预警设备列表
+			this.getazsurvMulchRecord()
+			// 获取预警列表
 			this.getyjList()
 		},
-		// 页面显示时重置滚动
-		onShow() {
-			this.$nextTick(() => {
-				this.resetAllScroll()
-			})
-		},
 		methods: {
-			// 格式化数字
+			// 获取站点列表
-			cutMoneyFiter(val) {
+			importWyw() {
-				if (!val && val !== 0) return 0
+				this.array = []
-				return val
+				this.arrays = []
-			},
+				this.arrays1 = [{
-			
+					label: '全部监测设备',
-			// ===== 获取站点列表（趋势图专用） =====
+					value: ''
-			getStationList() {
+				}]
-				this.stationNameList = []
-				this.stationList = []
 				this.$http.get('/applet/survStationInfo/list').then(res => {
-					const data = res.data.data || []
+					const dataList = res.data.data || []
-					for (var i = 0; i < data.length; i++) {
+					for (var i = 0; i < dataList.length; i++) {
-						this.stationList.push({
+						this.arrays.push({
-							label: data[i].stationName,
+							label: dataList[i].stationName,
-							value: data[i].stationCode  // 站点编码
+							value: dataList[i].stationCode
 						})
-						this.stationNameList.push(data[i].stationName)
+						this.arrays1.push({
+							label: dataList[i].stationName,
+							value: dataList[i].stationCode
+						})
+						this.array.push(dataList[i].stationName)
 					}
-					// 站点数据加载完成后，获取趋势数据
+					// 设置默认第一个站点
-					if (this.stationList.length > 0) {
+					if (this.array.length > 0) {
-						this.stationCode = this.stationList[0]?.value || ''
+						this.stationCode = this.arrays[0].value
-						this.$nextTick(() => {
+						// 调用趋势图获取数据
-							this.qushicov()
+						this.qushicov()
-						})
+					} else {
+						console.warn('没有获取到站点数据')
 					}
 				}).catch(err => {
-					console.log('获取站点列表失败', err)
+					console.error('获取站点列表失败:', err)
 				})
 			},
-			
+			// 获取监测站点设备数据
-			// ===== 获取设备列表（预警专用） =====
+			getazsurvMulchRecord() {
-			getDeviceList() {
+				this.arrays = []
-				this.deviceNameList = ['全部监测设备']
+				this.array1 = ['全部监测设备']
-				this.deviceList = [{
+				this.arrays1 = [{
 					label: '全部监测设备',
 					value: ''
 				}]
 				this.$http.get('/applet/survDeviceDeploy/survDeviceList').then(res => {
-					const data = res.data.data || []
+					const dataList = res.data.data || []
-					for (var i = 0; i < data.length; i++) {
+					for (var i = 0; i < dataList.length; i++) {
-						this.deviceList.push({
+						this.arrays.push({
-							label: data[i].fullDeviceName,
+							label: dataList[i].fullDeviceName,
-							value: data[i].id  // 设备部署ID
+							value: dataList[i].id
 						})
-						this.deviceNameList.push(data[i].fullDeviceName)
+						this.arrays1.push({
+							label: dataList[i].fullDeviceName,
+							value: dataList[i].id
+						})
+						this.array1.push(dataList[i].fullDeviceName)
 					}
 				}).catch(err => {
-					console.log('获取设备列表失败', err)
+					console.error('获取设备列表失败:', err)
 				})
 			},
-			
+			// 获取预警列表
-			// ===== 获取预警列表 =====
 			getyjList() {
-				let params = {}
+				let params = {
-				params.pageNo = this.pageNo
+					pageNo: this.pageNo,
-				params.pageSize = this.pageSize
+					pageSize: this.pageSize,
-				params.deployId = this.deployId  // 使用设备部署ID
+					deployId: this.stationCode1,
-				params.yearStr = this.yearStr
+					yearStr: this.yearStr
+				}
 				uni.showLoading({
 					title: '加载中'
 				});
@@ -321,7 +309,7 @@
 					params: params
 				}).then(res => {
 					if (res.data.code == 0) {
-						var data = res.data.data.records
+						var data = res.data.data.records || []
 						for (var i = 0; i < data.length; i++) {
 							data[i].times = data[i].alertTime.replace(" ", ":").replace(/\:/g, "-").split("-");
 							data[i].nian = data[i].times[0];
@@ -334,18 +322,11 @@
 							if (data[i].alertContent && data[i].alertContent.indexOf('监测数据名称:') != -1) {
 								data[i].alertContent = data[i].alertContent.replace('监测数据名称:', '')
 							}
-							if (typeof data[i].alertContent === 'string') {
-								data[i].alertContent = [{
-									name: '告警',
-									val: data[i].alertContent,
-									unit: ''
-								}]
-							}
 						}
 						this.list = this.list.concat(data)
-						this.total = res.data.data.total
+						this.total = res.data.data.total || 0
-						if (res.data.data.total != 0) {
+						if (this.total != 0) {
-							this.allNum = Number(res.data.data.total) / Number(this.pageSize) + '';
+							this.allNum = Number(this.total) / Number(this.pageSize) + '';
 							if (this.allNum.indexOf('.') == -1) {
 								this.allNum = this.allNum;
 							} else {
@@ -367,11 +348,10 @@
 					this.isRefresher = false
 				}).catch(err => {
 					uni.hideLoading();
-					console.log('获取预警列表失败', err)
+					console.error('获取预警列表失败:', err)
 				})
 			},
-			
+			// 分页加载
-			// ===== 分页加载 =====
 			lower() {
 				if (this.isLastpage) {
 					return
@@ -382,16 +362,17 @@
 					num = num + 1;
 				}, 1000)
 				this.pageNo = this.pageNo + 1;
-				let params = {}
+				let params = {
-				params.pageNo = this.pageNo
+					pageNo: this.pageNo,
-				params.pageSize = this.pageSize
+					pageSize: this.pageSize,
-				params.deployId = this.deployId  // 使用设备部署ID
+					deployId: this.stationCode1,
-				params.yearStr = this.yearStr
+					yearStr: this.yearStr
+				}
 				this.$http.get('/applet/wxclient/alertRecord', {
 					params: params
 				}).then(res => {
 					if (res.data.code == 0) {
-						var data = res.data.data.records
+						var data = res.data.data.records || []
 						for (var i = 0; i < data.length; i++) {
 							data[i].times = data[i].alertTime.replace(" ", ":").replace(/\:/g, "-").split("-");
 							data[i].nian = data[i].times[0];
@@ -404,16 +385,9 @@
 							if (data[i].alertContent && data[i].alertContent.indexOf('监测数据名称:') != -1) {
 								data[i].alertContent = data[i].alertContent.replace('监测数据名称:', '')
 							}
-							if (typeof data[i].alertContent === 'string') {
-								data[i].alertContent = [{
-									name: '告警',
-									val: data[i].alertContent,
-									unit: ''
-								}]
-							}
 						}
 						this.list = this.list.concat(data)
-						if (res.data.data.total != 0) {
+						if (this.total != 0) {
 							if (this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								this.loadStatus = 'nomore'
@@ -427,14 +401,13 @@
 						}
 					}
 				}).catch(err => {
-					console.log('加载更多预警失败', err)
+					console.error('加载更多失败:', err)
 				})
 			},
-			
+			// 获取评价
-			// ===== 获取评价 =====
 			getpj() {
 				this.$http.post('/applet/wxclient/displayInfo?infoType=' + 'effect_assess').then(res => {
-					let data = res.data.data.effect_assess.detailList
+					let data = res.data.data.effect_assess.detailList || []
 					this.pjlist = data
 					for (var i = 0; i < data.length; i++) {
 						if (data[i].detailCode == '综合评价') {
@@ -442,290 +415,169 @@
 						}
 					}
 				}).catch(err => {
-					console.log('获取评价失败', err)
+					console.error('获取评价数据失败:', err)
 				})
 			},
-			
+			// 选择年月日
-			// ===== 选择年月日 =====
 			radioChange(e) {
 				this.riqinumber = e.detail.value
-				this.timList.forEach((item, index) => {
+				this.current = this.timList.findIndex(item => item.value === e.detail.value)
-					if (item.value === e.detail.value) {
+				// 重新调用趋势图
-						this.current = index
-					}
-				})
-				let currentDate = new Date()
-				let year = currentDate.getFullYear()
-				let month = String(currentDate.getMonth() + 1).padStart(2, '0')
-				let day = String(currentDate.getDate()).padStart(2, '0')
-				
-				if (this.riqinumber === 'yearMonth') {
-					this.dateqs = String(year)
-				} else if (this.riqinumber === 'monthDays') {
-					this.dateqs = year + '-' + month
-				} else {
-					this.dateqs = year + '-' + month + '-' + day
-				}
 				this.qushicov()
 			},
-			
+			// 趋势时间切换
-			// ===== 趋势时间选择 =====
 			bindDateqsChange(e) {
-				let selectedDate = e.detail.value
+				let selectedDate = e.detail.value;
-				if (this.riqinumber === 'yearMonth') {
+				// 根据选择的维度格式化日期
-					this.dateqs = selectedDate.slice(0, 4)
+				if (this.riqinumber === 'monthDays') {
-				} else if (this.riqinumber === 'monthDays') {
+					this.dateqs = selectedDate.slice(0, 7); // YYYY-MM
-					this.dateqs = selectedDate.slice(0, 7)
+				} else if (this.riqinumber === 'yearMonth') {
+					this.dateqs = selectedDate.slice(0, 4); // YYYY
 				} else {
-					this.dateqs = selectedDate
+					this.dateqs = selectedDate; // YYYY-MM-DD
 				}
-				this.qushicov()
+				// 重新获取趋势数据
+				this.qushicov();
 			},
-			
+			// 趋势接口
-			// ===== 图表渲染完成回调 =====
-			onChartFinished() {
-				this.isChartRendered = true
-				this.$nextTick(() => {
-					this.resetAllScroll()
-				})
-			},
-			
-			// ===== 重置所有滚动位置 =====
-			resetAllScroll() {
-				// 1. 重置页面滚动
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 0
-				})
-				
-				// 2. H5 环境下直接操作 DOM
-				// #ifdef H5
-				setTimeout(() => {
-					// 重置页面滚动
-					window.scrollTo(0, 0)
-					
-					// 重置所有可滚动容器
-					const scrollableElements = document.querySelectorAll('.scroll-view, .qstcontent, .container, .qiun-data-charts')
-					scrollableElements.forEach(el => {
-						if (el.scrollTop !== undefined && el.scrollTop !== 0) {
-							el.scrollTop = 0
-						}
-						if (el.scrollLeft !== undefined && el.scrollLeft !== 0) {
-							el.scrollLeft = 0
-						}
-					})
-					
-					// 重置图表内部的 canvas 滚动
-					const chartContainer = document.querySelector('.qstcontent .qiun-data-charts')
-					if (chartContainer) {
-						chartContainer.scrollLeft = 0
-						chartContainer.scrollTop = 0
-						// 重置 canvas 父容器
-						const canvasWrapper = chartContainer.querySelector('.qiun-charts')
-						if (canvasWrapper) {
-							canvasWrapper.scrollLeft = 0
-							canvasWrapper.scrollTop = 0
-						}
-						// 重置 canvas 本身
-						const canvas = chartContainer.querySelector('canvas')
-						if (canvas && canvas.parentElement) {
-							canvas.parentElement.scrollLeft = 0
-							canvas.parentElement.scrollTop = 0
-						}
-					}
-				}, 150)
-				// #endif
-				
-				// 3. 小程序环境下使用 API
-				// #ifdef MP-WEIXIN
-				setTimeout(() => {
-					const query = uni.createSelectorQuery().in(this)
-					query.select('#chartContainer').boundingClientRect()
-					query.exec((res) => {
-						if (res && res[0]) {
-							// 尝试滚动到容器顶部
-							uni.pageScrollTo({
-								scrollTop: 0,
-								duration: 0
-							})
-						}
-					})
-				}, 150)
-				// #endif
-			},
-			
-			// ===== 趋势接口 =====
 			qushicov() {
-				if (this.isLoadingTrend) return
+				// 检查是否有站点编码
-				
-				// 确保有站点编码
 				if (!this.stationCode) {
-					if (this.stationList.length > 0) {
+					console.warn('站点编码为空，无法获取趋势数据')
-						this.stationCode = this.stationList[0].value
+					return
-					} else {
-						console.log('等待站点数据加载...')
-						setTimeout(() => {
-							if (this.stationList.length > 0) {
-								this.stationCode = this.stationList[0].value
-								this.qushicov()
-							}
-						}, 1000)
-						return
-					}
 				}
-
+				
-				if (!this.dateqs) {
-					this.dateqs = new Date().getFullYear().toString()
-				}
-
-				this.isLoadingTrend = true
 				let data = {
-					summrayMode: this.riqinumber || 'yearMonth',
+					summrayMode: this.riqinumber,
 					startTime: this.dateqs,
-					stationCode: this.stationCode,  // 站点编码
+					stationCode: this.stationCode,
 				}
 				
-				console.log('请求趋势数据参数:', data)
+				uni.showLoading({
+					title: '加载趋势数据...'
+				});
 				
-				// 清空数据
+				this.$http.post('/applet/survDeviceDeploy/waterIntegrateStatistic', data).then(iem => {
-				this.chartData = {
+					let lynum = iem.data.data
-					categories: [],
-					series: []
-				}
-				this.hasChartData = false
-
-				this.$http.post('/applet/survDeviceDeploy/waterIntegrateStatistic', data)
-					.then(iem => {
-						let lynum = iem.data.data
-						console.log('趋势数据返回:', lynum)
-						
-						if (!lynum || !lynum.tableHead || !lynum.tableData2 || lynum.tableHead.length === 0) {
-							console.log('趋势数据为空')
-							this.chartData = {
-								categories: [],
-								series: []
-							}
-							this.hasChartData = false
-							this.chartKey = Date.now()
-							return
-						}
-
-						this.processChartData(lynum)
-						this.hasChartData = true
-						// 数据加载完成后更新 key，强制重新渲染图表
-						this.chartKey = Date.now()
-						
-						// 重置滚动
-						this.$nextTick(() => {
-							this.resetAllScroll()
-						})
-					})
-					.catch(err => {
-						console.log('趋势数据请求失败', err)
-						this.chartData = {
-							categories: [],
-							series: []
-						}
-						this.hasChartData = false
-						this.chartKey = Date.now()
-					})
-					.finally(() => {
-						this.isLoadingTrend = false
-					})
-			},
-
-			// ===== 处理图表数据 =====
-			processChartData(lynum) {
-				let categories = []
-				let displayCategories = []
-				let series = []
-				let allValues = []
-				
-				categories = lynum.tableIndex || []
-				if (categories.length > 0) {
-					const middle = Math.floor(categories.length / 2)
-					displayCategories = categories.map((item, index) => {
-						if (index === 0 || index === middle || index === categories.length - 1) {
-							return item
-						}
-						return ''
-					})
-				}
-				
-				lynum.tableHead.forEach((header, index) => {
-					const seriesData = (lynum.tableData2 || []).map(row => {
-						const value = row[index] === "0" ? 0 : parseFloat(row[index]) || 0
-						allValues.push(value)
-						return value
-					})
 					
-					series.push({
+					setTimeout(() => {
-						name: header.eleDesc || header.name || '指标',
+						let categories = [];
-						data: seriesData
+						let displayCategories = [];
+						let series = [];
+						let allValues = [];
+						
+						if (lynum.tableHead && lynum.tableHead.length > 0) {
+							categories = lynum.tableIndex || [];
+							
+							if (categories.length > 0) {
+								const first = categories[0];
+								const middle = categories[Math.floor(categories.length / 2)];
+								const last = categories[categories.length - 1];
+								
+								displayCategories = categories.map((item, index) => {
+									if (index === 0 || index === Math.floor(categories.length / 2) || index === categories.length - 1) {
+										return item;
+									}
+									return '';
+								});
+							}
+							
+							lynum.tableHead.forEach((header, index) => {
+								const seriesData = lynum.tableData2.map(row => {
+									const value = row[index] === "0" ? 0 : parseFloat(row[index]) || 0;
+									allValues.push(value);
+									return value;
+								});
+								
+								series.push({
+									name: header.eleDesc || header,
+									data: seriesData
+								});
+							});
+							
+							// 动态计算Y轴范围
+							if (allValues.length > 0) {
+								const maxValue = Math.max(...allValues);
+								const minValue = Math.min(...allValues);
+								const padding = maxValue * 0.1;
+								const yAxisMax = maxValue + padding;
+								const yAxisMin = Math.max(0, minValue - padding);
+								
+								this.opts = {
+									...this.opts,
+									yAxis: {
+										gridType: "dash",
+										dashLength: 2,
+										data: [
+											{
+												min: yAxisMin,
+												max: yAxisMax
+											}
+										]
+									}
+								};
+							}
+						}
+						
+						let res = {
+							categories: displayCategories,
+							series: series
+						};
+						this.chartData = JSON.parse(JSON.stringify(res));
+						uni.hideLoading();
+					}, 500);
+				}).catch(err => {
+					uni.hideLoading();
+					console.error('获取趋势数据失败:', err)
+					// 显示错误提示
+					uni.showToast({
+						title: '获取趋势数据失败',
+						icon: 'none'
 					})
 				})
-				
-				if (allValues.length > 0) {
-					const maxValue = Math.max(...allValues)
-					const minValue = Math.min(...allValues)
-					const padding = (maxValue - minValue) * 0.1 || 10
-					const yAxisMax = maxValue + padding
-					const yAxisMin = Math.max(0, minValue - padding)
-					
-					this.opts = {
-						...this.opts,
-						yAxis: {
-							gridType: "dash",
-							dashLength: 2,
-							data: [
-								{
-									min: yAxisMin,
-									max: yAxisMax || 100
-								}
-							]
-						}
-					}
-				}
-				
-				this.chartData = {
-					categories: displayCategories,
-					series: series
-				}
-				console.log('图表数据更新:', this.chartData)
 			},
-			
+			// 折线图切换站点
-			// ===== 折线图切换站点 =====
 			bindPickerChange: function(e) {
 				this.index = e.detail.value
-				if (this.stationList[this.index]) {
+				this.stationName = this.array[this.index]
-					this.stationCode = this.stationList[this.index].value
+				for (var i = 0; i < this.arrays.length; i++) {
-					this.qushicov()
+					if (this.stationName == this.arrays[i].label) {
+						this.stationCode = this.arrays[i].value
+						break
+					}
 				}
+				// 切换站点后重新获取趋势数据
+				this.qushicov()
 			},
-			
+			// 预警切换站点
-			// ===== 预警切换设备 =====
 			bindPickerChange1: function(e) {
 				this.index1 = e.detail.value
-				if (this.deviceList[this.index1]) {
+				this.stationName1 = this.array1[this.index1]
-					this.deployId = this.deviceList[this.index1].value  // 设备部署ID
+				for (var i = 0; i < this.arrays.length; i++) {
+					if (this.stationName1 == this.arrays1[i].label) {
+						this.stationCode1 = this.arrays1[i].value
+						break
+					}
+				}
+				if (this.stationName1 == '全部监测设备') {
+					this.stationCode1 = null
 				}
 				this.pageNo = 1
 				this.getyjList()
 			},
-			
+			// 预警切换日期
-			// ===== 预警切换日期 =====
 			bindDateChange: function(e) {
 				this.yearStr = e.detail.value
 				this.date = e.detail.value
 				this.pageNo = 1
 				this.getyjList()
 			},
-			
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
 				let month = date.getMonth() + 1;
 				let day = date.getDate();
+
 				if (type === 'start') {
 					year = year - 10;
 				} else if (type === 'end') {
@@ -734,6 +586,11 @@
 				month = month > 9 ? month : '0' + month;
 				day = day > 9 ? day : '0' + day;
 				return `${year}-${month}-${day}`;
+			},
+			// 格式化数字（如果组件中有使用）
+			cutMoneyFiter(val) {
+				if (!val) return 0
+				return val
 			}
 		}
 	}
@@ -845,8 +702,6 @@
 		height: 400rpx;
 		width: 98%;
 		padding-left: 20rpx;
-		position: relative;
-		overflow: hidden;
 	}
 
 	.uni-ec-canvas {
@@ -1118,7 +973,6 @@
 	.pagebot {
 		height: 100rpx;
 	}
-	
 	// 选择年月日
 	.radio-group {
 	  display: flex;
@@ -1177,36 +1031,4 @@
 		width: 44rpx;
 		height: 44rpx;
 	}
-
-	// 空状态样式
-	.empty-chart {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #f8f9fc;
-		border-radius: 16rpx;
-		
-		.empty-text {
-			font-size: 28rpx;
-			color: #999;
-			font-family: Source Han Sans SC;
-		}
-	}
-	
-	// 重置图表滚动
-	.qstcontent {
-		.qiun-data-charts {
-			overflow: hidden !important;
-			
-			.qiun-charts {
-				overflow: hidden !important;
-			}
-			
-			canvas {
-				overflow: hidden !important;
-			}
-		}
-	}
 </style>

packDetail/pages/fwtz/add.vue

@@ -178,6 +178,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby)
 					}
 				})
 			},
@@ -206,6 +207,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby3)
 					}
 				})
 			},
@@ -215,14 +217,17 @@
 			},
 			// 选择养殖品种
 			change1(e){
+				console.log(e)
 				this.details.breedVariety = e.detail.value
 			},
 			// 选择治污模式
 			change2(e){
+				console.log(e)
 				this.details.controlMode = e.detail.value
 			},
 			// 选择利用模式
 			change3(e){
+				console.log(e)
 				this.details.useMode = e.detail.value
 			},
 			// 提交

packDetail/pages/fwtz/detail.vue

@@ -119,6 +119,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby)
 					}
 				})
 			},
@@ -154,6 +155,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby3)
 					}
 					for(var i=0;i<this.hobby3.length;i++){
 						if(this.details.useMode){

packDetail/pages/fwtz/edit.vue

@@ -179,6 +179,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby)
 					}
 				})
 			},
@@ -207,6 +208,7 @@
 							text:res.data.data[i].itemText,
 							value:res.data.data[i].itemValue
 						})
+						console.log(this.hobby3)
 					}
 				})
 			},
@@ -216,14 +218,17 @@
 			},
 			// 选择养殖品种
 			change1(e){
+				console.log(e)
 				this.details.breedVariety = e.detail.value
 			},
 			// 选择治污模式
 			change2(e){
+				console.log(e)
 				this.details.controlMode = e.detail.value
 			},
 			// 选择利用模式
 			change3(e){
+				console.log(e)
 				this.details.useMode = e.detail.value
 			},
 			// 提交

packDetail/pages/fwtz/index.vue

@@ -129,6 +129,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height - 182
 				}
 			});
@@ -141,12 +142,14 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height - 182
 				}
 			});
 			let pages = getCurrentPages();
 			let currPage = pages[pages.length - 1]; //当前页面
 			this.reload = currPage.data.reload
+			console.log(this.reload,'Ge')
 			if(this.reload){
 				this.farmName = ''
 				this.breedVariety = ''
@@ -172,6 +175,7 @@
 							value:res.data.data[i].itemValue
 						})
 						this.array.push(res.data.data[i].itemText)
+						console.log(this.array)
 					}
 				})
 			},
@@ -206,18 +210,24 @@
 						this.List = this.List.concat(data)
 						if(res.data.data.total != 0){
 							this.allNum = Number(res.data.data.total)/Number(this.pageSize)+'';
+							console.log(this.allNum,'总页数')
 							if(this.allNum.indexOf('.') == -1) {
 								this.allNum = this.allNum;
+								console.log(this.allNum,'if')
 							} else {
 								this.allNum = parseInt(Number(this.allNum)+1);
+								console.log(this.allNum,'else')
 							}
+							console.log(this.pageNo,this.allNum,'156156')
 							if(this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								 this.loadStatus='nomore'
+								console.log(this.isLastpage,'true','nomore')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage,'false')
 							}
 						}else{
 							this.isLastpage = true;
@@ -230,6 +240,7 @@
 			},
 			// 分页加载
 			lower() {
+				console.log("最后一页了，取消下拉功能");
 				// 最后一页了，取消下拉功能
 				if (this.isLastpage) {
 					return
@@ -239,6 +250,7 @@
 				this.intervalId = setInterval(() => {
 					num = num+1;
 				},1000)
+					console.log(this.intervalId,num)
 				this.pageNo = this.pageNo + 1;
 				let params = {}
 				params.pageNo = this.pageNo
@@ -254,10 +266,12 @@
 							if(this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								 this.loadStatus='nomore'
+								console.log(this.isLastpage,'true')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage,'false')
 							}
 						}else{
 							this.isLastpage = true;
@@ -267,6 +281,7 @@
 				})
 			},
 			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
 				this.index = e.detail.value
 				this.breedVariety = this.arrays[this.index].value
 				this.breedVariety1 = this.arrays[this.index].text
@@ -297,10 +312,12 @@
 			},
 			// 操作
 			caozuo(item){
+				console.log(item)
 				var that = this
 				uni.showActionSheet({
 					itemList: ['编辑', '删除'],
 					success: function (res) {
+						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 						if((res.tapIndex + 1) == 1){
 							uni.navigateTo({
 								url:'/packDetail/pages/fwtz/edit?item='+ encodeURIComponent(JSON.stringify(item))
@@ -311,6 +328,8 @@
 								content: '是否删除数据？',
 								success: function (res) {
 									if (res.confirm) {
+										console.log('用户点击确定');
+										console.log(item.id,1)
 										that.$http.delete(that.deleteUrl+'?id='+item.id).then(res =>{
 											if(res.data.code == 0){
 												uni.showToast({

packDetail/pages/login/login.vue

@@ -35,7 +35,7 @@
         </view>
       </view>
     </view>
-	<!-- <text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 河津市现代农业发展中心</text> -->
+	<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 汾西县农业农村局</text>
     <!-- <view class="loginpage">
       <image class="bigimg" src="../../static/dls.jpg" mode=""></image>
       <view class="padding text-center margin-top">
@@ -80,7 +80,7 @@ export default {
       thirdLoginInfo: "",
       thirdLoginState: false,
       bindingPhoneModal: false,
-      login: true,
+      login: false,
       thirdUserUuid: '',
       url: {
         bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
@@ -97,28 +97,30 @@ export default {
     this.CustomTop = this.Custom.top
   },
   onShow() {
-    // 检查是否已登录
+    var that = this
-    const token = uni.getStorageSync('constant');
-    if (token) {
-      // 已登录，直接跳转首页
-      uni.reLaunch({
-        url: '/pages/index/index'
-      });
-      return;
-    }
-    
-    // 未登录才执行微信登录流程
-    var that = this;
     uni.login({
       success: function (res) {
-        that.code = res.code;
+        console.log(res.code)
-        let params = {};
+        that.code = res.code
-        params.jsCode = that.code;
+        let params = {}
+        params.jsCode = that.code
+        console.log(params, 152)
         api.wxlogin(params).then(res => {
-          let userInfo = res.data.data;
+          console.log(res, 165)
-          uni.setStorageSync('third_session', userInfo.thirdSession);
+          if (res.data.code == 0) {
-          // 注意：这里不要自动跳转，只存储 session
+            let userInfo = res.data.data;
-        });
+            uni.setStorageSync('third_session', userInfo.thirdSession);
+            console.log(that.login, '状态')
+            if (userInfo.id) {
+              that.login = false
+              uni.reLaunch({
+                url: '/pages/index/index'
+              })
+            } else if (!userInfo.id) {
+              that.login = true
+            }
+          }
+        })
       }
     });
   },
@@ -148,6 +150,7 @@ export default {
       })
     },
     TypeInput(e) {
+      console.log(e, 415)
       // 只能输入数字的验证;
       const inputType = /[\W]/g   //想限制什么类型在这里换换正则就可以了
       this.$nextTick(function () {
@@ -155,6 +158,7 @@ export default {
       })
     },
     tologins() {
+      console.log(this.userInfoLoginDTO.password, this.userInfoLoginDTO.userName, '密码用户')
       if (!this.userInfoLoginDTO.userName) {
         uni.showToast({
           title: '请输入账号',
@@ -172,21 +176,23 @@ export default {
         return
       }
       this.$http.post('/applet/userInfo/logins', this.userInfoLoginDTO).then(res => {
-        api.loginCallback(res, ()=>{
+        if (res.data.code == 0) {
           uni.setStorageSync('constant', res.data.data)
           uni.setStorageSync('password', this.userInfoLoginDTO.password)
           uni.setStorageSync('userName', this.userInfoLoginDTO.userName)
           uni.reLaunch({
             url: '/pages/index/index'
           })
-        }, ()=>{
+        } else {
           uni.removeStorageSync('constant')
           uni.showToast({
             title: res.data.msg,
             icon: 'none',
             duration: 2000
           })
-        });
+          // this.userInfoLoginDTO.password = ''
+          // this.userInfoLoginDTO.userName = ''
+        }
       })
     }
   }
@@ -200,7 +206,7 @@ export default {
 		left: 50%;
 		transform: translate(-50%);
 		color: #999;
-		width: 60%;
+		width: 52%;
 	}
 .login-paddingtop {
   padding-top: 100upx;

packDetail/pages/operations/list.vue

@@ -167,6 +167,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height - 120
 				}
 			});
@@ -198,17 +199,21 @@
 						this.$set(item, 'checked', true)
 					})
 					this.checkList = this.alllist
+					console.log(this.checkList,156)
 				}
 
 			},
 			checkSelectItem(e, item) {
+				console.log(item,156)
 				// 如果是取消选中，就把checked置为false,如果是选中，就给添加一个checked=true
 				if (item.checked == true) {
 					this.$set(item, 'checked', false)
 					this.checkList = this.checkList.filter(items => (items.value !== item.value))
+					console.log(this.checkList,'true')
 				} else {
 					this.$set(item, 'checked', true)
 					this.checkList.push(item)
+					console.log(this.checkList,'false')
 				}
 				// 过滤出数组中checked为true的项目，如果和原alllist长度相等，就全选显示
 				let newArr = this.alllist.filter(item => (item.checked == true))
@@ -217,6 +222,7 @@
 				} else {
 					this.checkTrue = false;
 				}
+				console.log(this.checkList,41561456)
 			},
 			submit(){
 				uni.navigateBack({

packDetail/pages/sjdyj/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<!-- 顶部选项卡 -->
-		<!-- <view class="topScroll">
+		<view class="topScroll">
 			<scroll-view scroll-x="true" class="scroll">
 				<view class="scroll-item" v-for="(item,index) in topItems" :key="index" @click="chooseClick(item,index)"
 					:class="{'scroll-item2':isActive == index}">
@@ -10,7 +10,7 @@
 					</view>
 				</view>
 			</scroll-view>
-		</view> -->
+		</view>
 
 		<!-- 监测站告警 -->
 		<block v-if="isActive == 0">
@@ -135,13 +135,12 @@
 				arrays: [],
 				isRefresher: false, //下拉刷新状态
 				reload: '',
-				topItems: [
+				topItems: [{
-					// {
+						dictLabel: '监测站告警'
-					// 	dictLabel: '监测站告警'
+					},
-					// },
+					{
-					// {
+						dictLabel: '异常趋势图'
-					// 	dictLabel: '异常趋势图'
+					}
-					// }
 				],
 				value: 0,
 				rangeList: [],
@@ -939,8 +938,8 @@
 	.zwsj {
 		height: calc(100vh - 100rpx);
 		display: flex;
-		// align-items: center;
+		align-items: center;
-		// justify-content: center;
+		justify-content: center;
 	}
 
 	.inzwsj {
@@ -948,8 +947,8 @@
 	}
 
 	.zwsjimg {
-		width: 100%;
+		width: 200rpx;
-		height: 240rpx;
+		height: 200rpx;
 	}
 
 	.zwsjtext {

packDetail/pages/userzl/index.vue

@@ -66,6 +66,7 @@
 				var navigationHeight = 44 * pxToRpxScale
 				this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
 				this.contentheight = this.height - ktxStatusHeight - navigationHeight - 150
+				console.log(this.contentheight,123132)
 			}
 		});
     },
@@ -104,6 +105,7 @@
 		  });
 	  },
 	  radioChange(value){
+		  console.log(value)
 		  this.constant.sex = value.detail.value
 	  },
       submit() {

packDetail/pages/vidio/detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar :title="item.deployDes"/>
+		<uni-nav-bar :fixed="true" left-icon="left" background-color="#0F6EFF" @clickLeft="back()" status-bar :title="item.stationName"/>
 		<view class="liebiaos">
 			<view class="list_item">
 				<view class="list_item_top">
@@ -128,6 +128,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(JSON.parse(decodeURIComponent(options.item)))
 			this.item = JSON.parse(decodeURIComponent(options.item));
 		},
 		onShow() {

packDetail/pages/vidio/index.vue

@@ -84,29 +84,31 @@
 					var pxToRpxScale  = 750 / res.windowWidth
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
-					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx	
+					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
 			this.getList()
 		},
 		methods:{
-			getList() {
+			getList(){
 			    uni.showLoading({
 			        title: '加载中'
 			    });
 			    
-			    // 只请求第一个接口
+			    // 使用 Promise.all 同时发起两个请求
-			    this.$http.get('/applet/survStationInfo/deviceList')
+			    Promise.all([
-			        .then(res => {
+			        this.$http.get('/applet/survStationInfo/deviceList'),
-			            const data1 = res?.data?.data || [];
+			        this.$http.get('/applet/survStationInfo/fdeviceList')
-			            this.list = data1;
+			    ]).then(([res1, res2]) => {
-			            uni.hideLoading();
+			        // 合并两个数组
-			        })
+			        this.list = res1.data.data.concat(res2.data.data);
-			        .catch(error => {
+			        uni.hideLoading();
-			            console.error('请求失败:', error);
+			    }).catch(error => {
-			            uni.hideLoading();
+			        console.error('请求失败:', error);
-			        });
+			        uni.hideLoading();
+			    });
 			},
 			todetail(item,index){
 				uni.navigateTo({

packDetail/pages/vidio/soilindex.vue

@@ -9,7 +9,7 @@
 								<image v-if="it[0].stationType == 'livestock'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
 								<view class="item_right">
 									<view class="right_top">
-										{{it[0].stationName?it[0].stationName:'无设备信息'}}
+										{{it[0].stationName}}
 									</view>
 									<view class="right_bot">
 										<image src="../../static/shebei_icon_shebei.png" mode=""></image>
@@ -84,6 +84,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
@@ -100,6 +101,7 @@
 				})
 			},
 			todetail(item,index){
+				console.log(item,12)
 				uni.navigateTo({
 					url:'/packDetail/pages/vidio/detail?item=' + encodeURIComponent(JSON.stringify(item))
 				})

packDetail1/pages/about/index.vue

@@ -23,7 +23,7 @@
 					</view>
 				</view> -->
 			</view>
-			<!-- <text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 河津市现代农业发展中心</text> -->
+			<text class="botmTetx">Copyright <text style="font-size: 30rpx;padding:0rpx 7rpx;"> © </text> 汾西县农业农村局</text>
 		</view>
 	</view>
 </template>
@@ -112,6 +112,6 @@
 		left: 50%;
 		transform: translate(-50%);
 		color: #999;
-		width: 60%;
+		width: 52%;
 	}
 </style>

packDetail1/pages/device/index.vue

@@ -11,7 +11,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="bot_box" :class="{'single-item': item.depUrlArr && item.depUrlArr.length === 1}">
+					<view class="bot_box">
 						<view class="bot_left" v-for="(it,i) in item.depUrlArr" :key="i" @click="todetail(it,i,item)">
 							<view class="botleft_bot">
 								<view class="">
@@ -71,6 +71,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight * pxToRpxScale //将px 转换rpx
+					console.log(this.height, ktxStatusHeight, navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
@@ -84,6 +85,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight * pxToRpxScale //将px 转换rpx
+					console.log(this.height, ktxStatusHeight, navigationHeight)
 					this.scorllheight = this.height
 				}
 			});
@@ -110,18 +112,24 @@
 						this.List = this.List.concat(data)
 						if (data.length != 0) {
 							this.allNum = Number(data.length) / Number(this.pageSize) + '';
+							console.log(this.allNum, '总页数')
 							if (this.allNum.indexOf('.') == -1) {
 								this.allNum = this.allNum;
+								console.log(this.allNum, 'if')
 							} else {
 								this.allNum = parseInt(Number(this.allNum) + 1);
+								console.log(this.allNum, 'else')
 							}
+							console.log(this.pageNo, this.allNum, '156156')
 							if (this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								this.loadStatus = 'nomore'
+								console.log(this.isLastpage, 'true', 'nomore')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage, 'false')
 							}
 						} else {
 							this.isLastpage = true;
@@ -133,6 +141,7 @@
 				})
 			},
 			lower() {
+				console.log("最后一页了，取消下拉功能");
 				// 最后一页了，取消下拉功能
 				if (this.isLastpage) {
 					return
@@ -142,6 +151,7 @@
 				this.intervalId = setInterval(() => {
 					num = num + 1;
 				}, 1000)
+				console.log(this.intervalId, num)
 				this.pageNo = this.pageNo + 1;
 				let params = {}
 				params.pageNo = this.pageNo
@@ -156,10 +166,12 @@
 							if (this.pageNo == this.allNum) {
 								this.isLastpage = true;
 								this.loadStatus = 'nomore'
+								console.log(this.isLastpage, 'true')
 							} else {
 								this.isLastpage = false;
 								// this.isLoadMore=true
 								this.loadStatus = 'more'
+								console.log(this.isLastpage, 'false')
 							}
 						} else {
 							this.isLastpage = true;
@@ -222,7 +234,6 @@
 		font-size: 28rpx;
 		padding: 20rpx 0;
 		color: #8b95ea;
-		margin-top: 20rpx;
 	}
 
 	.top_box {
@@ -242,21 +253,6 @@
 		flex-wrap: wrap;
 	}
 
-	/* 当只有一个子元素时的样式优化 */
-	.bot_box.single-item {
-		justify-content: center;
-	}
-	
-	.bot_box.single-item .bot_left {
-		width: 100%;
-		height: 370rpx;
-	}
-	
-	.bot_box.single-item .bot_left .botleft_top {
-		width: 100%;
-		height: 300rpx;
-	}
-
 	.bot_left {
 		width: 48%;
 		border: 4rpx solid #f0f0f0;

packDetail1/pages/device/index1.vue

@@ -2326,6 +2326,7 @@
 		        uni.sendSocketMessage({
 		            data: JSON.stringify(param)
 		        });
+		        console.log('websocket发送给服务端的消息:', param);
 		        socketTask.close({
 		            code: 1000,
 		            success: (res) => {
@@ -2336,6 +2337,7 @@
 		
 		    // push
 		    pusherStateChange: function (e) {
+		        console.log('>>> live-pusher onPushStateChange:', e.detail.code);
 		        const code = e.detail.code;
 		        let content = '';
 		        switch (code) {
@@ -2438,11 +2440,13 @@
 		    },
 		
 		    stopPush() {
+		        console.log('停止推流');
 		        this.pushVideoContext.stop();
 		            this.pushVideo=false
 		    },
 		
 		    startPush() {
+		        console.log('开始推流，推流地址为:', this.pushUrl);
 		        uni.showToast({
 		            title: '开始推流，推流地址为:'
 		        });
@@ -2454,6 +2458,7 @@
 		    },
 		
 		    error(e) {
+		        console.log('live-player', e);
 		        console.error('live-player error:', e.detail.errMsg);
 		        if (e.detail.errCode == 10001) {
 		            uni.showToast({

packDetail1/pages/device/index2.vue

@@ -34,13 +34,19 @@
 	var player = null;
 	export default {
 		created() {
+			console.log(1111111111111111111111)
 			// this.initPlayer()
 		},
 		mounted() {
+			console.log('mounted...');
 
 			if (typeof window.EZUIKit !== 'undefined') {
+				
+				console.log('defined EZUIKit...');
 				this.initPlayer();
-			} else {	
+			} else {
+				
+				console.log('undefined EZUIKit...');				
 				// 动态引入较大类库避免影响页面展示
 				const script = document.createElement('script')
 				// view 层的页面运行在 www 根目录，其相对路径相对于 www 计算
@@ -56,6 +62,7 @@
 					windowWidth,
 					windowHeight
 				} = uni.getSystemInfoSync();
+				console.log('initPlayer...');	
 				return
 				fetch('https://zy.sxzooh.com/zh-api/applet/ysyun/getYsToken')
 				      // .then(response => response.json())

packDetail1/pages/device/playback.vue

@@ -226,8 +226,10 @@ export default {
     },
     onLoad: function (options) {
         livePlayerContext = uni.createLivePlayerContext('livePlayer');
+        console.log('获取参数', options);
         // 获取当前页面栈
         const currentPage = getCurrentPages();
+        console.log(currentPage.nv_length);
 
         // 获取url携带的参数
         const { accessToken, deviceSerial, channelNo, date, switch1Checked } = options;
@@ -236,6 +238,7 @@ export default {
             this.deviceSerial=deviceSerial,
             this.channelNo=channelNo,
             this.page=currentPage.nv_length
+        console.log(date);
         // 通过分享今日指定日期
         if (date) {
                 this.date=date,
@@ -258,8 +261,10 @@ export default {
      */
     onShareAppMessage: function (res) {
         const { accessToken, deviceSerial, channelNo, date, switch1Checked } = this;
+        console.log(switch1Checked);
         if (res.from === 'button') {
             // 来自页面内转发按钮
+            console.log(res.target);
                 this.panelStatus=0
         }
         return {
@@ -293,6 +298,7 @@ export default {
 
         // 获取存储类型
         switch1Change: function (e) {
+            console.log('当前存储类型', e.detail);
             if (e.detail.value == false) {
                     this.switchText='云存储',
                     this.switch1Checked=false,
@@ -321,8 +327,10 @@ export default {
             // 获取当前操作系统类型
             uni.getSystemInfo({
                 success(res) {
+                    console.log('当前操作系统：', res.system);
                     const sys = res.system;
                     type = sys.split(' ');
+                    console.log(type);
                     if (type[0] == 'iOS') {
                             that.toDay=date.replace(/\-/g, '/')
                     } else {
@@ -343,6 +351,7 @@ export default {
         // 获取时间轴
         getTimeLine: function () {
             const { recType, date, accessToken, deviceSerial, channelNo, timelineTimer, currentTimer } = this;
+            console.log('获取到的accessToken, accessToken', accessToken);
             var that = this;
             let currentDate = null;
             let timestampCurrent = null;
@@ -372,6 +381,7 @@ export default {
                 },
 
                 success: (res) => {
+                    console.log('获取播放时间片段', res.data);
                     if (res.data.code == 200) {
                         if (res.data.data != null) {
                             var result = res.data.data;
@@ -398,6 +408,7 @@ export default {
                                     et: et
                                 });
                             }
+                            console.log('availArr:', availArr);
                                 this.dateLine=availArr
                         } else {
                                 this.dialogNodataTitle='暂无数据',
@@ -436,6 +447,7 @@ export default {
             let stTime = e.detail.stTime;
             let etTime = e.detail.etTime;
             const { type, date, accessToken, deviceSerial, channelNo, videoSrc } = this;
+            console.log('当前播放时间', stTime, etTime);
             let startTime = null;
             let stopTime = null;
             startTime = date + ' ' + stTime;
@@ -469,6 +481,7 @@ export default {
                 },
 
                 success: (res) => {
+                    console.log('获取到的播放地址：', res.data);
                     if (res.data.code == '200' && res.data.data && res.data.data.url) {
                         const playUrl = res.data.data.url;
                             this.videoSrc=playUrl
@@ -476,6 +489,7 @@ export default {
                         this.handleStop();
                         // 开始播放
                         this.handlePlay();
+                        console.log('当前播放地址：', this.videoSrc);
                     } else if (res.data.code == '20007') {
                         debugger;
                             this.dialogTitle='获取播放地址失败',
@@ -505,6 +519,7 @@ export default {
                             this.dialogTitle='获取播放地址失败',
                             this.dialogContent=res.data.msg,
                             this.dialogShow=true
+                        console.log('获取rtmp播放地址失败');
                     }
                 }
             });
@@ -534,6 +549,7 @@ export default {
                         _this.fullScreen=true
                 }
             });
+            console.log('开启全屏');
         },
 
         unfullScreen() {
@@ -543,6 +559,7 @@ export default {
                         _this.fullScreen=false
                 }
             });
+            console.log('开启全屏');
         },
 
         ToggleObjectFit() {
@@ -559,6 +576,7 @@ export default {
         },
 
         handlePlay(callback) {
+            console.log('handelPlay', this.playVideo, this.isHD);
             this.checkNetWork();
             livePlayerContext.play({
                 success: () => {
@@ -576,6 +594,7 @@ export default {
                         title: '网络异常',
                         icon: 'none'
                     });
+                    console.log('开始播放失败');
                         this.videoNetWorkError=true
                         this.showVideoControls=false
                         this.videoLoadingStatus=100
@@ -584,6 +603,7 @@ export default {
         },
 
         handleStop(callback) {
+            console.log('stop');
             const { list } = this;
             livePlayerContext.stop({
                 success: () => {
@@ -602,6 +622,7 @@ export default {
         },
 
         autoHideControl() {
+            console.log('showHdSelect', this.showHDSelect);
             const _this = this;
             clearTimeout(this.autoHideTimer);
             this.autoHideTimer = setTimeout(() => {
@@ -619,6 +640,7 @@ export default {
 
         handleHD(e) {
             var showHDSelect = this.showHDSelect;
+            console.log('handleHD', showHDSelect);
             this.showHDSelect=!showHDSelect
         },
 
@@ -636,6 +658,7 @@ export default {
         },
 
         statechange(e) {
+            console.log('live-player code:', e.detail.code, e.detail);
             const { code } = e.detail;
             let { videoLoadingStatus, list, panelStatus } = this;
             switch (code) {
@@ -703,6 +726,7 @@ export default {
         },
 
         error(e) {
+            console.log('live-player', e);
             console.error('live-player error:', e.detail.errMsg);
             if (e.detail.errCode == 10001) {
                 uni.showToast({
@@ -714,6 +738,7 @@ export default {
         },
 
         onVideoTap(e) {
+            console.log('点击视频');
             const { deviceOffline, showVideoControls, panelStatus, videoNetWorkError } = this;
             if (deviceOffline || panelStatus === 4 || videoNetWorkError) {
                 return false;
@@ -730,8 +755,10 @@ export default {
         screenShoot(e) {
             const { playVideo, videoLoadingStatus } = this;
             if (!playVideo || videoLoadingStatus != 100) {
+                console.log('非播放状态下点击截图');
                 return false;
             }
+            console.log('开始截图');
             // livePlayerContext.snapshot('raw');
             let that = this;
             uni.getSetting({
@@ -759,10 +786,13 @@ export default {
             livePlayerContext
                 .snapshot('raw')
                 .then((data) => {
+                    console.log('data', data);
                     if (data) {
+                        console.log(data);
                         uni.saveImageToPhotosAlbum({
                             filePath: data.tempImagePath,
                             success(res) {
+                                console.log('保存成功', res);
                                 uni.showToast({
                                     title: '截图已保存至手机相册',
                                     icon: 'none'
@@ -820,6 +850,7 @@ export default {
 
         // 时间选择器
         bindDateChange: function (e) {
+            console.log('picker发送选择改变，携带值为', e.detail.value);
                 this.date=e.detail.value
             this.getTimeLine();
         },

packDetail1/pages/operations/list.vue

@@ -167,6 +167,7 @@
 					var ktxStatusHeight = res.statusBarHeight * pxToRpxScale
 					var navigationHeight = 44 * pxToRpxScale
 					this.height = res.windowHeight  * pxToRpxScale//将px 转换rpx		
+					console.log(this.height,ktxStatusHeight,navigationHeight)
 					this.scorllheight = this.height - 120
 				}
 			});
@@ -198,17 +199,21 @@
 						this.$set(item, 'checked', true)
 					})
 					this.checkList = this.alllist
+					console.log(this.checkList,156)
 				}
 
 			},
 			checkSelectItem(e, item) {
+				console.log(item,156)
 				// 如果是取消选中，就把checked置为false,如果是选中，就给添加一个checked=true
 				if (item.checked == true) {
 					this.$set(item, 'checked', false)
 					this.checkList = this.checkList.filter(items => (items.value !== item.value))
+					console.log(this.checkList,'true')
 				} else {
 					this.$set(item, 'checked', true)
 					this.checkList.push(item)
+					console.log(this.checkList,'false')
 				}
 				// 过滤出数组中checked为true的项目，如果和原alllist长度相等，就全选显示
 				let newArr = this.alllist.filter(item => (item.checked == true))
@@ -217,6 +222,7 @@
 				} else {
 					this.checkTrue = false;
 				}
+				console.log(this.checkList,41561456)
 			},
 			submit(){
 				uni.navigateBack({

pages.json

@@ -4,7 +4,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "农业面源污染监测系统",
+				"navigationBarTitleText": "汾西小流域面源污染监测",
 				"navigationStyle": "custom"
 			}
 		},
@@ -156,7 +156,7 @@
 				{
 					"path": "pages/operations/index",
 					"style": {
-						"navigationBarTitleText": "运维记录",
+						"navigationBarTitleText": "站点运维",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
@@ -164,7 +164,7 @@
 				{
 					"path": "pages/operations/detail",
 					"style": {
-						"navigationBarTitleText": "运维记录详情",
+						"navigationBarTitleText": "站点运维详情",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
@@ -172,7 +172,7 @@
 				{
 					"path": "pages/operations/add",
 					"style": {
-						"navigationBarTitleText": "新增运维记录",
+						"navigationBarTitleText": "新增站点运维",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
@@ -180,7 +180,7 @@
 				{
 					"path": "pages/operations/edit",
 					"style": {
-						"navigationBarTitleText": "编辑运维记录",
+						"navigationBarTitleText": "编辑站点运维",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
@@ -196,7 +196,7 @@
 				{
 					"path": "pages/analysis/index",
 					"style": {
-						"navigationBarTitleText": "监测数据统计分析",
+						"navigationBarTitleText": "统计分析",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
@@ -212,7 +212,7 @@
 				{
 					"path": "pages/sjdyj/index",
 					"style": {
-						"navigationBarTitleText": "智能预警",
+						"navigationBarTitleText": "预警信息",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}

pages/index/indexData.js

@@ -1,449 +0,0 @@
-const indexData = {
-    bigswiperList : [{
-        "id": "1692474977070829569",
-        "infoId": "1692474921957675010",
-        "detailCode": "图1",
-        "detailValue": "图",
-        "detailValue2": "1",
-        "propsValue1": null,
-        "propsValue2": null,
-        "detailPics": "temp/20230818174636_1692352452041.jpg",
-        "detailExtPics": null,
-        "detailNote": null,
-        "isShow": "1",
-        "sortNo": 1,
-        "tenantId": null,
-        "reVision": 0,
-        "createdBy": "hjadmin",
-        "createTime": "2023-08-18 17:54:14",
-        "updatedBy": null,
-        "isDel": 0,
-        "updatedTime": null
-    }, {
-        "id": "1692475023417888770",
-        "infoId": "1692474921957675010",
-        "detailCode": "图2",
-        "detailValue": "图",
-        "detailValue2": "2",
-        "propsValue1": null,
-        "propsValue2": null,
-        "detailPics": "temp/20230818174638_1692352462933.png",
-        "detailExtPics": null,
-        "detailNote": null,
-        "isShow": "1",
-        "sortNo": 1,
-        "tenantId": null,
-        "reVision": 0,
-        "createdBy": "hjadmin",
-        "createTime": "2023-08-18 17:54:25",
-        "updatedBy": null,
-        "isDel": 0,
-        "updatedTime": null
-    }],
-    wrwlist : [{
-        "unit": "℃",
-        "code": "dataAirTemp",
-        "color": "#22BB8A",
-        "icon": "sys/icon/shebei_icon_qixiang.png",
-        "description": "大气温度"
-    }, {
-        "unit": "%RH",
-        "code": "dataAirWet",
-        "color": "#EE701C",
-        "icon": "sys/icon/zhandian_icon_kongqishidu.png",
-        "description": "大气湿度"
-    }, {
-        "unit": "hPa",
-        "code": "dataAirPress",
-        "color": "#52AC2A",
-        "icon": "sys/icon/zhandian_icon_daqiyali.png",
-        "description": "大气压力"
-    }, {
-        "unit": "mm",
-        "code": "dataRainFall",
-        "color": "#2BADB9",
-        "icon": "sys/icon/zhandian_icon_jiangyuliang.png",
-        "description": "雨量"
-    }, {
-        "unit": "mm",
-        "code": "dataRainTotal",
-        "color": "#102B6A",
-        "icon": "sys/icon/zhandian_icon_jiangyuliang.png",
-        "description": "雨量累计"
-    }, {
-        "unit": "m/s",
-        "code": "dataWindSpeed",
-        "color": "#7CD6CF",
-        "icon": "sys/icon/zhandian_icon_fengsu.png",
-        "description": "风速"
-    }, {
-        "unit": "°",
-        "code": "dataWindDirection",
-        "color": "#26A3CC",
-        "icon": "sys/icon/zhandian_icon_fengxiang.png",
-        "description": "风向"
-    }, {
-        "unit": "MJ/m2",
-        "code": "dataSunTotal",
-        "color": "#6C48C7",
-        "icon": "sys/icon/zhandian_icon_taiyangquanfushe.png",
-        "description": "辐射累计"
-    }, {
-        "unit": "W/m2",
-        "code": "dataSunFallout",
-        "color": "#22BB8A",
-        "icon": "sys/icon/zhandian_icon_taiyangquanfushe.png",
-        "description": "太阳全辐射"
-    }, {
-        "unit": "%",
-        "code": "dataSoilWet",
-        "color": "#6495ED",
-        "icon": "sys/icon/zhandian_icon_turangshidu.png",
-        "description": "20CM土壤湿度"
-    }, {
-        "unit": "%",
-        "code": "dataSoilWet2",
-        "color": "#4169E1",
-        "icon": "sys/icon/zhandian_icon_turangshidu.png",
-        "description": "40CM土壤湿度"
-    }, {
-        "unit": "%",
-        "code": "dataSoilWet3",
-        "color": "#0000CD",
-        "icon": "sys/icon/zhandian_icon_turangshidu.png",
-        "description": "60CM土壤湿度"
-    }, {
-        "unit": "℃",
-        "code": "dataSoilTemp",
-        "color": "#C71585",
-        "icon": "sys/icon/zhandian_icon_turangwendu.png",
-        "description": "20CM土壤温度"
-    }, {
-        "unit": "℃",
-        "code": "dataSoilTemp2",
-        "color": "#FF1493",
-        "icon": "sys/icon/zhandian_icon_turangwendu.png",
-        "description": "40CM土壤温度"
-    }, {
-        "unit": "℃",
-        "code": "dataSoilTemp3",
-        "color": "#FF69B4",
-        "icon": "sys/icon/zhandian_icon_turangwendu.png",
-        "description": "60CM土壤温度"
-    }, {
-        "unit": "uS/cm",
-        "code": "dataSoilDdl",
-        "color": "#92D0D0",
-        "icon": "sys/icon/zhandian_icon_ec.png",
-        "description": "20CM电导率"
-    }, {
-        "unit": "uS/cm",
-        "code": "dataSoilDdl2",
-        "color": "#73A2A2",
-        "icon": "sys/icon/zhandian_icon_ec.png",
-        "description": "40CM电导率"
-    }, {
-        "unit": "uS/cm",
-        "code": "dataSoilDdl3",
-        "color": "#567777",
-        "icon": "sys/icon/zhandian_icon_ec.png",
-        "description": "60CM电导率"
-    }, {
-        "unit": "",
-        "code": "dataSoilSalt",
-        "color": "#4F5555",
-        "icon": "sys/icon/zhandian_icon_ec.png",
-        "description": "土壤盐分"
-    }, {
-        "unit": "%",
-        "code": "dataSoilWetMark",
-        "color": "#6495ED",
-        "icon": "sys/icon/zhandian_icon_turangshidu.png",
-        "description": "土壤湿度"
-    }, {
-        "unit": "℃",
-        "code": "dataSoilMark",
-        "color": "#C71585",
-        "icon": "sys/icon/zhandian_icon_turangwendu.png",
-        "description": "土壤温度"
-    }, {
-        "unit": "uS/cm",
-        "code": "dataSoilDdlMark",
-        "color": "#92D0D0",
-        "icon": "sys/icon/zhandian_icon_ec.png",
-        "description": "电导率"
-    }, {
-        "unit": "mg/L",
-        "code": "dataWaterTp",
-        "color": "#C8CC00",
-        "icon": "sys/icon/shebei_icon_tp.png",
-        "description": "总磷"
-    }, {
-        "unit": "mg/L",
-        "code": "dataWaterTn",
-        "color": "#009DB2",
-        "icon": "sys/icon/shebei_icon_tn.png",
-        "description": "总氮"
-    }, {
-        "unit": "mg/L",
-        "code": "dataWaterNo",
-        "color": "#72BAA7",
-        "icon": "sys/icon/shebei_icon_no3n.png",
-        "description": "硝态氮"
-    }, {
-        "unit": "mg/L",
-        "code": "dataWaterNh",
-        "color": "#225A1F",
-        "icon": "sys/icon/shebei_icon_nh3n.png",
-        "description": "氨氮"
-    }, {
-        "unit": "mg/L",
-        "code": "dataWaterCod",
-        "color": "#FDB933",
-        "icon": "sys/icon/shebei_icon_cod.png",
-        "description": "化学需氧量"
-    }, {
-        "unit": "mg/m³",
-        "code": "dataOu",
-        "color": "#f47a75",
-        "icon": "sys/icon/zhandian_icon_ou.png",
-        "description": "臭气浓度"
-    }, {
-        "unit": "mg/m³",
-        "code": "dataNh3",
-        "color": "#d05c7c",
-        "icon": "sys/icon/zhandian_icon_nh3.png",
-        "description": "氨气"
-    }, {
-        "unit": "mg/m³",
-        "code": "dataH2s",
-        "color": "#d05c9f",
-        "icon": "sys/icon/zhandian_icon_h2s.png",
-        "description": "硫化氢"
-    }, {
-        "unit": "mg/m³",
-        "code": "dataTvoc",
-        "color": "#f06464",
-        "icon": "sys/icon/zhandian_icon_tvoc.png",
-        "description": "总挥发性有机物"
-    }, {
-        "unit": "台",
-        "code": "default",
-        "color": "#DEAB8A",
-        "icon": "",
-        "description": "默认"
-    }],
-
-    list : [{
-        "name": "总氮",
-        "unit": "mg/L",
-        "value": "2.0000",
-        "color": "#009DB2",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:23",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_1",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总磷",
-        "unit": "mg/L",
-        "value": "1.0061",
-        "color": "#C8CC00",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:23",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_1",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "硝态氮",
-        "unit": "mg/L",
-        "value": "5.2110",
-        "color": "#72BAA7",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:23",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_1",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总氮",
-        "unit": "mg/L",
-        "value": "2.1114",
-        "color": "#009DB2",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:50",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_2",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总磷",
-        "unit": "mg/L",
-        "value": "0.9864",
-        "color": "#C8CC00",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:50",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_2",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "硝态氮",
-        "unit": "mg/L",
-        "value": "1.2373",
-        "color": "#72BAA7",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:50",
-        "stationName": "小流域监测站1#站",
-        "stationCode": "S_2",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总氮",
-        "unit": "mg/L",
-        "value": "49.6451",
-        "color": "#009DB2",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:36",
-        "stationName": "畜禽1号站",
-        "stationCode": "S_3",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总磷",
-        "unit": "mg/L",
-        "value": "10.1785",
-        "color": "#C8CC00",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:36",
-        "stationName": "畜禽1号站",
-        "stationCode": "S_3",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "氨氮",
-        "unit": "mg/L",
-        "value": "49.9502",
-        "color": "#225A1F",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:36",
-        "stationName": "畜禽1号站",
-        "stationCode": "S_3",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "化学需氧量",
-        "unit": "mg/L",
-        "value": "501.5000",
-        "color": "#FDB933",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:33:36",
-        "stationName": "畜禽1号站",
-        "stationCode": "S_3",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总氮",
-        "unit": "mg/L",
-        "value": "50.6921",
-        "color": "#009DB2",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:00:00",
-        "stationName": "畜禽2号站",
-        "stationCode": "S_4",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "总磷",
-        "unit": "mg/L",
-        "value": "0.2719",
-        "color": "#C8CC00",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:00:00",
-        "stationName": "畜禽2号站",
-        "stationCode": "S_4",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "氨氮",
-        "unit": "mg/L",
-        "value": "48.9038",
-        "color": "#225A1F",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:00:00",
-        "stationName": "畜禽2号站",
-        "stationCode": "S_4",
-        "stationType": null,
-        "dataCounts": 1045510
-    }, {
-        "name": "化学需氧量",
-        "unit": "mg/L",
-        "value": "498.3486",
-        "color": "#FDB933",
-        "trend": null,
-        "survItem": null,
-        "dataDateTime": "2025-05-23 19:00:00",
-        "stationName": "畜禽2号站",
-        "stationCode": "S_4",
-        "stationType": null,
-        "dataCounts": 1045510
-    }],
-    menu: [
-        {
-            name: '监测站点',
-            img: require('../../static/home_icon_jiance.png'),
-            path: '/packDetail/pages/Site/index'
-        }, {
-            name: '智能预警',
-            img: require('../../static/scd.png'),
-            path: '/packDetail/pages/sjdyj/index'
-        },
-        {
-            name: '视频监控',
-            img: require('../../static/home_icon_shipin.png'),
-            path: '/packDetail1/pages/device/index'
-        },
-        {
-            name: '运维记录',
-            img: require('../../static/home_icon_yunwei.png'),
-            path: '/packDetail/pages/operations/index'
-        },
-        {
-            name: '农业废弃物',
-            img: require('../../static/home_icon_feiqiwu.png'),
-            path: '/packDetail/pages/waste/index'
-        },
-        {
-            name: '粪污台账',
-            img: require('../../static/home_icon_fenwu.png'),
-            path: '/packDetail/pages/fwtz/index'
-        },
-        {
-            name: '设备管理',
-            img: require('../../static/home_icon_shebei.png'),
-            path: '/packDetail/pages/vidio/index'
-        },
-        {
-            name: '统计分析',
-            img: require('../../static/home_icon_shuju.png'),
-            path: '/packDetail/pages/analysis/index'
-        },
-    ]
-};
-
-export default indexData;

pages/maps/00/00.vue

@@ -0,0 +1,108 @@
+import { getApi } from "@/utils/common.js"
+export default {
+	data() {
+		return {
+			latitude: 29.519418, // 纬度
+			longitude: 106.687094, // 经度
+			allMarkers: [] // 标记点
+		}
+	},
+	onReady() {
+		// 1.页面准备好后，获取到map组件的执行上下文。注意：这里是取的map的id属性
+		this.mapContext = uni.createMapContext("alarm_map", this);
+		// 2.请求数据
+		this.getallStations()
+	},
+	methods: {
+		getallStations() {
+			uni.showLoading()
+			let obj = {
+				id: id,
+				stationQuery: query
+			}
+			getApi(obj).then(res => {
+				uni.hideLoading();
+				if (res.code == 0) {
+					if (!Array.isArray(res.data) || res.data.length <= 0) return
+					// 拿到请求数据后，把数据传给点聚合功能；
+					this.setMarkersAndCluster(res.data) // 3、调用聚合功能 
+				}
+			})
+		},
+		// 聚合功能
+		setMarkersAndCluster(markerList) {
+			// 1.组装数据之后，并赋值给地图上的marker
+			this.allMarkers = Array.from(markerList).map((item, i) => {
+				return {
+				...item,
+				width: 41,
+				height: 41,
+				iconPath: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				joinCluster: true, // 这个属性很重要，必须要
+				callout: { // 自定义标记点上方的气泡窗口
+					content: '***聚合1',
+					display: 'ALWAYS', // 'BYCLICK':点击显示; 'ALWAYS':常显
+					padding: 5,
+					textAlign: 'center',
+					color: '#C2874D',
+					borderRadius: 4
+				},
+				label: { // 为标记点旁边增加标签
+					content: '你好，marker',
+					borderColor: '#ff0000',
+					bgColor: '#ffffff'## 标题
+				},
+			}
+		});
+    
+		// 2.初始化点聚合的配置，未调用时采用默认配置
+		this.mapContext.initMarkerCluster({
+			enableDefaultStyle: false, // 是否启用默认的聚合样式(是否用自定义图标)
+			zoomOnClick: true,
+			gridSize: 60,
+			complete(res) {
+				console.log('initMarkerCluster', res)
+			}
+		});
+    
+		// 3.发生聚合时，给聚合点设置marker标签
+		this.mapContext.on('markerClusterCreate', res => {
+			const clusters = res.clusters // 新产生的聚合簇
+			const zhou = clusters.map(item=> {
+				const {
+				center, // 聚合点的经纬度数组
+				clusterId, // 聚合簇id
+				markerIds // 已经聚合了的标记点id数组
+				} = item
+				
+				return {
+					...center,
+					width: 50,
+					height: 50,
+					clusterId, // 必须有
+					iconPath: 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_blue.png',
+					borderRadius: 8,
+					joinCluster: true,
+					label: { // 定制聚合点样式
+						content: markerIds.length + '',
+						fontSize: 14,
+						width: 18,
+						height: 18,
+						color: '#ffffff',
+						bgColor: '#C2874D',
+						borderRadius: 6,
+						textAlign: 'center',
+						anchorX: 25,
+						anchorY: -60,
+					}
+				}
+		})
+		
+      	// 4. 添加聚合簇标签
+		this.mapContext.addMarkers({
+			markers: zhou,
+			clear: false, //是否先清空地图上所有的marker
+		})
+    })
+  }
+}

pages/maps/index - 副本.vue

@@ -0,0 +1,457 @@
+<template>
+	<view class="container">
+		<map id="map" ref="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="111.436625"
+			latitude="36.771975" show-location @markertap="markertap" @callouttap="callouttap">
+		</map>
+		<view class="zdxq">
+			<view class="zdxqitem" @click="switch2Change('团柏河')">
+				<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>
+</template>
+
+<script>
+	import api from '@/api/api'
+	import configService from '@/common/service/config.service.js';
+	export default {
+		data() {
+			return {
+				baseUrl:configService.staticDomainURL,
+				markers: [],
+				list: [],
+				issscd: false,  // 团柏河显示状态 (false表示显示)
+				isssscd: false, // 对竹河显示状态 (false表示显示)
+				stationInfo: [],
+				cusLocation: [],
+				stationlist: [],
+				stationTwolist:[],
+				mapCtx: null // 添加地图上下文
+			};
+		},
+		onLoad() {
+			this.$nextTick(() => {
+				this.getList()
+			})
+		},
+		onReady() {
+			// 在onReady中初始化地图上下文
+			this.mapCtx = uni.createMapContext('map', this);
+		},
+		onShow() {
+			if (!uni.getStorageSync('third_session')) {
+				uni.reLaunch({
+					url: '/packDetail/pages/login/login'
+				})
+			}
+		},
+		methods: {
+			getList() {
+				this.markers = []
+				this.list = []
+				this.stationInfo = []
+				this.cusLocation = []
+				this.stationlist = []
+				this.stationTwolist = []
+				
+				uni.showLoading({
+					title: '加载中'
+				});
+				
+				this.$http.get('/applet/survStationInfo/stationMap').then(res => {
+					// 合并 stationInfo 和 deviceList
+					const combinedList = [...res.data.data.stationInfo, ...res.data.data.deviceList];
+					this.stationlist = combinedList;
+					this.stationTwolist = [...res.data.data.stationInfo];
+					
+					console.log("合并后的stationlist+++++", this.stationlist);
+					
+					// 处理所有标记点
+					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') {
+							this.stationInfo.push(item);
+						}
+					});
+					
+					this.issscd = false
+					this.isssscd = false
+					this.qiyeChange()
+					this.list1query()
+					this.addDeviceMarkers() // 添加设备标记
+					
+					// 延迟执行以确保标记已经添加到地图
+					setTimeout(() => {
+						this.adjustMapToFitAllMarkers();
+					}, 500);
+					
+					uni.hideLoading();
+				})
+			},
+			
+			// 添加设备标记
+			addDeviceMarkers() {
+				this.stationlist.forEach((item, index) => {
+					// 如果是 deviceList 中的设备（有 type 字段但没有 stationType 字段）
+					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] // 上下左右的边距
+					});
+				}
+			},
+			
+			// 调整地图视野到特定区域的标记点
+			adjustMapToRegion(regionName) {
+				let points = [];
+				
+				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] // 可以调整边距以获得更好的显示效果
+					});
+				}
+			},
+			
+			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);
+						}
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* 样式保持不变 */
+	.bgimg {
+		position: fixed;
+		// z-index: -99;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+
+	.customCallout {
+		width: 349rpx;
+		height: 49rpx;
+		color: #fff;
+		font-size: 24rpx;
+		text-shadow: 1rpx 2rpx 0rpx #0D1934;
+		font-weight: bold;
+		// background-image: url('@/static/zhandian_icon_nongtian_title.png');
+		background-repeat: no-repeat;
+		background-size: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.customCallout1 {
+		width: 349rpx;
+		height: 49rpx;
+		color: #fff;
+		font-size: 24rpx;
+		text-shadow: 1rpx 2rpx 0rpx #0D1934;
+		font-weight: bold;
+		// background-image: url('@/static/zhandian_icon_xuqin_title.png');
+		background-repeat: no-repeat;
+		background-size: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.zdxq {
+		position: fixed;
+		left: 33rpx;
+		bottom: 36rpx;
+	}
+
+	.zdxqitem {
+		padding: 8rpx 0 7rpx 17rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 22rpx;
+		font-family: Source Han Sans SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		text-shadow: 0rpx 1rpx 0rpx rgba(4, 49, 52, 0.55);
+		width: 359rpx;
+		background: rgba(0, 0, 0, 0.52);
+		border: 1px solid #4B677C;
+		border-radius: 6rpx;
+		margin-bottom: 10rpx;
+		position: relative;
+	}
+
+	.crildon {
+		width: 10rpx;
+		height: 10rpx;
+		border-radius: 50%;
+		margin-right: 15rpx;
+	}
+
+	.zdxqitem:last-child {
+		margin-bottom: 0;
+	}
+
+	.zdxqitem image {
+		width: 33rpx;
+		height: 50rpx;
+		margin-right: 15rpx;
+	}
+
+	.zdxqitem:first-child image {
+		width: 30rpx;
+		height: 40rpx;
+		margin-right: 15rpx;
+	}
+
+	.textss {
+		flex: 1;
+		text-align: left;
+	}
+
+	.imgs {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		z-index: -9;
+	}
+
+	.switchs {
+		position: fixed;
+		top: 36rpx;
+		right: 40rpx;
+		display: flex;
+		align-items: center;
+	}
+</style>

pages/user/people.vue

@@ -31,7 +31,7 @@
 				<view class="boxitem_left">
 					<image src="../../static/me_icon_shebei.png" mode=""></image>
 					<view class="zl">
-						运维记录
+						站点运维
 					</view>
 				</view>
 				<image src="../../static/me_icon_in.png" mode=""></image>
@@ -78,14 +78,31 @@
 			});
 		},
 		onShow() {
-      api.checkLogin(()=>{
+			if(uni.getStorageSync('third_session')){
-        this.getuserInfo();
+				uni.login({
-      }, () => {
+				  success: function (res) {
-        uni.reLaunch({
+					this.code = res.code
-          url:'/packDetail/pages/login/login'
+					let params = {}
-        })
+					params.jsCode = this.code
-      });
+					api.wxlogin(params).then(res=>{
-
+						if(res.data.code == 0){
+							let userInfo = res.data.data;
+							// uni.setStorageSync('third_session', userInfo.thirdSession);
+							if(!userInfo.id){
+								uni.reLaunch({
+									url:'/packDetail/pages/login/login'
+								})
+							}
+						}
+					})
+				  }
+				});
+			}else if(!uni.getStorageSync('third_session')){
+				uni.reLaunch({
+					url:'/packDetail/pages/login/login'
+				})
+			}
+			this.getuserInfo()
 		},
 		methods: {
 			getuserInfo(){