|
@@ -59,13 +59,14 @@ class DrawRegionMap {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
const status = f.get("status"); // 'resolved' | 'unresolved'
|
|
const status = f.get("status"); // 'resolved' | 'unresolved'
|
|
|
|
|
+ const reproductiveName = f.get("reproductiveName") || "";
|
|
|
const isResolved = status === "resolved";
|
|
const isResolved = status === "resolved";
|
|
|
// 已解决:深灰填充,浅白描边;未解决:浅蓝填充,亮蓝描边
|
|
// 已解决:深灰填充,浅白描边;未解决:浅蓝填充,亮蓝描边
|
|
|
const fillColor = isResolved ? "rgba(0, 0, 0, 0.6)" : "rgba(0, 0, 0, 0.5)";
|
|
const fillColor = isResolved ? "rgba(0, 0, 0, 0.6)" : "rgba(0, 0, 0, 0.5)";
|
|
|
const strokeColor = isResolved ? "#7C7C7C" : "#2199F8";
|
|
const strokeColor = isResolved ? "#7C7C7C" : "#2199F8";
|
|
|
|
|
|
|
|
const text = new Text({
|
|
const text = new Text({
|
|
|
- text: status === "resolved" ? "已解决" : "未解决",
|
|
|
|
|
|
|
+ text: reproductiveName ? `${reproductiveName} ${status === "resolved" ? "已解决" : "未解决"}` : status === "resolved" ? "已解决" : "未解决",
|
|
|
font: "12px sans-serif",
|
|
font: "12px sans-serif",
|
|
|
fill: new Fill({ color: "#ffffff" }),
|
|
fill: new Fill({ color: "#ffffff" }),
|
|
|
backgroundFill: new Fill({
|
|
backgroundFill: new Fill({
|
|
@@ -328,6 +329,7 @@ class DrawRegionMap {
|
|
|
featureProjection: mapProjection,
|
|
featureProjection: mapProjection,
|
|
|
});
|
|
});
|
|
|
const feature = new Feature({ geometry });
|
|
const feature = new Feature({ geometry });
|
|
|
|
|
+ feature.set("reproductiveName", region.reproductiveName);
|
|
|
feature.set("status", region.status || "unresolved");
|
|
feature.set("status", region.status || "unresolved");
|
|
|
feature.set("updatedTime", region.updatedTime);
|
|
feature.set("updatedTime", region.updatedTime);
|
|
|
feature.set("label", region.label || "");
|
|
feature.set("label", region.label || "");
|