diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index 05863d8..1558e0a 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -7,19 +7,24 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  hiddenDangerNumber: '', // 隐患编号
-  primaryClassification: '', // 一级分类
-  secondaryClassification: '', // 二级分类
-  hiddenDangerDescription: '', // 隐患描述
-  hiddenDangerLevel: '', // 隐患等级
-  responsibleManagementEnterprise: '', // 管理责任企业
-  discoveryTime: '', // 发现时间
-  governanceSituation: '', // 治理
+  // hiddenDangerNumber: '', // 隐患编号
+  // primaryClassification: '', // 一级分类
+  // secondaryClassification: '', // 二级分类
+  // hiddenDangerDescription: '', // 隐患描述
+  // hiddenDangerLevel: '', // 隐患等级
+  // responsibleManagementEnterprise: '', // 管理责任企业
+  // discoveryTime: '', // 发现时间
+  // governanceSituation: '', // 治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -42,7 +47,20 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +90,28 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    hiddenDangerNumber: '', // 隐患编号
-    primaryClassification: '', // 一级分类
-    secondaryClassification: '', // 二级分类
-    hiddenDangerDescription: '', // 隐患描述
-    hiddenDangerLevel: '', // 隐患等级
-    responsibleManagementEnterprise: '', // 管理责任企业
-    discoveryTime: '', // 发现时间
-    governanceSituation: '', // 治理
+    // hiddenDangerNumber: '', // 隐患编号
+    // primaryClassification: '', // 一级分类
+    // secondaryClassification: '', // 二级分类
+    // hiddenDangerDescription: '', // 隐患描述
+    // hiddenDangerLevel: '', // 隐患等级
+    // responsibleManagementEnterprise: '', // 管理责任企业
+    // discoveryTime: '', // 发现时间
+    // governanceSituation: '', // 治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -102,12 +125,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportOver({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '管线占压数据列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportOver({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '管线占压数据列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['#', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '管线占压数据列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 导入
 const importRef = ref()
@@ -211,52 +252,64 @@
     <!-- 编辑操作 -->
     <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="发现开始时间"
+          end-placeholder="发现结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="隐患等级" clearable>
           <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.discoveryTime"
           type="date"
@@ -265,10 +318,16 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
+          <!-- <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" /> -->
+          <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option>
         </el-select>
       </search-item>
     </search-area>
@@ -276,10 +335,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -298,9 +357,9 @@
               <el-button size="small" link type="primary" @click="handler('detail', row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="handler('update', row)">
+              <!-- <el-button size="small" link type="primary" @click="handler('update', row)">
                 编辑
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index 05863d8..1558e0a 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -7,19 +7,24 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  hiddenDangerNumber: '', // 隐患编号
-  primaryClassification: '', // 一级分类
-  secondaryClassification: '', // 二级分类
-  hiddenDangerDescription: '', // 隐患描述
-  hiddenDangerLevel: '', // 隐患等级
-  responsibleManagementEnterprise: '', // 管理责任企业
-  discoveryTime: '', // 发现时间
-  governanceSituation: '', // 治理
+  // hiddenDangerNumber: '', // 隐患编号
+  // primaryClassification: '', // 一级分类
+  // secondaryClassification: '', // 二级分类
+  // hiddenDangerDescription: '', // 隐患描述
+  // hiddenDangerLevel: '', // 隐患等级
+  // responsibleManagementEnterprise: '', // 管理责任企业
+  // discoveryTime: '', // 发现时间
+  // governanceSituation: '', // 治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -42,7 +47,20 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +90,28 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    hiddenDangerNumber: '', // 隐患编号
-    primaryClassification: '', // 一级分类
-    secondaryClassification: '', // 二级分类
-    hiddenDangerDescription: '', // 隐患描述
-    hiddenDangerLevel: '', // 隐患等级
-    responsibleManagementEnterprise: '', // 管理责任企业
-    discoveryTime: '', // 发现时间
-    governanceSituation: '', // 治理
+    // hiddenDangerNumber: '', // 隐患编号
+    // primaryClassification: '', // 一级分类
+    // secondaryClassification: '', // 二级分类
+    // hiddenDangerDescription: '', // 隐患描述
+    // hiddenDangerLevel: '', // 隐患等级
+    // responsibleManagementEnterprise: '', // 管理责任企业
+    // discoveryTime: '', // 发现时间
+    // governanceSituation: '', // 治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -102,12 +125,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportOver({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '管线占压数据列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportOver({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '管线占压数据列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['#', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '管线占压数据列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 导入
 const importRef = ref()
@@ -211,52 +252,64 @@
     <!-- 编辑操作 -->
     <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="发现开始时间"
+          end-placeholder="发现结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="隐患等级" clearable>
           <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.discoveryTime"
           type="date"
@@ -265,10 +318,16 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
+          <!-- <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" /> -->
+          <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option>
         </el-select>
       </search-item>
     </search-area>
@@ -276,10 +335,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -298,9 +357,9 @@
               <el-button size="small" link type="primary" @click="handler('detail', row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="handler('update', row)">
+              <!-- <el-button size="small" link type="primary" @click="handler('update', row)">
                 编辑
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue
index 4d2b070..9c8506e 100644
--- a/src/views/main/recognition/detail.vue
+++ b/src/views/main/recognition/detail.vue
@@ -1,4 +1,4 @@
-<!-- 燃气报警管理详情 -->
+<!-- 第三方智能识别管理管理详情 -->
 <script lang="ts" setup name="GanDetail">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -106,7 +106,14 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="识别位置">
-            <el-input v-model.trim="areaForm.position" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
         <el-col :span="12">

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index 05863d8..1558e0a 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -7,19 +7,24 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  hiddenDangerNumber: '', // 隐患编号
-  primaryClassification: '', // 一级分类
-  secondaryClassification: '', // 二级分类
-  hiddenDangerDescription: '', // 隐患描述
-  hiddenDangerLevel: '', // 隐患等级
-  responsibleManagementEnterprise: '', // 管理责任企业
-  discoveryTime: '', // 发现时间
-  governanceSituation: '', // 治理
+  // hiddenDangerNumber: '', // 隐患编号
+  // primaryClassification: '', // 一级分类
+  // secondaryClassification: '', // 二级分类
+  // hiddenDangerDescription: '', // 隐患描述
+  // hiddenDangerLevel: '', // 隐患等级
+  // responsibleManagementEnterprise: '', // 管理责任企业
+  // discoveryTime: '', // 发现时间
+  // governanceSituation: '', // 治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -42,7 +47,20 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +90,28 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    hiddenDangerNumber: '', // 隐患编号
-    primaryClassification: '', // 一级分类
-    secondaryClassification: '', // 二级分类
-    hiddenDangerDescription: '', // 隐患描述
-    hiddenDangerLevel: '', // 隐患等级
-    responsibleManagementEnterprise: '', // 管理责任企业
-    discoveryTime: '', // 发现时间
-    governanceSituation: '', // 治理
+    // hiddenDangerNumber: '', // 隐患编号
+    // primaryClassification: '', // 一级分类
+    // secondaryClassification: '', // 二级分类
+    // hiddenDangerDescription: '', // 隐患描述
+    // hiddenDangerLevel: '', // 隐患等级
+    // responsibleManagementEnterprise: '', // 管理责任企业
+    // discoveryTime: '', // 发现时间
+    // governanceSituation: '', // 治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -102,12 +125,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportOver({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '管线占压数据列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportOver({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '管线占压数据列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['#', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '管线占压数据列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 导入
 const importRef = ref()
@@ -211,52 +252,64 @@
     <!-- 编辑操作 -->
     <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="发现开始时间"
