Merge branch 'lili' of qw/12 into master

src/components/atmpollution/atmcompanymap.vue

@@ -62,8 +62,8 @@ onMounted(() => {
     return '#cccccc';
   }
 
-  // 只加载乡镇级GeoJSON，并根据所属区县着色
-  fetch('http://localhost:8000/api/vector/export/all?table_name=town&format=geojson')
+  // 只加载乡镇级GeoJSON，并根据所属区县着色http://localhost:8000/api/vector/export/all?table_name=town&format=geojson
+  fetch('./data/韶关市乡镇划分图5.geojson')
     .then(res => {
       if (!res.ok) throw new Error(`乡镇划分图加载失败：${res.status}`);
       return res.json();
@@ -71,7 +71,7 @@ onMounted(() => {
     .then(townshipGeojson => {
       L.geoJSON(townshipGeojson, {
         style: (feature) => {
-          const countyName = feature.properties.county_name || '';
+          const countyName = feature.properties.FXZQMC || '';
           
           return {
             fillColor: getDistrictColor(countyName), // 使用所属区县的颜色

src/components/atmpollution/atmsamplemap.vue

@@ -149,8 +149,8 @@ onMounted(() => {
     "乳源": "#FF9F1C" // 可选：支持归一化后匹配（如GeoJSON是“乳源”时）
   };
 
-  // 加载区县边界（关键修改：匹配FXZQMC字段 + 归一化）http://localhost:8000/api/vector/export/all?table_name=town&format=geojson
-  fetch('http://localhost:8000/api/vector/export/all?table_name=town_boundary&format=geojson')
+  // 加载区县边界（关键修改：匹配FXZQMC字段 + 归一化）http://localhost:8000/api/vector/export/all?table_name=town_boundary&format=geojsonhttp://localhost:8000/api/vector/export/all?table_name=town&format=geojson
+  fetch('./data/韶关市乡镇划分图5.geojson')
     .then(res => {
       if (!res.ok) throw new Error(`区县边界加载失败：${res.status}`);
       return res.json();
@@ -160,7 +160,7 @@ onMounted(() => {
       
       L.geoJSON(geojson, {
         style: (feature) => {
-          const rawDistrictName = feature.properties.county_name || ''; // 从FXZQMC提取
+          const rawDistrictName = feature.properties.FXZQMC || ''; // 从FXZQMC提取
           const normalizedName = normalizeDistrictName(rawDistrictName);
           
           // 优先精确匹配，再归一化匹配