调整环境变量参数,支持项目切换
This commit is contained in:
@@ -7,6 +7,7 @@ import { Stroke } from "ol/style";
|
||||
import GeoJson from "ol/format/GeoJSON";
|
||||
import config from "@config/config";
|
||||
import { useMap } from "@app/OlMap/MapComponent";
|
||||
import { useProject } from "@/contexts/ProjectContext";
|
||||
|
||||
interface PropertyItem {
|
||||
key: string;
|
||||
@@ -26,6 +27,8 @@ const ZonePropsPanel: React.FC<ZonePropsPanelProps> = ({
|
||||
onClose,
|
||||
}) => {
|
||||
const map = useMap();
|
||||
const project = useProject();
|
||||
const workspace = project?.workspace;
|
||||
|
||||
const [props, setProps] = React.useState<
|
||||
PropertyItem[] | Record<string, any>
|
||||
@@ -103,9 +106,10 @@ const ZonePropsPanel: React.FC<ZonePropsPanelProps> = ({
|
||||
if (!map) {
|
||||
return;
|
||||
}
|
||||
const workspaceValue = workspace || config.MAP_WORKSPACE;
|
||||
const networkZoneLayer = new VectorLayer({
|
||||
source: new VectorSource({
|
||||
url: `${config.MAP_URL}/${config.MAP_WORKSPACE}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${config.MAP_WORKSPACE}:network_zone&outputFormat=application/json`,
|
||||
url: `${config.MAP_URL}/${workspaceValue}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${workspaceValue}:network_zone&outputFormat=application/json`,
|
||||
format: new GeoJson(),
|
||||
}),
|
||||
style: new Style({
|
||||
@@ -155,7 +159,7 @@ const ZonePropsPanel: React.FC<ZonePropsPanelProps> = ({
|
||||
map.removeLayer(highlightLayer);
|
||||
map.un("click", clickListener);
|
||||
};
|
||||
}, [map, handleMapClickSelectFeatures]);
|
||||
}, [map, handleMapClickSelectFeatures, workspace]);
|
||||
// 获取中文标签
|
||||
const getChineseLabel = (key: string): string => {
|
||||
const labelMap: Record<string, string> = {
|
||||
|
||||
@@ -50,9 +50,10 @@ import { FixedSizeList } from "react-window";
|
||||
import { useNotification } from "@refinedev/core";
|
||||
import axios from "axios";
|
||||
import { useGetIdentity } from "@refinedev/core";
|
||||
import config, { NETWORK_NAME } from "@/config/config";
|
||||
import config from "@/config/config";
|
||||
|
||||
import { useMap } from "@app/OlMap/MapComponent";
|
||||
import { useProject } from "@/contexts/ProjectContext";
|
||||
import { GeoJSON } from "ol/format";
|
||||
import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/mapQueryService";
|
||||
import VectorLayer from "ol/layer/Vector";
|
||||
@@ -180,12 +181,17 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
|
||||
}
|
||||
}, [pendingSelection, onSelectionChange]);
|
||||
|
||||
// Get workspace from context
|
||||
const project = useProject();
|
||||
const workspace = project?.workspace;
|
||||
|
||||
// 初始化 SCADA 设备列表
|
||||
useEffect(() => {
|
||||
const fetchScadaDevices = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const url = `${config.MAP_URL}/${config.MAP_WORKSPACE}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${config.MAP_WORKSPACE}:geo_scada&outputFormat=application/json`;
|
||||
const activeWorkspace = workspace || config.MAP_WORKSPACE;
|
||||
const url = `${config.MAP_URL}/${activeWorkspace}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${activeWorkspace}:geo_scada&outputFormat=application/json`;
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) throw new Error("Failed to fetch SCADA devices");
|
||||
const json = await response.json();
|
||||
@@ -211,7 +217,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
|
||||
}
|
||||
};
|
||||
fetchScadaDevices();
|
||||
}, []);
|
||||
}, [workspace]);
|
||||
|
||||
const effectiveDevices = devices.length > 0 ? devices : internalDevices;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user