+          end-placeholder="发现结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="隐患等级" clearable>
           <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.discoveryTime"
           type="date"
@@ -265,10 +318,16 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
+          <!-- <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" /> -->
+          <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option>
         </el-select>
       </search-item>
     </search-area>
@@ -276,10 +335,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -298,9 +357,9 @@
               <el-button size="small" link type="primary" @click="handler('detail', row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="handler('update', row)">
+              <!-- <el-button size="small" link type="primary" @click="handler('update', row)">
                 编辑
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue
index 4d2b070..9c8506e 100644
--- a/src/views/main/recognition/detail.vue
+++ b/src/views/main/recognition/detail.vue
@@ -1,4 +1,4 @@
-<!-- 燃气报警管理详情 -->
+<!-- 第三方智能识别管理管理详情 -->
 <script lang="ts" setup name="GanDetail">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -106,7 +106,14 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="识别位置">
-            <el-input v-model.trim="areaForm.position" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/main/recognition/index.vue b/src/views/main/recognition/index.vue
index 094e95a..f2b39bf 100644
--- a/src/views/main/recognition/index.vue
+++ b/src/views/main/recognition/index.vue
@@ -12,19 +12,23 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteIdentify, exportIdentify, getIdentifyListPage } from '@/api/page/recognition'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const baseUrl = import.meta.env.VITE_APP_API_BASEURL
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
-  recognitionType: '', // 识别类型
-  recognitionTime: '', // 识别时间
-  position: '', // 地理位置
-  recognitionPrecision: '', // 准确度
-  recognitionLevel: '', // 风险等级
+  // recognitionCode: '', // 第三方code
+  // recognitionType: '', // 识别类型
+  // recognitionTime: '', // 识别时间
+  // position: '', // 地理位置
+  // recognitionPrecision: '', // 准确度
+  // recognitionLevel: '', // 风险等级
   taskName: '', // 任务名称
   alarmStatus: '', // 报警状态
+  riskLevel: '',
+  begTime: '',
+  endTime: '',
   offset: 1,
   limit: 20,
 })
@@ -33,7 +37,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '智能识别编号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '识别类型', value: 'recognitionType', align: 'center' },
+  // { text: '识别类型', value: 'recognitionType', align: 'center' },
   { text: '识别时间', value: 'recognitionTime', align: 'center' },
   { text: '识别经纬度', value: 'latlng', align: 'center' },
   { text: '识别位置', value: 'position', align: 'center' },
@@ -46,7 +50,26 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -56,16 +79,17 @@
   }
   getIdentifyListPage(listQuery.value).then((res) => {
     console.log(res.data, '第三方')
-    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}` }))
+    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}`, recognitionLevel: recognitionLevelDict[item.recognitionLevel] }))
     // list.value.forEach((item: any) => {
     //   getLocation(`${item.longitude},${item.latitude}`).then((res) => {
     //     if (res.data.info === 'OK') {
-    //       if (res.data.pois.length) {
-    //         item.position = res.data.pois[0].address
-    //       }
-    //       else {
-    //         item.position = '/'
-    //       }
+    // item.position = res.data.regeocode.formatted_address
+    // if (res.data.pois.length) {
+    //   item.position = res.data.pois[0].address
+    // }
+    // else {
+    //   item.position = '/'
+    // }
     //     }
     //     else {
     //       item.position = '/'
@@ -86,23 +110,21 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    recognitionCode: '', // 第三方code
-    recognitionType: '', // 识别类型
-    recognitionTime: '', // 识别时间
-    position: '', // 地理位置
-    recognitionPrecision: '', // 准确度
-    recognitionLevel: '', // 风险等级
     taskName: '', // 任务名称
     alarmStatus: '', // 报警状态
+    riskLevel: '',
+    begTime: '',
+    endTime: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -116,12 +138,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportIdentify({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '第三方施工智能识别列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportIdentify({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '第三方施工智能识别列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text), '报警状态']
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+      alarmStatus: item.alarmStatus,
+    }
   })
+  exportExcel({
+    json,
+    name: '第三方施工智能识别列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
@@ -190,6 +231,12 @@
   await getDict()
   fetchData(true) // 获取数据
 })
+const url = ref('')
+const showBig = ref(false)
+const show = (imgUrl: string) => {
+  url.value = imgUrl
+  showBig.value = !showBig.value
+}
 </script>
 
 <template>
@@ -200,20 +247,20 @@
     <!-- 详情 -->
     <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionCode"
           placeholder="施工智能识别编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-select v-model="listQuery.recognitionType" class="short-input" placeholder="识别类型" clearable>
           <el-option v-for="item in identifyTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.recognitionTime"
           type="datetime"
@@ -221,16 +268,16 @@
           format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.position"
           placeholder="地理位置信息"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionPrecision"
           placeholder="识别准确度范围"
@@ -238,13 +285,25 @@
           clearable
           style="width: 100%;"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.recognitionLevel" class="short-input" placeholder="风险等级" clearable>
+        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
           <el-option v-for="item in riskGradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="识别开始时间"
+          end-placeholder="识别结束时间"
+        />
+      </search-item>
+      <search-item>
         <el-input
           v-model.trim="listQuery.taskName"
           placeholder="巡检任务名称"
@@ -278,7 +337,13 @@
         <template #columns>
           <el-table-column label="图片" align="center">
             <template #default="{ row }">
-              <el-image style="width: 40px; height: 40px;" :src="`${baseUrl}/static/${row.alarmPicture}`" :preview-src-list="[`${baseUrl}/static/${row.alarmPicture}`]" />
+              <el-image calss="img" style="width: 40px; height: 40px;z-index: 99999999; position: relative;" :src="`${baseUrl}/static/${row.alarmPicture}`" @click="show(`${baseUrl}/static/${row.alarmPicture}`)" />
+              <div v-if="showBig" class="big-view-pic">
+                <el-image style="width: 750px; height: 350px; position: relative;" :src="url" />
+                <div class="big-view-pic-close" @click="show('')">
+                  x
+                </div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="报警状态" align="center">
@@ -304,4 +369,34 @@
 
 <style lang="scss" scoped>
 // 样式
