diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..de66c15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 50000 // 请求超时时间
+  timeout: 1000 * 60 * 5 // 请求超时时间
 })
 
 // request拦截器
@@ -15,13 +15,13 @@
     if (store.getters.token) {
       console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
+    // console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -66,6 +66,7 @@
     }
   },
   error => {
+    // console.log(error, 'error')
     // 如果是下载文件返回的错误
     if (error.response.data instanceof Blob) {
       // 将blob强制转换为JSON

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..de66c15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 50000 // 请求超时时间
+  timeout: 1000 * 60 * 5 // 请求超时时间
 })
 
 // request拦截器
@@ -15,13 +15,13 @@
     if (store.getters.token) {
       console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
+    // console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -66,6 +66,7 @@
     }
   },
   error => {
+    // console.log(error, 'error')
     // 如果是下载文件返回的错误
     if (error.response.data instanceof Blob) {
       // 将blob强制转换为JSON
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
index d5bc9a1..754dda7 100644
--- a/src/views/alarmManage/component/HandlePrompt.vue
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -7,9 +7,22 @@
     @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="取消原因" prop="handleMessage">
-        <el-input
+        <!-- <el-input
           v-model.trim="formData.handleMessage"
           type="textarea"
+          placeholder="请输入详细的告警取消原因"/> -->
+          <el-select v-model.trim="formData.handleMessage" placeholder="请选择取消原因" style="width: 100%;">
+            <el-option value="施工" label="施工"></el-option>
+            <el-option value="测试" label="测试"></el-option>
+            <el-option value="抢修" label="抢修"></el-option>
+            <el-option value="演练" label="演练"></el-option>
+            <el-option value="其他" label="其他"></el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.handleMessage === '其他'" prop="handleMessage1">
+        <el-input
+          v-model.trim="formData.handleMessage1"
+          type="textarea"
           placeholder="请输入详细的告警取消原因"/>
       </el-form-item>
     </el-form>
@@ -37,7 +50,8 @@
         endTime: '', // 批量消警查询条件——结束时间
         id: '', // 工单id
         jobStatus: '', // 工单状态
-        handleMessage: '' // 原因
+        handleMessage: '', // 原因
+        handleMessage1: '' // 原因
       },
       isBatch: false, // 是不是批量删除
       dialogVisible: false,
@@ -49,8 +63,8 @@
         label: '无需处理' // 已取消
       }],
       rules: {
-        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
-        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        handleMessage: [{ required: true, message: '取消原因必选', trigger: ['blur', 'change'] }],
+        handleMessage1: [{ min: 1, max: 30, required: true, message: '长度在1-30字之间', trigger: ['blur', 'change'] }]
       },
       value: ''
     }
