|
@@ -122,7 +122,7 @@ async function setFarmByGardenId(gardenIdValue) {
|
|
|
if (!gardenIdValue) {
|
|
if (!gardenIdValue) {
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 先刷新农场列表,确保数据是最新的
|
|
// 先刷新农场列表,确保数据是最新的
|
|
|
return new Promise((resolve) => {
|
|
return new Promise((resolve) => {
|
|
|
VE_API.farm.listByUserId().then(({data}) => {
|
|
VE_API.farm.listByUserId().then(({data}) => {
|
|
@@ -171,7 +171,7 @@ function getFarmList() {
|
|
|
});
|
|
});
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 如果没有传入 gardenId,执行正常逻辑
|
|
// 如果没有传入 gardenId,执行正常逻辑
|
|
|
getFarmListWithoutGardenId();
|
|
getFarmListWithoutGardenId();
|
|
|
}
|
|
}
|
|
@@ -188,7 +188,7 @@ function selectFarmFromList(data) {
|
|
|
farmName.value = savedFarmName;
|
|
farmName.value = savedFarmName;
|
|
|
farmId.value = Number(savedFarmId);
|
|
farmId.value = Number(savedFarmId);
|
|
|
isDefaultFarm.value = savedFarm.defaultOption || false;
|
|
isDefaultFarm.value = savedFarm.defaultOption || false;
|
|
|
- localStorage.setItem('selectedFarmPoint', savedFarm.point);
|
|
|
|
|
|
|
+ localStorage.setItem('selectedFarmPoint', savedFarm.wkt);
|
|
|
} else {
|
|
} else {
|
|
|
// 如果保存的农场不在列表中,按优先级选择
|
|
// 如果保存的农场不在列表中,按优先级选择
|
|
|
selectDefaultFarm(data);
|
|
selectDefaultFarm(data);
|
|
@@ -226,7 +226,7 @@ watch(() => props.gardenId, (newGardenId) => {
|
|
|
function selectDefaultFarm(data) {
|
|
function selectDefaultFarm(data) {
|
|
|
// 首先查找 defaultOption 为 true 的农场
|
|
// 首先查找 defaultOption 为 true 的农场
|
|
|
const defaultFarm = data.find(farm => farm.defaultOption === true);
|
|
const defaultFarm = data.find(farm => farm.defaultOption === true);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (defaultFarm) {
|
|
if (defaultFarm) {
|
|
|
// 如果有默认农场,选择它
|
|
// 如果有默认农场,选择它
|
|
|
farmName.value = defaultFarm.name;
|
|
farmName.value = defaultFarm.name;
|
|
@@ -240,7 +240,7 @@ function selectDefaultFarm(data) {
|
|
|
isDefaultFarm.value = data[0].defaultOption || false;
|
|
isDefaultFarm.value = data[0].defaultOption || false;
|
|
|
localStorage.setItem('selectedFarmPoint', data[0].point);
|
|
localStorage.setItem('selectedFarmPoint', data[0].point);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 保存到 localStorage
|
|
// 保存到 localStorage
|
|
|
localStorage.setItem('selectedFarmId', farmId.value);
|
|
localStorage.setItem('selectedFarmId', farmId.value);
|
|
|
localStorage.setItem('selectedFarmName', farmName.value);
|
|
localStorage.setItem('selectedFarmName', farmName.value);
|
|
@@ -266,7 +266,7 @@ const MAP_KEY = "CZLBZ-LJICQ-R4A5J-BN62X-YXCRJ-GNBUT";
|
|
|
function getLocationName() {
|
|
function getLocationName() {
|
|
|
const farmLocation = convertPointToArray(localStorage.getItem('selectedFarmPoint'));
|
|
const farmLocation = convertPointToArray(localStorage.getItem('selectedFarmPoint'));
|
|
|
let formattedLocation = null;
|
|
let formattedLocation = null;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (farmLocation) {
|
|
if (farmLocation) {
|
|
|
formattedLocation = `${farmLocation[1]},${farmLocation[0]}`;
|
|
formattedLocation = `${farmLocation[1]},${farmLocation[0]}`;
|
|
|
} else {
|
|
} else {
|
|
@@ -343,7 +343,7 @@ const currentDateText = computed(() => {
|
|
|
border-radius: 8px;
|
|
border-radius: 8px;
|
|
|
padding: 10px 12px;
|
|
padding: 10px 12px;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
&.expanded {
|
|
&.expanded {
|
|
|
height: 312px;
|
|
height: 312px;
|
|
|
}
|
|
}
|