+.img {
+  cursor: pointer;
+}
+
+.big-view-pic {
+  position: fixed;
+  z-index: 99999;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  .big-view-pic-close {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 44px;
+    height: 44px;
+    font-size: 24px;
+    color: #555;
+    // background-color: #606266;
+    border-color: #fff;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 44px;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
 </style>

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index 05863d8..1558e0a 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -7,19 +7,24 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  hiddenDangerNumber: '', // 隐患编号
-  primaryClassification: '', // 一级分类
-  secondaryClassification: '', // 二级分类
-  hiddenDangerDescription: '', // 隐患描述
-  hiddenDangerLevel: '', // 隐患等级
-  responsibleManagementEnterprise: '', // 管理责任企业
-  discoveryTime: '', // 发现时间
-  governanceSituation: '', // 治理
+  // hiddenDangerNumber: '', // 隐患编号
+  // primaryClassification: '', // 一级分类
+  // secondaryClassification: '', // 二级分类
+  // hiddenDangerDescription: '', // 隐患描述
+  // hiddenDangerLevel: '', // 隐患等级
+  // responsibleManagementEnterprise: '', // 管理责任企业
+  // discoveryTime: '', // 发现时间
+  // governanceSituation: '', // 治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -42,7 +47,20 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +90,28 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    hiddenDangerNumber: '', // 隐患编号
-    primaryClassification: '', // 一级分类
-    secondaryClassification: '', // 二级分类
-    hiddenDangerDescription: '', // 隐患描述
-    hiddenDangerLevel: '', // 隐患等级
-    responsibleManagementEnterprise: '', // 管理责任企业
-    discoveryTime: '', // 发现时间
-    governanceSituation: '', // 治理
+    // hiddenDangerNumber: '', // 隐患编号
+    // primaryClassification: '', // 一级分类
+    // secondaryClassification: '', // 二级分类
+    // hiddenDangerDescription: '', // 隐患描述
+    // hiddenDangerLevel: '', // 隐患等级
+    // responsibleManagementEnterprise: '', // 管理责任企业
+    // discoveryTime: '', // 发现时间
+    // governanceSituation: '', // 治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -102,12 +125,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportOver({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '管线占压数据列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportOver({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '管线占压数据列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['#', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '管线占压数据列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 导入
 const importRef = ref()
@@ -211,52 +252,64 @@
     <!-- 编辑操作 -->
     <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="发现开始时间"
+          end-placeholder="发现结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="隐患等级" clearable>
           <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.discoveryTime"
           type="date"
@@ -265,10 +318,16 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
+          <!-- <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" /> -->
+          <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option>
         </el-select>
       </search-item>
     </search-area>
@@ -276,10 +335,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -298,9 +357,9 @@
               <el-button size="small" link type="primary" @click="handler('detail', row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="handler('update', row)">
+              <!-- <el-button size="small" link type="primary" @click="handler('update', row)">
                 编辑
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue
index 4d2b070..9c8506e 100644
--- a/src/views/main/recognition/detail.vue
+++ b/src/views/main/recognition/detail.vue
@@ -1,4 +1,4 @@
-<!-- 燃气报警管理详情 -->
+<!-- 第三方智能识别管理管理详情 -->
 <script lang="ts" setup name="GanDetail">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -106,7 +106,14 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="识别位置">
-            <el-input v-model.trim="areaForm.position" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/main/recognition/index.vue b/src/views/main/recognition/index.vue
index 094e95a..f2b39bf 100644
--- a/src/views/main/recognition/index.vue
+++ b/src/views/main/recognition/index.vue
@@ -12,19 +12,23 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteIdentify, exportIdentify, getIdentifyListPage } from '@/api/page/recognition'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const baseUrl = import.meta.env.VITE_APP_API_BASEURL
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
-  recognitionType: '', // 识别类型
-  recognitionTime: '', // 识别时间
-  position: '', // 地理位置
-  recognitionPrecision: '', // 准确度
-  recognitionLevel: '', // 风险等级
+  // recognitionCode: '', // 第三方code
+  // recognitionType: '', // 识别类型
+  // recognitionTime: '', // 识别时间
+  // position: '', // 地理位置
+  // recognitionPrecision: '', // 准确度
+  // recognitionLevel: '', // 风险等级
   taskName: '', // 任务名称
   alarmStatus: '', // 报警状态
+  riskLevel: '',
+  begTime: '',
+  endTime: '',
   offset: 1,
   limit: 20,
 })
@@ -33,7 +37,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '智能识别编号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '识别类型', value: 'recognitionType', align: 'center' },
+  // { text: '识别类型', value: 'recognitionType', align: 'center' },
   { text: '识别时间', value: 'recognitionTime', align: 'center' },
   { text: '识别经纬度', value: 'latlng', align: 'center' },
   { text: '识别位置', value: 'position', align: 'center' },
@@ -46,7 +50,26 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -56,16 +79,17 @@
   }
   getIdentifyListPage(listQuery.value).then((res) => {
     console.log(res.data, '第三方')
-    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}` }))
+    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}`, recognitionLevel: recognitionLevelDict[item.recognitionLevel] }))
     // list.value.forEach((item: any) => {
     //   getLocation(`${item.longitude},${item.latitude}`).then((res) => {
     //     if (res.data.info === 'OK') {
-    //       if (res.data.pois.length) {
-    //         item.position = res.data.pois[0].address
-    //       }
-    //       else {
-    //         item.position = '/'
-    //       }
+    // item.position = res.data.regeocode.formatted_address
+    // if (res.data.pois.length) {
+    //   item.position = res.data.pois[0].address
+    // }
+    // else {
+    //   item.position = '/'
+    // }
     //     }
     //     else {
     //       item.position = '/'
@@ -86,23 +110,21 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    recognitionCode: '', // 第三方code
-    recognitionType: '', // 识别类型
-    recognitionTime: '', // 识别时间
-    position: '', // 地理位置
-    recognitionPrecision: '', // 准确度
-    recognitionLevel: '', // 风险等级
     taskName: '', // 任务名称
     alarmStatus: '', // 报警状态
+    riskLevel: '',
+    begTime: '',
+    endTime: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -116,12 +138,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportIdentify({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '第三方施工智能识别列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportIdentify({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '第三方施工智能识别列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text), '报警状态']
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+      alarmStatus: item.alarmStatus,
+    }
   })
+  exportExcel({
+    json,
+    name: '第三方施工智能识别列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
@@ -190,6 +231,12 @@
   await getDict()
   fetchData(true) // 获取数据
 })
+const url = ref('')
+const showBig = ref(false)
+const show = (imgUrl: string) => {
+  url.value = imgUrl
+  showBig.value = !showBig.value
+}
 </script>
 
 <template>
@@ -200,20 +247,20 @@
     <!-- 详情 -->
     <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionCode"
           placeholder="施工智能识别编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-select v-model="listQuery.recognitionType" class="short-input" placeholder="识别类型" clearable>
           <el-option v-for="item in identifyTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.recognitionTime"
           type="datetime"
@@ -221,16 +268,16 @@
           format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.position"
           placeholder="地理位置信息"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionPrecision"
           placeholder="识别准确度范围"
@@ -238,13 +285,25 @@
           clearable
           style="width: 100%;"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.recognitionLevel" class="short-input" placeholder="风险等级" clearable>
+        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
           <el-option v-for="item in riskGradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="识别开始时间"
+          end-placeholder="识别结束时间"
+        />
+      </search-item>
+      <search-item>
         <el-input
           v-model.trim="listQuery.taskName"
           placeholder="巡检任务名称"
@@ -278,7 +337,13 @@
         <template #columns>
           <el-table-column label="图片" align="center">
             <template #default="{ row }">
-              <el-image style="width: 40px; height: 40px;" :src="`${baseUrl}/static/${row.alarmPicture}`" :preview-src-list="[`${baseUrl}/static/${row.alarmPicture}`]" />
+              <el-image calss="img" style="width: 40px; height: 40px;z-index: 99999999; position: relative;" :src="`${baseUrl}/static/${row.alarmPicture}`" @click="show(`${baseUrl}/static/${row.alarmPicture}`)" />
+              <div v-if="showBig" class="big-view-pic">
+                <el-image style="width: 750px; height: 350px; position: relative;" :src="url" />
+                <div class="big-view-pic-close" @click="show('')">
+                  x
+                </div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="报警状态" align="center">
@@ -304,4 +369,34 @@
 
 <style lang="scss" scoped>
 // 样式
