Merge branch 'Malaysia' of http://www.sysuimars.cn:3000/feiniao/agriculture-one-map into Malaysia

src/views/warningHome/index.vue

@@ -68,14 +68,14 @@ const currentYear = ref(2025);
 const currentQuarter = ref(1);
 
 // 顶部基础 tabs
-const baseTabs = ["物候期分布", "长势等级", "水利", "灌渠与泵站", "资源", "导出报告"];
-const activeBaseTab = ref("物候期分布");
+const baseTabs = ["Phenological Stage", "Crop Condition", "Hydrology", "Canals", "Resources", "Export Report"];
+const activeBaseTab = ref("Phenological Stage");
 
 const legendKeys = {
-    "物候期分布": "phenology",
-    "长势等级": "growth_status",
-    "水利": "water_conservancy",
-    "灌渠与泵站": "facility",
+    "Phenological Stage": "phenology",
+    "Crop Condition": "growth_status",
+    "Hydrology": "water_conservancy",
+    "Canals": "facility",
 }
 
 const warningLayers = ref({});
@@ -92,16 +92,16 @@ const handleBaseTabClick = (tab) => {
     // 水利图层隐藏
     waterLayer && waterLayer.toggleLayer(false)
     waterLayer && waterLayer.toggleCanalLayer(false)
-    if (tab === "资源") {
+    if (tab === "Resources") {
         staticMapPointLayers.showPoint()
-    }else if (tab === "灌渠与泵站") {
+    }else if (tab === "Canals") {
         staticMapPointLayers.showImg(imgData.value)
         waterLayer && waterLayer.toggleCanalLayer(true)
-    }else if (tab === "长势等级") {
+    }else if (tab === "Crop Condition") {
         staticMapLayers.showSingle("Dongguan长势", false);
-    }else if (tab === "物候期分布") {
+    }else if (tab === "Phenological Stage") {
         staticMapLayers.showSingle("Dongguan物候期", false);
-    }else if (tab === "水利") {
+    }else if (tab === "Hydrology") {
         waterLayer && waterLayer.toggleLayer(true)
     }else {
         eventBus.emit("homePage:gybg", { filename: '/东莞水稻平台8月报告.pdf', title: "果园报告" });
@@ -172,7 +172,7 @@ onMounted(async () => {
 
     eventBus.emit("warningMap:init", warningMap.kmap);
 
-    handleBaseTabClick("物候期分布")
+    handleBaseTabClick("Phenological Stage")
 
     // 图例数据
     eventBus.on("alarmList:warningLayers", (data) => {
@@ -379,7 +379,7 @@ const getTreeChecks = async (nodeData, data) => {
 
     // 物候期分布：限制"二级只能选一个，三级不限个数"
     if (
-        (activeBaseTab.value === "物候期分布" ||
+        (activeBaseTab.value === "Phenological Stage" ||
             activeBaseTab.value === "预警分布" ||
             activeBaseTab.value === "农场分布") &&
         treeRef.value
@@ -426,7 +426,7 @@ const getTreeChecks = async (nodeData, data) => {
 
     // 任意 tab 下，最终都用当前选中的节点驱动地图渲染
     // 提取最后一级节点的 id 到数组（没有子节点的叶子节点）
-    const field = activeBaseTab.value === "物候期分布" || activeBaseTab.value === "农场分布" ? "originalId" : "id";
+    const field = activeBaseTab.value === "Phenological Stage" || activeBaseTab.value === "农场分布" ? "originalId" : "id";
     const lastLevelIds = finalCheckedNodes
         .filter((n) => (!n.items || n.items.length === 0) && (!n.children || n.children.length === 0))
         .map((n) => n[field]);
@@ -434,7 +434,7 @@ const getTreeChecks = async (nodeData, data) => {
         distributionLayer.initData([]);
         return;
     }
-    if (activeBaseTab.value === "物候期分布") {
+    if (activeBaseTab.value === "Phenological Stage") {
         const phenologyData = await getDistributionData(null, lastLevelIds);
         distributionLayer.initData(phenologyData, "phenologyName");
         return;

src/views/warningHome/map/waterLayer.js

@@ -38,7 +38,7 @@ class WaterLayer {
                 const strokeWidth = 2 + 1.5 * (0.5 + 0.5 * Math.sin(phase));
                 // 33, 150, 243
                 const strokeColor = `rgba(33, 150, 243, ${alpha.toFixed(2)})`;
-                return that.vectorStyle.getPolygonStyle("rgba(0,0,0,0)", strokeColor, strokeWidth);
+                return that.vectorStyle.getPolygonStyle("#00152699", strokeColor, strokeWidth);
             }
         });