Administrator
/
FenXiNspUniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改河津的测试bug

This commit is contained in:
978184212@qq.com 2026-08-20 18:48:46 +08:00
parent 8350978c5e
commit 1337f99702
8 changed files with 287 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "河津市农业面源污染监测系统",
"name" : "农业面源污染监测系统",
"appid" : "__UNI__A58A5D7",
"description" : "",
"versionName" : "2.2.22",

1
packDetail/pages/Site/detail.vue
View File

@ -291,6 +291,7 @@
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();
})

4
packDetail/pages/Site/index.vue
View File

@ -8,8 +8,8 @@
<view class="list_item" v-for="(item,index) in List" :key="index" @click="todetail(item,index)">
<view class="list_item_top">
<view class="list_item_left">
<image v-if="item.stationType == 'livestock1'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<image v-else-if="item.stationType == 'watershed1'" src="../../static/zhandian_icon_xuqin.png" mode=""></image>
<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">

39
packDetail/pages/vidio/index.vue
View File

@ -91,37 +91,22 @@
this.getList()
},
methods:{
getList(){
getList() {
uni.showLoading({
title: '加载中'
});
// 使用 Promise.all 同时发起两个请求
Promise.all([
this.$http.get('/applet/survStationInfo/deviceList'),
this.$http.get('/applet/survStationInfo/fdeviceList')
]).then(([res1, res2]) => {
const data1 = res1?.data?.data || [];
// 安全获取第二个接口的数据
let data2 = [];
if (res2?.data?.data && Array.isArray(res2.data.data) && res2.data.data.length > 0) {
data2 = res2.data.data[0] || [];
}
// data2 有数据才合并
this.list = data2.length > 0 ? data1.concat(data2) : data1;
// 可选：打印日志方便调试
if (data2.length === 0) {
console.log('第二个接口无数据，跳过合并');
}
uni.hideLoading();
}).catch(error => {
console.error('请求失败:', error);
uni.hideLoading();
});
// 只请求第一个接口
this.$http.get('/applet/survStationInfo/deviceList')
.then(res => {
const data1 = res?.data?.data || [];
this.list = data1;
uni.hideLoading();
})
.catch(error => {
console.error('请求失败:', error);
uni.hideLoading();
});
},
todetail(item,index){
uni.navigateTo({

BIN
packDetail/static/dls.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 50 KiB

2
pages.json
View File

@ -4,7 +4,7 @@
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "河津市农业面源污染监测系统",
"navigationBarTitleText": "农业面源污染监测系统",
"navigationStyle": "custom"
}
},

2
pages/index/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="container">
<uni-nav-bar :fixed="true" leftWidth="00rpx" rightWidth="0rpx" background-color="transparent" status-bar title="河津市农业面源污染监测系统" />
<uni-nav-bar :fixed="true" leftWidth="00rpx" rightWidth="0rpx" background-color="transparent" status-bar title="农业面源污染监测系统" />
<image src="../../static/home_top_bg.png" mode="" class="bgimg"></image>
<scroll-view class="content" scroll-y="true" :style="{height:contentheight + 'rpx'}">
<view class="top_address">

557
pages/maps/index.vue
View File

@ -1,5 +1,6 @@
<template>
<view class="container">
<!-- <image src="../../static/zddt.jpg" mode="" class="bgimg" @click="todetail()"></image> -->
<map id="map" style="width: 100%; height:2000rpx;" scale="13" :markers="markers" longitude="110.628279"
latitude="35.546105" show-location @markertap="markertap" @callouttap="callouttap">
<cover-view slot="callout">
@ -40,6 +41,11 @@
<view class="crildon" :style="!isssscd?'background:#00ff37':'background: #ccc;'"></view>
</view>
</view>
<!-- <view class="switchs" :defaultSwitch="isscd">-->
<!-- <selectSwitch @change="switch1Change" :defaultSwitch="isscd" checked_bj_color="#13ce66"/>-->
<!-- <switch style="margin-right: 10rpx;" :checked="isscd" @change="switch1Change" />-->
<!-- &lt;!&ndash; 显示/隐藏杀虫灯 &ndash;&gt;-->
<!-- </view>-->
</view>
</template>
@ -66,17 +72,15 @@
stationInfo: [],
pestlightMarker: null,
stationlist: [],
timerSet: null,
// 点聚合相关
mapContext: null,
clusterMarkerIds: [], // 参与聚合的marker id列表
isClusterInited: false // 是否已初始化聚合
timerSet: null
};
},
onLoad() {
this.$nextTick(() => {
this.getList()
})
// this.isscd = true
// this.getList()
this.$nextTick(() => {
this.getList()
})
},
onShow() {
var that = this
@ -92,10 +96,14 @@
console.log(res, 165)
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 {
// that.isscd = true
//
}
}
})
@ -106,137 +114,13 @@
url: '/pages/loginindex'
})
}
},
onReady() {
// 获取地图上下文
this.mapContext = uni.createMapContext("map", this);
// 初始化点聚合
this.initCluster()
// 1.页面准备好后，获取到map组件的执行上下文。注意：这里是取的map的id属性
this.mapContext = uni.createMapContext("alarm_map", this);
},
methods: {
// ===== 新增：初始化点聚合 =====
initCluster() {
if (!this.mapContext) {
setTimeout(() => {
this.initCluster()
}, 500)
return
}
// 1. 初始化聚合配置
this.mapContext.initMarkerCluster({
enableDefaultStyle: false, // 使用默认样式
zoomOnClick: true, // 点击聚合点时是否放大地图
gridSize: 60, // 聚合网格大小
complete: (res) => {
console.log('initMarkerCluster success', res)
this.isClusterInited = true
// 聚合初始化完成后，添加杀虫灯标记
this.addPestMarkersToCluster()
}
})
// 2. 监听聚合簇创建事件，自定义聚合簇样式
this.mapContext.on('markerClusterCreate', (res) => {
console.log('markerClusterCreate', res)
const clusters = res.clusters
const clusterMarkers = clusters.map((cluster) => {
// 获取该聚合簇中第一个marker的坐标作为中心点
const centerLat = cluster.center.latitude
const centerLng = cluster.center.longitude
const count = cluster.markerIds.length
return {
id: cluster.clusterId,
latitude: centerLat,
longitude: centerLng,
width: 40,
height: 40,
iconPath: '/static/zhandian_sahchong_dingwei.png',
label: {
content: count + '',
color: '#ffffff',
fontSize: 12,
fontWeight: 'bold',
anchorX: 0,
anchorY: -8,
borderWidth: 0,
bgColor: 'rgba(0,0,0,0.6)',
borderRadius: 10,
padding: 2
}
}
})
// 更新聚合簇样式
this.mapContext.addMarkers({
markers: clusterMarkers,
clear: false,
complete: (res) => {
console.log('add cluster markers success', res)
}
})
})
},
// ===== 新增：添加杀虫灯到聚合 =====
addPestMarkersToCluster() {
if (!this.isClusterInited) return
// 先移除之前的聚合标记
if (this.clusterMarkerIds.length > 0) {
this.mapContext.removeMarkers({
markerIds: this.clusterMarkerIds,
complete: (res) => {
console.log('remove old cluster markers', res)
}
})
this.clusterMarkerIds = []
}
// 如果杀虫灯开关是关闭状态，不添加
if (!this.isscd || this.pestlight.length === 0) return
// 准备聚合标记数据
const pestMarkers = []
this.pestlight.forEach((item, index) => {
const markerId = 10000 + index
pestMarkers.push({
id: markerId,
latitude: Number(item.latitude),
longitude: Number(item.longitude),
width: 15,
height: 20,
iconPath: '/static/zhandian_sahchong_dingwei.png',
joinCluster: true, // 参与聚合
inType: 'pestlight',
stationName: item.stationName,
stationCode: item.stationCode
})
this.clusterMarkerIds.push(markerId)
})
// 通过 addMarkers 添加参与聚合的标记
this.mapContext.addMarkers({
markers: pestMarkers,
clear: false,
complete: (res) => {
console.log('add pest markers to cluster success', res)
}
})
},
// ===== 修改：移除杀虫灯从聚合 =====
removePestMarkersFromCluster() {
if (this.clusterMarkerIds.length > 0 && this.mapContext) {
this.mapContext.removeMarkers({
markerIds: this.clusterMarkerIds,
complete: (res) => {
console.log('remove pest markers from cluster', res)
}
})
this.clusterMarkerIds = []
}
},
getList() {
this.markers = []
this.markersNoPest = []
@ -247,178 +131,103 @@
});
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
this.stationlist = [...res.data.data.pestlight, ...res.data.data.cusLocation, ...res.data.data.stationInfo]
this.stationlist.forEach((item,index) => {
item.id = index;
if(item.inType == 'pestlight'){
this.pestlight.push(item)
}
if(item.stationType == 'cusLocaltion'){
this.cusLocation.push(item)
}
if(item.stationType == 'orient' || item.stationType == 'livestock'){
this.stationInfo.push(item)
}
this.stationlist.forEach((item,index) => {
item.id = index;
if(item.inType == 'pestlight'){
this.pestlight.push(item)
}
if(item.stationType == 'cusLocaltion'){
this.cusLocation.push(item)
}
if(item.stationType == 'orient' || item.stationType == 'livestock'){
this.stationInfo.push(item)
}
this.list.push({
latitude:Number(item.stationLatitude),
longitude: Number(item.stationLongitude),
stationType:item.stationType,
sortNo: item.sortNo,
stationName: item.stationName,
stationCode: item.stationCode
})
})
this.issscd = false
this.isssscd = false
this.qiyeChange()
this.list1query()
this.list2query()
uni.hideLoading();
})
},
// 处理 stationlist 数据方法
processStationList(stationlist) {
if (stationlist) {
stationlist.forEach(item => {
this.list.push({
latitude:Number(item.stationLatitude),
longitude: Number(item.stationLongitude),
stationType:item.stationType,
latitude: item.inType === 'pestlight' ? Number(item.latitude) : Number(item
.stationLatitude),
longitude: item.inType === 'pestlight' ? Number(item.longitude) : Number(item
.stationLongitude),
stationType: item.inType === 'pestlight' ? 'pestlight' : item.stationType,
sortNo: item.sortNo,
stationName: item.stationName,
stationCode: item.stationCode
})
})
this.issscd = false
this.isssscd = false
this.qiyeChange()
this.list1query()
this.list2query()
// 如果聚合已初始化，直接添加杀虫灯；否则等待初始化完成
if (this.isClusterInited) {
this.addPestMarkersToCluster()
}
uni.hideLoading();
})
},
// ===== 修改：杀虫灯开关控制 =====
switch1Change() {
this.isscd = !this.isscd;
if (this.isscd) {
// 打开 - 添加杀虫灯到聚合
this.addPestMarkersToCluster()
} else {
// 关闭 - 从聚合中移除杀虫灯
this.removePestMarkersFromCluster()
}
},
// ===== 以下方法完全保持原样 =====
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;
this.list.push({
latitude:Number(item.stationLatitude),
longitude: Number(item.stationLongitude),
stationType:item.stationType,
sortNo: item.sortNo,
stationName: item.stationName,
stationCode: item.stationCode
})
const markerItem = {
id: item.id,
// 生成 pointers 数据方法
generatePointers() {
const iconConfig = {
// pestlight: {
// iconPath: '/static/zhandian_sahchong_dingwei.png',
// width: 15,
// height: 20
// },
orient: {
iconPath: '/static/zhandian_nongtian_dingwei.png',
width: 35,
height: 52
},
livestock: {
iconPath: '/static/zhandian_xuqin_dingwei.png',
width: 35,
height: 52
},
cusLocaltion: {
iconPath: '/static/qiyeIcon.png',
width: 35,
height: 52
}
}
this.list.forEach((item, i) => {
const config = iconConfig[item.stationType] || {}
item.iconPath = config.iconPath || ''
item.width = config.width || 0
item.height = config.height || 0
this.pointers.push({
id: i,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
latitude: Number(item.latitude),
longitude: Number(item.longitude),
width: item.width,
height: item.height,
customCallout: {
anchorY: 0,
anchorX: 0,
display: 'ALWAYS'
anchorY: 0, // Y轴偏移量
anchorX: 0, // X轴偏移量
display: 'ALWAYS' // 一直展示
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true
};
this.markers.push(markerItem);
}
},
switch2Change() {
this.issscd = !this.issscd
this.list1query()
},
switch3Change() {
this.isssscd = !this.isssscd
this.list2query()
},
list1query(){
if (!this.issscd) {
for (let i = 0; i < this.stationInfo.length; i++) {
const item = this.stationInfo[i];
if(item.stationType === 'orient'){
item.iconPath = '/static/zhandian_nongtian_dingwei.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);
}
}
} else {
this.markers = this.markers.filter((item)=>{
return item.stationType !== 'orient'
joinCluster: true // 是否参与点聚合
})
}
},
list2query(){
if (!this.isssscd) {
for (let i = 0; i < this.stationInfo.length; i++) {
const item = this.stationInfo[i];
if(item.stationType === 'livestock'){
item.iconPath = '/static/zhandian_xuqin_dingwei.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);
}
}
} else {
this.markers = this.markers.filter((item)=>{
return item.stationType !== 'livestock'
})
}
})
},
markertap(e) {
const index = e.detail.markerId
console.log(e.detail,'index')
// 判断是否点击的是聚合点
if (e.detail && e.detail.isCluster) {
console.log('点击了聚合点:', e.detail)
return
}
if (['orient', 'livestock'].includes(this.list[index]?.stationType)) {
console.log(e.detail,'index')
if (['orient', 'livestock'].includes(this.list[index].stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(this.list[index]))}`
})
@ -426,7 +235,7 @@
},
callouttap(e) {
const index = e.detail.markerId
if (['orient', 'livestock'].includes(this.list[index]?.stationType)) {
if (['orient', 'livestock'].includes(this.list[index].stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(this.list[index]))}`
})
@ -434,7 +243,174 @@
},
todetails(item) {
console.log(item, '还是个然后')
}
},
switch1Change() {
this.isscd = !this.isscd;
let index = 0;
if (!this.isscd) {
this.pestlightMarker = [];
this.timerSet = setInterval(() => {
for (let i = 0; i < 50 && index < this.pestlight.length; i++) {
const item = this.pestlight[index];
item.iconPath = '/static/zhandian_sahchong_dingwei.png';
item.latitude = Number(item.latitude);
item.longitude = Number(item.longitude);
item.width = 15;
item.height = 20;
// 创建符合 markers 格式的对象
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0, // Y轴偏移量
anchorX: 0, // X轴偏移量
display: 'ALWAYS' // 一直展示
},
// stationType: item.stationType,
inType: item.inType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false // 是否参与点聚合
};
this.markers.push(markerItem);
index++;
}
// this.markers = this.markers.concat(aa);
if (index >= this.pestlight.length) {
clearInterval(this.timerSet);
}
}, 1000);
} else {
clearInterval(this.timerSet);
this.markers = this.markers.filter((item)=>{
return item.inType !== 'pestlight'
})
}
},
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;
this.list.push({
latitude:Number(item.stationLatitude),
longitude: Number(item.stationLongitude),
stationType:item.stationType,
sortNo: item.sortNo,
stationName: item.stationName,
stationCode: item.stationCode
})
// 创建符合 markers 格式的对象
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0, // Y轴偏移量
anchorX: 0, // X轴偏移量
display: 'ALWAYS' // 一直展示
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true // 是否参与点聚合
};
this.markers.push(markerItem);
}
},
switch2Change() {
this.issscd = !this.issscd
this.list1query()
},
switch3Change() {
this.isssscd = !this.isssscd
this.list2query()
},
list1query(){
if (!this.issscd) {
for (let i = 0; i < this.stationInfo.length; i++) {
const item = this.stationInfo[i];
if(item.stationType === 'orient'){
item.iconPath = '/static/zhandian_nongtian_dingwei.png';
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 35;
item.height = 52;
// 创建符合 markers 格式的对象
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0, // Y轴偏移量
anchorX: 0, // X轴偏移量
display: 'ALWAYS' // 一直展示
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true // 是否参与点聚合
};
this.markers.push(markerItem);
}
}
} else {
this.markers = this.markers.filter((item)=>{
return item.stationType !== 'orient'
})
}
},
list2query(){
if (!this.isssscd) {
for (let i = 0; i < this.stationInfo.length; i++) {
const item = this.stationInfo[i];
if(item.stationType === 'livestock'){
item.iconPath = '/static/zhandian_xuqin_dingwei.png';
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 35;
item.height = 52;
// 创建符合 markers 格式的对象
const markerItem = {
id: item.id,
iconPath: item.iconPath,
latitude: item.latitude,
longitude: item.longitude,
width: item.width,
height: item.height,
customCallout: {
anchorY: 0, // Y轴偏移量
anchorX: 0, // X轴偏移量
display: 'ALWAYS' // 一直展示
},
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: true // 是否参与点聚合
};
this.markers.push(markerItem);
}
}
} else {
this.markers = this.markers.filter((item)=>{
return item.stationType !== 'livestock'
})
}
}
}
}
</script>
@ -442,6 +418,7 @@
<style lang="scss">
.bgimg {
position: fixed;
// z-index: -99;
top: 0;
left: 0;
width: 100%;
@ -455,6 +432,7 @@
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;
@ -469,6 +447,7 @@
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;