+
+ 设备ID：
+ ${vehicleInfo.gpsDeviceId || vehicleInfo.gpsId || '--'}
-
-
- 设备ID：
- ${vehicleInfo.gpsDeviceId || vehicleInfo.gpsId || '--'}
-
-
- 车牌号：
- ${vehicleInfo.vePlate || vehicleInfo.plateNumber || '--'}
-
-
- 最新时间：
- ${point.createTime || point.server_time || point.updateTime || '--'}
-
-
- 经度：
- ${lng.toFixed(6)}
-
-
- 纬度：
- ${lat.toFixed(6)}
-
+
+ 车牌号：
+ ${vehicleInfo.vePlate || vehicleInfo.plateNumber || '--'}
-
- 📍 点击标记查看详情
+
+ 最新时间：
+ ${point.createTime || point.server_time || point.updateTime || '--'}
+
+
+ 经度：
+ ${lng.toFixed(6)}
+
+
+ 纬度：
+ ${lat.toFixed(6)}
- `;
+
+ 📍 点击查看农机列表
+ →
+
+
+ `;
+
+ this.vehicleInfoWindow = new AMap.InfoWindow({
+ content: infoContent,
+ offset: new AMap.Pixel(0, -35),
+ autoMove: true,
+ closeWhenClickMap: true,
+ isCustom: true,
+ });
+
+ if (!isNaN(lng) && !isNaN(lat)) {
+ this.vehicleInfoWindow.open(this.aMap, [lng, lat]);
+ this.vehicleMarkers.push(this.vehicleInfoWindow);
- this.vehicleInfoWindow = new AMap.InfoWindow({
- content: infoContent,
- offset: new AMap.Pixel(0, -35),
- autoMove: true,
- closeWhenClickMap: true,
- // 关键：设置背景透明
- isCustom: true,
- });
-
- if (!isNaN(lng) && !isNaN(lat)) {
- this.vehicleInfoWindow.open(this.aMap, [lng, lat]);
- this.vehicleMarkers.push(this.vehicleInfoWindow);
+ // 添加点击事件监听 - 点击信息窗口打开农机列表
+ setTimeout(() => {
+ const infoWindowEl = document.querySelector('.vehicle-info-window');
+ if (infoWindowEl) {
+ infoWindowEl.addEventListener('click', (e) => {
+ // 防止点击内部按钮时冒泡
+ if (e.target.closest('.vehicle-info-window')) {
+ this.openAgriculturalMachineryList(vehicleInfo, point);
+ }
+ });
+ }
- // 额外：手动覆盖InfoWindow的默认背景
- setTimeout(() => {
- const infoWindowEl = document.querySelector('.amap-info-content');
- if (infoWindowEl) {
- infoWindowEl.style.background = 'transparent !important';
- infoWindowEl.style.padding = '0 !important';
+ // 覆盖InfoWindow的默认背景
+ const infoWindowContent = document.querySelector('.amap-info-content');
+ if (infoWindowContent) {
+ infoWindowContent.style.background = 'transparent !important';
+ infoWindowContent.style.padding = '0 !important';
+ }
+ }, 50);
+ }
+},
+
+ // 打开智慧农机列表并传值
+ openAgriculturalMachineryList(vehicleInfo, point) {
+ // 构建当前选中的车辆数据
+ const vehicleData = {
+ vehicleInfo: vehicleInfo,
+ location: point,
+ vehicleName: vehicleInfo.vePlate || vehicleInfo.plateNumber || '车辆',
+ deviceId: vehicleInfo.gpsDeviceId || vehicleInfo.gpsId || '',
+ latitude: point.weidu || point.latitude || point.lat || 0,
+ longitude: point.jingdu || point.longitude || point.lng || point.lon || 0,
+ extData: {
+ vehicleType: '危废车辆',
+ status: '在线',
+ lastUpdate: point.createTime || point.server_time || point.updateTime || new Date().toISOString()
}
- }, 50);
- }
- },
+ };
+
+ this.closeVehicleInfoWindow();
+ this.qcdtdialogTableVisible = false;
+
+ this.agriculturalVehicleData = vehicleData;
+ this.agriculturalDialogVisible = true;
+ },
// 关闭信息窗口
closeVehicleInfoWindow() {
@@ -872,15 +922,21 @@ export default {
pageNo: 1,
pageSize: 30,
}).then(res => {
- this.vehicleList = res.result.records || [];
- console.log('车辆列表:', this.vehicleList);
+ if (res.code === 200 && res.result) {
+ // 存储完整的返回数据
+ this.vehicleListFull = res.result;
+ // 存储 records 数组
+ this.vehicleList = res.result.records || [];
+ } else {
+ this.vehicleList = [];
+ this.vehicleListFull = null;
+ }
}).catch(err => {
- console.error('获取车辆列表失败:', err);
+ this.vehicleList = [];
+ this.vehicleListFull = null;
});
},
- // ==================== 原有方法（保持不变） ====================
-
formatter: function (num) {
return num.toFixed(3)
},
diff --git a/src/pages/Home/index_map.vue11123 b/src/pages/Home/index_map.vue11123
deleted file mode 100644
index f243679..0000000
--- a/src/pages/Home/index_map.vue11123
+++ /dev/null
@@ -1,1893 +0,0 @@
-
-
-
-
- 武乡县黄河流域农业面源污染平台
- 治理效果评价和监测一张图
-
-
-
- {{ nowTime }}
-
-
-
-
-
-
-
-
-
- 欢迎您，{{inforname}}！
-
- 
- 退出登录
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{briefconCode}}
-
-
-
-
- {{item.detailValue}}
-
-
-
-
-
-
农田面源污染监测站
-
个
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
气候环境
-
-
-
-
-
-
![]()
-
{{item.detailCode}}
-
{{item.detailValue2}}
-
-
-
-
-
-
-
-
水利情况
-
-
-
-
-
![]()
-
{{legth.detailCode}}
-
{{legth.detailValue2}}
-
-
-
-
-
-
-
-
- {{value.infoName}}
-
-
- -
- {{ite.detailCode}}
-
-
- {{ite.detailValue2}}
-
-
-
-
-
-
-
-
-
-
-
-
{{qcdtinfor.stationName}}
-
-
-
-
-
-
-
-
站点位置：{{qcdtinfor.stationLocation}}
-
-
-
-
建站时间：{{qcdtinfor.buildTime}}
-
-
-
-
设备数量：{{qcdtinfor.deviceCount}}
-
-
-
-
监测指标
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
对竹河监测站
-
-
-
-
团百河监测站
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
重要污染物治理效果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{item.stationName}}
-
-
-
-
-
-
![]()
-
-
-
-
-
-
![]()
-
-
{{valist.name}}
-
-
-
- {{valist.unit}}
-
-
-
-
-
-
-
-
-
-
面源污染治理效果评价
-
-
-
-
- {{effect_assess0.detailCode}}
-
- {{effect_assess0.detailValue}}
-
-
-
- {{effect_assess1.detailCode}}
- {{effect_assess1.detailValue}}
-
-
- {{effect_assess2.detailValue}}
- {{effect_assess2.detailCode}}
-
-
- {{effect_assess3.detailValue}}
- {{effect_assess3.detailCode}}
-
-
-
- {{effect_assess4.detailValue}}
- {{effect_assess4.detailCode}}
-
-
-
-
-
-
-
监测站实时数据
-
-
-
-
-
-
-
-
- {{item.stationName}}
- {{item.name}}
- {{item.value}}{{item.unit}}
-
-
-
{{item.dataDateTime}}
-
-
-
-
-
-
-
-
-
-
-
- 农业废弃物台账
-
-
-
-
-
-
-
-
-
-
-
- 废弃农膜采样信息
-
-
累计 {{ntfmnumbtotal}} 条
-
-
-
- | 采样时间 |
- 监测站 |
- 作物 |
- 农膜残留量(kg/h㎡) |
- 覆膜年份 |
-
- 
-
-
- | {{item.sampTime}} |
- {{item.stationName}} |
- {{item.cropName}} |
- {{item.mulchRemain}} |
- {{item.mulchYear}} |
-
-
-
-
-
-
-
-
-
-
-
- 畜禽粪污台账
-
-
-
-
-
-
-
-
-
-
-
- 粪污台账
-
-
累计 {{qcfmnumbtotal}} 条
-
-
-
- | 年份 |
- 养殖场名称 |
- 养殖品种 |
- 现有存栏 |
- 固体粪便 |
- 液体粪污 |
- 混合粪污 |
- 收入金额 |
-
-
-
-
- | {{item.countYear}} |
- {{item.farmName}} |
- {{item.breedVariety}} |
- {{item.breedScale}} |
- {{item.fecesQuantity}} |
- {{item.urineQuantity}} |
- {{item.mixQuantity}} |
- {{item.chargeAmount}} |
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
- 
- 
+ 
+ 
+ 查看详情
+ 
+ 车辆信息
+ 
+ 
+ 
+ 
+ 
- 
- 
- 作业历史
- 
- 农机信息
- 
- 
- 
- 
- 
- 
- 
- 
- 
+ 
+ 
+ 
+