diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->
diff --git a/src/components/map/leaflet.vue b/src/components/map/leaflet.vue
new file mode 100644
index 0000000..edeac98
--- /dev/null
+++ b/src/components/map/leaflet.vue
@@ -0,0 +1,483 @@
+<!--
+  Description: leaflet地图  --离线
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import infoDetailHot from './infoWindowHot.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { electricityBranch, electricityNode, getAreaPosition, getDeviceListPage, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
+const $props = defineProps({
+  isDashboard: {
+    type: Boolean,
+    default: true,
+  },
+})
+const $emits = defineEmits(['complete'])
+// import 'leaflet/dist/leaflet.css'
+const leafletRef = ref()
+const electricityList = ref()
+const publicPath = window.location.href.split('#')[0]
+// 电网节点数组
+const markerArr = ref([
+])
+const markerArrInfo = ref()
+const markerArrInfo1 = ref()
+// 折现节点坐标
+const lineArr = ref([])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 用热坐标数组
+const markerArrHot = ref()
+const markerArrHotInfo = ref()
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const infoWindowHot = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
+const windowInfoHotRef = ref()
+const map = ref()
+// 图层实例
+const layer = ref()
+const satellite = ref()
+const flag = ref(true)
+const layerAllList = ref<any[]>([])
+// 切换图层
+const changeLayerGrop = () => {
+  if (flag.value) {
+    map.value?.addLayer(layer.value)
+    map.value?.removeLayer(satellite.value)
+  }
+  else {
+    map.value?.removeLayer(layer.value)
+    map.value?.addLayer(satellite.value)
+  }
+  flag.value = !flag.value
+}
+// 地图点击事件
+const clickHandler = function (e) {
+  if (event.button === 2) {
+    console.log('当前点击坐标为:   ', e.latlng)
+  }
+}
+const init = async () => {
+  var container = L.DomUtil.get(leafletRef.value)
+  if (container != null) {
+    container._leaflet_id = null
+  }
+  //
+  layer.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  layer.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/ordinary/${z1}/${y1}/${x1}.png`
+  }
+  // 卫星图层
+  satellite.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  satellite.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/satellite/${z1}/${y1}/${x1}.png`
+  }
+  map.value = L.map(leafletRef.value, {
+    layers: [layer.value],
+    /* center:[纬度,经度] */
+    center: [40.830627, 111.73142],
+    zoom: 18,
+    doubleClickZoom: true, // 禁用双击放大
+    attributionControl: true, // 移除右下角leaflet标识
+    zoomControl: true, // 禁用 + - 按钮
+  })
+  $emits('complete', map.value)
+  map.value.on('mousedown', clickHandler)
+}
+// onMounted(() => {
+//   init()
+// })
+// 绘制用电监测相关
+const useElectricity = () => {
+  // 电网支路标记点绘制
+  for (let i = 0; i < markerArr.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon1.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myIcon, data: markerArrInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo.value[i].nodeName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr.value[i][1], markerArr.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+  // 光伏标记点及光伏绘制
+  for (let i = 0; i < markerArr1.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon2.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myIcon, data: markerArrInfo1.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo1.value[i].stationName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    const element = document.getElementById('leaflet-windowInfoRef2')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef2.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr1.value[i][1], markerArr1.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+
+    // 绘制电网和节点连线
+    const path = markerArrInfo1.value.map((item) => {
+      return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+    })
+    for (let i = 0; i < path.length; i++) {
+      const line = L.polyline(path[i].map((item: number[]) => [item[1], item[0]]), {
+        color: '#03A382',
+        weight: 2,
+        smoothFactor: 5,
+        lineCap: 'round',
+        lineJoin: 'round',
+        dashArray: [10, 6],
+      })
+      layerAllList.value.push(line)
+      map.value.addLayer(line)
+    }
+  }
+
+  // // 电网支路折线绘制
+  for (let i = 0; i < lineArr.value.length; i++) {
+    const path = lineArr.value.map(item => item.branchNodeInfos)
+    const line = path.map(item => (
+      item.map((child) => {
+        return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+      })
+    ))
+    line.forEach((item) => {
+      item.forEach((child) => {
+        const path = [child[0].reverse(), child[1].reverse()]
+        const line = L.polyline(path, {
+          color: child[2] === 1 ? '#008d68' : '#000',
+          weight: 2,
+          smoothFactor: 5,
+          lineCap: 'round',
+          lineJoin: 'round',
+          dashArray: [10, 8],
+        })
+        layerAllList.value.push(line)
+        map.value.addLayer(line)
+        // 离线支路连接添加开关图标
+        if (child[2] === 0) {
+          const data = [(Number(child[0][0]) + Number(child[1][0])) / 2, (Number(child[0][1]) + Number(child[1][1])) / 2]
+          console.log(data, 'data')
+          const myIcon = L.icon({
+            iconUrl: `${publicPath}img/icon3.png`,
+            iconSize: [25, 25], // 图标的大小
+            iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+            popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+          })
+          const marker = L.marker(data, { icon: myIcon })
+          layerAllList.value.push(marker)
+          map.value.addLayer(marker)
+        }
+      })
+    })
+  }
+  if (!$props.isDashboard) {
+    clearAllLayer()
+  }
+  // $emits('complete', map.value)
+}
+// 绘制用热监测相关
+const useHot = () => {
+  for (let i = 0; i < markerArrHot.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon4.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myIcon, data: markerArrHotInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrHotInfo.value[i].deviceName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoHotRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoHotRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArrHot.value[i][1], markerArrHot.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+}
+onMounted(async () => {
+  // if (!$props.isDashboard) {
+  //   await init()
+  //   return
+  // }
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
+    // 电网列表
+    electricityList.value = list.data
+    // 查询节点列表(标记点)
+    if (electricityList.value.length) {
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
+    }
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    await init()
+    useElectricity()
+  }
+  catch (error) {
+    init()
+  }
+  // 获取用热数据
+  getDeviceListPage({
+    offset: 1,
+    limit: 999,
+    ptn: '',
+    deviceType: '2',
+  }).then((res) => {
+    markerArrHotInfo.value = res.data.rows
+    markerArrHot.value = res.data.rows.map(item => ([Number(item.lng), Number(item.lat)]))
+  })
+  // getElectricityListAll().then((res) => {
+  //   // 电网列表
+  //   electricityList.value = res.data
+  //   // 默认选中第一个查询节点
+  //   if (electricityList.value.length) {
+  //     electricityNode(electricityList.value[0].id).then((res) => {
+  //       markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+  //       markerArrInfo.value = res.data
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
+})
+
+// 分区
+const area = ref('')
+const areaList = ref([])
+// 获取分区列表
+const fetchAreaList = () => {
+  getDictByCode('ptn_type').then((res) => {
+    areaList.value = res.data
+  })
+}
+fetchAreaList()
+const areaMarkerList = ref()
+const polygons = ref()
+// 绘制区域
+const drawArea = (markerList: any, color: string) => {
+  const polygon = L.polygon(
+    markerList.map((item: number[]) => item.reverse()),
+    {
+      color,
+    })
+  polygons.value = polygon
+  map.value.addLayer(polygon)
+}
+const clearDraw = () => {
+  if (polygons.value) {
+    console.log('删除')
+    polygons.value.remove()
+    // map.value.removeLayer(polygons.value)
+    area.value = ''
+  }
+}
+// 监听分区变化
+watch(() => area.value, (newVal) => {
+  console.log(newVal, 'newVal')
+  if (polygons.value) {
+    console.log('删除')
+    // map.value.removeLayer(polygons.value)
+    polygons.value.remove()
+  }
+  if (!newVal) {
+    return
+  }
+  getAreaPosition(newVal).then((res) => {
+    const color = {
+      1: '#2b8cbe',
+      2: '#ccebc5',
+      3: '#7bccc4',
+    }
+    areaMarkerList.value = res.data
+    if (res.data.length) {
+      areaMarkerList.value.push(res.data[0])
+      const data = areaMarkerList.value.map(item => ([Number(item.lng), Number(item.lat)]))
+      drawArea(data, color[newVal])
+    }
+  })
+})
+function clearAllLayer() {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  $emits('complete', map.value)
+}
+// 用电检测/用热监测 默认用电
+const flagType = ref(true)
+// 切换用电检测/用热监测
+const changeFlagType = () => {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  if (flagType.value) {
+    useHot()
+  }
+  else {
+    useElectricity()
+  }
+  flagType.value = !flagType.value
+}
+defineExpose({ changeLayerGrop, changeFlagType, flag, map, layerAllList })
+onUnmounted(() => {
+  console.log('页面要销毁')
+  map.value?.remove()
+  document.getElementById('map-leaflet111')?.remove()
+})
+</script>
+
+<template>
+  <div id="map-leaflet111" ref="leafletRef" />
+  <info-detail v-if="isDashboard" ref="windowInfoRef" />
+  <info-detail2 v-if="isDashboard" ref="windowInfoRef2" />
+  <info-detail-hot v-if="isDashboard" ref="windowInfoHotRef" />
+  <div v-if="isDashboard" class="btns">
+    <el-radio-group v-model="area">
+      <el-radio-button v-for="item in areaList" :key="item.id" :label="item.value" @dblclick="clearDraw">
+        {{ item.name }}
+      </el-radio-button>
+    </el-radio-group>
+  </div>
+</template>
+
+<style>
+.leaflet-my-div-text {
+  white-space: nowrap !important;
+  margin-top: 10px !important;
+}
+
+.leaflet-popup-content {
+  width: 100% !important;
+  padding-top: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+#map-leaflet111 {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.btns {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+  z-index: 999;
+}
+</style>

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->
diff --git a/src/components/map/leaflet.vue b/src/components/map/leaflet.vue
new file mode 100644
index 0000000..edeac98
--- /dev/null
+++ b/src/components/map/leaflet.vue
@@ -0,0 +1,483 @@
+<!--
+  Description: leaflet地图  --离线
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import infoDetailHot from './infoWindowHot.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { electricityBranch, electricityNode, getAreaPosition, getDeviceListPage, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
+const $props = defineProps({
+  isDashboard: {
+    type: Boolean,
+    default: true,
+  },
+})
+const $emits = defineEmits(['complete'])
+// import 'leaflet/dist/leaflet.css'
+const leafletRef = ref()
+const electricityList = ref()
+const publicPath = window.location.href.split('#')[0]
+// 电网节点数组
+const markerArr = ref([
+])
+const markerArrInfo = ref()
+const markerArrInfo1 = ref()
+// 折现节点坐标
+const lineArr = ref([])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 用热坐标数组
+const markerArrHot = ref()
+const markerArrHotInfo = ref()
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const infoWindowHot = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
+const windowInfoHotRef = ref()
+const map = ref()
+// 图层实例
+const layer = ref()
+const satellite = ref()
+const flag = ref(true)
+const layerAllList = ref<any[]>([])
+// 切换图层
+const changeLayerGrop = () => {
+  if (flag.value) {
+    map.value?.addLayer(layer.value)
+    map.value?.removeLayer(satellite.value)
+  }
+  else {
+    map.value?.removeLayer(layer.value)
+    map.value?.addLayer(satellite.value)
+  }
+  flag.value = !flag.value
+}
+// 地图点击事件
+const clickHandler = function (e) {
+  if (event.button === 2) {
+    console.log('当前点击坐标为:   ', e.latlng)
+  }
+}
+const init = async () => {
+  var container = L.DomUtil.get(leafletRef.value)
+  if (container != null) {
+    container._leaflet_id = null
+  }
+  //
+  layer.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  layer.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/ordinary/${z1}/${y1}/${x1}.png`
+  }
+  // 卫星图层
+  satellite.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  satellite.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/satellite/${z1}/${y1}/${x1}.png`
+  }
+  map.value = L.map(leafletRef.value, {
+    layers: [layer.value],
+    /* center:[纬度,经度] */
+    center: [40.830627, 111.73142],
+    zoom: 18,
+    doubleClickZoom: true, // 禁用双击放大
+    attributionControl: true, // 移除右下角leaflet标识
+    zoomControl: true, // 禁用 + - 按钮
+  })
+  $emits('complete', map.value)
+  map.value.on('mousedown', clickHandler)
+}
+// onMounted(() => {
+//   init()
+// })
+// 绘制用电监测相关
+const useElectricity = () => {
+  // 电网支路标记点绘制
+  for (let i = 0; i < markerArr.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon1.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myIcon, data: markerArrInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo.value[i].nodeName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr.value[i][1], markerArr.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+  // 光伏标记点及光伏绘制
+  for (let i = 0; i < markerArr1.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon2.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myIcon, data: markerArrInfo1.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo1.value[i].stationName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    const element = document.getElementById('leaflet-windowInfoRef2')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef2.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr1.value[i][1], markerArr1.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+
+    // 绘制电网和节点连线
+    const path = markerArrInfo1.value.map((item) => {
+      return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+    })
+    for (let i = 0; i < path.length; i++) {
+      const line = L.polyline(path[i].map((item: number[]) => [item[1], item[0]]), {
+        color: '#03A382',
+        weight: 2,
+        smoothFactor: 5,
+        lineCap: 'round',
+        lineJoin: 'round',
+        dashArray: [10, 6],
+      })
+      layerAllList.value.push(line)
+      map.value.addLayer(line)
+    }
+  }
+
+  // // 电网支路折线绘制
+  for (let i = 0; i < lineArr.value.length; i++) {
+    const path = lineArr.value.map(item => item.branchNodeInfos)
+    const line = path.map(item => (
+      item.map((child) => {
+        return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+      })
+    ))
+    line.forEach((item) => {
+      item.forEach((child) => {
+        const path = [child[0].reverse(), child[1].reverse()]
+        const line = L.polyline(path, {
+          color: child[2] === 1 ? '#008d68' : '#000',
+          weight: 2,
+          smoothFactor: 5,
+          lineCap: 'round',
+          lineJoin: 'round',
+          dashArray: [10, 8],
+        })
+        layerAllList.value.push(line)
+        map.value.addLayer(line)
+        // 离线支路连接添加开关图标
+        if (child[2] === 0) {
+          const data = [(Number(child[0][0]) + Number(child[1][0])) / 2, (Number(child[0][1]) + Number(child[1][1])) / 2]
+          console.log(data, 'data')
+          const myIcon = L.icon({
+            iconUrl: `${publicPath}img/icon3.png`,
+            iconSize: [25, 25], // 图标的大小
+            iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+            popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+          })
+          const marker = L.marker(data, { icon: myIcon })
+          layerAllList.value.push(marker)
+          map.value.addLayer(marker)
+        }
+      })
+    })
+  }
+  if (!$props.isDashboard) {
+    clearAllLayer()
+  }
+  // $emits('complete', map.value)
+}
+// 绘制用热监测相关
+const useHot = () => {
+  for (let i = 0; i < markerArrHot.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon4.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myIcon, data: markerArrHotInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrHotInfo.value[i].deviceName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoHotRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoHotRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArrHot.value[i][1], markerArrHot.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+}
+onMounted(async () => {
+  // if (!$props.isDashboard) {
+  //   await init()
+  //   return
+  // }
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
+    // 电网列表
+    electricityList.value = list.data
+    // 查询节点列表(标记点)
+    if (electricityList.value.length) {
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
+    }
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    await init()
+    useElectricity()
+  }
+  catch (error) {
+    init()
+  }
+  // 获取用热数据
+  getDeviceListPage({
+    offset: 1,
+    limit: 999,
+    ptn: '',
+    deviceType: '2',
+  }).then((res) => {
+    markerArrHotInfo.value = res.data.rows
+    markerArrHot.value = res.data.rows.map(item => ([Number(item.lng), Number(item.lat)]))
+  })
+  // getElectricityListAll().then((res) => {
+  //   // 电网列表
+  //   electricityList.value = res.data
+  //   // 默认选中第一个查询节点
+  //   if (electricityList.value.length) {
+  //     electricityNode(electricityList.value[0].id).then((res) => {
+  //       markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+  //       markerArrInfo.value = res.data
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
+})
+
+// 分区
+const area = ref('')
+const areaList = ref([])
+// 获取分区列表
+const fetchAreaList = () => {
+  getDictByCode('ptn_type').then((res) => {
+    areaList.value = res.data
+  })
+}
+fetchAreaList()
+const areaMarkerList = ref()
+const polygons = ref()
+// 绘制区域
+const drawArea = (markerList: any, color: string) => {
+  const polygon = L.polygon(
+    markerList.map((item: number[]) => item.reverse()),
+    {
+      color,
+    })
+  polygons.value = polygon
+  map.value.addLayer(polygon)
+}
+const clearDraw = () => {
+  if (polygons.value) {
+    console.log('删除')
+    polygons.value.remove()
+    // map.value.removeLayer(polygons.value)
+    area.value = ''
+  }
+}
+// 监听分区变化
+watch(() => area.value, (newVal) => {
+  console.log(newVal, 'newVal')
+  if (polygons.value) {
+    console.log('删除')
+    // map.value.removeLayer(polygons.value)
+    polygons.value.remove()
+  }
+  if (!newVal) {
+    return
+  }
+  getAreaPosition(newVal).then((res) => {
+    const color = {
+      1: '#2b8cbe',
+      2: '#ccebc5',
+      3: '#7bccc4',
+    }
+    areaMarkerList.value = res.data
+    if (res.data.length) {
+      areaMarkerList.value.push(res.data[0])
+      const data = areaMarkerList.value.map(item => ([Number(item.lng), Number(item.lat)]))
+      drawArea(data, color[newVal])
+    }
+  })
+})
+function clearAllLayer() {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  $emits('complete', map.value)
+}
+// 用电检测/用热监测 默认用电
+const flagType = ref(true)
+// 切换用电检测/用热监测
+const changeFlagType = () => {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  if (flagType.value) {
+    useHot()
+  }
+  else {
+    useElectricity()
+  }
+  flagType.value = !flagType.value
+}
+defineExpose({ changeLayerGrop, changeFlagType, flag, map, layerAllList })
+onUnmounted(() => {
+  console.log('页面要销毁')
+  map.value?.remove()
+  document.getElementById('map-leaflet111')?.remove()
+})
+</script>
+
+<template>
+  <div id="map-leaflet111" ref="leafletRef" />
+  <info-detail v-if="isDashboard" ref="windowInfoRef" />
+  <info-detail2 v-if="isDashboard" ref="windowInfoRef2" />
+  <info-detail-hot v-if="isDashboard" ref="windowInfoHotRef" />
+  <div v-if="isDashboard" class="btns">
+    <el-radio-group v-model="area">
+      <el-radio-button v-for="item in areaList" :key="item.id" :label="item.value" @dblclick="clearDraw">
+        {{ item.name }}
+      </el-radio-button>
+    </el-radio-group>
+  </div>
+</template>
+
+<style>
+.leaflet-my-div-text {
+  white-space: nowrap !important;
+  margin-top: 10px !important;
+}
+
+.leaflet-popup-content {
+  width: 100% !important;
+  padding-top: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+#map-leaflet111 {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.btns {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+  z-index: 999;
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 34e9cc3..ec142e3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,6 +18,7 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import 'leaflet/dist/leaflet.css'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->
diff --git a/src/components/map/leaflet.vue b/src/components/map/leaflet.vue
new file mode 100644
index 0000000..edeac98
--- /dev/null
+++ b/src/components/map/leaflet.vue
@@ -0,0 +1,483 @@
+<!--
+  Description: leaflet地图  --离线
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import infoDetailHot from './infoWindowHot.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { electricityBranch, electricityNode, getAreaPosition, getDeviceListPage, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
+const $props = defineProps({
+  isDashboard: {
+    type: Boolean,
+    default: true,
+  },
+})
+const $emits = defineEmits(['complete'])
+// import 'leaflet/dist/leaflet.css'
+const leafletRef = ref()
+const electricityList = ref()
+const publicPath = window.location.href.split('#')[0]
+// 电网节点数组
+const markerArr = ref([
+])
+const markerArrInfo = ref()
+const markerArrInfo1 = ref()
+// 折现节点坐标
+const lineArr = ref([])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 用热坐标数组
+const markerArrHot = ref()
+const markerArrHotInfo = ref()
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const infoWindowHot = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
+const windowInfoHotRef = ref()
+const map = ref()
+// 图层实例
+const layer = ref()
+const satellite = ref()
+const flag = ref(true)
+const layerAllList = ref<any[]>([])
+// 切换图层
+const changeLayerGrop = () => {
+  if (flag.value) {
+    map.value?.addLayer(layer.value)
+    map.value?.removeLayer(satellite.value)
+  }
+  else {
+    map.value?.removeLayer(layer.value)
+    map.value?.addLayer(satellite.value)
+  }
+  flag.value = !flag.value
+}
+// 地图点击事件
+const clickHandler = function (e) {
+  if (event.button === 2) {
+    console.log('当前点击坐标为:   ', e.latlng)
+  }
+}
+const init = async () => {
+  var container = L.DomUtil.get(leafletRef.value)
+  if (container != null) {
+    container._leaflet_id = null
+  }
+  //
+  layer.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  layer.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/ordinary/${z1}/${y1}/${x1}.png`
+  }
+  // 卫星图层
+  satellite.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  satellite.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/satellite/${z1}/${y1}/${x1}.png`
+  }
+  map.value = L.map(leafletRef.value, {
+    layers: [layer.value],
+    /* center:[纬度,经度] */
+    center: [40.830627, 111.73142],
+    zoom: 18,
+    doubleClickZoom: true, // 禁用双击放大
+    attributionControl: true, // 移除右下角leaflet标识
+    zoomControl: true, // 禁用 + - 按钮
+  })
+  $emits('complete', map.value)
+  map.value.on('mousedown', clickHandler)
+}
+// onMounted(() => {
+//   init()
+// })
+// 绘制用电监测相关
+const useElectricity = () => {
+  // 电网支路标记点绘制
+  for (let i = 0; i < markerArr.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon1.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myIcon, data: markerArrInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo.value[i].nodeName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr.value[i][1], markerArr.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+  // 光伏标记点及光伏绘制
+  for (let i = 0; i < markerArr1.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon2.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myIcon, data: markerArrInfo1.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo1.value[i].stationName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    const element = document.getElementById('leaflet-windowInfoRef2')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef2.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr1.value[i][1], markerArr1.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+
+    // 绘制电网和节点连线
+    const path = markerArrInfo1.value.map((item) => {
+      return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+    })
+    for (let i = 0; i < path.length; i++) {
+      const line = L.polyline(path[i].map((item: number[]) => [item[1], item[0]]), {
+        color: '#03A382',
+        weight: 2,
+        smoothFactor: 5,
+        lineCap: 'round',
+        lineJoin: 'round',
+        dashArray: [10, 6],
+      })
+      layerAllList.value.push(line)
+      map.value.addLayer(line)
+    }
+  }
+
+  // // 电网支路折线绘制
+  for (let i = 0; i < lineArr.value.length; i++) {
+    const path = lineArr.value.map(item => item.branchNodeInfos)
+    const line = path.map(item => (
+      item.map((child) => {
+        return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+      })
+    ))
+    line.forEach((item) => {
+      item.forEach((child) => {
+        const path = [child[0].reverse(), child[1].reverse()]
+        const line = L.polyline(path, {
+          color: child[2] === 1 ? '#008d68' : '#000',
+          weight: 2,
+          smoothFactor: 5,
+          lineCap: 'round',
+          lineJoin: 'round',
+          dashArray: [10, 8],
+        })
+        layerAllList.value.push(line)
+        map.value.addLayer(line)
+        // 离线支路连接添加开关图标
+        if (child[2] === 0) {
+          const data = [(Number(child[0][0]) + Number(child[1][0])) / 2, (Number(child[0][1]) + Number(child[1][1])) / 2]
+          console.log(data, 'data')
+          const myIcon = L.icon({
+            iconUrl: `${publicPath}img/icon3.png`,
+            iconSize: [25, 25], // 图标的大小
+            iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+            popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+          })
+          const marker = L.marker(data, { icon: myIcon })
+          layerAllList.value.push(marker)
+          map.value.addLayer(marker)
+        }
+      })
+    })
+  }
+  if (!$props.isDashboard) {
+    clearAllLayer()
+  }
+  // $emits('complete', map.value)
+}
+// 绘制用热监测相关
+const useHot = () => {
+  for (let i = 0; i < markerArrHot.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon4.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myIcon, data: markerArrHotInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrHotInfo.value[i].deviceName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoHotRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoHotRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArrHot.value[i][1], markerArrHot.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+}
+onMounted(async () => {
+  // if (!$props.isDashboard) {
+  //   await init()
+  //   return
+  // }
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
+    // 电网列表
+    electricityList.value = list.data
+    // 查询节点列表(标记点)
+    if (electricityList.value.length) {
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
+    }
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    await init()
+    useElectricity()
+  }
+  catch (error) {
+    init()
+  }
+  // 获取用热数据
+  getDeviceListPage({
+    offset: 1,
+    limit: 999,
+    ptn: '',
+    deviceType: '2',
+  }).then((res) => {
+    markerArrHotInfo.value = res.data.rows
+    markerArrHot.value = res.data.rows.map(item => ([Number(item.lng), Number(item.lat)]))
+  })
+  // getElectricityListAll().then((res) => {
+  //   // 电网列表
+  //   electricityList.value = res.data
+  //   // 默认选中第一个查询节点
+  //   if (electricityList.value.length) {
+  //     electricityNode(electricityList.value[0].id).then((res) => {
+  //       markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+  //       markerArrInfo.value = res.data
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
+})
+
+// 分区
+const area = ref('')
+const areaList = ref([])
+// 获取分区列表
+const fetchAreaList = () => {
+  getDictByCode('ptn_type').then((res) => {
+    areaList.value = res.data
+  })
+}
+fetchAreaList()
+const areaMarkerList = ref()
+const polygons = ref()
+// 绘制区域
+const drawArea = (markerList: any, color: string) => {
+  const polygon = L.polygon(
+    markerList.map((item: number[]) => item.reverse()),
+    {
+      color,
+    })
+  polygons.value = polygon
+  map.value.addLayer(polygon)
+}
+const clearDraw = () => {
+  if (polygons.value) {
+    console.log('删除')
+    polygons.value.remove()
+    // map.value.removeLayer(polygons.value)
+    area.value = ''
+  }
+}
+// 监听分区变化
+watch(() => area.value, (newVal) => {
+  console.log(newVal, 'newVal')
+  if (polygons.value) {
+    console.log('删除')
+    // map.value.removeLayer(polygons.value)
+    polygons.value.remove()
+  }
+  if (!newVal) {
+    return
+  }
+  getAreaPosition(newVal).then((res) => {
+    const color = {
+      1: '#2b8cbe',
+      2: '#ccebc5',
+      3: '#7bccc4',
+    }
+    areaMarkerList.value = res.data
+    if (res.data.length) {
+      areaMarkerList.value.push(res.data[0])
+      const data = areaMarkerList.value.map(item => ([Number(item.lng), Number(item.lat)]))
+      drawArea(data, color[newVal])
+    }
+  })
+})
+function clearAllLayer() {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  $emits('complete', map.value)
+}
+// 用电检测/用热监测 默认用电
+const flagType = ref(true)
+// 切换用电检测/用热监测
+const changeFlagType = () => {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  if (flagType.value) {
+    useHot()
+  }
+  else {
+    useElectricity()
+  }
+  flagType.value = !flagType.value
+}
+defineExpose({ changeLayerGrop, changeFlagType, flag, map, layerAllList })
+onUnmounted(() => {
+  console.log('页面要销毁')
+  map.value?.remove()
+  document.getElementById('map-leaflet111')?.remove()
+})
+</script>
+
+<template>
+  <div id="map-leaflet111" ref="leafletRef" />
+  <info-detail v-if="isDashboard" ref="windowInfoRef" />
+  <info-detail2 v-if="isDashboard" ref="windowInfoRef2" />
+  <info-detail-hot v-if="isDashboard" ref="windowInfoHotRef" />
+  <div v-if="isDashboard" class="btns">
+    <el-radio-group v-model="area">
+      <el-radio-button v-for="item in areaList" :key="item.id" :label="item.value" @dblclick="clearDraw">
+        {{ item.name }}
+      </el-radio-button>
+    </el-radio-group>
+  </div>
+</template>
+
+<style>
+.leaflet-my-div-text {
+  white-space: nowrap !important;
+  margin-top: 10px !important;
+}
+
+.leaflet-popup-content {
+  width: 100% !important;
+  padding-top: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+#map-leaflet111 {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.btns {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+  z-index: 999;
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 34e9cc3..ec142e3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,6 +18,7 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import 'leaflet/dist/leaflet.css'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9f395ae..fc3219f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,7 +4,8 @@
   Date: 2023-04-21
  -->
 <script lang="ts" setup name="dashboard">
-import guadmap from '@/components/map/index.vue'
+import leaflet from '@/components/map/leaflet.vue'
+// import amap from '@/components/map/index.vue'
 const mainHeight = ref(document.body.clientHeight - 50)
 window.addEventListener('resize', () => {
   const bodyHeight = document.body.clientHeight - 50
@@ -26,7 +27,7 @@
 <template>
   <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
-    <guadmap ref="mapRef" />
+    <leaflet ref="mapRef" />
     <!-- 按钮 -->
     <div class="btn1">
       <el-radio-group v-model="current">
@@ -56,11 +57,13 @@
   position: absolute;
   right: 20px;
   bottom: 20px;
+  z-index: 999;
 }
 
 .btn1 {
   position: absolute;
   right: 20px;
   top: 20px;
+  z-index: 999;
 }
 </style>

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->
diff --git a/src/components/map/leaflet.vue b/src/components/map/leaflet.vue
new file mode 100644
index 0000000..edeac98
--- /dev/null
+++ b/src/components/map/leaflet.vue
@@ -0,0 +1,483 @@
+<!--
+  Description: leaflet地图  --离线
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import infoDetailHot from './infoWindowHot.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { electricityBranch, electricityNode, getAreaPosition, getDeviceListPage, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
+const $props = defineProps({
+  isDashboard: {
+    type: Boolean,
+    default: true,
+  },
+})
+const $emits = defineEmits(['complete'])
+// import 'leaflet/dist/leaflet.css'
+const leafletRef = ref()
+const electricityList = ref()
+const publicPath = window.location.href.split('#')[0]
+// 电网节点数组
+const markerArr = ref([
+])
+const markerArrInfo = ref()
+const markerArrInfo1 = ref()
+// 折现节点坐标
+const lineArr = ref([])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 用热坐标数组
+const markerArrHot = ref()
+const markerArrHotInfo = ref()
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const infoWindowHot = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
+const windowInfoHotRef = ref()
+const map = ref()
+// 图层实例
+const layer = ref()
+const satellite = ref()
+const flag = ref(true)
+const layerAllList = ref<any[]>([])
+// 切换图层
+const changeLayerGrop = () => {
+  if (flag.value) {
+    map.value?.addLayer(layer.value)
+    map.value?.removeLayer(satellite.value)
+  }
+  else {
+    map.value?.removeLayer(layer.value)
+    map.value?.addLayer(satellite.value)
+  }
+  flag.value = !flag.value
+}
+// 地图点击事件
+const clickHandler = function (e) {
+  if (event.button === 2) {
+    console.log('当前点击坐标为:   ', e.latlng)
+  }
+}
+const init = async () => {
+  var container = L.DomUtil.get(leafletRef.value)
+  if (container != null) {
+    container._leaflet_id = null
+  }
+  //
+  layer.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  layer.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/ordinary/${z1}/${y1}/${x1}.png`
+  }
+  // 卫星图层
+  satellite.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  satellite.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/satellite/${z1}/${y1}/${x1}.png`
+  }
+  map.value = L.map(leafletRef.value, {
+    layers: [layer.value],
+    /* center:[纬度,经度] */
+    center: [40.830627, 111.73142],
+    zoom: 18,
+    doubleClickZoom: true, // 禁用双击放大
+    attributionControl: true, // 移除右下角leaflet标识
+    zoomControl: true, // 禁用 + - 按钮
+  })
+  $emits('complete', map.value)
+  map.value.on('mousedown', clickHandler)
+}
+// onMounted(() => {
+//   init()
+// })
+// 绘制用电监测相关
+const useElectricity = () => {
+  // 电网支路标记点绘制
+  for (let i = 0; i < markerArr.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon1.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myIcon, data: markerArrInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo.value[i].nodeName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr.value[i][1], markerArr.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+  // 光伏标记点及光伏绘制
+  for (let i = 0; i < markerArr1.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon2.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myIcon, data: markerArrInfo1.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo1.value[i].stationName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    const element = document.getElementById('leaflet-windowInfoRef2')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef2.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr1.value[i][1], markerArr1.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+
+    // 绘制电网和节点连线
+    const path = markerArrInfo1.value.map((item) => {
+      return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+    })
+    for (let i = 0; i < path.length; i++) {
+      const line = L.polyline(path[i].map((item: number[]) => [item[1], item[0]]), {
+        color: '#03A382',
+        weight: 2,
+        smoothFactor: 5,
+        lineCap: 'round',
+        lineJoin: 'round',
+        dashArray: [10, 6],
+      })
+      layerAllList.value.push(line)
+      map.value.addLayer(line)
+    }
+  }
+
+  // // 电网支路折线绘制
+  for (let i = 0; i < lineArr.value.length; i++) {
+    const path = lineArr.value.map(item => item.branchNodeInfos)
+    const line = path.map(item => (
+      item.map((child) => {
+        return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+      })
+    ))
+    line.forEach((item) => {
+      item.forEach((child) => {
+        const path = [child[0].reverse(), child[1].reverse()]
+        const line = L.polyline(path, {
+          color: child[2] === 1 ? '#008d68' : '#000',
+          weight: 2,
+          smoothFactor: 5,
+          lineCap: 'round',
+          lineJoin: 'round',
+          dashArray: [10, 8],
+        })
+        layerAllList.value.push(line)
+        map.value.addLayer(line)
+        // 离线支路连接添加开关图标
+        if (child[2] === 0) {
+          const data = [(Number(child[0][0]) + Number(child[1][0])) / 2, (Number(child[0][1]) + Number(child[1][1])) / 2]
+          console.log(data, 'data')
+          const myIcon = L.icon({
+            iconUrl: `${publicPath}img/icon3.png`,
+            iconSize: [25, 25], // 图标的大小
+            iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+            popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+          })
+          const marker = L.marker(data, { icon: myIcon })
+          layerAllList.value.push(marker)
+          map.value.addLayer(marker)
+        }
+      })
+    })
+  }
+  if (!$props.isDashboard) {
+    clearAllLayer()
+  }
+  // $emits('complete', map.value)
+}
+// 绘制用热监测相关
+const useHot = () => {
+  for (let i = 0; i < markerArrHot.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon4.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myIcon, data: markerArrHotInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrHotInfo.value[i].deviceName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoHotRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoHotRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArrHot.value[i][1], markerArrHot.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+}
+onMounted(async () => {
+  // if (!$props.isDashboard) {
+  //   await init()
+  //   return
+  // }
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
+    // 电网列表
+    electricityList.value = list.data
+    // 查询节点列表(标记点)
+    if (electricityList.value.length) {
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
+    }
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    await init()
+    useElectricity()
+  }
+  catch (error) {
+    init()
+  }
+  // 获取用热数据
+  getDeviceListPage({
+    offset: 1,
+    limit: 999,
+    ptn: '',
+    deviceType: '2',
+  }).then((res) => {
+    markerArrHotInfo.value = res.data.rows
+    markerArrHot.value = res.data.rows.map(item => ([Number(item.lng), Number(item.lat)]))
+  })
+  // getElectricityListAll().then((res) => {
+  //   // 电网列表
+  //   electricityList.value = res.data
+  //   // 默认选中第一个查询节点
+  //   if (electricityList.value.length) {
+  //     electricityNode(electricityList.value[0].id).then((res) => {
+  //       markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+  //       markerArrInfo.value = res.data
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
+})
+
+// 分区
+const area = ref('')
+const areaList = ref([])
+// 获取分区列表
+const fetchAreaList = () => {
+  getDictByCode('ptn_type').then((res) => {
+    areaList.value = res.data
+  })
+}
+fetchAreaList()
+const areaMarkerList = ref()
+const polygons = ref()
+// 绘制区域
+const drawArea = (markerList: any, color: string) => {
+  const polygon = L.polygon(
+    markerList.map((item: number[]) => item.reverse()),
+    {
+      color,
+    })
+  polygons.value = polygon
+  map.value.addLayer(polygon)
+}
+const clearDraw = () => {
+  if (polygons.value) {
+    console.log('删除')
+    polygons.value.remove()
+    // map.value.removeLayer(polygons.value)
+    area.value = ''
+  }
+}
+// 监听分区变化
+watch(() => area.value, (newVal) => {
+  console.log(newVal, 'newVal')
+  if (polygons.value) {
+    console.log('删除')
+    // map.value.removeLayer(polygons.value)
+    polygons.value.remove()
+  }
+  if (!newVal) {
+    return
+  }
+  getAreaPosition(newVal).then((res) => {
+    const color = {
+      1: '#2b8cbe',
+      2: '#ccebc5',
+      3: '#7bccc4',
+    }
+    areaMarkerList.value = res.data
+    if (res.data.length) {
+      areaMarkerList.value.push(res.data[0])
+      const data = areaMarkerList.value.map(item => ([Number(item.lng), Number(item.lat)]))
+      drawArea(data, color[newVal])
+    }
+  })
+})
+function clearAllLayer() {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  $emits('complete', map.value)
+}
+// 用电检测/用热监测 默认用电
+const flagType = ref(true)
+// 切换用电检测/用热监测
+const changeFlagType = () => {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  if (flagType.value) {
+    useHot()
+  }
+  else {
+    useElectricity()
+  }
+  flagType.value = !flagType.value
+}
+defineExpose({ changeLayerGrop, changeFlagType, flag, map, layerAllList })
+onUnmounted(() => {
+  console.log('页面要销毁')
+  map.value?.remove()
+  document.getElementById('map-leaflet111')?.remove()
+})
+</script>
+
+<template>
+  <div id="map-leaflet111" ref="leafletRef" />
+  <info-detail v-if="isDashboard" ref="windowInfoRef" />
+  <info-detail2 v-if="isDashboard" ref="windowInfoRef2" />
+  <info-detail-hot v-if="isDashboard" ref="windowInfoHotRef" />
+  <div v-if="isDashboard" class="btns">
+    <el-radio-group v-model="area">
+      <el-radio-button v-for="item in areaList" :key="item.id" :label="item.value" @dblclick="clearDraw">
+        {{ item.name }}
+      </el-radio-button>
+    </el-radio-group>
+  </div>
+</template>
+
+<style>
+.leaflet-my-div-text {
+  white-space: nowrap !important;
+  margin-top: 10px !important;
+}
+
+.leaflet-popup-content {
+  width: 100% !important;
+  padding-top: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+#map-leaflet111 {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.btns {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+  z-index: 999;
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 34e9cc3..ec142e3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,6 +18,7 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import 'leaflet/dist/leaflet.css'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9f395ae..fc3219f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,7 +4,8 @@
   Date: 2023-04-21
  -->
 <script lang="ts" setup name="dashboard">
-import guadmap from '@/components/map/index.vue'
+import leaflet from '@/components/map/leaflet.vue'
+// import amap from '@/components/map/index.vue'
 const mainHeight = ref(document.body.clientHeight - 50)
 window.addEventListener('resize', () => {
   const bodyHeight = document.body.clientHeight - 50
@@ -26,7 +27,7 @@
 <template>
   <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
-    <guadmap ref="mapRef" />
+    <leaflet ref="mapRef" />
     <!-- 按钮 -->
     <div class="btn1">
       <el-radio-group v-model="current">
@@ -56,11 +57,13 @@
   position: absolute;
   right: 20px;
   bottom: 20px;
+  z-index: 999;
 }
 
 .btn1 {
   position: absolute;
   right: 20px;
   top: 20px;
+  z-index: 999;
 }
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 95a6fa5..24a9b1e 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -143,6 +143,7 @@
       dataFormRef.value.clearValidate()
     })
     areaForm.value.electricityId = id
+    isEditMode.value = true
   }
   else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row

diff --git a/package.json b/package.json
index 7453a14..b14cb3b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "hotkeys-js": "^3.10.0",
     "html2canvas": "^1.4.1",
     "jsencrypt": "^3.3.1",
+    "leaflet": "^1.9.4",
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.0",
     "mockjs": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7673a86..5eaa8d1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,6 +50,9 @@
   jsencrypt:
     specifier: ^3.3.1
     version: 3.3.1
+  leaflet:
+    specifier: ^1.9.4
+    version: 1.9.4
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -5287,6 +5290,10 @@
       bin-pack: 1.0.2
     dev: true
 
+  /leaflet@1.9.4:
+    resolution: {integrity: sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==}
+    dev: false
+
   /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
diff --git a/public/config/config.json b/public/config/config.json
index fdd3bd1..d9e3716 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -9,15 +9,15 @@
   "DataVUrl":[
     {
       "name": "碳足迹监测",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹评价",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     },
     {
       "name": "碳足迹预警",
-      "url": "https://share.shanhaibi.com/6705f423dc67f/"
+      "url": "https://share.shanhaibi.com/670e1ecdca09d/"
     }
   ]
 }
diff --git a/public/img/icon-marker.png b/public/img/icon-marker.png
new file mode 100644
index 0000000..4f68e9a
--- /dev/null
+++ b/public/img/icon-marker.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index 9e9fd9f..4c4a4e3 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -38,6 +38,7 @@
     InfoWindow: typeof import('./components/map/infoWindow.vue')['default']
     InfoWindow2: typeof import('./components/map/infoWindow2.vue')['default']
     InfoWindowHot: typeof import('./components/map/infoWindowHot.vue')['default']
+    Leaflet: typeof import('./components/map/leaflet.vue')['default']
     LineChart: typeof import('./components/Echart/LineChart.vue')['default']
     Map: typeof import('./components/map/index.vue')['default']
     MapBak: typeof import('./components/map-bak/index.vue')['default']
diff --git a/src/components/SelectLocationMap/index.vue b/src/components/SelectLocationMap/index.vue
index 2c7064d..d725932 100644
--- a/src/components/SelectLocationMap/index.vue
+++ b/src/components/SelectLocationMap/index.vue
@@ -17,12 +17,15 @@
 const cancel = () => {
   dialogFormVisible.value = false
 }
+const position = ref<any[]>([])
 // 确认
 const confirm = () => {
+  $emit('confirm', position.value)
   dialogFormVisible.value = false
 }
 const location = (data: number[]) => {
-  $emit('confirm', data)
+  // $emit('confirm', data)
+  position.value = data
 }
 defineExpose({
   initDialog,
@@ -34,7 +37,7 @@
     v-model="dialogFormVisible" title="选择位置" append-to-body width="1000px" :close-on-click-modal="false"
     top="12vh"
   >
-    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm="location" />
+    <map-div v-if="dialogFormVisible" style="height: 500px;" :init="init" @confirm1="location" />
     <template #footer>
       <div class="dialog-footer">
         <el-button type="primary" @click="confirm">
diff --git a/src/components/SelectLocationMap/map/index copy.vue b/src/components/SelectLocationMap/map/index copy.vue
new file mode 100644
index 0000000..b27ede2
--- /dev/null
+++ b/src/components/SelectLocationMap/map/index copy.vue
@@ -0,0 +1,244 @@
+<!--
+  Description: 高德地图
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="GuadMap">
+import { ElMessage } from 'element-plus'
+// import AMapLoader from '@amap/amap-jsapi-loader'
+const $props = defineProps({
+  init: {
+    type: Array,
+    default: () => [],
+  },
+})
+const $emit = defineEmits(['confirm'])
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
+  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
+}
+// 地图实例
+const map = ref()
+const AMap1 = ref()
+const remarkRef = ref()
+const placeSearchRef = ref()
+// 地图点击事件
+const clickHandler = function (e) {
+  console.log(e, 'eeee')
+  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
+  $emit('confirm', location)
+  // 在该点添加标记点
+  map.value.remove(remarkRef.value)
+  const AMap = AMap1.value
+  const marker = new AMap.Marker({
+    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+  })
+  remarkRef.value = marker
+  map.value.add(marker)
+}
+// 初始化地图
+const initMap = () => {
+  if (!window.localStorage.getItem('amapResource')) {
+    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
+  }
+  const offline = window.AMap
+  AMap1.value = offline
+  map.value = new offline.Map('map-location', { // 设置地图容器id
+    resizeEnable: true,
+    viewMode: '3D', // 是否为3D地图模式
+    zoom: 18, // 初始化地图级别
+    center: [111.73142, 40.830627], // 初始化地图中心点位置
+    zooms: [10, 18],
+    layers: [
+      new offline.TileLayer({
+        visible: true,
+        zIndex: 0,
+        opacity: 1,
+        zooms: [10, 18],
+        dataZooms: [10, 18],
+        getTileUrl: (a: any, b: any, c: any) => {
+          // 经纬度转换成本地瓦片所在路径
+          const flag = '00000000'
+          const zz = c
+          const z = `L${zz}`
+          const xx = a.toString(16)
+          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
+          const yy = b.toString(16)
+          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
+          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
+        },
+      }),
+    ],
+    // mapStyle: 'amap://styles/darkblue',
+  })
+  // AMapLoader.load({
+  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
+  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+  // })
+  //   .then((AMap) => {
+  //     AMap1.value = AMap
+  //     // 初始化地图
+  //     map.value = new AMap.Map('map-location', {
+  //       viewMode: '3D', //  是否为3D地图模式
+  //       zoom: 17, // 初始化地图级别
+  //       center: [116.26755900, 39.91547100],
+  //       resizeEnable: true,
+  //     })
+  map.value.clearMap()
+  if ($props.init.length) {
+    console.log($props.init, '$props.init')
+    setTimeout(() => {
+      const marker = new AMap1.value.Marker({
+        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+      })
+      remarkRef.value = marker
+      map.value.add(marker)
+      map.value.setFitView()
+    })
+  }
+  //     // 创建引入搜索组件
+  //     const placeSearch = new AMap.PlaceSearch({
+  //       pageSize: 5, // 单页显示结果条数
+  //       pageIndex: 1, // 页码
+  //       // city: "010", // 兴趣点城市
+  //       citylimit: false, // 是否强制限制在设置的城市内搜索
+  //       map: map.value, // 展现结果的地图实例
+  //       panel: 'result', // 结果列表将在此容器中进行展示。
+  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+  //     })
+  //     placeSearchRef.value = placeSearch
+  //     // 绑定事件
+  map.value.on('click', clickHandler)
+  //   })
+  //   .catch((e) => {
+  //     console.log(e)
+  //   })
+}
+onMounted(async () => {
+  initMap()
+})
+onBeforeUnmount(() => {
+  // 解绑事件
+  map.value.clearMap()
+  map.value.off('click', clickHandler)
+  map.value.destroy()
+  map.value = []
+})
+const search = ref('')
+watch(() => search.value, (newVal) => {
+  if (newVal) {
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
+  }
+  else {
+    placeSearchRef.value.clear()
+    // map.value.add(remarkRef.value)
+    map.value.setFitView()
+  }
+}, {
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div class="box" style="position: relative;">
+    <div id="map-location" style="width: 100%; height: 500px;" />
+    <!-- <div class="info">
+      <div class="input-item">
+        <el-input v-model="search" placeholder="请输入关键字" clearable />
+      </div>
+    </div>
+    <div id="result" /> -->
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.box {
+  position: relative;
+}
+
+#result {
+  width: 270px;
+  position: absolute;
+  top: 34px;
+  right: 0;
+  height: 100px;
+}
+
+#map {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.info {
+  // padding: 0.5rem 0.7rem;
+  margin-bottom: 1rem;
+  border-radius: 0.25rem;
+  position: absolute;
+  top: 0;
+  background-color: #fff;
+  width: auto;
+  min-width: 270px;
+  border-width: 0;
+  right: 0;
+  // box-shadow: 0 2px 6px 0 rgb(240 131 0 / 50%);
+
+  .input-item {
+    position: relative;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 100%;
+    height: 2.2rem;
+    border: 1px solid #ccc;
+    border-radius: 0.2rem;
+
+    .input-item-prepend {
+      margin-right: -1px;
+      width: 35%;
+      font-size: 13px;
+      border-right: 1px solid #666;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      background: #b2cefe;
+
+      span {
+        text-align: center;
+      }
+    }
+
+    input {
+      width: 60%;
+      background: #fff;
+      padding: 0.2rem 0.6rem;
+      margin-left: 0.3rem;
+      border: none;
+    }
+  }
+}
+</style>
+
+<style>
+/* 隐藏高德logo  */
+.amap-logo {
+  display: none !important;
+}
+
+/* 隐藏高德版权  */
+.amap-copyright {
+  display: none !important;
+}
+
+.amap-marker-label {
+  border: 0;
+  background-color: transparent;
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index b27ede2..63049e3 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -1,162 +1,80 @@
 <!--
-  Description: 高德地图
+  Description: leaflet地图
   Author: 李亚光
   Date: 2023-04-21
  -->
-<script lang="ts" setup name="GuadMap">
-import { ElMessage } from 'element-plus'
-// import AMapLoader from '@amap/amap-jsapi-loader'
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import leaflet from '@/components/map/leaflet.vue'
 const $props = defineProps({
   init: {
     type: Array,
     default: () => [],
   },
 })
-const $emit = defineEmits(['confirm'])
-// 设置安全密钥
-window._AMapSecurityConfig = {
-  // securityJsCode: '56bf9671d4b3517d294caec4751889a1', // 后期需替换
-  securityJsCode: localStorage.getItem('securityJsCode')!, // 后期需替换
-}
-// 地图实例
-const map = ref()
-const AMap1 = ref()
-const remarkRef = ref()
-const placeSearchRef = ref()
-// 地图点击事件
-const clickHandler = function (e) {
-  console.log(e, 'eeee')
-  const location = [e.lnglat.getLng(), e.lnglat.getLat()]
-  $emit('confirm', location)
-  // 在该点添加标记点
-  map.value.remove(remarkRef.value)
-  const AMap = AMap1.value
-  const marker = new AMap.Marker({
-    position: location, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-  })
-  remarkRef.value = marker
-  map.value.add(marker)
-}
-// 初始化地图
-const initMap = () => {
-  if (!window.localStorage.getItem('amapResource')) {
-    ElMessage.error('未配置离线地图资源地址或地址配置不正确，请检查配置文件')
-  }
-  const offline = window.AMap
-  AMap1.value = offline
-  map.value = new offline.Map('map-location', { // 设置地图容器id
-    resizeEnable: true,
-    viewMode: '3D', // 是否为3D地图模式
-    zoom: 18, // 初始化地图级别
-    center: [111.73142, 40.830627], // 初始化地图中心点位置
-    zooms: [10, 18],
-    layers: [
-      new offline.TileLayer({
-        visible: true,
-        zIndex: 0,
-        opacity: 1,
-        zooms: [10, 18],
-        dataZooms: [10, 18],
-        getTileUrl: (a: any, b: any, c: any) => {
-          // 经纬度转换成本地瓦片所在路径
-          const flag = '00000000'
-          const zz = c
-          const z = `L${zz}`
-          const xx = a.toString(16)
-          const x = `C${flag.substring(0, 8 - xx.length)}${xx}`
-          const yy = b.toString(16)
-          const y = `R${flag.substring(0, 8 - yy.length)}${yy}`
-          return `${window.localStorage.getItem('amapResource')}/ordinary/${z}/${y}/${x}.png`
-        },
-      }),
-    ],
-    // mapStyle: 'amap://styles/darkblue',
-  })
-  // AMapLoader.load({
-  //   key: '40849e82b4e33f5255b17372520c954d', // 后期需替换
-  //   version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-  //   plugins: ['AMap.Scale', 'AMap.MouseTool', 'AMap.ToolBar', 'AMap.PlaceSearch', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-  // })
-  //   .then((AMap) => {
-  //     AMap1.value = AMap
-  //     // 初始化地图
-  //     map.value = new AMap.Map('map-location', {
-  //       viewMode: '3D', //  是否为3D地图模式
-  //       zoom: 17, // 初始化地图级别
-  //       center: [116.26755900, 39.91547100],
-  //       resizeEnable: true,
-  //     })
-  map.value.clearMap()
+const $emit = defineEmits(['confirm1'])
+const publicPath = window.location.href.split('#')[0]
+const mapRef = ref()
+const complete = (map: any) => {
+  // 先判断有无初始坐标
   if ($props.init.length) {
-    console.log($props.init, '$props.init')
-    setTimeout(() => {
-      const marker = new AMap1.value.Marker({
-        position: $props.init, // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-      })
-      remarkRef.value = marker
-      map.value.add(marker)
-      map.value.setFitView()
+    map.setView([$props.init[1], $props.init[0]], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
     })
-  }
-  //     // 创建引入搜索组件
-  //     const placeSearch = new AMap.PlaceSearch({
-  //       pageSize: 5, // 单页显示结果条数
-  //       pageIndex: 1, // 页码
-  //       // city: "010", // 兴趣点城市
-  //       citylimit: false, // 是否强制限制在设置的城市内搜索
-  //       map: map.value, // 展现结果的地图实例
-  //       panel: 'result', // 结果列表将在此容器中进行展示。
-  //       autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
-  //     })
-  //     placeSearchRef.value = placeSearch
-  //     // 绑定事件
-  map.value.on('click', clickHandler)
-  //   })
-  //   .catch((e) => {
-  //     console.log(e)
-  //   })
-}
-onMounted(async () => {
-  initMap()
-})
-onBeforeUnmount(() => {
-  // 解绑事件
-  map.value.clearMap()
-  map.value.off('click', clickHandler)
-  map.value.destroy()
-  map.value = []
-})
-const search = ref('')
-watch(() => search.value, (newVal) => {
-  if (newVal) {
-    placeSearchRef.value.search(newVal, (a, b) => {
-      console.log(a, b, 'assss')
-    })
+    const marker = L.marker([$props.init[1], $props.init[0]], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
   }
   else {
-    placeSearchRef.value.clear()
-    // map.value.add(remarkRef.value)
-    map.value.setFitView()
+    map.setView([40.830627, 111.73142], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([40.830627, 111.73142], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+    $emit('confirm1', [40.830627, 111.73142])
   }
-}, {
-  deep: true,
-  // immediate: true,
-})
+  map.on('click', (e) => {
+    console.log(e, '1')
+    mapRef.value.layerAllList.forEach((element: any) => {
+      map.removeLayer(element)
+    })
+    mapRef.value.layerAllList = []
+    console.log(e.latlng.lat, 'e.latlng.lat')
+    map.setView([e.latlng.lat, e.latlng.lng], 18)
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon-marker.png`,
+      iconSize: [25, 40], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+    })
+    const marker = L.marker([e.latlng.lat, e.latlng.lng], { icon: myIcon })
+    mapRef.value.layerAllList.push(marker)
+    map.addLayer(marker)
+
+    $emit('confirm1', [e.latlng.lng, e.latlng.lat])
+  })
+}
 </script>
 
 <template>
-  <div class="box" style="position: relative;">
-    <div id="map-location" style="width: 100%; height: 500px;" />
-    <!-- <div class="info">
-      <div class="input-item">
-        <el-input v-model="search" placeholder="请输入关键字" clearable />
-      </div>
-    </div>
-    <div id="result" /> -->
+  <div class="box" style="position: relative;overflow: hidden;">
+    <leaflet ref="mapRef" :is-dashboard="false" class="map-1" @complete="complete" />
   </div>
 </template>
 
 <style lang="scss" scoped>
+.map-1 {
+  ::v-deep(.btns) {
+    display: none;
+  }
+}
+
 .box {
   position: relative;
 }
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 76074fc..52f990b 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -533,6 +533,15 @@
   height: 100%;
   margin: 0;
   font-family: "微软雅黑";
+  position: absolute;
+  z-index: 998;
+  top: 0;
+  left: 0;
+
+  ::v-deep(.amap-layer) {
+    display: none;
+    background-color: transparent;
+  }
 }
 
 .btns {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index ef73a01..f77cba4 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -9,10 +9,12 @@
 const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
+const show = ref(false)
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // show.value = true
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +22,9 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // show.value = false
+  // infoWindow.value?.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +32,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
+  <div id="leaflet-windowInfoRef" class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index ddb676f..0c6e8ad 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -12,7 +12,7 @@
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,13 +29,13 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
+  <div id="leaflet-windowInfoRef2" class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 54d3dd9..6326bd7 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -5,14 +5,14 @@
  -->
 <script lang="ts" setup name="infoWindow">
 import trendChart from './trendChart.vue'
-const overlay = ref()
-const infoWindow = ref()
+// const overlay = ref()
+// const infoWindow = ref()
 const info = ref()
 const trendRef = ref()
 // 初始化
 const initialize = (e) => {
-  overlay.value = e.overlay
-  infoWindow.value = e.infoWindow
+  // overlay.value = e.overlay
+  // infoWindow.value = e.infoWindow
   info.value = e.info
   trendRef.value.expand = true
   trendRef.value.range = 'day'
@@ -20,8 +20,8 @@
 defineExpose({ initialize })
 // 关闭
 const close = () => {
-  infoWindow.value.close()
-  trendRef.value.expand = true
+  // infoWindow.value.close()
+  // trendRef.value.expand = true
 }
 const expand = computed(() => {
   return trendRef.value?.expand
@@ -29,26 +29,26 @@
 </script>
 
 <template>
-  <div class="container" :style="`height: ${expand ? '230px' : '455px'}`">
+  <div id="leaflet-windowInfoHotRef" class="container" :style="`height: ${expand ? '230px' : '455px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
       </div>
       <div class="close" @click="close">
-        x
+        <!-- x -->
       </div>
     </div>
     <div class="item">
-      <span>设备编号 : {{ info?.deviceNo }}</span>  <span>设备类型 : {{ info?.deviceTypeName }}</span>
+      <span>设备编号 : {{ info?.deviceNo }}</span> <span>设备类型 : {{ info?.deviceTypeName }}</span>
     </div>
     <div class="item">
-      <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
+      <span>所属分区 : {{ info?.ptnName }}</span> <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
-      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+      <span>监测值 : {{ info?.monitorVal }}</span> <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
+      <span>安装位置 : {{ info?.installLocaltion }}</span> <span>安装时间 : {{ info?.installTime }}</span>
     </div>
     <div class="item">
       <!-- <span>碳势 : {{ info?.en }} gCO2/KJ</span>  -->
diff --git a/src/components/map/leaflet.vue b/src/components/map/leaflet.vue
new file mode 100644
index 0000000..edeac98
--- /dev/null
+++ b/src/components/map/leaflet.vue
@@ -0,0 +1,483 @@
+<!--
+  Description: leaflet地图  --离线
+  Author: 李亚光
+  Date: 2023-04-21
+ -->
+<script lang="ts" setup name="leafletMap">
+import L from 'leaflet'
+import infoDetail from './infoWindow.vue'
+import infoDetail2 from './infoWindow2.vue'
+import infoDetailHot from './infoWindowHot.vue'
+import { getDictByCode } from '@/api/system/dict'
+import { electricityBranch, electricityNode, getAreaPosition, getDeviceListPage, getElectricityListAll, getMonitorStationList } from '@/api/api/index'
+const $props = defineProps({
+  isDashboard: {
+    type: Boolean,
+    default: true,
+  },
+})
+const $emits = defineEmits(['complete'])
+// import 'leaflet/dist/leaflet.css'
+const leafletRef = ref()
+const electricityList = ref()
+const publicPath = window.location.href.split('#')[0]
+// 电网节点数组
+const markerArr = ref([
+])
+const markerArrInfo = ref()
+const markerArrInfo1 = ref()
+// 折现节点坐标
+const lineArr = ref([])
+// 光伏数组
+const markerArr1 = ref([
+])
+// 用热坐标数组
+const markerArrHot = ref()
+const markerArrHotInfo = ref()
+// 信息窗体
+const infoWindow = ref()
+const infoWindow2 = ref()
+const infoWindowHot = ref()
+const windowInfoRef = ref()
+const windowInfoRef2 = ref()
+const windowInfoHotRef = ref()
+const map = ref()
+// 图层实例
+const layer = ref()
+const satellite = ref()
+const flag = ref(true)
+const layerAllList = ref<any[]>([])
+// 切换图层
+const changeLayerGrop = () => {
+  if (flag.value) {
+    map.value?.addLayer(layer.value)
+    map.value?.removeLayer(satellite.value)
+  }
+  else {
+    map.value?.removeLayer(layer.value)
+    map.value?.addLayer(satellite.value)
+  }
+  flag.value = !flag.value
+}
+// 地图点击事件
+const clickHandler = function (e) {
+  if (event.button === 2) {
+    console.log('当前点击坐标为:   ', e.latlng)
+  }
+}
+const init = async () => {
+  var container = L.DomUtil.get(leafletRef.value)
+  if (container != null) {
+    container._leaflet_id = null
+  }
+  //
+  layer.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  layer.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/ordinary/${z1}/${y1}/${x1}.png`
+  }
+  // 卫星图层
+  satellite.value = L.tileLayer('', {
+    subdomains: ['1', '2', '3', '4'],
+    minZoom: 8,
+    maxZoom: 18,
+  })
+  satellite.value.getTileUrl = (croods: any) => {
+    const { x, y, z } = croods
+    const flag = '00000000'
+    const zz = z
+    const z1 = `L${zz}`
+    const xx = x.toString(16)
+    const x1 = `C${flag.substring(0, 8 - xx.length)}${xx}`
+    const yy = y.toString(16)
+    const y1 = `R${flag.substring(0, 8 - yy.length)}${yy}`
+    return `${window.localStorage.getItem('amapResource')}/satellite/${z1}/${y1}/${x1}.png`
+  }
+  map.value = L.map(leafletRef.value, {
+    layers: [layer.value],
+    /* center:[纬度,经度] */
+    center: [40.830627, 111.73142],
+    zoom: 18,
+    doubleClickZoom: true, // 禁用双击放大
+    attributionControl: true, // 移除右下角leaflet标识
+    zoomControl: true, // 禁用 + - 按钮
+  })
+  $emits('complete', map.value)
+  map.value.on('mousedown', clickHandler)
+}
+// onMounted(() => {
+//   init()
+// })
+// 绘制用电监测相关
+const useElectricity = () => {
+  // 电网支路标记点绘制
+  for (let i = 0; i < markerArr.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon1.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myIcon, data: markerArrInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo.value[i].nodeName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr.value[i][1], markerArr.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr.value[i][1], markerArr.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+  // 光伏标记点及光伏绘制
+  for (let i = 0; i < markerArr1.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon2.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myIcon, data: markerArrInfo1.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrInfo1.value[i].stationName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArr1.value[i][1], markerArr1.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    const element = document.getElementById('leaflet-windowInfoRef2')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoRef2.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArr1.value[i][1], markerArr1.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+
+    // 绘制电网和节点连线
+    const path = markerArrInfo1.value.map((item) => {
+      return [[Number(item.lng), Number(item.lat)], [Number(item.nodeLng), Number(item.nodeLat)]]
+    })
+    for (let i = 0; i < path.length; i++) {
+      const line = L.polyline(path[i].map((item: number[]) => [item[1], item[0]]), {
+        color: '#03A382',
+        weight: 2,
+        smoothFactor: 5,
+        lineCap: 'round',
+        lineJoin: 'round',
+        dashArray: [10, 6],
+      })
+      layerAllList.value.push(line)
+      map.value.addLayer(line)
+    }
+  }
+
+  // // 电网支路折线绘制
+  for (let i = 0; i < lineArr.value.length; i++) {
+    const path = lineArr.value.map(item => item.branchNodeInfos)
+    const line = path.map(item => (
+      item.map((child) => {
+        return ([[child.flng, child.flat], [child.tlng, child.tlat], child.status2])
+      })
+    ))
+    line.forEach((item) => {
+      item.forEach((child) => {
+        const path = [child[0].reverse(), child[1].reverse()]
+        const line = L.polyline(path, {
+          color: child[2] === 1 ? '#008d68' : '#000',
+          weight: 2,
+          smoothFactor: 5,
+          lineCap: 'round',
+          lineJoin: 'round',
+          dashArray: [10, 8],
+        })
+        layerAllList.value.push(line)
+        map.value.addLayer(line)
+        // 离线支路连接添加开关图标
+        if (child[2] === 0) {
+          const data = [(Number(child[0][0]) + Number(child[1][0])) / 2, (Number(child[0][1]) + Number(child[1][1])) / 2]
+          console.log(data, 'data')
+          const myIcon = L.icon({
+            iconUrl: `${publicPath}img/icon3.png`,
+            iconSize: [25, 25], // 图标的大小
+            iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+            popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+          })
+          const marker = L.marker(data, { icon: myIcon })
+          layerAllList.value.push(marker)
+          map.value.addLayer(marker)
+        }
+      })
+    })
+  }
+  if (!$props.isDashboard) {
+    clearAllLayer()
+  }
+  // $emits('complete', map.value)
+}
+// 绘制用热监测相关
+const useHot = () => {
+  for (let i = 0; i < markerArrHot.value.length; i++) {
+    // marker点标记
+    const myIcon = L.icon({
+      iconUrl: `${publicPath}img/icon4.png`,
+      iconSize: [25, 25], // 图标的大小
+      iconAnchor: [10, 10], // 图标的锚点，即图标的位置应该放置在地图上的位置
+      popupAnchor: [0, 0], // 弹出框的锚点，即当你点击图标时，弹出框应该出现在哪个位置
+    })
+    const marker = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myIcon, data: markerArrHotInfo.value[i] })
+    layerAllList.value.push(marker)
+    map.value.addLayer(marker)
+    // 文本标记
+    const myText = L.divIcon({
+      html: `${markerArrHotInfo.value[i].deviceName}`,
+      className: 'leaflet-my-div-text',
+      iconSize: 24,
+    })
+    const text = L.marker([markerArrHot.value[i][1], markerArrHot.value[i][0]], { icon: myText })
+    layerAllList.value.push(text)
+    map.value.addLayer(text)
+    // 添加信息窗体
+    const element = document.getElementById('leaflet-windowInfoHotRef')
+    marker.bindPopup(element)
+    marker.on('click', (e) => {
+      // 传递数据
+      windowInfoHotRef.value.initialize({
+        info: e.target.options.data,
+        map: map.value,
+        position: [markerArrHot.value[i][1], markerArrHot.value[i][0]],
+      })
+      // 打开窗体
+      marker.openPopup()
+    })
+  }
+}
+onMounted(async () => {
+  // if (!$props.isDashboard) {
+  //   await init()
+  //   return
+  // }
+  // 获取电网列表
+  try {
+    const list = await getElectricityListAll()
+    // 电网列表
+    electricityList.value = list.data
+    // 查询节点列表(标记点)
+    if (electricityList.value.length) {
+      const res = await electricityNode(electricityList.value[0].id)
+      markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+      markerArrInfo.value = res.data
+      // 获取支路信息(折线)
+      const res1 = await electricityBranch(electricityList.value[0].id)
+      lineArr.value = res1.data
+    }
+    // 获取光伏列表
+    const list1 = await getMonitorStationList()
+    markerArr1.value = list1.data.map(item => ([Number(item.lng), Number(item.lat)]))
+    markerArrInfo1.value = list1.data
+    // 初始化地图
+    await init()
+    useElectricity()
+  }
+  catch (error) {
+    init()
+  }
+  // 获取用热数据
+  getDeviceListPage({
+    offset: 1,
+    limit: 999,
+    ptn: '',
+    deviceType: '2',
+  }).then((res) => {
+    markerArrHotInfo.value = res.data.rows
+    markerArrHot.value = res.data.rows.map(item => ([Number(item.lng), Number(item.lat)]))
+  })
+  // getElectricityListAll().then((res) => {
+  //   // 电网列表
+  //   electricityList.value = res.data
+  //   // 默认选中第一个查询节点
+  //   if (electricityList.value.length) {
+  //     electricityNode(electricityList.value[0].id).then((res) => {
+  //       markerArr.value = res.data.map(item => ([Number(item.lng), Number(item.lat)]))
+  //       markerArrInfo.value = res.data
+  //       // 获取支路
+  //       electricityBranch(electricityList.value[0].id).then(res => {
+  //         lineArr.value = res.data
+  //         // console.log(res.data)
+  //         initMap()
+  //       })
+  //     })
+  //   }
+  // })
+})
+
+// 分区
+const area = ref('')
+const areaList = ref([])
+// 获取分区列表
+const fetchAreaList = () => {
+  getDictByCode('ptn_type').then((res) => {
+    areaList.value = res.data
+  })
+}
+fetchAreaList()
+const areaMarkerList = ref()
+const polygons = ref()
+// 绘制区域
+const drawArea = (markerList: any, color: string) => {
+  const polygon = L.polygon(
+    markerList.map((item: number[]) => item.reverse()),
+    {
+      color,
+    })
+  polygons.value = polygon
+  map.value.addLayer(polygon)
+}
+const clearDraw = () => {
+  if (polygons.value) {
+    console.log('删除')
+    polygons.value.remove()
+    // map.value.removeLayer(polygons.value)
+    area.value = ''
+  }
+}
+// 监听分区变化
+watch(() => area.value, (newVal) => {
+  console.log(newVal, 'newVal')
+  if (polygons.value) {
+    console.log('删除')
+    // map.value.removeLayer(polygons.value)
+    polygons.value.remove()
+  }
+  if (!newVal) {
+    return
+  }
+  getAreaPosition(newVal).then((res) => {
+    const color = {
+      1: '#2b8cbe',
+      2: '#ccebc5',
+      3: '#7bccc4',
+    }
+    areaMarkerList.value = res.data
+    if (res.data.length) {
+      areaMarkerList.value.push(res.data[0])
+      const data = areaMarkerList.value.map(item => ([Number(item.lng), Number(item.lat)]))
+      drawArea(data, color[newVal])
+    }
+  })
+})
+function clearAllLayer() {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  $emits('complete', map.value)
+}
+// 用电检测/用热监测 默认用电
+const flagType = ref(true)
+// 切换用电检测/用热监测
+const changeFlagType = () => {
+  layerAllList.value.forEach((item: any) => {
+    map.value.removeLayer(item)
+  })
+  layerAllList.value = []
+  map.value.setView([40.830627, 111.73142], 18)
+  // 区域框展示
+  area.value = ''
+  if (flagType.value) {
+    useHot()
+  }
+  else {
+    useElectricity()
+  }
+  flagType.value = !flagType.value
+}
+defineExpose({ changeLayerGrop, changeFlagType, flag, map, layerAllList })
+onUnmounted(() => {
+  console.log('页面要销毁')
+  map.value?.remove()
+  document.getElementById('map-leaflet111')?.remove()
+})
+</script>
+
+<template>
+  <div id="map-leaflet111" ref="leafletRef" />
+  <info-detail v-if="isDashboard" ref="windowInfoRef" />
+  <info-detail2 v-if="isDashboard" ref="windowInfoRef2" />
+  <info-detail-hot v-if="isDashboard" ref="windowInfoHotRef" />
+  <div v-if="isDashboard" class="btns">
+    <el-radio-group v-model="area">
+      <el-radio-button v-for="item in areaList" :key="item.id" :label="item.value" @dblclick="clearDraw">
+        {{ item.name }}
+      </el-radio-button>
+    </el-radio-group>
+  </div>
+</template>
+
+<style>
+.leaflet-my-div-text {
+  white-space: nowrap !important;
+  margin-top: 10px !important;
+}
+
+.leaflet-popup-content {
+  width: 100% !important;
+  padding-top: 8px;
+}
+</style>
+
+<style lang="scss" scoped>
+#map-leaflet111 {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+.btns {
+  position: absolute;
+  left: 10px;
+  bottom: 10px;
+  z-index: 999;
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 34e9cc3..ec142e3 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,6 +18,7 @@
 // 加载 iconify 图标（element plus）
 import { downloadAndInstall } from '@/iconify-ep'
 import { hasPermission } from '@/utils/composables/permission'
+import 'leaflet/dist/leaflet.css'
 // 引入打印插件
 if (useSettingsStore().app.iconifyOfflineUse) {
   downloadAndInstall()
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 9f395ae..fc3219f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,7 +4,8 @@
   Date: 2023-04-21
  -->
 <script lang="ts" setup name="dashboard">
-import guadmap from '@/components/map/index.vue'
+import leaflet from '@/components/map/leaflet.vue'
+// import amap from '@/components/map/index.vue'
 const mainHeight = ref(document.body.clientHeight - 50)
 window.addEventListener('resize', () => {
   const bodyHeight = document.body.clientHeight - 50
@@ -26,7 +27,7 @@
 <template>
   <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
-    <guadmap ref="mapRef" />
+    <leaflet ref="mapRef" />
     <!-- 按钮 -->
     <div class="btn1">
       <el-radio-group v-model="current">
@@ -56,11 +57,13 @@
   position: absolute;
   right: 20px;
   bottom: 20px;
+  z-index: 999;
 }
 
 .btn1 {
   position: absolute;
   right: 20px;
   top: 20px;
+  z-index: 999;
 }
 </style>
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 95a6fa5..24a9b1e 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -143,6 +143,7 @@
       dataFormRef.value.clearValidate()
     })
     areaForm.value.electricityId = id
+    isEditMode.value = true
   }
   else if (dialogStatus.value === 'update' || dialogStatus.value === 'detail') { // 如果是修改，将row中数据填写到输入框中
     areaForm.value = row
diff --git a/src/views/evaluate/page.vue b/src/views/evaluate/page.vue
index 10434a4..ffe5cb1 100644
--- a/src/views/evaluate/page.vue
+++ b/src/views/evaluate/page.vue
@@ -56,6 +56,7 @@
           shanhaiFrame.contentWindow.postMessage(Object.assign(json, { type: 'triggerInteract' }), '*')
         })
       }
+      console.log(123, props.name)
     }, 1500)
 
     // 预警 {"optionKey":"text","value":"跳转预警","boardId":"d76dd9e6-e001-4caf-89fa-191038f3ca68","widgetId":"d4a2b18d-de8b-4fab-8118-787ff9342be1"}