diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 59a78f6..e859af2 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -117,7 +117,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    loginExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    loginExport(params).then((res: any) => {
       exportFile(res.data, '登录日志')
       loading.close()
     })

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 59a78f6..e859af2 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -117,7 +117,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    loginExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    loginExport(params).then((res: any) => {
       exportFile(res.data, '登录日志')
       loading.close()
     })
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..7af197b 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -162,7 +162,11 @@
   else {
     searchQuery.ids = []
   }
-  exportApi(searchQuery).then((res) => {
+  const params = {
+    ...searchQuery,
+    limit: 999999,
+  }
+  exportApi(params).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
     searchQuery.ids = []
@@ -244,7 +248,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 59a78f6..e859af2 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -117,7 +117,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    loginExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    loginExport(params).then((res: any) => {
       exportFile(res.data, '登录日志')
       loading.close()
     })
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..7af197b 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -162,7 +162,11 @@
   else {
     searchQuery.ids = []
   }
-  exportApi(searchQuery).then((res) => {
+  const params = {
+    ...searchQuery,
+    limit: 999999,
+  }
+  exportApi(params).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
     searchQuery.ids = []
@@ -244,7 +248,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 79e22e0..af731b1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref } from 'vue'
 import type { addInfo } from './user-interface'
 import comTreeSelect from './selecTree.vue'
 import { toTreeList } from '@/utils/structure'
@@ -10,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
-import {videoTree} from "@/api/ycjg/aqbb";
-import {ref} from "vue";
+import { videoTree } from '@/api/ycjg/aqbb'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
@@ -172,7 +172,7 @@
 const safeList = ref<any[]>([])
 
 onMounted(() => {
-  getDictByCode('secretLevel').then((response) => {
+  getDictByCode('secretUserLevel').then((response) => {
     if (response.code === 200) {
       safeList.value = response.data
     }
@@ -319,7 +319,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="密级" prop="secretLevel">
-            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%">
+            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%;">
               <el-option
                 v-for="item in safeList"
                 :key="item.value"

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 59a78f6..e859af2 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -117,7 +117,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    loginExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    loginExport(params).then((res: any) => {
       exportFile(res.data, '登录日志')
       loading.close()
     })
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..7af197b 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -162,7 +162,11 @@
   else {
     searchQuery.ids = []
   }
-  exportApi(searchQuery).then((res) => {
+  const params = {
+    ...searchQuery,
+    limit: 999999,
+  }
+  exportApi(params).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
     searchQuery.ids = []
@@ -244,7 +248,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 79e22e0..af731b1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref } from 'vue'
 import type { addInfo } from './user-interface'
 import comTreeSelect from './selecTree.vue'
 import { toTreeList } from '@/utils/structure'
@@ -10,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
-import {videoTree} from "@/api/ycjg/aqbb";
-import {ref} from "vue";
+import { videoTree } from '@/api/ycjg/aqbb'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
@@ -172,7 +172,7 @@
 const safeList = ref<any[]>([])
 
 onMounted(() => {
-  getDictByCode('secretLevel').then((response) => {
+  getDictByCode('secretUserLevel').then((response) => {
     if (response.code === 200) {
       safeList.value = response.data
     }
@@ -319,7 +319,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="密级" prop="secretLevel">
-            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%">
+            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%;">
               <el-option
                 v-for="item in safeList"
                 :key="item.value"
diff --git a/src/views/ycjg/fzsq/edit.vue b/src/views/ycjg/fzsq/edit.vue
index 48219ab..1b4d2b6 100644
--- a/src/views/ycjg/fzsq/edit.vue
+++ b/src/views/ycjg/fzsq/edit.vue
@@ -266,68 +266,80 @@
       </el-row>
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
-          <span style="color: red">*</span>
-          <el-form-item label="授权相机" class="required" style="margin-top: -25px">
+          <span style="color: red;">*</span>
+          <el-form-item label="授权相机" class="required" style="margin-top: -25px;">
             <el-input v-model="filterCamera" placeholder="授权相机过滤" />
             <el-tree
-              ref="treeRef"
               v-if="dialogVisible"
+              ref="treeRef"
               :disabled="dialogStatus === 'detail'"
               style="max-height: 200px;overflow-y: scroll;width: 100%;"
               :data="data"
               show-checkbox
               node-key="id"
               accordion
+              :check-strictly="true"
               :default-expand-all="false"
               :default-checked-keys="formData.cameraIds"
               :filter-node-method="filterNode"
-              :props="defaultProps"/>
+              :props="defaultProps"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
-          <span style="color: red">*</span>
-          <el-form-item label="授权人员" class="required" style="margin-top: -25px">
+          <span style="color: red;">*</span>
+          <el-form-item label="授权人员" class="required" style="margin-top: -25px;">
             <el-input v-model="filterPerson" placeholder="授权人员过滤" />
             <el-tree
-              ref="treePersonRef"
               v-if="dialogVisible"
+              ref="treePersonRef"
               :disabled="dialogStatus === 'detail'"
               style="max-height: 200px;overflow-y: scroll;width: 100%;"
               :data="dataPerson"
               show-checkbox
               node-key="id"
               accordion
+              :check-strictly="true"
               :default-expand-all="false"
               :default-checked-keys="formData.personIds"
               :filter-node-method="filterNode"
-              :props="defaultProps"/>
+              :props="defaultProps"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="24" class="grid-cell">
           <el-form-item label="分组描述" class="required">
-            <el-input v-model="formData.description" :disabled="dialogStatus === 'detail'" type="text" placeholder="分组描述" clearable />
+            <el-input
+              v-model="formData.description"
+              :disabled="dialogStatus === 'detail'"
+              type="textarea"
+              autosize
+              maxlength="50"
+              show-word-limit
+              placeholder="分组描述" clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="10">-->
-<!--        <el-col :span="24" class="grid-cell">-->
-<!--          <el-form-item label="密 级" class="required">-->
-<!--            <el-select v-model="formData.safe" :disabled="dialogStatus === 'detail'" placeholder="必选" style="width: 100%">-->
-<!--              <el-option-->
-<!--                v-for="item in safeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
+      <!--      <el-row :gutter="10"> -->
+      <!--        <el-col :span="24" class="grid-cell"> -->
+      <!--          <el-form-item label="密 级" class="required"> -->
+      <!--            <el-select v-model="formData.safe" :disabled="dialogStatus === 'detail'" placeholder="必选" style="width: 100%"> -->
+      <!--              <el-option -->
+      <!--                v-for="item in safeList" -->
+      <!--                :key="item.value" -->
+      <!--                :label="item.name" -->
+      <!--                :value="item.value" -->
+      <!--              /> -->
+      <!--            </el-select> -->
+      <!--          </el-form-item> -->
+      <!--        </el-col> -->
+      <!--      </el-row> -->
     </el-form>
     <template #footer>
-      <div class="dialog-footer" v-show="dialogStatus !== 'detail'">
+      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>

diff --git a/20240821.zip b/20240821.zip
deleted file mode 100644
index 36831cf..0000000
--- a/20240821.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 87b6e86..8806ec2 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -104,6 +104,8 @@
   return request({
     url: 'sys/loginLog/export',
     method: 'get',
+    responseType: 'blob',
+    data: params,
     params,
   })
 }
diff --git a/src/views/map/map.vue b/src/views/map/map.vue
index 1b06bc3..9a877c1 100644
--- a/src/views/map/map.vue
+++ b/src/views/map/map.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup name="Map">
+import { ElMessage } from 'element-plus'
 import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import dayjs from 'dayjs'
@@ -21,8 +22,8 @@
 
 const map: any = ref(null)
 const baseLayer = ref([])
+const ciLayer: any = ref(null)
 const keyword = ref('')
-const refreshMarker = ref(false)
 const isRightShow = ref(false)
 const pointList: Ref<any[]> = ref([])
 const currentName = ref('')
@@ -37,13 +38,18 @@
 const amap = ref() // 组件
 
 function search(init = true) {
-  refreshMarker.value = false
   map.value.eachLayer((layer: any) => {
     if (layer !== baseLayer.value[0]) {
       layer.remove()
     }
   })
 
+  // if (ciLayer.value) {
+  //   console.log('清理图层')
+  //   map.value.removeLayer(ciLayer.value)
+  // }
+  // ciLayer.value = L.layerGroup([]).addLayer(map.value)
+
   getDevListPage({
     keyword: keyword.value,
     devType: '',
@@ -65,6 +71,7 @@
       }
       const Icon = L.icon({
         iconUrl: icon,
+        iconAnchor: [18, 15],
         iconSize: [30, 30],
       })
       const message
@@ -83,29 +90,43 @@
         className: 'my-div-icon',
         iconSize: [30, 30],
       })
-      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value).bindPopup(popup)
+      const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(map.value)
+      marker.bindPopup(popup)
+      // // 关闭popup时，重置地图中心点
+      // marker.on('popupclose', () => {
+      //   map.value.panTo(marker.getLatLng())
+      // })
+
+      // map.value.on('zoomend', (e: any) => {
+      //   if (map.value) {
+      //     map.value.getLayers().forEach(marker => {
+      //       var newLatLng = marker.getLatLng()
+      //       marker.setLatLng(newLatLng)
+      //     })
+      //   }
+      // })
+
+      // const marker = L.marker([item.latitude, item.longitude], { icon: divIcon }).addTo(ciLayer.value)
+      // ciLayer.value!.addLayer(marker)
     })
-    refreshMarker.value = true
-    // 定位
-    // if (res.data.length > 0) {
-    //   map.value.setView({ lat: res.data[0].latitude, lng: res.data[0].longitude })
-    // }
-    if (init && res && res.data && res.data.rows && res.data.rows.length > 0) {
-      let lat = proxy.$position.lat
-      let lng = proxy.$position.lng
-      console.log('执行定位')
-      for (let i = 0; i < res.data.rows.length; i++) {
-        if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
-          lat = res.data.rows[i].latitude
-          lng = res.data.rows[i].longitude
-          console.log('lat, lng', lat, lng)
-          map.value.setView([lat, lng])
-          break
-        }
+    if (init && res && res.data && res.data.rows) {
+      if (!res.data.rows.length) {
+        ElMessage.warning('查无结果')
       }
-    }
-    else {
-      map.value.setView([toParentsMap.value.lat, toParentsMap.value.lng])
+      else {
+        let lat = proxy.$position.lat
+        let lng = proxy.$position.lng
+        console.log('执行定位')
+        for (let i = 0; i < res.data.rows.length; i++) {
+          if (res.data.rows[i].latitude && res.data.rows[i].longitude) {
+            lat = res.data.rows[i].latitude
+            lng = res.data.rows[i].longitude
+            console.log('lat, lng', lat, lng)
+            break
+          }
+        }
+        map.value.setView([lat, lng])
+      }
     }
   })
 }
@@ -128,6 +149,12 @@
   const str = '/static/tiles/{z}/{x}/{y}.png'
   baseLayer.value.push(L.tileLayer(str).addTo(map.value))
   search(false)
+
+  // 当地图缩放结束后更新标记点位置
+  map.value.on('zoomend', () => {
+    console.log('监听缩放结束')
+    search(false)
+  })
 })
 
 onBeforeUnmount(() => {
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index cc9dda3..45eeb8c 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -114,14 +114,26 @@
 // 查询数据
 const search = () => {
   listLoading.value = true
-  getAreaListPage(listQuery).then((res) => {
-    list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: true }))
-    list.value = toTreeList(list.value)
+  const params = {
+    ...listQuery,
+    limit: 999999,
+  }
+  getAreaListPage(params).then((res) => {
+    // list.value = res.data.rows.map((item: any) => ({ ...item, hasChildren: false }))
+    list.value = toTreeList(res.data.rows)
     listLoading.value = false
     nextTick(() => {
       table.value.doLayout()
     })
   })
+  // getAreaByPid('0').then((res) => {
+  //   list.value = res.data.map((item: any) => ({ ...item, hasChildren: true }))
+  //   list.value = toTreeList(list.value)
+  //   listLoading.value = false
+  //   nextTick(() => {
+  //     table.value.doLayout()
+  //   })
+  // })
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size: number; page: number }) => {
diff --git a/src/views/system/fileConfiguration/configuration.vue b/src/views/system/fileConfiguration/configuration.vue
index 84661e4..2f0ebff 100644
--- a/src/views/system/fileConfiguration/configuration.vue
+++ b/src/views/system/fileConfiguration/configuration.vue
@@ -130,7 +130,7 @@
       fileName: searchQuery.fileName, // 文件名称
       moduleName: searchQuery.moduleName, // 模块名
       downloadNo: searchQuery.downloadNo,
-      limit: 20,
+      limit: 999999,
       offset: 1,
       ids: selectList.value,
     }
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index c684565..8fca187 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup name="ListLog">
 import { reactive, ref } from 'vue'
-import {ElLoading, ElMessage, ElMessageBox} from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { Download } from '@element-plus/icons-vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { Delete, Download } from '@element-plus/icons-vue'
 import type { IlistQuery } from './log-interface'
 import {
   bizExport,
@@ -148,7 +147,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    bizExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    bizExport(params).then((res: any) => {
       exportFile(res.data, '操作日志')
       loading.close()
     })
@@ -171,7 +175,7 @@
         <el-icon>
           <svg-icon name="ep:document-copy" />
         </el-icon>
-        日志存储：{{logRate}}
+        日志存储：{{ logRate }}
       </div>
       <!-- 筛选条件 -->
       <search-area @search="search">
@@ -193,7 +197,9 @@
           />
         </search-item>
         <template #btns>
-          <el-button class="search-btn" type="info" :icon="Download"  @click="exportExcelBtn">导出日志</el-button>
+          <el-button class="search-btn" type="info" :icon="Download" @click="exportExcelBtn">
+            导出日志
+          </el-button>
         </template>
       </search-area>
       <table-container>
@@ -209,8 +215,12 @@
           <template #columns>
             <el-table-column label="操作结果" width="100" align="center">
               <template #default="scope">
-                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>{{scope.row.succeed}}</el-button>
-                <el-button v-else type="info" plain disabled>{{scope.row.succeed}}</el-button>
+                <el-button v-if="scope.row.succeed === '成功'" type="success" plain size="small" disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
+                <el-button v-else type="info" plain disabled>
+                  {{ scope.row.succeed }}
+                </el-button>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80" align="center">
@@ -235,6 +245,6 @@
   color: #5588c7;
   font-weight: bold;
   font-size: 16px;
-  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
 }
 </style>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 59a78f6..e859af2 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -117,7 +117,12 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (list.value.length > 0) {
-    loginExport(listQuery).then((res: any) => {
+    const params = {
+      ...listQuery,
+      limit: 999999,
+      offset: 1,
+    }
+    loginExport(params).then((res: any) => {
       exportFile(res.data, '登录日志')
       loading.close()
     })
diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue
index e5a32c8..7af197b 100644
--- a/src/views/system/signature/autograph.vue
+++ b/src/views/system/signature/autograph.vue
@@ -162,7 +162,11 @@
   else {
     searchQuery.ids = []
   }
-  exportApi(searchQuery).then((res) => {
+  const params = {
+    ...searchQuery,
+    limit: 999999,
+  }
+  exportApi(params).then((res) => {
     exportFile(res.data, '签名管理')
     loading.close()
     searchQuery.ids = []
@@ -244,7 +248,7 @@
       <normal-table
         :data="list" :total="total" :columns="columns as any"
         :query="{ limit: searchQuery.limit, offset: searchQuery.offset }" :list-loading="loadingTable"
-        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multiSelect="multiSelect"
+        :is-showmulti-select="true" :is-multi="true" @change="changePage" @multi-select="multiSelect"
       >
         <template #preColumns>
           <el-table-column label="#" width="55" align="center">
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 79e22e0..af731b1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="SystemUserAddDialog">
 import type { FormInstance, FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref } from 'vue'
 import type { addInfo } from './user-interface'
 import comTreeSelect from './selecTree.vue'
 import { toTreeList } from '@/utils/structure'
@@ -10,8 +11,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
-import {videoTree} from "@/api/ycjg/aqbb";
-import {ref} from "vue";
+import { videoTree } from '@/api/ycjg/aqbb'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
 const dialogFormVisible = ref<boolean>(false)// 对话框是否显示
@@ -172,7 +172,7 @@
 const safeList = ref<any[]>([])
 
 onMounted(() => {
-  getDictByCode('secretLevel').then((response) => {
+  getDictByCode('secretUserLevel').then((response) => {
     if (response.code === 200) {
       safeList.value = response.data
     }
@@ -319,7 +319,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="密级" prop="secretLevel">
-            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%">
+            <el-select v-model="userForm.secretLevel" placeholder="必选" style="width: 100%;">
               <el-option
                 v-for="item in safeList"
                 :key="item.value"
diff --git a/src/views/ycjg/fzsq/edit.vue b/src/views/ycjg/fzsq/edit.vue
index 48219ab..1b4d2b6 100644
--- a/src/views/ycjg/fzsq/edit.vue
+++ b/src/views/ycjg/fzsq/edit.vue
@@ -266,68 +266,80 @@
       </el-row>
       <el-row :gutter="10">
         <el-col :span="12" class="grid-cell">
-          <span style="color: red">*</span>
-          <el-form-item label="授权相机" class="required" style="margin-top: -25px">
+          <span style="color: red;">*</span>
+          <el-form-item label="授权相机" class="required" style="margin-top: -25px;">
             <el-input v-model="filterCamera" placeholder="授权相机过滤" />
             <el-tree
-              ref="treeRef"
               v-if="dialogVisible"
+              ref="treeRef"
               :disabled="dialogStatus === 'detail'"
               style="max-height: 200px;overflow-y: scroll;width: 100%;"
               :data="data"
               show-checkbox
               node-key="id"
               accordion
+              :check-strictly="true"
               :default-expand-all="false"
               :default-checked-keys="formData.cameraIds"
               :filter-node-method="filterNode"
-              :props="defaultProps"/>
+              :props="defaultProps"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12" class="grid-cell">
-          <span style="color: red">*</span>
-          <el-form-item label="授权人员" class="required" style="margin-top: -25px">
+          <span style="color: red;">*</span>
+          <el-form-item label="授权人员" class="required" style="margin-top: -25px;">
             <el-input v-model="filterPerson" placeholder="授权人员过滤" />
             <el-tree
-              ref="treePersonRef"
               v-if="dialogVisible"
+              ref="treePersonRef"
               :disabled="dialogStatus === 'detail'"
               style="max-height: 200px;overflow-y: scroll;width: 100%;"
               :data="dataPerson"
               show-checkbox
               node-key="id"
               accordion
+              :check-strictly="true"
               :default-expand-all="false"
               :default-checked-keys="formData.personIds"
               :filter-node-method="filterNode"
-              :props="defaultProps"/>
+              :props="defaultProps"
+            />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="10">
         <el-col :span="24" class="grid-cell">
           <el-form-item label="分组描述" class="required">
-            <el-input v-model="formData.description" :disabled="dialogStatus === 'detail'" type="text" placeholder="分组描述" clearable />
+            <el-input
+              v-model="formData.description"
+              :disabled="dialogStatus === 'detail'"
+              type="textarea"
+              autosize
+              maxlength="50"
+              show-word-limit
+              placeholder="分组描述" clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="10">-->
-<!--        <el-col :span="24" class="grid-cell">-->
-<!--          <el-form-item label="密 级" class="required">-->
-<!--            <el-select v-model="formData.safe" :disabled="dialogStatus === 'detail'" placeholder="必选" style="width: 100%">-->
-<!--              <el-option-->
-<!--                v-for="item in safeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
+      <!--      <el-row :gutter="10"> -->
+      <!--        <el-col :span="24" class="grid-cell"> -->
+      <!--          <el-form-item label="密 级" class="required"> -->
+      <!--            <el-select v-model="formData.safe" :disabled="dialogStatus === 'detail'" placeholder="必选" style="width: 100%"> -->
+      <!--              <el-option -->
+      <!--                v-for="item in safeList" -->
+      <!--                :key="item.value" -->
+      <!--                :label="item.name" -->
+      <!--                :value="item.value" -->
+      <!--              /> -->
+      <!--            </el-select> -->
+      <!--          </el-form-item> -->
+      <!--        </el-col> -->
+      <!--      </el-row> -->
     </el-form>
     <template #footer>
-      <div class="dialog-footer" v-show="dialogStatus !== 'detail'">
+      <div v-show="dialogStatus !== 'detail'" class="dialog-footer">
         <el-button :loading="btnLoading" type="primary" @click="submitForm">
           保存
         </el-button>
diff --git a/src/views/ycjg/sbgl/editDev.vue b/src/views/ycjg/sbgl/editDev.vue
index 14055bb..c3ac402 100644
--- a/src/views/ycjg/sbgl/editDev.vue
+++ b/src/views/ycjg/sbgl/editDev.vue
@@ -339,7 +339,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="设备名称" prop="monitorName" class="required">
             <el-input
-              v-model="formData.monitorName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.monitorName" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -375,14 +375,14 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 10px;margin-top: -10px;font-weight: bold;">
+      <!-- <el-row style="margin-bottom: 10px;margin-top: -10px;font-weight: bold;">
         摄像头信息：
-      </el-row>
+      </el-row> -->
       <el-row :gutter="10">
         <!-- <el-col :span="6" class="grid-cell">
           <el-form-item label="ip地址" prop="deviceIp" class="required">
             <el-input
-              v-model="formData.deviceIp" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.deviceIp" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -390,7 +390,7 @@
         <el-col :span="4" class="grid-cell">
           <el-form-item label="端口" prop="devicePort" class="required" label-width="52px">
             <el-input
-              v-model="formData.devicePort" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.devicePort" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -398,7 +398,7 @@
         <el-col :span="5" class="grid-cell">
           <el-form-item label="登录账号" prop="deviceUser" class="required">
             <el-input
-              v-model="formData.deviceUser" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.deviceUser" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -406,7 +406,7 @@
         <el-col :span="5" class="grid-cell">
           <el-form-item label="登录密码" prop="devicePassword" class="required">
             <el-input
-              v-model="formData.devicePassword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.devicePassword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable show-password
             />
           </el-form-item>
@@ -414,7 +414,7 @@
         <el-col :span="24" class="grid-cell">
           <el-form-item label="设备国标号" prop="cameraIndexCode" class="required" label-width="100px">
             <el-input
-              v-model="formData.cameraIndexCode" :disabled="dialogStatus === 'detail'" placeholder="必填"
+              v-model.trim="formData.cameraIndexCode" :disabled="dialogStatus === 'detail'" placeholder="必填"
               clearable
               type="textarea"
               maxlength="100"
@@ -424,14 +424,14 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 10px;margin-top: -10px;font-weight: bold;">
+      <!-- <el-row style="margin-bottom: 10px;margin-top: -10px;font-weight: bold;">
         NVR信息：
-      </el-row>
+      </el-row> -->
       <el-row :gutter="10">
         <!-- <el-col :span="6" class="grid-cell">
           <el-form-item label="ip地址" prop="nvrIp" class="required">
             <el-input
-              v-model="formData.nvrIp" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.nvrIp" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -439,7 +439,7 @@
         <el-col :span="4" class="grid-cell">
           <el-form-item label="端口" prop="nvrPort" class="required" label-width="52px">
             <el-input
-              v-model="formData.nvrPort" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.nvrPort" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -447,7 +447,7 @@
         <el-col :span="5" class="grid-cell">
           <el-form-item label="登录账号" prop="nvrUser" class="required">
             <el-input
-              v-model="formData.nvrUser" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.nvrUser" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -455,7 +455,7 @@
         <el-col :span="5" class="grid-cell">
           <el-form-item label="登录密码" prop="nvrPassword" class="required">
             <el-input
-              v-model="formData.nvrPassword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.nvrPassword" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable show-password
             />
           </el-form-item>
@@ -463,7 +463,7 @@
         <el-col :span="4" class="grid-cell">
           <el-form-item label="通道号" prop="nvrChannel" class="required" label-width="70px">
             <el-input
-              v-model="formData.nvrChannel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.nvrChannel" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -471,7 +471,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="经度" prop="longitude" class="required">
             <el-input
-              v-model="formData.longitude" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.longitude" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -479,7 +479,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="纬度" prop="latitude" class="required">
             <el-input
-              v-model="formData.latitude" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
+              v-model.trim="formData.latitude" :disabled="dialogStatus === 'detail'" type="text" placeholder="必填"
               clearable
             />
           </el-form-item>
@@ -487,7 +487,7 @@
         <!-- <el-col :span="24" class="grid-cell">
           <el-form-item label="NVR国标号" prop="nvrIndexCode" class="required" label-width="100px">
             <el-input
-              v-model="formData.nvrIndexCode" :disabled="dialogStatus === 'detail'" placeholder="必填"
+              v-model.trim="formData.nvrIndexCode" :disabled="dialogStatus === 'detail'" placeholder="必填"
               clearable
               type="textarea"
               maxlength="100"
@@ -499,7 +499,7 @@
         <el-col :span="24" class="grid-cell">
           <el-form-item label="详细位置" class="required">
             <el-input
-              v-model="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
+              v-model.trim="formData.location" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
               clearable
             />
           </el-form-item>
@@ -507,7 +507,7 @@
         <el-col :span="24" class="grid-cell">
           <el-form-item label="备注" class="required">
             <el-input
-              v-model="formData.description" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
+              v-model.trim="formData.description" :disabled="dialogStatus === 'detail'" type="text" placeholder="非必填"
               clearable
               maxlength="50"
               show-word-limit