Compare commits
No commits in common. "db76832051661f0e2e3dbb11885b4451546592a7" and "e2333f8caa4642b4eda22c266bf11047c98db694" have entirely different histories.
db76832051
...
e2333f8caa
|
|
@ -48,7 +48,7 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
|
|||
'app-id' : uni.getAccountInfoSync().miniProgram.appId,
|
||||
"client-type" : "MA",
|
||||
'third-session' : uni.getStorageSync('third_session')||'123',
|
||||
'X-Tenant-Id' : '1003'
|
||||
'X-Tenant-Id' : '1002'
|
||||
}
|
||||
/*
|
||||
if (!token) { // 如果token不存在，调用cancel 会取消本次请求，但是该函数的catch() 仍会执行
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name" : "稷山县县面源污染监测平台",
|
||||
"name" : "吉县面源污染监测平台",
|
||||
"appid" : "__UNI__A58A5D7",
|
||||
"description" : "",
|
||||
"versionName" : "2.2.22",
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
"quickapp" : {},
|
||||
/* 快应用特有相关 */
|
||||
"mp-weixin" : {
|
||||
"appid" : "wxca651c881cfb603f",
|
||||
"appid" : "wxc078890f8668ed2e",
|
||||
"setting" : {
|
||||
"urlCheck" : false,
|
||||
"es6" : true,
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
@ -196,7 +196,7 @@ export default {
|
|||
left: 50%;
|
||||
transform: translate(-50%);
|
||||
color: #999;
|
||||
width: 66%;
|
||||
width: 52%;
|
||||
}
|
||||
.login-paddingtop {
|
||||
padding-top: 100upx;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 64 KiB |
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
{
|
||||
"path": "pages/index/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "稷山县县小流域面源污染监测",
|
||||
"navigationBarTitleText": "吉县小流域面源污染监测",
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
@ -80,8 +80,7 @@
|
|||
<view class="bot_mid">
|
||||
<view class="bot_mid_left"
|
||||
:class="{'bot_mid_lefts':item.type == 2 || item.type == 0}">
|
||||
{{ (item.value !== null && item.value !== undefined && item.value !== '' && !isNaN(item.value)) ? item.value + (item.unit || '') : '0' }}
|
||||
<!-- {{ item.unit }} -->
|
||||
{{ (item.value !== null && item.value !== undefined && item.value !== '' && !isNaN(item.value)) ? item.value + (item.unit || '') : '0' }}{{ item.unit }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="bot_rig" v-if="item.times">
|
||||
|
|
|
|||
|
|
@ -17,55 +17,18 @@
|
|||
农田污染监测站
|
||||
</view>
|
||||
</view>
|
||||
<view class="zdxqitem" @click="switch2Change('enterprise')">
|
||||
<image src="../../static/qiyebzIcon.png" mode="" style="width: 40rpx; height: 40rpx;"></image>
|
||||
<!-- <view class="zdxqitem" @click="switch2Change('watershed')">
|
||||
<image src="../../static/zhandian_xiaoliuyu_dingwei.png" mode=""></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 class="zdxqitem" @click="switch2Change('soil')">
|
||||
<image src="../../static/iconsheturangzs.png" mode=""></image>
|
||||
<view class="textss">
|
||||
长期定位监测点
|
||||
</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>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -91,18 +54,13 @@
|
|||
soilStationList: [],
|
||||
allStationList: [],
|
||||
stationTwoList: [],
|
||||
enterpriseList: [],
|
||||
mapCtx: null,
|
||||
showEnterprisePopup: false,
|
||||
currentEnterprise: {},
|
||||
currentMarkerId: null,
|
||||
maxMarkerId: 0,
|
||||
// 添加调试开关
|
||||
debugMode: true
|
||||
mapCtx: null // 添加地图上下文
|
||||
|
||||
};
|
||||
},
|
||||
onLoad() {},
|
||||
onReady() {
|
||||
// 在onReady中初始化地图上下文
|
||||
this.mapCtx = uni.createMapContext('map', this);
|
||||
},
|
||||
onShow() {
|
||||
|
|
@ -117,369 +75,326 @@
|
|||
})
|
||||
},
|
||||
methods: {
|
||||
// kaihs
|
||||
getList() {
|
||||
this.markers = []
|
||||
this.stationList = []
|
||||
this.cusLocationList = []
|
||||
this.soilStationList = []
|
||||
this.allStationList = []
|
||||
this.stationTwoList = []
|
||||
this.enterpriseList = []
|
||||
this.markers = []
|
||||
this.stationList = []
|
||||
this.cusLocationList = []
|
||||
this.soilStationList = []
|
||||
this.allStationList = []
|
||||
this.stationTwoList = []
|
||||
|
||||
uni.showLoading({
|
||||
title: '加载中'
|
||||
});
|
||||
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);
|
||||
this.allStationList.forEach((item, index) => {
|
||||
item.id = index + 1; // 从1开始
|
||||
});
|
||||
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);
|
||||
this.allStationList.forEach((item, index) => {
|
||||
item.id = index;
|
||||
});
|
||||
|
||||
this.issscd = false
|
||||
this.isssscd = false
|
||||
this.isSoilShow = false
|
||||
this.issscd = false
|
||||
this.isssscd = false
|
||||
this.isSoilShow = false
|
||||
|
||||
// 设置初始最大ID
|
||||
this.maxMarkerId = this.allStationList.length + 1;
|
||||
// 渲染所有标记
|
||||
this.enterpriseRender();
|
||||
this.stationRender();
|
||||
this.monitorRender()
|
||||
|
||||
this.enterpriseRender();
|
||||
this.stationRender();
|
||||
this.monitorRender()
|
||||
// 使用增强的视野调整方法
|
||||
this.ensureAllMarkersVisible();
|
||||
|
||||
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);
|
||||
})
|
||||
uni.hideLoading();
|
||||
}).catch(err => {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: '数据加载失败',
|
||||
icon: 'none'
|
||||
});
|
||||
console.error('加载地图数据失败:', err);
|
||||
})
|
||||
},
|
||||
ensureAllMarkersVisible() {
|
||||
// 确保地图上下文已初始化
|
||||
if (!this.mapCtx) {
|
||||
this.mapCtx = uni.createMapContext('map', this);
|
||||
}
|
||||
|
||||
renderEnterpriseMarkers() {
|
||||
if (!this.enterpriseList || this.enterpriseList.length === 0) {
|
||||
console.warn('企业列表为空');
|
||||
return;
|
||||
}
|
||||
// 过滤出有效的坐标点
|
||||
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) {
|
||||
console.warn('没有有效的坐标点');
|
||||
// 如果有默认坐标，使用默认坐标
|
||||
if (this.center.latitude && this.center.longitude) {
|
||||
this.mapCtx.moveToLocation({
|
||||
latitude: this.center.latitude,
|
||||
longitude: this.center.longitude,
|
||||
scale: 10
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
this.enterpriseList.forEach((item, index) => {
|
||||
const lat = Number(item.entLat);
|
||||
const lng = Number(item.entLong);
|
||||
console.log('有效坐标点数量:', validPoints.length);
|
||||
|
||||
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
|
||||
console.warn('企业坐标无效:', item.entName, lat, lng);
|
||||
return;
|
||||
}
|
||||
// 方法1：使用 includePoints（优先）
|
||||
try {
|
||||
this.mapCtx.includePoints({
|
||||
points: validPoints,
|
||||
padding: [80, 80, 80, 80], // 增加边距让点位不贴边
|
||||
success: () => {
|
||||
console.log('地图视野调整成功');
|
||||
},
|
||||
fail: (err) => {
|
||||
console.error('includePoints失败:', err);
|
||||
// 如果失败，使用备用方案
|
||||
this.fallbackAdjustMap(validPoints);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('调整地图视野异常:', e);
|
||||
this.fallbackAdjustMap(validPoints);
|
||||
}
|
||||
|
||||
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);
|
||||
});
|
||||
// 方法2：延迟重试（确保地图完全渲染）
|
||||
setTimeout(() => {
|
||||
if (this.mapCtx) {
|
||||
try {
|
||||
this.mapCtx.includePoints({
|
||||
points: validPoints,
|
||||
padding: [80, 80, 80, 80]
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('第二次调整失败:', e);
|
||||
}
|
||||
}
|
||||
}, 500);
|
||||
|
||||
// 方法3：第三次重试（更长的延迟）
|
||||
setTimeout(() => {
|
||||
if (this.mapCtx) {
|
||||
try {
|
||||
this.mapCtx.includePoints({
|
||||
points: validPoints,
|
||||
padding: [120, 100, 100, 100]
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('第三次调整失败:', e);
|
||||
}
|
||||
}
|
||||
}, 1000);
|
||||
},
|
||||
fallbackAdjustMap(validPoints) {
|
||||
if (!validPoints || validPoints.length === 0) return;
|
||||
|
||||
markertap(e) {
|
||||
const index = e.detail.markerId;
|
||||
// 查找匹配的marker
|
||||
const marker = this.markers.find(m => Number(m.id) === Number(index));
|
||||
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);
|
||||
|
||||
if (!marker) {
|
||||
console.warn('未找到对应的marker, ID:', index);
|
||||
return;
|
||||
}
|
||||
// 计算中心点
|
||||
const centerLat = (minLat + maxLat) / 2;
|
||||
const centerLng = (minLng + maxLng) / 2;
|
||||
|
||||
// 计算合适的缩放级别
|
||||
const latDiff = maxLat - minLat;
|
||||
const lngDiff = maxLng - minLng;
|
||||
const maxDiff = Math.max(latDiff, lngDiff);
|
||||
|
||||
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 || ''
|
||||
};
|
||||
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.currentMarkerId = marker.id;
|
||||
this.showEnterprisePopup = true;
|
||||
return;
|
||||
}
|
||||
console.log('备用方案 - 中心点:', centerLat, centerLng, '缩放:', scale);
|
||||
|
||||
// 原有的监测站逻辑
|
||||
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`
|
||||
})
|
||||
}
|
||||
// 移动地图到计算出的中心位置
|
||||
this.mapCtx.moveToLocation({
|
||||
latitude: centerLat,
|
||||
longitude: centerLng,
|
||||
scale: scale
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('备用方案失败:', e);
|
||||
}
|
||||
},
|
||||
|
||||
// 关闭企业信息弹窗
|
||||
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);
|
||||
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;
|
||||
}
|
||||
// 验证坐标有效性
|
||||
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);
|
||||
}
|
||||
const markerItem = {
|
||||
id: item.id || `enterprise_${i}`,
|
||||
iconPath: '/static/qiyeIcon.png',
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
width: 35,
|
||||
height: 52,
|
||||
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() {
|
||||
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 (!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;
|
||||
}
|
||||
// 验证坐标有效性
|
||||
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
|
||||
console.warn('站房点位坐标无效:', item.stationName, lat, lng);
|
||||
continue;
|
||||
}
|
||||
|
||||
const markerItem = {
|
||||
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);
|
||||
}
|
||||
}
|
||||
const markerItem = {
|
||||
id: item.id || `station_${i}`,
|
||||
iconPath: this.baseUrl + '/' + item.stationIcon,
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
width: 239,
|
||||
height: 186,
|
||||
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);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
monitorRender() {
|
||||
this.soilStationList.forEach((item, index) => {
|
||||
const lat = Number(item.latitude);
|
||||
const lng = Number(item.longitude);
|
||||
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;
|
||||
}
|
||||
// 验证坐标有效性
|
||||
if (isNaN(lat) || isNaN(lng) || lat === 0 || lng === 0) {
|
||||
console.warn('监测点位坐标无效:', item.name, lat, lng);
|
||||
return;
|
||||
}
|
||||
|
||||
let iconPath = '';
|
||||
let width = 35;
|
||||
let height = 35;
|
||||
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';
|
||||
}
|
||||
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);
|
||||
});
|
||||
const markerItem = {
|
||||
id: item.id || `device_${index}`,
|
||||
iconPath: iconPath,
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
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,
|
||||
};
|
||||
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
|
||||
});
|
||||
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`
|
||||
})
|
||||
}
|
||||
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) {
|
||||
switch2Change(name) { // 焦点显示图例
|
||||
// 更新对应区域的状态
|
||||
let that = this;
|
||||
if (name === that.lastTap) {
|
||||
that.adjustMapToFitAllMarkers();
|
||||
that.lastTap = '';
|
||||
} else {
|
||||
// 聚焦到特定区域
|
||||
that.adjustMapToRegion(name);
|
||||
that.lastTap = name;
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
// 调整地图视野以包含所有标记点（类似setFitView效果）
|
||||
adjustMapToFitAllMarkers() {
|
||||
if (this.mapCtx && this.markers.length > 0) {
|
||||
this.mapCtx.includePoints({
|
||||
|
|
@ -487,24 +402,26 @@
|
|||
latitude: item.latitude,
|
||||
longitude: item.longitude
|
||||
})),
|
||||
padding: [60, 60, 60, 60]
|
||||
padding: [60, 60, 60, 60] // 上下左右的边距
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
adjustMapToRegion(regionName) {
|
||||
// 调整地图视野到特定区域的标记点
|
||||
//stationType: "orient" 农田
|
||||
//stationType: "livestock" 畜禽
|
||||
//stationType: "watershed" 小流域
|
||||
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') {
|
||||
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++);
|
||||
|
|
@ -514,12 +431,17 @@
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (points.length > 0 && this.mapCtx) {
|
||||
this.mapCtx.includePoints({
|
||||
points: points,
|
||||
padding: [80, 110, 80, 110]
|
||||
padding: [80, 110, 80, 110] // 增加边距以获得更好的显示效果
|
||||
});
|
||||
} else if (points.length === 0) {
|
||||
// 如果没有找到对应的标记点，显示提示
|
||||
// uni.showToast({
|
||||
// title: `未找到${regionName}相关的监测点`,
|
||||
// icon: 'none'
|
||||
// });
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
@ -530,6 +452,7 @@
|
|||
/* 样式保持不变 */
|
||||
.bgimg {
|
||||
position: fixed;
|
||||
// z-index: -99;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
|
|
@ -543,6 +466,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;
|
||||
|
|
@ -557,6 +481,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;
|
||||
|
|
@ -630,91 +555,4 @@
|
|||
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>
|
||||
Loading…
Reference in New Issue