+.img {
+  cursor: pointer;
+}
+
+.big-view-pic {
+  position: fixed;
+  z-index: 99999;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  .big-view-pic-close {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 44px;
+    height: 44px;
+    font-size: 24px;
+    color: #555;
+    // background-color: #606266;
+    border-color: #fff;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 44px;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
 </style>
diff --git a/src/views/main/undergroundCavity/detail.vue b/src/views/main/undergroundCavity/detail.vue
index 4db2e56..b127fce 100644
--- a/src/views/main/undergroundCavity/detail.vue
+++ b/src/views/main/undergroundCavity/detail.vue
@@ -5,6 +5,7 @@
 import uploadFile from './upload.vue'
 import mapDialog from '@/views/main/database/mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
+import { getLocation } from '@/api/map'
 import { addHole, detailHole, editHole } from '@/api/page/undergroundCavity'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -38,6 +39,7 @@
   detectionTime: [{ required: true, message: '探测时间必选', trigger: ['blur', 'change'] }],
   riskLevel: [{ required: true, message: '风险等级必选', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '空洞位置必填', trigger: ['blur', 'change'] }],
+  lnglat: [{ required: true, message: '经纬度必选', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 字典
 const riskLevelList = ref<{ name: string;value: string;id: string }[]>() // 风险等级
@@ -109,6 +111,14 @@
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
   areaForm.value.lnglat = location.join()
+  getLocation(areaForm.value.lnglat).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.position = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.position = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -208,8 +218,15 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="20">
-          <el-form-item label="空洞位置" prop="position">
-            <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+          <el-form-item label="空洞位置">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/api/map.ts b/src/api/map.ts
index 220d9f0..f7adcf1 100644
--- a/src/api/map.ts
+++ b/src/api/map.ts
@@ -7,8 +7,12 @@
   return axios.get(`https://restapi.amap.com/v3/geocode/geo?address=${address}&key=${mapStore.key}`)
 }
 // 根据经纬度获取详细位置信息
+// export function getLocation(posotion: string) {
+//   // 例子 posotion = 116.3254,39.1458
+//   return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+// }
 export function getLocation(posotion: string) {
   // 例子 posotion = 116.3254,39.1458
-  return axios.get(`https://restapi.amap.com/v3/place/around?location=${posotion}&key=${mapStore.key}&offset=1`)
+  return axios.get(`https://restapi.amap.com/v3/geocode/regeo?output=json&location=${posotion}&key=${mapStore.key}`)
 }
 
diff --git a/src/api/page/page.ts b/src/api/page/page.ts
index fb105a3..954b15d 100644
--- a/src/api/page/page.ts
+++ b/src/api/page/page.ts
@@ -26,8 +26,9 @@
 }
 // 巡检轨迹
 export function getTaskDetail(params: any) {
+  console.log(params, 'params')
   return request({
-    url: '/system/busPatrolTrack/listPage?offset=1&limit=20',
+    url: `/system/busPatrolTrack/listPage?limit=10&offset=${params.offset}`,
     method: 'post',
     data: params,
   })
diff --git a/src/components/map/components/analyse.vue b/src/components/map/components/analyse.vue
index 1efb87a..135f04d 100644
--- a/src/components/map/components/analyse.vue
+++ b/src/components/map/components/analyse.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/car.vue b/src/components/map/components/car.vue
index 5d21839..7d58b24 100644
--- a/src/components/map/components/car.vue
+++ b/src/components/map/components/car.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/gas.vue b/src/components/map/components/gas.vue
index a85adcd..196de56 100644
--- a/src/components/map/components/gas.vue
+++ b/src/components/map/components/gas.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/recognition.vue b/src/components/map/components/recognition.vue
index bf7bda6..5fe3cf9 100644
--- a/src/components/map/components/recognition.vue
+++ b/src/components/map/components/recognition.vue
@@ -25,12 +25,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
@@ -128,7 +123,7 @@
         width: 44px;
         height: 44px;
         font-size: 24px;
-        color: #fff;
+        color: #555;
         // background-color: #606266;
         border-color: #fff;
         border-radius: 50%;
diff --git a/src/components/map/components/task.vue b/src/components/map/components/task.vue
index 1445ad6..850196d 100644
--- a/src/components/map/components/task.vue
+++ b/src/components/map/components/task.vue
@@ -16,9 +16,13 @@
     }),
   },
 })
+const trajectoryList = ref()
+const trajectoryOffset = ref(1)
 const trackRef = ref() // 轨迹详情弹窗实例
 watch(() => $props.info, () => {
   trackRef.value?.cancel()
+  trajectoryOffset.value = 1
+  trajectoryList.value = []
 }, {
   deep: true,
 })
@@ -31,7 +35,7 @@
   //   [116.372105, 39.90651],
   //   [116.428945, 39.89663],
   // ]
-  getTaskDetail({ taskId: $props.info.id }).then((res) => {
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
     const data = res.data.rows.map((item: any, index: number) => {
       return {
         ...item,
@@ -48,6 +52,7 @@
         dialog: 'taskDetail',
       }
     }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = data
     // 打开详情弹窗
     if (data.length) {
       trackRef.value?.initDialog(data)
@@ -57,6 +62,37 @@
     }
   })
 }
+// 滚动条滚动到底部
+const toBottom = () => {
+  trajectoryOffset.value += 1
+  getTaskDetail({ taskId: $props.info.id, offset: trajectoryOffset.value }).then((res) => {
+    const data = res.data.rows.map((item: any, index: number) => {
+      return {
+        ...item,
+
+        lat: item.lagitude,
+        lng: item.longitude,
+        // 数据问题 犯了
+        // lat: arr[index][1],
+        // lng: arr[index][0],
+        position: item.position,
+        isAlarm: item.isAlarm === '1' ? '是' : '否',
+        time: item.ts,
+        value: item.gas,
+        dialog: 'taskDetail',
+      }
+    }).filter((item: any) => item.lat && item.lng)
+    trajectoryList.value = [...trajectoryList.value, ...data]
+    // 打开详情弹窗
+    if (data.length) {
+      trackRef.value?.initDialog(trajectoryList.value)
+      trackRef.value.isBottom = true
+    }
+    else {
+      trackRef.value.isBottom = false
+    }
+  })
+}
 </script>
 
 <template>
@@ -105,7 +141,7 @@
       </el-button>
     </div>
     <!-- 轨迹详情弹窗 -->
-    <track-dialog ref="trackRef" class="track" />
+    <track-dialog ref="trackRef" class="track" @bottom="toBottom" />
   </div>
 </template>
 
