diff --git a/src/hooks/web/useProject.tsx b/src/hooks/web/useProject.tsx
index 86f54af..3982c2a 100644
--- a/src/hooks/web/useProject.tsx
+++ b/src/hooks/web/useProject.tsx
@@ -351,7 +351,7 @@ export function useLayer() {
// },
// clustering: {
// enabled: clustering.enabled,
- // pixelRange: clustering.pixelRange,
+ // pixelRange: clusstering.pixelRange,
// minimumClusterSize: clustering.minimumClusterSize,
// clusterEvent: undefined,
// clusterColors: undefined, // 聚合点颜色
diff --git a/src/utils/mapUtils.ts b/src/utils/mapUtils.ts
index 71b38ca..7428594 100644
--- a/src/utils/mapUtils.ts
+++ b/src/utils/mapUtils.ts
@@ -134,28 +134,24 @@ export const queryLayersByPos = (position: any, layerList = [], cb: any) => {
[200, 201].includes(result.status) &&
result?.data?.datasetInfos?.length > 0
) {
- console.log("处理业务数据 >>>>>> ", result?.data);
const fieldInfos = result.data.datasetInfos?.[0]?.fieldInfos;
- console.log("fieldInfos >>>>> ", fieldInfos);
const currentFeature = result.data.features?.[0];
- console.log("currentFeature >>>>> ", currentFeature);
const nameIndex = fieldInfos.findIndex((f: any) =>
["res_name", "dike_name", "waga_name"].includes(f.name)
);
const codeIndex = fieldInfos.findIndex((f: any) =>
["res_code", "dike_code", "waga_code"].includes(f.name)
);
- // if (layer?.fields?.length > 0) {
- // const fieldIndex = fieldInfos.findIndex((f) => f.name === layer?.fields[0]?.field);
- // code = currentFeature?.fieldValues[fieldIndex];
- // }
+ const scaleIndex = fieldInfos.findIndex((f: any) =>
+ ["eng_scal", "dike_scale", "waga_scale"].includes(f.name)
+ );
resData = {
attributes: {
showCode: "" + currentFeature?.fieldValues[codeIndex],
showName: "" + currentFeature?.fieldValues[nameIndex],
+ scale: "" + currentFeature?.fieldValues[scaleIndex],
},
};
- console.log("resData >>>>> ", resData);
}
if (cb) cb(resData);
break;
@@ -229,7 +225,6 @@ export const getSelectedLayersLegend = (selectedLayersList: any) => {
`${layer.url}/legend.json?bbox=${bbox}`
);
}
- console.log(result);
if (result.status === 200 && result.data) {
let currentLayer = [];
// if (mapName) {
diff --git a/src/views/Main/InspectionCard/index.vue b/src/views/Main/InspectionCard/index.vue
index 6696506..6ada7bd 100644
--- a/src/views/Main/InspectionCard/index.vue
+++ b/src/views/Main/InspectionCard/index.vue
@@ -79,7 +79,7 @@ onMounted(() => {
window.$bus.$on("inspection-card-query-data", queryData);
});
onBeforeUnmount(() => {
- window.$bus.$off("inspection-card-query-data");
+ // window.$bus.$off("inspection-card-query-data");
});
diff --git a/src/views/Main/Map/index.vue b/src/views/Main/Map/index.vue
index cdedcdd..137ca36 100644
--- a/src/views/Main/Map/index.vue
+++ b/src/views/Main/Map/index.vue
@@ -20,7 +20,8 @@ onMounted(async () => {
});
onBeforeUnmount(() => {
window.removeEventListener("message", messageCallback);
- window.$bus.$all_off();
+ window.removeEventListener("resize", resize);
+ window.removeEventListener("load", resize);
});
diff --git a/src/views/Main/MonitoringCard/index.vue b/src/views/Main/MonitoringCard/index.vue
index f31c6ae..8cc8e80 100644
--- a/src/views/Main/MonitoringCard/index.vue
+++ b/src/views/Main/MonitoringCard/index.vue
@@ -32,7 +32,7 @@