Compare commits

..

No commits in common. "2f876393144badd30666e9527db37d7524beae5b" and "eae52816825342acd2310bc9b373807f87e96550" have entirely different histories.

3 changed files with 541 additions and 721 deletions

26
.gitignore vendored
View File

@ -1,24 +1,2 @@
.DS_Store
node_modules
/dist
/unpackage
# local env files
.env.local
.env.*.local
# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
/unpackage/
/.idea/

File diff suppressed because one or more lines are too long

View File

@ -1,34 +1,72 @@
<template>
<view class="container">
<map id="map" ref="map" style="width: 100%; height: calc(100vh + 50rpx);" scale="13" :markers="markers"
longitude="112.83100231396601" latitude="36.872032399813556" show-location show-compass show-scale @markertap="markertap" >
<map id="map" ref="map" style="width: 100%; height: calc(100vh + 50rpx);" :scale="mapScale" :markers="markers"
longitude="112.83100231396601" latitude="36.872032399813556" show-location show-compass show-scale
@markertap="markertap">
</map>
<view class="zdxq">
<view class="zdxqitem" @click="switch2Change('livestock')">
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
<view class="textss">
畜禽污染监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('orient')">
<view class="zdxqitem" @click="switch2Change('livestock')">
<image src="../../static/zhandian_xuqin_dingwei.png" mode=""></image>
<view class="textss">
畜禽污染监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('orient')">
<image src="../../static/zhandian_nongtian_dingwei.png" mode=""></image>
<view class="textss">
农田污染监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('watershed')">
<image src="../../static/zhandian_xiaoliuyu_dingwei.png" mode=""></image>
<view class="textss">
小流域监测站
</view>
</view>
<view class="zdxqitem" @click="switch2Change('soil')">
<image src="../../static/iconsheturangzs.png" mode=""></image>
<view class="zdxqitem" @click="switch2Change('enterprise')">
<image src="../../static/qiyebzIcon.png" mode="" style="width: 40rpx; height: 40rpx;"></image>
<view class="textss">
长期定位监测点
企业监测点
</view>
</view>
</view>
<!-- 企业信息弹出框 -->
<view class="enterprise-popup" v-if="showEnterprisePopup" @click="closePopup">
<view class="popup-content" @click.stop>
<view class="popup-header">
<text class="popup-title">{{ currentEnterprise.entName || '企业信息' }}</text>
<text class="popup-close" @click="closePopup">×</text>
</view>
<view class="popup-body">
<view class="info-item">
<text class="label">企业简称</text>
<text class="value">{{ currentEnterprise.entShortName || '-' }}</text>
</view>
<view class="info-item">
<text class="label">负责人</text>
<text class="value">{{ currentEnterprise.entCharge || '-' }}</text>
</view>
<view class="info-item">
<text class="label">统一信用代码</text>
<text class="value">{{ currentEnterprise.entCredit || '-' }}</text>
</view>
<view class="info-item">
<text class="label">企业编号</text>
<text class="value">{{ currentEnterprise.entCode || '-' }}</text>
</view>
<view class="info-item">
<text class="label">企业简介</text>
<text class="value">{{ currentEnterprise.entIntro || '暂无简介' }}</text>
</view>
<view class="info-item">
<text class="label">联系电话</text>
<text class="value">{{ currentEnterprise.entPhone || '暂无' }}</text>
</view>
<view class="info-item">
<text class="label">创建时间</text>
<text class="value">{{ currentEnterprise.createTime || '-' }}</text>
</view>
</view>
<!-- <view class="popup-footer">
<button class="btn-detail" @click="goEnterpriseDetail">查看详情</button>
</view> -->
</view>
</view>
</view>
</template>
@ -44,35 +82,39 @@
latitude: 36.5,
longitude: 111.7
},
scale: 14,
mapScale: 13,
markers: [],
markersZIndex: 1,
markersZIndex: 1,
lastTap: '',
stationList: [],
stationList: [],
cusLocationList: [],
soilStationList: [],
allStationList: [],
allStationList: [],
stationTwoList: [],
mapCtx: null //
enterpriseList: [],
mapCtx: null,
showEnterprisePopup: false,
currentEnterprise: {},
currentMarkerId: null,
maxMarkerId: 0,
//
debugMode: true
};
},
onLoad() {
},
onLoad() {},
onReady() {
// onReady
this.mapCtx = uni.createMapContext('map', this);
},
onShow() {
api.checkLogin(()=>{
this.$nextTick(() => {
this.getList()
})
}, () => {
uni.reLaunch({
url:'/packDetail/pages/login/login'
})
})
api.checkLogin(() => {
this.$nextTick(() => {
this.getList()
})
}, () => {
uni.reLaunch({
url: '/packDetail/pages/login/login'
})
})
},
methods: {
getList() {
@ -81,229 +123,405 @@
this.cusLocationList = []
this.soilStationList = []
this.allStationList = []
this.stationTwoList = []
this.enterpriseList = []
uni.showLoading({
title: '加载中'
});
//
this.$http.get('/applet/survStationInfo/stationMap').then(res => {
this.stationList = [...res.data.data.stationInfo];
this.cusLocationList = [...res.data.data.cusLocation];
this.soilStationList = [...res.data.data.deviceList];
this.allStationList.push(...this.stationList);
this.allStationList.push(...this.cusLocationList);
this.allStationList.push(...this.soilStationList);
// console.log("stationlist+++++", this.allStationList);
// console.log("stationList+++++", this.stationList);
// console.log("cusLocationList+++++", this.cusLocationList);
// console.log("soilStationList+++++", this.soilStationList);
//stationType: "orient"
//stationType: "livestock"
//stationType: "watershed"
this.stationList = [...res.data.data.stationInfo];
this.cusLocationList = [...res.data.data.cusLocation];
this.soilStationList = [...res.data.data.deviceList];
this.allStationList.push(...this.stationList);
this.allStationList.push(...this.cusLocationList);
this.allStationList.push(...this.soilStationList);
this.allStationList.forEach((item, index) => {
item.id = index;
item.id = index + 1; // 1
});
this.issscd = false
this.isssscd = false
this.isSoilShow = false
this.enterpriseRender();//
this.stationRender();//
this.monitorRender() //
//
setTimeout(() => {
this.adjustMapToFitAllMarkers();
}, 500);
// ID
this.maxMarkerId = this.allStationList.length + 1;
this.enterpriseRender();
this.stationRender();
this.monitorRender()
uni.hideLoading();
}).catch(err => {
uni.hideLoading();
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
console.error('加载地图数据失败:', err);
})
//
this.$http.get('/applet/wxclient/getEntList').then(res => {
if (res.data.data && res.data.data.result) {
this.enterpriseList = res.data.data.result;
this.renderEnterpriseMarkers();
this.ensureAllMarkersVisible();
}
uni.hideLoading();
}).catch(err => {
uni.hideLoading();
uni.showToast({
title: '企业数据加载失败',
icon: 'none'
});
console.error('加载企业数据失败:', err);
})
},
enterpriseRender() {//
for (let i = 0; i < this.cusLocationList.length; i++) {
const item = this.cusLocationList[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: false, //
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
}
},
stationRender() {//
// 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];
item.iconPath = this.baseUrl +'/'+ item.stationIcon;
item.latitude = Number(item.stationLatitude);
item.longitude = Number(item.stationLongitude);
item.width = 239;
item.height = 186;
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: false, //
zIndex: this.markersZIndex + 1,
};
this.markers.push(markerItem);
}
}
},
monitorRender() {//
this.soilStationList.forEach((item, index) => {
let iconPath = '';
let width = 35;
let height = 35;
//
switch(item.type) {
case 'soil':
iconPath = this.baseUrl + '/icon/device/soil.png';
width = 32;
height = 47;
break;
case 'camera':
iconPath = this.baseUrl + '/icon/device/cam.png';
width = 45;
height = 45;
break;
default:
iconPath = this.baseUrl + '/icon/device/default.png';
renderEnterpriseMarkers() {
if (!this.enterpriseList || this.enterpriseList.length === 0) {
console.warn('企业列表为空');
return;
}
this.enterpriseList.forEach((item, index) => {
const lat = Number(item.entLat);
const lng = Number(item.entLong);
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('企业坐标无效:', item.entName, lat, lng);
return;
}
const markerId = ++this.maxMarkerId;
let iconPath = '/static/qiyeIcon.png';
if (item.entMapIcon) {
iconPath = this.baseUrl + '/' + item.entMapIcon;
}
const markerItem = {
id: markerId,
iconPath: iconPath,
latitude: lat,
longitude: lng,
width: 40,
height: 50,
stationType: 'enterprise',
stationName: item.entName,
entShortName: item.entShortName,
entCharge: item.entCharge,
entCredit: item.entCredit,
entCode: item.entCode,
entIntro: item.entIntro,
entPhone: item.entPhone,
createTime: item.createTime,
entId: item.id,
joinCluster: false,
zIndex: this.markersZIndex++,
enterpriseData: item,
// callout
callout: {
content: item.entName || '企业',
color: '#FFFFFF',
fontSize: 14,
borderRadius: 10,
bgColor: '#007AFF',
padding: 8,
display: 'ALWAYS'
}
};
this.markers.push(markerItem);
});
},
markertap(e) {
const index = e.detail.markerId;
// marker
const marker = this.markers.find(m => Number(m.id) === Number(index));
if (!marker) {
console.warn('未找到对应的marker, ID:', index);
return;
}
if (marker.stationType === 'enterprise') {
this.currentEnterprise = marker.enterpriseData || {
entName: marker.stationName || '企业名称',
entShortName: marker.entShortName || '',
entCharge: marker.entCharge || '',
entCredit: marker.entCredit || '',
entCode: marker.entCode || '',
entIntro: marker.entIntro || '暂无简介',
entPhone: marker.entPhone || '暂无',
createTime: marker.createTime || ''
};
this.currentMarkerId = marker.id;
this.showEnterprisePopup = true;
return;
}
//
if (['orient', 'livestock'].includes(marker.stationType)) {
uni.navigateTo({
url: `/packDetail/pages/Site/detail?item=${encodeURIComponent(JSON.stringify(marker))}`
})
} else if (marker.stationType === 'device') {
uni.navigateTo({
url: `/packDetail/pages/vidio/soilindex`
})
}
},
//
closePopup() {
this.showEnterprisePopup = false;
this.currentEnterprise = {};
this.currentMarkerId = null;
},
enterpriseRender() {
for (let i = 0; i < this.cusLocationList.length; i++) {
const item = this.cusLocationList[i];
const lat = Number(item.stationLatitude);
const lng = Number(item.stationLongitude);
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('企业点位坐标无效:', item.stationName, lat, lng);
continue;
}
const markerItem = {
id: ++this.maxMarkerId,
iconPath: '/static/qiyeIcon.png',
latitude: lat,
longitude: lng,
width: 35,
height: 52,
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
}
},
stationRender() {
if (!this.issscd) {
for (let i = 0; i < this.stationList.length; i++) {
const item = this.stationList[i];
const lat = Number(item.stationLatitude);
const lng = Number(item.stationLongitude);
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('站房点位坐标无效:', item.stationName, lat, lng);
continue;
}
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: false, //
zIndex: this.markersZIndex,
id: ++this.maxMarkerId,
iconPath: this.baseUrl + '/' + item.stationIcon,
latitude: lat,
longitude: lng,
width: 239,
height: 186,
stationType: item.stationType,
stationName: item.stationName,
stationCode: item.stationCode,
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
});
},
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.navigateTo({
url: `/packDetail/pages/vidio/soilindex`
})
}
}
},
switch2Change(name) {//
//
//:xuqin nongtian xiaoliuyu turang
let that = this;
if(name === that.lastTap){
that.adjustMapToFitAllMarkers();
that.lastTap = '';
} else {
//
that.adjustMapToRegion(name);
that.lastTap = name;
// 使this.preciseMapAdjustment(name);
}
monitorRender() {
this.soilStationList.forEach((item, index) => {
const lat = Number(item.latitude);
const lng = Number(item.longitude);
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
console.warn('监测点位坐标无效:', item.name, lat, lng);
return;
}
let iconPath = '';
let width = 35;
let height = 35;
switch (item.type) {
case 'soil':
iconPath = this.baseUrl + '/icon/device/soil.png';
width = 32;
height = 47;
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: ++this.maxMarkerId,
iconPath: iconPath,
latitude: lat,
longitude: lng,
width: width,
height: height,
stationType: 'device',
stationName: item.name,
stationCode: item.ids,
deviceType: item.type,
joinCluster: false,
zIndex: this.markersZIndex,
};
this.markers.push(markerItem);
});
},
ensureAllMarkersVisible() {
if (!this.mapCtx) {
this.mapCtx = uni.createMapContext('map', this);
}
const validPoints = this.markers
.filter(item => {
const lat = Number(item.latitude);
const lng = Number(item.longitude);
return !isNaN(lat) && !isNaN(lng) && lat !== 0 && lng !== 0;
})
.map(item => ({
latitude: Number(item.latitude),
longitude: Number(item.longitude)
}));
if (validPoints.length === 0) {
if (this.center.latitude && this.center.longitude) {
this.mapCtx.moveToLocation({
latitude: this.center.latitude,
longitude: this.center.longitude,
scale: 10
});
}
return;
}
try {
this.mapCtx.includePoints({
points: validPoints,
padding: [80, 80, 80, 80]
});
} catch (e) {
console.error('调整地图视野异常:', e);
this.fallbackAdjustMap(validPoints);
}
},
fallbackAdjustMap(validPoints) {
if (!validPoints || validPoints.length === 0) return;
try {
const lats = validPoints.map(p => p.latitude);
const lngs = validPoints.map(p => p.longitude);
const minLat = Math.min(...lats);
const maxLat = Math.max(...lats);
const minLng = Math.min(...lngs);
const maxLng = Math.max(...lngs);
const centerLat = (minLat + maxLat) / 2;
const centerLng = (minLng + maxLng) / 2;
const latDiff = maxLat - minLat;
const lngDiff = maxLng - minLng;
const maxDiff = Math.max(latDiff, lngDiff);
let scale = 13;
if (maxDiff > 2) scale = 6;
else if (maxDiff > 1) scale = 8;
else if (maxDiff > 0.5) scale = 10;
else if (maxDiff > 0.2) scale = 11;
else if (maxDiff > 0.1) scale = 12;
else scale = 13;
this.mapCtx.moveToLocation({
latitude: centerLat,
longitude: centerLng,
scale: scale
});
} catch (e) {
console.error('备用方案失败:', e);
}
},
switch2Change(name) {
let that = this;
if (name === that.lastTap) {
that.adjustMapToFitAllMarkers();
that.lastTap = '';
} else {
that.adjustMapToRegion(name);
that.lastTap = name;
}
},
adjustMapToFitAllMarkers() {
if (this.mapCtx && this.markers.length > 0) {
this.mapCtx.includePoints({
points: this.markers.map(item => ({
latitude: item.latitude,
longitude: item.longitude
})),
padding: [60, 60, 60, 60]
});
}
},
adjustMapToRegion(regionName) {
let that = this;
let points = [];
let markers = [];
if (regionName === 'enterprise') {
markers = this.markers.filter(item => item.stationType === 'enterprise');
} else if (regionName === 'orient' || regionName === 'livestock' || regionName === 'watershed') {
markers = this.markers.filter(item => item.stationType === regionName);
} else if (regionName === 'soil') {
markers = this.markers.filter(item => item.type === 'soil' || item.deviceType === 'soil');
}
if (markers.length > 0) {
points = markers.map(item => {
item.zIndex = (that.markersZIndex++);
return {
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude)
}
});
}
if (points.length > 0 && this.mapCtx) {
this.mapCtx.includePoints({
points: points,
padding: [80, 110, 80, 110]
});
}
},
// setFitView
adjustMapToFitAllMarkers() {
if (this.mapCtx && this.markers.length > 0) {
this.mapCtx.includePoints({
points: this.markers.map(item => ({latitude: item.latitude, longitude: item.longitude})),
padding: [60, 60, 60, 60] //
});
}
},
adjustMapToRegion(regionName) {
//
//stationType: "orient"
//stationType: "livestock"
//stationType: "watershed"
let that = this;
let points = [];
let markers = [];
that.markersZIndex ++;
that.markersZIndex ++;
if (regionName === 'orient' || regionName === 'livestock' || regionName === 'watershed') {
//
markers = this.markers.filter(item => item.stationType === regionName);
} else if (regionName === 'soil') {
//
markers = this.markers.filter(item => item.type === 'soil' || item.deviceType === 'soil');
}
console.log(this.markers)
if(markers.length > 0){
points = markers.map(item => {
item.zIndex = that.markersZIndex;
return {
latitude: Number(item.latitude || item.stationLatitude),
longitude: Number(item.longitude || item.stationLongitude)
}});
}
if (points.length > 0 && this.mapCtx) {
this.mapCtx.includePoints({
points: points,
padding: [80, 110, 80, 110] //
});
} else if (points.length === 0) {
//
// uni.showToast({
// title: `${regionName}`,
// icon: 'none'
// });
}
},
}
}
</script>
@ -312,7 +530,6 @@
/* 样式保持不变 */
.bgimg {
position: fixed;
// z-index: -99;
top: 0;
left: 0;
width: 100%;
@ -326,7 +543,6 @@
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;
@ -341,7 +557,6 @@
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;
@ -415,4 +630,91 @@
display: flex;
align-items: center;
}
/* 企业信息弹窗样式 */
.enterprise-popup {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: center;
z-index: 9999;
}
.popup-content {
width: 600rpx;
max-height: 70vh;
background: #FFFFFF;
border-radius: 20rpx;
overflow: hidden;
display: flex;
flex-direction: column;
}
.popup-header {
padding: 30rpx 30rpx 20rpx;
border-bottom: 1px solid #eee;
display: flex;
justify-content: space-between;
align-items: center;
}
.popup-title {
font-size: 34rpx;
font-weight: bold;
color: #333;
flex: 1;
}
.popup-close {
font-size: 48rpx;
color: #999;
padding: 0 10rpx;
cursor: pointer;
}
.popup-body {
padding: 20rpx 30rpx;
overflow-y: auto;
flex: 1;
}
.info-item {
display: flex;
padding: 12rpx 0;
font-size: 28rpx;
border-bottom: 1px solid #f5f5f5;
}
.info-item .label {
color: #666;
width: 160rpx;
flex-shrink: 0;
}
.info-item .value {
color: #333;
flex: 1;
word-break: break-all;
}
.popup-footer {
padding: 20rpx 30rpx 30rpx;
border-top: 1px solid #eee;
}
.btn-detail {
width: 100%;
height: 80rpx;
line-height: 80rpx;
background: #007AFF;
color: #FFFFFF;
font-size: 30rpx;
border-radius: 40rpx;
border: none;
}
</style>