@@ -113,7 +149,7 @@
   .track {
     position: absolute;
     top: -35px;
-    left: 480px;
+    left: 510px;
   }
 
   .btn {
diff --git a/src/components/map/components/taskDetail.vue b/src/components/map/components/taskDetail.vue
index 904632c..d168910 100644
--- a/src/components/map/components/taskDetail.vue
+++ b/src/components/map/components/taskDetail.vue
@@ -19,12 +19,7 @@
   if (newVal.lng && newVal.lat) {
     getLocation(`${newVal.lng},${newVal.lat}`).then((res) => {
       if (res.data.info === 'OK') {
-        if (res.data.pois.length) {
-          position.value = res.data.pois[0].address
-        }
-        else {
-          position.value = '/'
-        }
+        position.value = res.data.regeocode.formatted_address
       }
       else {
         position.value = '/'
diff --git a/src/components/map/components/track.vue b/src/components/map/components/track.vue
index a8168b4..1b05e0f 100644
--- a/src/components/map/components/track.vue
+++ b/src/components/map/components/track.vue
@@ -2,6 +2,7 @@
 <script lang="ts" setup name="TrackDialog">
 import { Clock, LocationInformation, Odometer } from '@element-plus/icons-vue'
 import useMapStore from '@/store/modules/map'
+const $emits = defineEmits(['bottom'])
 const dialogVisible = ref(false)
 const mapStore = useMapStore() // 地图仓库
 const data = ref<any[]>([])
@@ -12,15 +13,37 @@
 const cancel = () => {
   dialogVisible.value = false
 }
-defineExpose({ initDialog, cancel })
+const scrollMenuRef = ref()
 const showTrack = () => {
 // 将数据存储到仓库中，首页绘制需要使用
   mapStore.setDetailList(data.value)
 }
+// 触底标识
+const isBottom = ref(true)
+// 触底刷新
+onMounted(() => {
+  scrollMenuRef.value.wrapRef.addEventListener('scroll', (event: any) => {
+    const value = scrollMenuRef.value.wrapRef.scrollTop
+    if ((scrollMenuRef.value.wrapRef.scrollHeight - scrollMenuRef.value.wrapRef.clientHeight) - value <= 200) {
+      // 滚动条快到底部
+      if (isBottom.value) {
+        $emits('bottom')
+        isBottom.value = false
+      }
+    }
+    // return false
+    // event.stopPropagation()
+    // event.preventDefault()
+  })
+  // window.addEventListener('mousewheel', (e) => {
+  //   console.log(e)
+  // })
+})
+defineExpose({ initDialog, cancel, scrollMenuRef, isBottom })
 </script>
 
 <template>
-  <div v-if="dialogVisible " class="container-track">
+  <div v-show="dialogVisible" class="container-track">
     <div class="title">
       <div class="text">
         <!-- 这是一个弹窗 -->
@@ -33,7 +56,7 @@
         x
       </div>
     </div>
-    <el-scrollbar style="height: 470px; margin-top: 10px;">
+    <el-scrollbar ref="scrollMenuRef" style="height: 470px; margin-top: 10px;" class="scrollMenuBox">
       <!-- 具体要包裹的内容 -->
       <el-timeline>
         <el-timeline-item
@@ -89,6 +112,12 @@
 </template>
 
 <style lang="scss" scoped>
+.scrollMenuBox {
+  ::v-deep(.el-scrollbar__thumb) {
+    background-color: #000 !important;
+  }
+}
+
 .red {
   color: #9f1919;
   font-weight: 700;
diff --git a/src/components/map/infoDialog.vue b/src/components/map/infoDialog.vue
index 7c5d30c..d54880f 100644
--- a/src/components/map/infoDialog.vue
+++ b/src/components/map/infoDialog.vue
@@ -64,7 +64,7 @@
 }
 
 .task {
-  width: 470px !important;
+  width: 500px !important;
   height: 200px !important;
 }
 
@@ -78,7 +78,7 @@
 }
 
 .recognition {
-  width: 350px !important;
+  width: 500px !important;
   height: 280px !important;
 }
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index b84f0bd..3eece9f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -102,11 +102,11 @@
     icon: identifyIcon,
     check: identifyCheck,
     menu: [
-      {
-        name: '正常',
-        value: '正常',
-        color: '#2DBF00',
-      },
+      // {
+      //   name: '正常',
+      //   value: '正常',
+      //   color: '#2DBF00',
+      // },
       {
         name: '低风险',
         value: '低风险',
@@ -337,6 +337,12 @@
     mapRef.value.drawPonit(data)
   })
 }
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 获取第三方智能识别
 const fetchRecognition = () => {
   getRecognition({
@@ -348,19 +354,19 @@
     const data = res.data.rows.map((item: any) => {
       let icon = ''
       switch (item.recognitionLevel) {
-        case '正常':
-          icon = recognition1
-          break
-        case '低风险':
+        // case '正常':
+        //   icon = recognition1
+        //   break
+        case 'low':
           icon = recognition2
           break
-        case '一般风险':
+        case 'middle':
           icon = recognition3
           break
-        case '较高风险':
+        case 'high':
           icon = recognition4
           break
-        case '严重风险':
+        case 'suphigh':
           icon = recognition5
           break
       }
@@ -372,6 +378,7 @@
         lng: '116.265982',
         icon,
         dialog: 'recognition',
+        recognitionLevel: recognitionLevelDict[item.recognitionLevel],
         // alarmPicture: '2023-11\\e9109d1dc73c453b9f4cf47c6e0c90da.png',
       }
     }).filter((item: any) => item.lat && item.lng)
diff --git a/src/views/inspection/gas/detail.vue b/src/views/inspection/gas/detail.vue
index ba60c69..1ee597b 100644
--- a/src/views/inspection/gas/detail.vue
+++ b/src/views/inspection/gas/detail.vue
@@ -128,7 +128,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="报警位置">
-            <el-input v-model.trim="location" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="location" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/inspection/gas/list.vue b/src/views/inspection/gas/list.vue
index 4e02063..c5e5bc7 100644
--- a/src/views/inspection/gas/list.vue
+++ b/src/views/inspection/gas/list.vue
@@ -13,6 +13,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportGas, getGasListPage } from '@/api/page/gas'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -74,12 +75,13 @@
       getLocation(`${item.alarmLongitude},${item.alarmLatitude}`).then((res: any) => {
         console.log(res.data, 'data')
         if (res.data.info === 'OK') {
-          if (res.data.pois?.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
+          // if (res.data.pois?.length) {
+          //   item.position = res.data.pois[0].address
+          // }
+          // else {
+          //   item.position = '/'
+          // }
         }
         else {
           item.position = '/'
@@ -116,7 +118,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -130,13 +132,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportGas({ ids: checkoutList.value }).then((res) => {
-    // const blob = new Blob([res.data])
-    exportFile(res.data, '巡检任务列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportGas({ ids: checkoutList.value }).then((res) => {
+  //   // const blob = new Blob([res.data])
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '燃气报警列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/inspection/task/detail.vue b/src/views/inspection/task/detail.vue
index 086c62c..cada8c8 100644
--- a/src/views/inspection/task/detail.vue
+++ b/src/views/inspection/task/detail.vue
@@ -9,6 +9,7 @@
 import type { dictType } from '@/global'
 import { exportFile } from '@/utils/exportUtils'
 import { exportTaskDetail, getTaskDetailListPage } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $route = useRoute()
 const $router = useRouter()
 const listQuery = ref({
@@ -105,7 +106,7 @@
 const checkoutList = ref<string[]>([])
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 // 导出
 const exportList = () => {
@@ -118,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTaskDetail({ ids: checkoutList }).then((res) => {
-    exportFile(res.data, '轨迹详情.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportTaskDetail({ ids: checkoutList }).then((res) => {
+  //   exportFile(res.data, '轨迹详情.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '巡检任务详情',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
diff --git a/src/views/inspection/task/list.vue b/src/views/inspection/task/list.vue
index 880c09d..96f7960 100644
--- a/src/views/inspection/task/list.vue
+++ b/src/views/inspection/task/list.vue
@@ -10,6 +10,7 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteTask, exportTask, getTaskListPage, updateTask } from '@/api/page/task'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 // 查询条件
@@ -97,7 +98,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -112,12 +113,19 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportTask({ ids: checkoutList.value }).then((res) => {
-    loading.close()
-    exportFile(res.data, '巡检任务列表.xlsx')
-  }).catch(() => {
-    loading.close()
+  // exportTask({ ids: checkoutList.value }).then((res) => {
+  //   loading.close()
+  //   exportFile(res.data, '巡检任务列表.xlsx')
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: checkoutList.value.map((item: any, index: number) => ({ index: index + 1, taskCode: item.taskCode, taskName: item.taskName, carPlate: item.carPlate, modelName: item.modelName, beginDate: item.beginDate, endDate: item.endDate, km: item.km, statusName: item.statusName })),
+    name: '巡检任务列表',
+    titleArr: ['序号', '巡检任务编号', '巡检任务名称', '巡检车牌号', '车载云台型号', '巡检开始时间', '巡检结束时间', '巡检公里(km)', '巡检状态'],
+    sheetName: 'sheet1',
   })
+  loading.close()
 }
 
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -176,7 +184,7 @@
   )
     .then(() => {
       // 删除逻辑
-      batchDeleteTask({ ids: checkoutList.value }).then((res) => {
+      batchDeleteTask({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
         ElMessage.success('删除成功')
         fetchData(true) // 获取数据
       })
diff --git a/src/views/main/analyse/index.vue b/src/views/main/analyse/index.vue
index dc491dc..01c50b0 100644
--- a/src/views/main/analyse/index.vue
+++ b/src/views/main/analyse/index.vue
@@ -9,6 +9,7 @@
 import { batchDeleteAnalyse, exportAnalyse, getAnalyseListPage } from '@/api/page/analyse'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
@@ -63,14 +64,9 @@
       // if (index > 2) {
       //   return
       // }
-      getLocation(`${item.longitude},${item.latitude}`).then((res) => {
+      getLocation(`${item.longitude.trim()},${item.latitude.trim()}`).then((res) => {
         if (res.data.info === 'OK') {
-          if (res.data.pois.length) {
-            item.position = res.data.pois[0].address
-          }
-          else {
-            item.position = '/'
-          }
+          item.position = res.data.regeocode.formatted_address
         }
         else {
           item.position = '/'
@@ -104,7 +100,7 @@
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -118,12 +114,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportAnalyse({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '风险耦合记录.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportAnalyse({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '风险耦合记录.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '风险耦合记录',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
diff --git a/src/views/main/database/detail.vue b/src/views/main/database/detail.vue
index a798fc6..af3fd60 100644
--- a/src/views/main/database/detail.vue
+++ b/src/views/main/database/detail.vue
@@ -5,6 +5,7 @@
 import mapDialog from './mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
 import { addOver, editOver } from '@/api/page/database'
+import { getLocation } from '@/api/map'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
 const dialogFormVisible = ref(false) // 对话框是否显示
@@ -137,6 +138,14 @@
   console.log(location, '选择的位置')
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
+  getLocation(location.join()).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.location = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.location = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -199,7 +208,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="地点" prop="location">
-            <el-input v-model.trim="areaForm.location" type="text" />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.location"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.location" type="text" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/database/index.vue b/src/views/main/database/index.vue
index 05863d8..1558e0a 100644
--- a/src/views/main/database/index.vue
+++ b/src/views/main/database/index.vue
@@ -7,19 +7,24 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteOver, exporOver, getOverListPage, importOver, templateOver } from '@/api/page/database'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  hiddenDangerNumber: '', // 隐患编号
-  primaryClassification: '', // 一级分类
-  secondaryClassification: '', // 二级分类
-  hiddenDangerDescription: '', // 隐患描述
-  hiddenDangerLevel: '', // 隐患等级
-  responsibleManagementEnterprise: '', // 管理责任企业
-  discoveryTime: '', // 发现时间
-  governanceSituation: '', // 治理
+  // hiddenDangerNumber: '', // 隐患编号
+  // primaryClassification: '', // 一级分类
+  // secondaryClassification: '', // 二级分类
+  // hiddenDangerDescription: '', // 隐患描述
+  // hiddenDangerLevel: '', // 隐患等级
+  // responsibleManagementEnterprise: '', // 管理责任企业
+  // discoveryTime: '', // 发现时间
+  // governanceSituation: '', // 治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -42,7 +47,20 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +90,28 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    hiddenDangerNumber: '', // 隐患编号
-    primaryClassification: '', // 一级分类
-    secondaryClassification: '', // 二级分类
-    hiddenDangerDescription: '', // 隐患描述
-    hiddenDangerLevel: '', // 隐患等级
-    responsibleManagementEnterprise: '', // 管理责任企业
-    discoveryTime: '', // 发现时间
-    governanceSituation: '', // 治理
+    // hiddenDangerNumber: '', // 隐患编号
+    // primaryClassification: '', // 一级分类
+    // secondaryClassification: '', // 二级分类
+    // hiddenDangerDescription: '', // 隐患描述
+    // hiddenDangerLevel: '', // 隐患等级
+    // responsibleManagementEnterprise: '', // 管理责任企业
+    // discoveryTime: '', // 发现时间
+    // governanceSituation: '', // 治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -102,12 +125,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportOver({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '管线占压数据列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportOver({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '管线占压数据列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['#', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '管线占压数据列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 导入
 const importRef = ref()
@@ -211,52 +252,64 @@
     <!-- 编辑操作 -->
     <detail-dialog ref="handlerRef" @refresh="searchList" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerNumber"
           placeholder="隐患编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.primaryClassification"
           placeholder="一级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.secondaryClassification"
           placeholder="二级分类"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.hiddenDangerDescription"
           placeholder="隐患描述"
           class="short-input"
           clearable
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="发现开始时间"
+          end-placeholder="发现结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.hiddenDangerLevel" class="short-input" placeholder="隐患等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="隐患等级" clearable>
           <el-option v-for="item in hiddenDangerLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.responsibleManagementEnterprise"
           placeholder="管理责任公司"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.discoveryTime"
           type="date"
@@ -265,10 +318,16 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.governanceSituation" class="short-input" placeholder="是否进行治理" clearable>
-          <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" />
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
+          <!-- <el-option v-for="item in governanceSituationList" :key="item.id" :label="item.name" :value="item.value" /> -->
+          <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option>
         </el-select>
       </search-item>
     </search-area>
@@ -276,10 +335,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"
@@ -298,9 +357,9 @@
               <el-button size="small" link type="primary" @click="handler('detail', row)">
                 详情
               </el-button>
-              <el-button size="small" link type="primary" @click="handler('update', row)">
+              <!-- <el-button size="small" link type="primary" @click="handler('update', row)">
                 编辑
-              </el-button>
+              </el-button> -->
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/main/recognition/detail.vue b/src/views/main/recognition/detail.vue
index 4d2b070..9c8506e 100644
--- a/src/views/main/recognition/detail.vue
+++ b/src/views/main/recognition/detail.vue
@@ -1,4 +1,4 @@
-<!-- 燃气报警管理详情 -->
+<!-- 第三方智能识别管理管理详情 -->
 <script lang="ts" setup name="GanDetail">
 import type { FormRules } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -106,7 +106,14 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="识别位置">
-            <el-input v-model.trim="areaForm.position" type="text" disabled />
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="text" disabled />
+            </el-tooltip>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/src/views/main/recognition/index.vue b/src/views/main/recognition/index.vue
index 094e95a..f2b39bf 100644
--- a/src/views/main/recognition/index.vue
+++ b/src/views/main/recognition/index.vue
@@ -12,19 +12,23 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteIdentify, exportIdentify, getIdentifyListPage } from '@/api/page/recognition'
 import { getLocation } from '@/api/map'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 const baseUrl = import.meta.env.VITE_APP_API_BASEURL
 // 查询条件
 const listQuery = ref({
-  recognitionCode: '', // 第三方code
-  recognitionType: '', // 识别类型
-  recognitionTime: '', // 识别时间
-  position: '', // 地理位置
-  recognitionPrecision: '', // 准确度
-  recognitionLevel: '', // 风险等级
+  // recognitionCode: '', // 第三方code
+  // recognitionType: '', // 识别类型
+  // recognitionTime: '', // 识别时间
+  // position: '', // 地理位置
+  // recognitionPrecision: '', // 准确度
+  // recognitionLevel: '', // 风险等级
   taskName: '', // 任务名称
   alarmStatus: '', // 报警状态
+  riskLevel: '',
+  begTime: '',
+  endTime: '',
   offset: 1,
   limit: 20,
 })
@@ -33,7 +37,7 @@
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '智能识别编号', value: 'recognitionCode', align: 'center', width: '160' },
-  { text: '识别类型', value: 'recognitionType', align: 'center' },
+  // { text: '识别类型', value: 'recognitionType', align: 'center' },
   { text: '识别时间', value: 'recognitionTime', align: 'center' },
   { text: '识别经纬度', value: 'latlng', align: 'center' },
   { text: '识别位置', value: 'position', align: 'center' },
@@ -46,7 +50,26 @@
 const list = ref([]) // 表格数据
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
 
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
+const recognitionLevelDict: { [key: string]: string } = {
+  low: '低风险',
+  middle: '一般风险',
+  high: '较高风险',
+  suphigh: '严重风险',
+}
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -56,16 +79,17 @@
   }
   getIdentifyListPage(listQuery.value).then((res) => {
     console.log(res.data, '第三方')
-    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}` }))
+    list.value = res.data.rows.map((item: any) => ({ ...item, latlng: `${item.longitude},${item.latitude}`, recognitionLevel: recognitionLevelDict[item.recognitionLevel] }))
     // list.value.forEach((item: any) => {
     //   getLocation(`${item.longitude},${item.latitude}`).then((res) => {
     //     if (res.data.info === 'OK') {
-    //       if (res.data.pois.length) {
-    //         item.position = res.data.pois[0].address
-    //       }
-    //       else {
-    //         item.position = '/'
-    //       }
+    // item.position = res.data.regeocode.formatted_address
+    // if (res.data.pois.length) {
+    //   item.position = res.data.pois[0].address
+    // }
+    // else {
+    //   item.position = '/'
+    // }
     //     }
     //     else {
     //       item.position = '/'
@@ -86,23 +110,21 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    recognitionCode: '', // 第三方code
-    recognitionType: '', // 识别类型
-    recognitionTime: '', // 识别时间
-    position: '', // 地理位置
-    recognitionPrecision: '', // 准确度
-    recognitionLevel: '', // 风险等级
     taskName: '', // 任务名称
     alarmStatus: '', // 报警状态
+    riskLevel: '',
+    begTime: '',
+    endTime: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -116,12 +138,31 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportIdentify({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '第三方施工智能识别列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportIdentify({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '第三方施工智能识别列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text), '报警状态']
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+      alarmStatus: item.alarmStatus,
+    }
   })
+  exportExcel({
+    json,
+    name: '第三方施工智能识别列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
@@ -190,6 +231,12 @@
   await getDict()
   fetchData(true) // 获取数据
 })
+const url = ref('')
+const showBig = ref(false)
+const show = (imgUrl: string) => {
+  url.value = imgUrl
+  showBig.value = !showBig.value
+}
 </script>
 
 <template>
@@ -200,20 +247,20 @@
     <!-- 详情 -->
     <detail-dialog ref="detailRef" />
     <search-area :need-clear="true" @search="searchList" @clear="reset">
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionCode"
           placeholder="施工智能识别编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-select v-model="listQuery.recognitionType" class="short-input" placeholder="识别类型" clearable>
           <el-option v-for="item in identifyTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.recognitionTime"
           type="datetime"
@@ -221,16 +268,16 @@
           format="YYYY-MM-DD HH:mm:ss"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.position"
           placeholder="地理位置信息"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.recognitionPrecision"
           placeholder="识别准确度范围"
@@ -238,13 +285,25 @@
           clearable
           style="width: 100%;"
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.recognitionLevel" class="short-input" placeholder="风险等级" clearable>
+        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
           <el-option v-for="item in riskGradeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="识别开始时间"
+          end-placeholder="识别结束时间"
+        />
+      </search-item>
+      <search-item>
         <el-input
           v-model.trim="listQuery.taskName"
           placeholder="巡检任务名称"
@@ -278,7 +337,13 @@
         <template #columns>
           <el-table-column label="图片" align="center">
             <template #default="{ row }">
-              <el-image style="width: 40px; height: 40px;" :src="`${baseUrl}/static/${row.alarmPicture}`" :preview-src-list="[`${baseUrl}/static/${row.alarmPicture}`]" />
+              <el-image calss="img" style="width: 40px; height: 40px;z-index: 99999999; position: relative;" :src="`${baseUrl}/static/${row.alarmPicture}`" @click="show(`${baseUrl}/static/${row.alarmPicture}`)" />
+              <div v-if="showBig" class="big-view-pic">
+                <el-image style="width: 750px; height: 350px; position: relative;" :src="url" />
+                <div class="big-view-pic-close" @click="show('')">
+                  x
+                </div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="报警状态" align="center">
@@ -304,4 +369,34 @@
 
 <style lang="scss" scoped>
 // 样式
+.img {
+  cursor: pointer;
+}
+
+.big-view-pic {
+  position: fixed;
+  z-index: 99999;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  .big-view-pic-close {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 44px;
+    height: 44px;
+    font-size: 24px;
+    color: #555;
+    // background-color: #606266;
+    border-color: #fff;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 44px;
+
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}
 </style>
diff --git a/src/views/main/undergroundCavity/detail.vue b/src/views/main/undergroundCavity/detail.vue
index 4db2e56..b127fce 100644
--- a/src/views/main/undergroundCavity/detail.vue
+++ b/src/views/main/undergroundCavity/detail.vue
@@ -5,6 +5,7 @@
 import uploadFile from './upload.vue'
 import mapDialog from '@/views/main/database/mapDialog.vue'
 import { getDictByCode } from '@/api/system/dict'
+import { getLocation } from '@/api/map'
 import { addHole, detailHole, editHole } from '@/api/page/undergroundCavity'
 const emits = defineEmits(['refresh'])
 const dataFormRef = ref()
@@ -38,6 +39,7 @@
   detectionTime: [{ required: true, message: '探测时间必选', trigger: ['blur', 'change'] }],
   riskLevel: [{ required: true, message: '风险等级必选', trigger: ['blur', 'change'] }],
   position: [{ required: true, message: '空洞位置必填', trigger: ['blur', 'change'] }],
+  lnglat: [{ required: true, message: '经纬度必选', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 字典
 const riskLevelList = ref<{ name: string;value: string;id: string }[]>() // 风险等级
@@ -109,6 +111,14 @@
   areaForm.value.longitude = location[0]
   areaForm.value.latitude = location[1]
   areaForm.value.lnglat = location.join()
+  getLocation(areaForm.value.lnglat).then((res) => {
+    if (res.data.info === 'OK') {
+      areaForm.value.position = res.data.regeocode.formatted_address
+    }
+    else {
+      areaForm.value.position = '/'
+    }
+  })
 }
 // 初始化对话框
 const initDialog = (type: string, row: any) => {
@@ -208,8 +218,15 @@
       </el-row>
       <el-row :gutter="24">
         <el-col :span="20">
-          <el-form-item label="空洞位置" prop="position">
-            <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+          <el-form-item label="空洞位置">
+            <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="areaForm.position"
+              placement="bottom"
+            >
+              <el-input v-model.trim="areaForm.position" type="textarea" maxlength="100" show-word-limit :rows="2" placeholder="空洞位置" />
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/main/undergroundCavity/index.vue b/src/views/main/undergroundCavity/index.vue
index 9b0aa16..073fe4e 100644
--- a/src/views/main/undergroundCavity/index.vue
+++ b/src/views/main/undergroundCavity/index.vue
@@ -7,20 +7,25 @@
 import { exportFile } from '@/utils/exportUtils'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { batchDeleteHole, exportHole, getHoleListPage, importHole, templateHole } from '@/api/page/undergroundCavity'
+import { exportExcel } from '@/utils/exportXlsx'
 const $router = useRouter()
 const { proxy } = getCurrentInstance() as any
 
 // 查询条件
 const listQuery = ref({
-  holeCode: '', // 空洞编号
-  abnormolWave: '', // 异常波形
-  detectionDistance: '', // 探测距离
-  holeSize: '', // 空洞大小
-  holeType: '', // 空洞类型
-  detectionTime: '', // 探测时间
-  riskLevel: '', // 风险等级
-  position: '', // 空洞位置
-  isHandle: '', // 是否进行治理
+  // holeCode: '', // 空洞编号
+  // abnormolWave: '', // 异常波形
+  // detectionDistance: '', // 探测距离
+  // holeSize: '', // 空洞大小
+  // holeType: '', // 空洞类型
+  // detectionTime: '', // 探测时间
+  // riskLevel: '', // 风险等级
+  // position: '', // 空洞位置
+  // isHandle: '', // 是否进行治理
+  begTime: '',
+  endTime: '',
+  isProcess: '',
+  overLevel: '',
   offset: 1,
   limit: 20,
 })
@@ -28,7 +33,7 @@
 const loadingTable = ref(false) // 表格loading
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '地下空洞编号', value: 'holeCode', align: 'center', width: '160' },
+  // { text: '地下空洞编号', value: 'holeCode', align: 'center', width: '160' },
   { text: '异常波形', value: 'abnormolWave', align: 'center' },
   { text: '探测距离', value: 'detectionDistance', align: 'center' },
   { text: '空洞大小', value: 'holeSize', align: 'center' },
@@ -41,6 +46,20 @@
   { text: '是否进行治理', value: 'isHandle', align: 'center' },
 ])
 const list = ref([]) // 表格数据
+// 筛选时间段数据
+const dateRange = ref<any[]>(['', ''])
+
+// 时间变更
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.begTime = `${val[0]}`
+    listQuery.value.endTime = `${val[1]}`
+  }
+  else {
+    listQuery.value.begTime = ''
+    listQuery.value.endTime = ''
+  }
+})
 // 选中的内容
 const checkoutList = ref<string[]>([])
 // 数据查询
@@ -56,7 +75,7 @@
       return {
         ...item,
         lnglat: `${item.longitude},${item.latitude}`,
-        isHandle: item.isHandle === '1' ? '是' : '否',
+        isHandle: item.isHandle === '1' ? '已治理' : '未治理',
       }
     })
     total.value = parseInt(res.data.total)
@@ -73,24 +92,20 @@
 // 重置
 const reset = () => {
   listQuery.value = {
-    holeCode: '', // 空洞编号
-    abnormolWave: '', // 异常波形
-    detectionDistance: '', // 探测距离
-    holeSize: '', // 空洞大小
-    holeType: '', // 空洞类型
-    detectionTime: '', // 探测时间
-    riskLevel: '', // 风险等级
-    position: '', // 空洞位置
-    isHandle: '', // 是否进行治理
+    begTime: '',
+    endTime: '',
+    isProcess: '',
+    overLevel: '',
     offset: 1,
     limit: 20,
   }
+  dateRange.value = ['', '']
   fetchData(true)
 }
 
 // 多选发生改变时
 function handleSelectionChange(e: any) {
-  checkoutList.value = e.map((item: { id: string }) => item.id)
+  checkoutList.value = e
 }
 
 // 导出
@@ -104,12 +119,30 @@
     text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  exportHole({ ids: checkoutList.value }).then((res) => {
-    exportFile(res.data, '地下空洞列表.xlsx')
-    loading.close()
-  }).catch(() => {
-    loading.close()
+  // exportHole({ ids: checkoutList.value }).then((res) => {
+  //   exportFile(res.data, '地下空洞列表.xlsx')
+  //   loading.close()
+  // }).catch(() => {
+  //   loading.close()
+  // })
+  const titleArr = ['序号', ...columns.value.map((item: any) => item.text)]
+  const json = checkoutList.value.map((item: any, index: number) => {
+    const obj = {} as any
+    columns.value.map((item: any) => item.value).forEach((element: any) => {
+      obj[element] = item[element]
+    })
+    return {
+      index: index + 1,
+      ...obj,
+    }
   })
+  exportExcel({
+    json,
+    name: '地下空洞列表',
+    titleArr,
+    sheetName: 'sheet1',
+  })
+  loading.close()
 }
 // 删除
 const deleteList = () => {
@@ -126,7 +159,7 @@
       type: 'warning',
     },
   ).then((res) => {
-    batchDeleteHole({ ids: checkoutList.value }).then((res) => {
+    batchDeleteHole({ ids: checkoutList.value.map((item: any) => item.id) }).then((res) => {
       ElMessage.success('操作成功')
       fetchData(true)
     })
@@ -213,47 +246,47 @@
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <!-- 编辑弹窗 -->
       <detail-dialog ref="detailRef" @refresh="searchList" />
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.holeCode"
           placeholder="地下空洞编号"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.abnormolWave"
           placeholder="异常波形"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.detectionDistance"
           placeholder="探测距离"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.holeSize"
           placeholder="空洞大小"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.holeType"
           placeholder="空洞类型"
           class="short-input"
           clearable
         />
-      </search-item>
-      <search-item>
+      </search-item> -->
+      <!-- <search-item>
         <el-date-picker
           v-model="listQuery.detectionTime"
           type="date"
@@ -262,23 +295,41 @@
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD HH:mm:ss"
         />
+      </search-item> -->
+      <search-item>
+        <el-date-picker
+          v-model="dateRange"
+          class="short-input"
+          type="datetimerange"
+          range-separator="至"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          start-placeholder="探测开始时间"
+          end-placeholder="探测结束时间"
+        />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.riskLevel" class="short-input" placeholder="风险等级" clearable>
+        <el-select v-model="listQuery.overLevel" class="short-input" placeholder="风险等级" clearable>
           <el-option v-for="item in riskLevelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-      <search-item>
+      <!-- <search-item>
         <el-input
           v-model.trim="listQuery.position"
           placeholder="空洞位置"
           class="short-input"
           clearable
         />
-      </search-item>
+      </search-item> -->
       <search-item>
-        <el-select v-model="listQuery.isHandle" class="short-input" placeholder="是否进行治理" clearable>
+        <el-select v-model="listQuery.isProcess" class="short-input" placeholder="是否进行治理" clearable>
           <el-option v-for="item in handlerList" :key="item.id" :label="item.name" :value="item.value" />
+          <!-- <el-option value="已治理" label="已治理">
+            已治理
+          </el-option>
+          <el-option value="未治理" label="未治理">
+            未治理
+          </el-option> -->
         </el-select>
       </search-item>
     </search-area>
@@ -286,10 +337,10 @@
       <template #btns-right>
         <icon-button icon="icon-add" title="新增" type="primary" @click="handler('create', {})" />
         <icon-button icon="icon-delete" title="删除" type="primary" @click="deleteList" />
-        <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
-        <icon-button icon="icon-import" title="导入" type="primary" @click="importList" />
-        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
+        <!-- <icon-button icon="icon-template" title="模板下载" type="primary" @click="templateDownload" /> -->
+        <!-- <icon-button icon="icon-import" title="导入" type="primary" @click="importList" /> -->
         <icon-button icon="icon-export" title="导出" type="primary" @click="exportList" />
+        <input ref="importRef" style="display: none;" type="file" accept=".xls,.xlsx" @change="onFileChange">
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="loadingTable"