@@ -94,7 +108,7 @@
             // 批量消警接口
             if (this.isBatch) {
               const form = {
-                handleMessage: this.formData.handleMessage
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
               }
               batchCancel(form).then(response => {
                 this.$message.success('批量消警成功')
@@ -103,7 +117,7 @@
             } else { // 单个消警接口
               const formData = {
                 id: this.formData.id,
-                handleMessage: this.formData.handleMessage,
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
                 handlePhotos:''
               }
               overJob(formData).then(response => {
@@ -120,6 +134,7 @@
       this.$emit('watchChild')
       this.formData.jobStatus = ''
       this.formData.handleMessage = ''
+      this.formData.handleMessage1 = ''
       // 清除验证
       this.$nextTick(() => {
         this.$refs['form'].clearValidate()

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..de66c15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 50000 // 请求超时时间
+  timeout: 1000 * 60 * 5 // 请求超时时间
 })
 
 // request拦截器
@@ -15,13 +15,13 @@
     if (store.getters.token) {
       console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
+    // console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -66,6 +66,7 @@
     }
   },
   error => {
+    // console.log(error, 'error')
     // 如果是下载文件返回的错误
     if (error.response.data instanceof Blob) {
       // 将blob强制转换为JSON
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
index d5bc9a1..754dda7 100644
--- a/src/views/alarmManage/component/HandlePrompt.vue
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -7,9 +7,22 @@
     @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="取消原因" prop="handleMessage">
-        <el-input
+        <!-- <el-input
           v-model.trim="formData.handleMessage"
           type="textarea"
+          placeholder="请输入详细的告警取消原因"/> -->
+          <el-select v-model.trim="formData.handleMessage" placeholder="请选择取消原因" style="width: 100%;">
+            <el-option value="施工" label="施工"></el-option>
+            <el-option value="测试" label="测试"></el-option>
+            <el-option value="抢修" label="抢修"></el-option>
+            <el-option value="演练" label="演练"></el-option>
+            <el-option value="其他" label="其他"></el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.handleMessage === '其他'" prop="handleMessage1">
+        <el-input
+          v-model.trim="formData.handleMessage1"
+          type="textarea"
           placeholder="请输入详细的告警取消原因"/>
       </el-form-item>
     </el-form>
@@ -37,7 +50,8 @@
         endTime: '', // 批量消警查询条件——结束时间
         id: '', // 工单id
         jobStatus: '', // 工单状态
-        handleMessage: '' // 原因
+        handleMessage: '', // 原因
+        handleMessage1: '' // 原因
       },
       isBatch: false, // 是不是批量删除
       dialogVisible: false,
@@ -49,8 +63,8 @@
         label: '无需处理' // 已取消
       }],
       rules: {
-        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
-        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        handleMessage: [{ required: true, message: '取消原因必选', trigger: ['blur', 'change'] }],
+        handleMessage1: [{ min: 1, max: 30, required: true, message: '长度在1-30字之间', trigger: ['blur', 'change'] }]
       },
       value: ''
     }
@@ -94,7 +108,7 @@
             // 批量消警接口
             if (this.isBatch) {
               const form = {
-                handleMessage: this.formData.handleMessage
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
               }
               batchCancel(form).then(response => {
                 this.$message.success('批量消警成功')
@@ -103,7 +117,7 @@
             } else { // 单个消警接口
               const formData = {
                 id: this.formData.id,
-                handleMessage: this.formData.handleMessage,
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
                 handlePhotos:''
               }
               overJob(formData).then(response => {
@@ -120,6 +134,7 @@
       this.$emit('watchChild')
       this.formData.jobStatus = ''
       this.formData.handleMessage = ''
+      this.formData.handleMessage1 = ''
       // 清除验证
       this.$nextTick(() => {
         this.$refs['form'].clearValidate()
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3d22eac..1847a26 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -104,7 +104,7 @@
         offset: 1,
         limit: 20,
         sort: '',
-        order: ''
+        order: '',
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -263,7 +263,7 @@
       if (listQuery.endTime === '') {
         listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
       }
-      batchExportAlarm(listQuery).then(res => {
+      batchExportAlarm({...listQuery, status: '1,2'}).then(res => {
         loading.close() // 关闭加载动画
         console.log('download===', res)
         const blob = new Blob([res.data])
@@ -290,7 +290,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAlarmList(this.listQuery).then(response => {
+      getAlarmList({...this.listQuery, status: '1,2' }).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..de66c15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 50000 // 请求超时时间
+  timeout: 1000 * 60 * 5 // 请求超时时间
 })
 
 // request拦截器
@@ -15,13 +15,13 @@
     if (store.getters.token) {
       console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
+    // console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -66,6 +66,7 @@
     }
   },
   error => {
+    // console.log(error, 'error')
     // 如果是下载文件返回的错误
     if (error.response.data instanceof Blob) {
       // 将blob强制转换为JSON
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
index d5bc9a1..754dda7 100644
--- a/src/views/alarmManage/component/HandlePrompt.vue
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -7,9 +7,22 @@
     @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="取消原因" prop="handleMessage">
-        <el-input
+        <!-- <el-input
           v-model.trim="formData.handleMessage"
           type="textarea"
+          placeholder="请输入详细的告警取消原因"/> -->
+          <el-select v-model.trim="formData.handleMessage" placeholder="请选择取消原因" style="width: 100%;">
+            <el-option value="施工" label="施工"></el-option>
+            <el-option value="测试" label="测试"></el-option>
+            <el-option value="抢修" label="抢修"></el-option>
+            <el-option value="演练" label="演练"></el-option>
+            <el-option value="其他" label="其他"></el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.handleMessage === '其他'" prop="handleMessage1">
+        <el-input
+          v-model.trim="formData.handleMessage1"
+          type="textarea"
           placeholder="请输入详细的告警取消原因"/>
       </el-form-item>
     </el-form>
@@ -37,7 +50,8 @@
         endTime: '', // 批量消警查询条件——结束时间
         id: '', // 工单id
         jobStatus: '', // 工单状态
-        handleMessage: '' // 原因
+        handleMessage: '', // 原因
+        handleMessage1: '' // 原因
       },
       isBatch: false, // 是不是批量删除
       dialogVisible: false,
@@ -49,8 +63,8 @@
         label: '无需处理' // 已取消
       }],
       rules: {
-        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
-        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        handleMessage: [{ required: true, message: '取消原因必选', trigger: ['blur', 'change'] }],
+        handleMessage1: [{ min: 1, max: 30, required: true, message: '长度在1-30字之间', trigger: ['blur', 'change'] }]
       },
       value: ''
     }
@@ -94,7 +108,7 @@
             // 批量消警接口
             if (this.isBatch) {
               const form = {
-                handleMessage: this.formData.handleMessage
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
               }
               batchCancel(form).then(response => {
                 this.$message.success('批量消警成功')
@@ -103,7 +117,7 @@
             } else { // 单个消警接口
               const formData = {
                 id: this.formData.id,
-                handleMessage: this.formData.handleMessage,
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
                 handlePhotos:''
               }
               overJob(formData).then(response => {
@@ -120,6 +134,7 @@
       this.$emit('watchChild')
       this.formData.jobStatus = ''
       this.formData.handleMessage = ''
+      this.formData.handleMessage1 = ''
       // 清除验证
       this.$nextTick(() => {
         this.$refs['form'].clearValidate()
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3d22eac..1847a26 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -104,7 +104,7 @@
         offset: 1,
         limit: 20,
         sort: '',
-        order: ''
+        order: '',
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -263,7 +263,7 @@
       if (listQuery.endTime === '') {
         listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
       }
-      batchExportAlarm(listQuery).then(res => {
+      batchExportAlarm({...listQuery, status: '1,2'}).then(res => {
         loading.close() // 关闭加载动画
         console.log('download===', res)
         const blob = new Blob([res.data])
@@ -290,7 +290,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAlarmList(this.listQuery).then(response => {
+      getAlarmList({...this.listQuery, status: '1,2' }).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index 9573fab..8550272 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -261,6 +261,7 @@
           <div
             v-if="currentWindow.visible && videoList.length"
             style="width: 300px;height: 150px;background-color: #000"
+            @dbclick="fullscreen"
           >
             <iframe
               style="width: 100%;height: 100%;border: none;"
@@ -348,13 +349,34 @@
         </el-form>
       </div>
     </el-popover>
+    <!-- 天安门和玉泉山视图切换 -->
+    <el-button
+    v-if="showView === 'tam'"
+      slot="reference"
+      type="primary"
+      icon="el-icon-arrow-left"
+      class="toolbox"
+      style="top: 120px"
+      circle
+      @click="switchView"
+    />
+    <el-button
+    v-if="showView === 'yqs'"
+      slot="reference"
+      type="primary"
+      icon="el-icon-arrow-right"
+      class="toolbox"
+      style="top: 120px"
+      circle
+      @click="switchView"
+    />
   </div>
 </template>
 
 <script>
 import SelectTree from "@/components/SelectTree/singleSelect";
 import { getWellType } from "@/api/well";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import {
   getWellList,
   getWellInfo,
@@ -507,7 +529,10 @@
       videoList: [],
       currentVideo: "",
       videoUrl: "",
-      locationInfo: {}
+      locationInfo: {},
+      showView: "tam",
+      videoType: 'real',
+      alarmTime: '',
     };
   },
   computed: {
@@ -617,14 +642,61 @@
     console.log(this.locationInfo, "this.locationInfo");
   },
   methods: {
+    // 全屏
+    fullscreen() {
+      console.log('全屏')
+    },
+    // 切换视图
+    switchView() {
+      if (this.showView === "tam") {
+        this.showView = "yqs";
+      } else if (this.showView === "yqs") {
+        this.showView = "tam";
+      }
+      if (this.showView === "tam") {
+        console.log(456)
+        this.$nextTick(() => {
+          this.center = { lng:116.405001641622642, lat: 39.91493678481352 }
+          this.map.reset();
+        });
+      } else if (this.showView === "yqs") {
+        console.log(123)
+        this.$nextTick(() => {
+          this.center = { lng: 116.25017487386563, lat: 40.001269468037 }
+          this.map.reset();
+        });
+      }
+    },
     // 切换视频
     changeVideo(index) {
       this.currentVideo = index;
-      this.videoUrl = `http://${this.locationInfo.ip}:${
-        this.locationInfo.port
-      }/videoPlayer/#/index?url=${
-        this.videoList[this.currentVideo]
-      }&plugin=hls.js`;
+      const back = JSON.parse(JSON.stringify(this.videoList));
+      this.videoList = [];
+      // console.log(this.videoType, 'videoType')
+      setTimeout(() => {
+        this.videoList = back;
+        this.videoUrl = `http://${this.locationInfo.ip}:${
+          this.locationInfo.port
+        }/videoPlayer/#/index?url=${
+          this.videoList[this.currentVideo]
+        }&plugin=hls.js`
+        // this.videoUrl = this.videoType === 'real' ? `http://${this.locationInfo.ip}:${
+        //   this.locationInfo.port
+        // }/videoPlayer/#/index?url=${
+        //   this.videoList[this.currentVideo]
+        // }&plugin=hls.js` : `http://${this.locationInfo.ip}:${
+        //         this.locationInfo.port
+        //       }/videoPlayer/#/index?url=${
+        //         this.videoList[this.currentVideo]
+        //       }&plugin=hk-player&time1=${dayjs(this.alarmTime)
+        //     .subtract(30, "second")
+        //     .format("YYYY-MM-DD HH:mm:ss")}&time2=${dayjs(this.alarmTime)
+        //     .add(30, "second")
+        //     .format("YYYY-MM-DD HH:mm:ss")}`;
+        // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+        //   this.videoList[this.currentVideo]
+        // }&plugin=hls.js`;
+      }, 100);
     },
     // 点击显示全部闸井
     showAllWells(val) {
@@ -737,6 +809,7 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data);
+          console.log(data, 'overviw websocket')
           that.refreshAlarm(true);
           that.playAudio();
           that.$notify({
@@ -781,7 +854,7 @@
       getWellType().then(response => {
         this.wellTypeList = [];
         this.wellTypeDict = {};
-        const wellTypes = this.$store.getters.wellTypes;
+        const wellTypes = response.data.map((item) => item.value);
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
             this.wellTypeList.push(wellType);
@@ -857,7 +930,7 @@
         deptid.push(deptList[lastIndex]);
         // deptid.concat(deptList)
       }
-      console.log(deptid);
+      // console.log(deptid);
       const wellType = this.listQuery.wellType;
       // const isAlarm = this.listQuery.isAlarm
       const hideWellIds = [];
@@ -903,7 +976,7 @@
         this.center = { lng: centerxs[index], lat: centerys[index] };
         this.zoom = 15;
       }
-      console.log(hideWellCodes.length);
+      // console.log(hideWellCodes.length, '1111111111',hideWellCodes );
       for (const alarmWell of this.alarmWells) {
         if (hideWellIds.indexOf(alarmWell.wellId) > -1) {
           alarmWell.visible = false;
@@ -912,6 +985,7 @@
         }
       }
       this.hideWellCodes = hideWellCodes;
+      // console.log( this.hideWellCodes, ' this.hideWellCodes')
       if (this.showMarkers) {
         this.$message.success(
           "共找到符合筛选条件的闸井 " + this.showMarkers.length + " 个"
@@ -954,6 +1028,7 @@
           });
         }
       }
+      // console.log(this.showMarkers, 'showMarkers')
     },
     // 获取报警的闸井列表
     getWellList() {
@@ -1052,6 +1127,11 @@
     },
     // 点击闸井详情气泡
     openInfoWindow(point) {
+      console.log(point, 'ponit接收')
+      // if(!point.wellId) {
+      //   return
+      // }
+      this.videoType = 'real'
       const wellId = point.wellId;
       console.log("click well");
       this.videoList = [];
@@ -1094,6 +1174,7 @@
       //       this.videoList[this.currentVideo]
       //     }&plugin=hls.js`;
       getWellVideo(wellId).then(res => {
+        this.videoType = 'real'
         this.videoList = res.data;
         if (this.videoList.length) {
           this.currentVideo = 0;
@@ -1103,6 +1184,9 @@
           }/videoPlayer/#/index?url=${
             this.videoList[this.currentVideo]
           }&plugin=hls.js`;
+          // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+          //   this.videoList[this.currentVideo]
+          // }&plugin=hls.js`;
         }
       });
     },
@@ -1184,6 +1268,7 @@
     },
     // 点击报警详情
     openAlarmWindow(wellId, position, alarm) {
+      // console.log('点击报警详情', wellId,position, alarm)
       this.videoList = [];
       this.currentVideo = "";
       this.videoUrl = "";
@@ -1194,7 +1279,6 @@
       this.keywords = "";
       // this.listQuery.wellType = ''
       // this.listQuery.deptid = []
-
       getWellAlarms(wellId).then(response => {
         if (response.code === 200) {
           const wellInfo = response.data;
@@ -1214,29 +1298,65 @@
           });
         }
       });
+      this.videoType = 'real'
+      getWellVideo(wellId).then(res => {
+        this.videoType = 'real'
+        this.videoList = res.data;
+        if (this.videoList.length) {
+          this.currentVideo = 0;
+          // http://111.198.10.15:21904/videoPlayer/#/index?url=http://kbs-dokdo.gscdn.com/dokdo_300/definst/dokdo_300.stream/playlist.m3u8&plugin=hls.js
+          this.videoUrl = `http://${this.locationInfo.ip}:${
+            this.locationInfo.port
+          }/videoPlayer/#/index?url=${
+            this.videoList[this.currentVideo]
+          }&plugin=hls.js`;
+          // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+          //   this.videoList[this.currentVideo]
+          // }&plugin=hls.js`;
+        }
+      })
       // 获取历史视频
       // console.log(alarm, "123");
-      if (alarm.alarmTime) {
-        getWellHistoryVideo(
-          wellId,
-          dayjs(well.alarmTime)
-            .subtract(30, "second")
-            .format("YYYY-MM-DD HH:mm:ss"),
-          dayjs(well.alarmTime)
-            .add(30, "second")
-            .format("YYYY-MM-DD HH:mm:ss")
-        ).then(res => {
-          this.videoList = res.data;
-          if (this.videoList.length) {
-            this.currentVideo = 0;
-            this.videoUrl = `http://${this.locationInfo.ip}:${
-              this.locationInfo.port
-            }/videoPlayer/#/index?url=${
-              this.videoList[this.currentVideo]
-            }&plugin=hls.js`;
-          }
-        });
-      }
+      // if (alarm.alarmTime) {
+      //   getWellHistoryVideo(
+      //     wellId,
+      //     dayjs(alarm.alarmTime)
+      //       .subtract(30, "second")
+      //       .format("YYYY-MM-DD HH:mm:ss"),
+      //     dayjs(alarm.alarmTime)
+      //       .add(30, "second")
+      //       .format("YYYY-MM-DD HH:mm:ss")
+      //   )
+      //     .then(res => {
+      //       this.alarmTime = alarm.alarmTime
+      //       this.videoType = 'real'
+      //       console.log(res.data, "视频列表");
+      //       this.videoList = res.data;
+      //       if (this.videoList.length) {
+      //         this.currentVideo = 0;
+      //         // this.videoUrl = `http://${this.locationInfo.ip}:${
+      //         //   this.locationInfo.port
+      //         // }/videoPlayer/#/index?url=${
+      //         //   this.videoList[this.currentVideo]
+      //         // }&plugin=hls.js`;
+      //       //   this.videoUrl = `http://${this.locationInfo.ip}:${
+      //       //     this.locationInfo.port
+      //       //   }/videoPlayer/#/index?url=${
+      //       //     this.videoList[this.currentVideo]
+      //       //   }&plugin=hk-player&time1=${dayjs(this.alarmTime)
+      //       // .subtract(30, "second")
+      //       // .format("YYYY-MM-DD HH:mm:ss")}&time2=${dayjs(this.alarmTime)
+      //       // .add(30, "second")
+      //       // .format("YYYY-MM-DD HH:mm:ss")}`;
+      //         // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+      //         //   this.videoList[this.currentVideo]
+      //         // }&plugin=hls.js`;
+      //       }
+      //     })
+      //     .catch(error => {
+      //       console.log(error, "error");
+      //     });
+      // }
     },
     // 点击报警列表
     alarmRowClick(row, column, event) {
@@ -1399,6 +1519,7 @@
       }
       // 按数量排序
       typeCountList = typeCountList.sort((x, y) => y.value - x.value);
+      console.log(typeCountList, 'typeCountList')
       // 转为字符串数组
       for (const item of typeCountList) {
         // typeCountList.push({type:this.wellTypeDict[key],value:typeCount[key]})

diff --git a/config/dev.env.js b/config/dev.env.js
index 3b87ed5..928c69b 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -10,8 +10,8 @@
   // BASE_API: '"http://106.74.146.218:2031"'
   // BASE_API: '"http://192.168.0.212:8083"'
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
-  // BASE_API: '"http://111.198.10.15:11707/smartwell"'
-  BASE_API: '"http://192.168.165.39:8083"'
+  BASE_API: '"http://111.198.10.15:11645"'
+  // BASE_API: '"http://10.9.39.8:8083"'
 
   // BASE_API: '"http://139.198.16.38:8095/smartcity"'
   // BASE_API: '"http://10.9.39.8:8083"'
diff --git a/config/prod.env.js b/config/prod.env.js
index 5b466e4..dc63cf3 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,4 +5,5 @@
   // BASE_API: '"http://192.168.8.201:8083/smartwell"'
   // BASE_API: '"http://111.198.10.15:11707/smartwell"'
   BASE_API: '"http://10.9.39.8:8083"'
+  // BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/components/BMap/baiduPointCollection.vue b/src/components/BMap/baiduPointCollection.vue
index a448203..2ff1e40 100644
--- a/src/components/BMap/baiduPointCollection.vue
+++ b/src/components/BMap/baiduPointCollection.vue
@@ -1,82 +1,116 @@
 <script>
-  import commonMixin from 'vue-baidu-map/components/base/mixins/common.js'
-  import bindEvents from 'vue-baidu-map/components/base/bindEvent.js'
-  import {createPoint } from 'vue-baidu-map/components/base/factory.js'
+import commonMixin from "vue-baidu-map/components/base/mixins/common.js";
+import bindEvents from "vue-baidu-map/components/base/bindEvent.js";
+import { createPoint } from "vue-baidu-map/components/base/factory.js";
 
-  export default {
-    render () {},
-    name: 'baiduPointCollection',
-    mixins: [commonMixin('overlay')],
-    props: {
-      points: {
-        type: Array,
-        default () {
-          return []
-        }
-      },
-      shape: {
-        type: String,
-        default: 'BMAP_POINT_SHAPE_CIRCLE'
-      },
-      color: {
-        type: String
-      },
-      size: {
-        type: String,
-        default: 'BMAP_POINT_SIZE_NORMAL'
+export default {
+  render() {},
+  name: "baiduPointCollection",
+  mixins: [commonMixin("overlay")],
+  props: {
+    points: {
+      type: Array,
+      default() {
+        return [];
       }
     },
-    watch: {
-      shape (val) {
-        const {originInstance, color, size} = this
-        originInstance.setStyles({
-          shape: global[val],
-          color,
-          size: global[size]
-        })
-      },
-      size (val) {
-        const {originInstance, color, shape} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color,
-          size: global[val]
-        })
-      },
-      color (val) {
-        const {originInstance, shape, size} = this
-        originInstance.setStyles({
-          shape: global[shape],
-          color: val,
-          size: global[size]
-        })
-      },
-      points: {
-        deep: true,
-        handler (val) {
-          const {originInstance} = this
-          originInstance.clear()
-          originInstance.setPoints(val)
-        }
-      }
+    shape: {
+      type: String,
+      default: "BMAP_POINT_SHAPE_CIRCLE"
     },
-    methods: {
-      load () {
-        const {BMap, map, points, shape, color, size} = this
-        const overlay = this.originInstance = new BMap.PointCollection(points.map(p => createPoint(BMap, p)), {
-          shape: global[shape],
-          color,
-          size: global[size]
-        })
-        const thisvue = this
-        overlay.addEventListener('click', function(e) {
-          console.log('baiduPointCollection click listener')
-          thisvue.$emit('click',e.point)
-        })
-
-        bindEvents.call(this, overlay)
-        map.addOverlay(overlay)
+    color: {
+      type: String
+    },
+    size: {
+      type: String,
+      default: "BMAP_POINT_SIZE_NORMAL"
+    }
+  },
+  watch: {
+    shape(val) {
+      const { originInstance, color, size } = this;
+      originInstance.setStyles({
+        shape: global[val],
+        color,
+        size: global[size]
+      });
+    },
+    size(val) {
+      const { originInstance, color, shape } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color,
+        size: global[val]
+      });
+    },
+    color(val) {
+      const { originInstance, shape, size } = this;
+      originInstance.setStyles({
+        shape: global[shape],
+        color: val,
+        size: global[size]
+      });
+    },
+    points: {
+      deep: true,
+      handler(val) {
+        const { originInstance } = this;
+        originInstance.clear();
+        originInstance.setPoints(val);
       }
     }
+  },
+  methods: {
+    load() {
+      const { BMap, map, points, shape, color, size } = this;
+      const overlay = (this.originInstance = new BMap.PointCollection(
+        points.map(p => createPoint(BMap, p)),
+        {
+          shape: global[shape],
+          color,
+          size: global[size]
+        }
+      ));
+      const thisvue = this;
+      overlay.addEventListener("click", function(e) {
+        // console.log("baiduPointCollection click listener");
+        // console.log(points, "points");
+        // console.log(e, "eeeeeeeeeeeeeeeeee");
+        // thisvue.$emit("click", e.point);
+        // 1. 获取点击的坐标点
+        // setTimeout(() => {
+        // console.log(JSON.parse(JSON.stringify(e)), 'e.po111111111111nit')
+        // });
+        const clickedPoint = e.point;
+        // console.log(e, "eeeeeeeeeeeeeeeeeeeeeee");
+        // console.log(clickedPoint, "clickedPoint");
+        if (clickedPoint.wellId) {
+          thisvue.$emit("click", {
+            ...clickedPoint
+          });
+        } else {
+          // 2. 在points数组中查找匹配的项
+          const matchedItem = points.find(item => {
+            // 创建当前项的坐标点
+            const itemPoint = new BMap.Point(item.lng, item.lat);
+            // 比较两点是否相同（可以添加一定的容差）
+            return clickedPoint.equals(itemPoint);
+          });
+          // console.log(matchedItem, "matchedItem");
+          // 3. 如果找到匹配项，emit出去
+          if (matchedItem) {
+            thisvue.$emit("click", {
+              ...matchedItem,
+              point: e.point,
+              data: matchedItem // 包含完整的原始数据
+            });
+          }
+        }
+      });
+
+      bindEvents.call(this, overlay);
+      map.addOverlay(overlay);
+    }
   }
+};
 </script>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 1f8ee17..a561f3e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -107,6 +107,7 @@
           reject(error)
         })
         getBizPerm().then(response => {
+
           const data = response.data
           if (data.wellTypes && data.wellTypes.length > 0) { // 验证返回的wellTypes是否是一个非空数组
             commit('SET_WELLTYPES', data.wellTypes)
diff --git a/src/utils/request.js b/src/utils/request.js
index c88ea76..de66c15 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,7 +6,7 @@
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 50000 // 请求超时时间
+  timeout: 1000 * 60 * 5 // 请求超时时间
 })
 
 // request拦截器
@@ -15,13 +15,13 @@
     if (store.getters.token) {
       console.log('request.js  gettoken')
       config.headers['token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-      console.log(config.headers['token'])
+      // console.log(config.headers['token'])
     }
     return config
   },
   error => {
     // Do something with request error
-    console.log(error) // for debug
+    // console.log(error) // for debug
     Promise.reject(error)
   }
 )
@@ -66,6 +66,7 @@
     }
   },
   error => {
+    // console.log(error, 'error')
     // 如果是下载文件返回的错误
     if (error.response.data instanceof Blob) {
       // 将blob强制转换为JSON
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
index d5bc9a1..754dda7 100644
--- a/src/views/alarmManage/component/HandlePrompt.vue
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -7,9 +7,22 @@
     @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="取消原因" prop="handleMessage">
-        <el-input
+        <!-- <el-input
           v-model.trim="formData.handleMessage"
           type="textarea"
+          placeholder="请输入详细的告警取消原因"/> -->
+          <el-select v-model.trim="formData.handleMessage" placeholder="请选择取消原因" style="width: 100%;">
+            <el-option value="施工" label="施工"></el-option>
+            <el-option value="测试" label="测试"></el-option>
+            <el-option value="抢修" label="抢修"></el-option>
+            <el-option value="演练" label="演练"></el-option>
+            <el-option value="其他" label="其他"></el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item v-if="formData.handleMessage === '其他'" prop="handleMessage1">
+        <el-input
+          v-model.trim="formData.handleMessage1"
+          type="textarea"
           placeholder="请输入详细的告警取消原因"/>
       </el-form-item>
     </el-form>
@@ -37,7 +50,8 @@
         endTime: '', // 批量消警查询条件——结束时间
         id: '', // 工单id
         jobStatus: '', // 工单状态
-        handleMessage: '' // 原因
+        handleMessage: '', // 原因
+        handleMessage1: '' // 原因
       },
       isBatch: false, // 是不是批量删除
       dialogVisible: false,
@@ -49,8 +63,8 @@
         label: '无需处理' // 已取消
       }],
       rules: {
-        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
-        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        handleMessage: [{ required: true, message: '取消原因必选', trigger: ['blur', 'change'] }],
+        handleMessage1: [{ min: 1, max: 30, required: true, message: '长度在1-30字之间', trigger: ['blur', 'change'] }]
       },
       value: ''
     }
@@ -94,7 +108,7 @@
             // 批量消警接口
             if (this.isBatch) {
               const form = {
-                handleMessage: this.formData.handleMessage
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
               }
               batchCancel(form).then(response => {
                 this.$message.success('批量消警成功')
@@ -103,7 +117,7 @@
             } else { // 单个消警接口
               const formData = {
                 id: this.formData.id,
-                handleMessage: this.formData.handleMessage,
+                handleMessage: this.formData.handleMessage === '其他' ? this.formData.handleMessage1   : this.formData.handleMessage,
                 handlePhotos:''
               }
               overJob(formData).then(response => {
@@ -120,6 +134,7 @@
       this.$emit('watchChild')
       this.formData.jobStatus = ''
       this.formData.handleMessage = ''
+      this.formData.handleMessage1 = ''
       // 清除验证
       this.$nextTick(() => {
         this.$refs['form'].clearValidate()
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 3d22eac..1847a26 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -104,7 +104,7 @@
         offset: 1,
         limit: 20,
         sort: '',
-        order: ''
+        order: '',
       }, // 筛选条件
       timeRange: [], // 时间范围
       columns: [
@@ -263,7 +263,7 @@
       if (listQuery.endTime === '') {
         listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
       }
-      batchExportAlarm(listQuery).then(res => {
+      batchExportAlarm({...listQuery, status: '1,2'}).then(res => {
         loading.close() // 关闭加载动画
         console.log('download===', res)
         const blob = new Blob([res.data])
@@ -290,7 +290,7 @@
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
-      getAlarmList(this.listQuery).then(response => {
+      getAlarmList({...this.listQuery, status: '1,2' }).then(response => {
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index 9573fab..8550272 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -261,6 +261,7 @@
           <div
             v-if="currentWindow.visible && videoList.length"
             style="width: 300px;height: 150px;background-color: #000"
+            @dbclick="fullscreen"
           >
             <iframe
               style="width: 100%;height: 100%;border: none;"
@@ -348,13 +349,34 @@
         </el-form>
       </div>
     </el-popover>
+    <!-- 天安门和玉泉山视图切换 -->
+    <el-button
+    v-if="showView === 'tam'"
+      slot="reference"
+      type="primary"
+      icon="el-icon-arrow-left"
+      class="toolbox"
+      style="top: 120px"
+      circle
+      @click="switchView"
+    />
+    <el-button
+    v-if="showView === 'yqs'"
+      slot="reference"
+      type="primary"
+      icon="el-icon-arrow-right"
+      class="toolbox"
+      style="top: 120px"
+      circle
+      @click="switchView"
+    />
   </div>
 </template>
 
 <script>
 import SelectTree from "@/components/SelectTree/singleSelect";
 import { getWellType } from "@/api/well";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import {
   getWellList,
   getWellInfo,
@@ -507,7 +529,10 @@
       videoList: [],
       currentVideo: "",
       videoUrl: "",
-      locationInfo: {}
+      locationInfo: {},
+      showView: "tam",
+      videoType: 'real',
+      alarmTime: '',
     };
   },
   computed: {
@@ -617,14 +642,61 @@
     console.log(this.locationInfo, "this.locationInfo");
   },
   methods: {
+    // 全屏
+    fullscreen() {
+      console.log('全屏')
+    },
+    // 切换视图
+    switchView() {
+      if (this.showView === "tam") {
+        this.showView = "yqs";
+      } else if (this.showView === "yqs") {
+        this.showView = "tam";
+      }
+      if (this.showView === "tam") {
+        console.log(456)
+        this.$nextTick(() => {
+          this.center = { lng:116.405001641622642, lat: 39.91493678481352 }
+          this.map.reset();
+        });
+      } else if (this.showView === "yqs") {
+        console.log(123)
+        this.$nextTick(() => {
+          this.center = { lng: 116.25017487386563, lat: 40.001269468037 }
+          this.map.reset();
+        });
+      }
+    },
     // 切换视频
     changeVideo(index) {
       this.currentVideo = index;
-      this.videoUrl = `http://${this.locationInfo.ip}:${
-        this.locationInfo.port
-      }/videoPlayer/#/index?url=${
-        this.videoList[this.currentVideo]
-      }&plugin=hls.js`;
+      const back = JSON.parse(JSON.stringify(this.videoList));
+      this.videoList = [];
+      // console.log(this.videoType, 'videoType')
+      setTimeout(() => {
+        this.videoList = back;
+        this.videoUrl = `http://${this.locationInfo.ip}:${
+          this.locationInfo.port
+        }/videoPlayer/#/index?url=${
+          this.videoList[this.currentVideo]
+        }&plugin=hls.js`
+        // this.videoUrl = this.videoType === 'real' ? `http://${this.locationInfo.ip}:${
+        //   this.locationInfo.port
+        // }/videoPlayer/#/index?url=${
+        //   this.videoList[this.currentVideo]
+        // }&plugin=hls.js` : `http://${this.locationInfo.ip}:${
+        //         this.locationInfo.port
+        //       }/videoPlayer/#/index?url=${
+        //         this.videoList[this.currentVideo]
+        //       }&plugin=hk-player&time1=${dayjs(this.alarmTime)
+        //     .subtract(30, "second")
+        //     .format("YYYY-MM-DD HH:mm:ss")}&time2=${dayjs(this.alarmTime)
+        //     .add(30, "second")
+        //     .format("YYYY-MM-DD HH:mm:ss")}`;
+        // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+        //   this.videoList[this.currentVideo]
+        // }&plugin=hls.js`;
+      }, 100);
     },
     // 点击显示全部闸井
     showAllWells(val) {
@@ -737,6 +809,7 @@
         this.socket.onmessage = function(msg) {
           // 转换为json对象
           const data = JSON.parse(msg.data);
+          console.log(data, 'overviw websocket')
           that.refreshAlarm(true);
           that.playAudio();
           that.$notify({
@@ -781,7 +854,7 @@
       getWellType().then(response => {
         this.wellTypeList = [];
         this.wellTypeDict = {};
-        const wellTypes = this.$store.getters.wellTypes;
+        const wellTypes = response.data.map((item) => item.value);
         for (const wellType of response.data) {
           if (wellTypes.indexOf(wellType.value) !== -1) {
             this.wellTypeList.push(wellType);
@@ -857,7 +930,7 @@
         deptid.push(deptList[lastIndex]);
         // deptid.concat(deptList)
       }
-      console.log(deptid);
+      // console.log(deptid);
       const wellType = this.listQuery.wellType;
       // const isAlarm = this.listQuery.isAlarm
       const hideWellIds = [];
@@ -903,7 +976,7 @@
         this.center = { lng: centerxs[index], lat: centerys[index] };
         this.zoom = 15;
       }
-      console.log(hideWellCodes.length);
+      // console.log(hideWellCodes.length, '1111111111',hideWellCodes );
       for (const alarmWell of this.alarmWells) {
         if (hideWellIds.indexOf(alarmWell.wellId) > -1) {
           alarmWell.visible = false;
@@ -912,6 +985,7 @@
         }
       }
       this.hideWellCodes = hideWellCodes;
+      // console.log( this.hideWellCodes, ' this.hideWellCodes')
       if (this.showMarkers) {
         this.$message.success(
           "共找到符合筛选条件的闸井 " + this.showMarkers.length + " 个"
@@ -954,6 +1028,7 @@
           });
         }
       }
+      // console.log(this.showMarkers, 'showMarkers')
     },
     // 获取报警的闸井列表
     getWellList() {
@@ -1052,6 +1127,11 @@
     },
     // 点击闸井详情气泡
     openInfoWindow(point) {
+      console.log(point, 'ponit接收')
+      // if(!point.wellId) {
+      //   return
+      // }
+      this.videoType = 'real'
       const wellId = point.wellId;
       console.log("click well");
       this.videoList = [];
@@ -1094,6 +1174,7 @@
       //       this.videoList[this.currentVideo]
       //     }&plugin=hls.js`;
       getWellVideo(wellId).then(res => {
+        this.videoType = 'real'
         this.videoList = res.data;
         if (this.videoList.length) {
           this.currentVideo = 0;
@@ -1103,6 +1184,9 @@
           }/videoPlayer/#/index?url=${
             this.videoList[this.currentVideo]
           }&plugin=hls.js`;
+          // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+          //   this.videoList[this.currentVideo]
+          // }&plugin=hls.js`;
         }
       });
     },
@@ -1184,6 +1268,7 @@
     },
     // 点击报警详情
     openAlarmWindow(wellId, position, alarm) {
+      // console.log('点击报警详情', wellId,position, alarm)
       this.videoList = [];
       this.currentVideo = "";
       this.videoUrl = "";
@@ -1194,7 +1279,6 @@
       this.keywords = "";
       // this.listQuery.wellType = ''
       // this.listQuery.deptid = []
-
       getWellAlarms(wellId).then(response => {
         if (response.code === 200) {
           const wellInfo = response.data;
@@ -1214,29 +1298,65 @@
           });
         }
       });
+      this.videoType = 'real'
+      getWellVideo(wellId).then(res => {
+        this.videoType = 'real'
+        this.videoList = res.data;
+        if (this.videoList.length) {
+          this.currentVideo = 0;
+          // http://111.198.10.15:21904/videoPlayer/#/index?url=http://kbs-dokdo.gscdn.com/dokdo_300/definst/dokdo_300.stream/playlist.m3u8&plugin=hls.js
+          this.videoUrl = `http://${this.locationInfo.ip}:${
+            this.locationInfo.port
+          }/videoPlayer/#/index?url=${
+            this.videoList[this.currentVideo]
+          }&plugin=hls.js`;
+          // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+          //   this.videoList[this.currentVideo]
+          // }&plugin=hls.js`;
+        }
+      })
       // 获取历史视频
       // console.log(alarm, "123");
-      if (alarm.alarmTime) {
-        getWellHistoryVideo(
-          wellId,
-          dayjs(well.alarmTime)
-            .subtract(30, "second")
-            .format("YYYY-MM-DD HH:mm:ss"),
-          dayjs(well.alarmTime)
-            .add(30, "second")
-            .format("YYYY-MM-DD HH:mm:ss")
-        ).then(res => {
-          this.videoList = res.data;
-          if (this.videoList.length) {
-            this.currentVideo = 0;
-            this.videoUrl = `http://${this.locationInfo.ip}:${
-              this.locationInfo.port
-            }/videoPlayer/#/index?url=${
-              this.videoList[this.currentVideo]
-            }&plugin=hls.js`;
-          }
-        });
-      }
+      // if (alarm.alarmTime) {
+      //   getWellHistoryVideo(
+      //     wellId,
+      //     dayjs(alarm.alarmTime)
+      //       .subtract(30, "second")
+      //       .format("YYYY-MM-DD HH:mm:ss"),
+      //     dayjs(alarm.alarmTime)
+      //       .add(30, "second")
+      //       .format("YYYY-MM-DD HH:mm:ss")
+      //   )
+      //     .then(res => {
+      //       this.alarmTime = alarm.alarmTime
+      //       this.videoType = 'real'
+      //       console.log(res.data, "视频列表");
+      //       this.videoList = res.data;
+      //       if (this.videoList.length) {
+      //         this.currentVideo = 0;
+      //         // this.videoUrl = `http://${this.locationInfo.ip}:${
+      //         //   this.locationInfo.port
+      //         // }/videoPlayer/#/index?url=${
+      //         //   this.videoList[this.currentVideo]
+      //         // }&plugin=hls.js`;
+      //       //   this.videoUrl = `http://${this.locationInfo.ip}:${
+      //       //     this.locationInfo.port
+      //       //   }/videoPlayer/#/index?url=${
+      //       //     this.videoList[this.currentVideo]
+      //       //   }&plugin=hk-player&time1=${dayjs(this.alarmTime)
+      //       // .subtract(30, "second")
+      //       // .format("YYYY-MM-DD HH:mm:ss")}&time2=${dayjs(this.alarmTime)
+      //       // .add(30, "second")
+      //       // .format("YYYY-MM-DD HH:mm:ss")}`;
+      //         // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+      //         //   this.videoList[this.currentVideo]
+      //         // }&plugin=hls.js`;
+      //       }
+      //     })
+      //     .catch(error => {
+      //       console.log(error, "error");
+      //     });
+      // }
     },
     // 点击报警列表
     alarmRowClick(row, column, event) {
@@ -1399,6 +1519,7 @@
       }
       // 按数量排序
       typeCountList = typeCountList.sort((x, y) => y.value - x.value);
+      console.log(typeCountList, 'typeCountList')
       // 转为字符串数组
       for (const item of typeCountList) {
         // typeCountList.push({type:this.wellTypeDict[key],value:typeCount[key]})
diff --git a/src/views/wellManage/infoWellBdOffline.vue b/src/views/wellManage/infoWellBdOffline.vue
index 3060037..33d9260 100644
--- a/src/views/wellManage/infoWellBdOffline.vue
+++ b/src/views/wellManage/infoWellBdOffline.vue
@@ -288,11 +288,24 @@
     // 切换视频
     changeVideo(index) {
       this.currentVideo = index
-      this.videoUrl = `http://${this.locationInfo.ip}:${
-            this.locationInfo.port
-          }/videoPlayer/#/index?url=${
-            this.videoList[this.currentVideo]
-          }&plugin=hls.js`;
+      const back = JSON.parse(JSON.stringify(this.videoList))
+      this.videoList = []
+       setTimeout(() => {
+        this.videoList = back
+        this.videoUrl = `http://${this.locationInfo.ip}:${
+        this.locationInfo.port
+      }/videoPlayer/#/index?url=${
+        this.videoList[this.currentVideo]
+      }&plugin=hls.js`;
+      // this.videoUrl = `http://10.9.39.8:8080/videoPlayer/#/index?url=${
+      //   this.videoList[this.currentVideo]
+      // }&plugin=hls.js`;
+      }, 100);
+      // this.videoUrl = `http://${this.locationInfo.ip}:${
+      //       this.locationInfo.port
+      //     }/videoPlayer/#/index?url=${
+      //       this.videoList[this.currentVideo]
+      //     }&plugin=hls.js`;
     },
     // 获取区域1
     fetchArea1() {