diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 620e514..5656f8c 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -87,6 +87,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
@@ -113,7 +114,8 @@
         areaName: '',
         road: '',
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        tel: ''
       }, // 表单
       columns: [
         { text: '监控内容', value: 'watchType' },
@@ -159,7 +161,8 @@
         area: row.area, // 街道
         road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 620e514..5656f8c 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -87,6 +87,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
@@ -113,7 +114,8 @@
         areaName: '',
         road: '',
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        tel: ''
       }, // 表单
       columns: [
         { text: '监控内容', value: 'watchType' },
@@ -159,7 +161,8 @@
         area: row.area, // 街道
         road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index be54ce8..4b21ecd 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -58,6 +58,11 @@
               <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="短信手机号" prop="tel">
+              <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+            </el-form-item>
+          </el-col>
           <el-col :span="14">
             <el-form-item label="路标图片" prop="images">
               <el-upload
@@ -222,6 +227,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       map: null, // 地图对象
       baseLayer: 'gaode_vec', // 底图图层
@@ -249,7 +275,8 @@
         area: '', // 街道
         road: '', // 道路
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
+        responsibleDeptName: '', // 维护人员部门
+        tel: ''
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -274,6 +301,7 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
@@ -376,7 +404,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel // 维护人员部门
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1(row.deptid)

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 620e514..5656f8c 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -87,6 +87,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
@@ -113,7 +114,8 @@
         areaName: '',
         road: '',
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        tel: ''
       }, // 表单
       columns: [
         { text: '监控内容', value: 'watchType' },
@@ -159,7 +161,8 @@
         area: row.area, // 街道
         road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index be54ce8..4b21ecd 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -58,6 +58,11 @@
               <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="短信手机号" prop="tel">
+              <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+            </el-form-item>
+          </el-col>
           <el-col :span="14">
             <el-form-item label="路标图片" prop="images">
               <el-upload
@@ -222,6 +227,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       map: null, // 地图对象
       baseLayer: 'gaode_vec', // 底图图层
@@ -249,7 +275,8 @@
         area: '', // 街道
         road: '', // 道路
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
+        responsibleDeptName: '', // 维护人员部门
+        tel: ''
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -274,6 +301,7 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
@@ -376,7 +404,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel // 维护人员部门
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1(row.deptid)
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 3f60c05..9e5de11 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -81,7 +81,8 @@
         qu: '',
         area: '', // 街道
         // road: '',
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }, // 表单
       formConfig: [
         { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
@@ -94,6 +95,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 620e514..5656f8c 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -87,6 +87,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
@@ -113,7 +114,8 @@
         areaName: '',
         road: '',
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        tel: ''
       }, // 表单
       columns: [
         { text: '监控内容', value: 'watchType' },
@@ -159,7 +161,8 @@
         area: row.area, // 街道
         road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index be54ce8..4b21ecd 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -58,6 +58,11 @@
               <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="短信手机号" prop="tel">
+              <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+            </el-form-item>
+          </el-col>
           <el-col :span="14">
             <el-form-item label="路标图片" prop="images">
               <el-upload
@@ -222,6 +227,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       map: null, // 地图对象
       baseLayer: 'gaode_vec', // 底图图层
@@ -249,7 +275,8 @@
         area: '', // 街道
         road: '', // 道路
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
+        responsibleDeptName: '', // 维护人员部门
+        tel: ''
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -274,6 +301,7 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
@@ -376,7 +404,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel // 维护人员部门
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1(row.deptid)
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 3f60c05..9e5de11 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -81,7 +81,8 @@
         qu: '',
         area: '', // 街道
         // road: '',
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }, // 表单
       formConfig: [
         { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
@@ -94,6 +95,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index db4efc6..94a72ea 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -131,8 +131,9 @@
         { text: '详细地址', value: 'position', align: 'center' },
         // { text: '点位类型', value: 'wellTypeName', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
-        { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button' },
-        { text: '布防状态', value: 'bfztName', align: 'center' }
+        { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button', width: '80' },
+        { text: '布防状态', value: 'bfztName', align: 'center', width: '110' },
+        { text: '手机号', value: 'tel', align: 'center' }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 267ead3..c91bd64 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -3,7 +3,7 @@
   "subtitle": "",
   "theme":"blue",
   "baseUrl": "http://111.198.10.15:11314/",
-  "wsUrl": "ws://111.198.10.15:11415/websocket/",
+  "wsUrl": "ws://111.198.10.15:11314/websocket/",
   "page": "http://10.80.106.217:9527/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad",
diff --git a/src/components/alarmDialog.vue b/src/components/alarmDialog.vue
index e059579..ea30b1a 100644
--- a/src/components/alarmDialog.vue
+++ b/src/components/alarmDialog.vue
@@ -43,6 +43,7 @@
         alarmTime: '--',
         cancelTime: '--'
       },
+      isHidden: false, // 页面是否被切走
     }
   },
   methods: {
@@ -52,8 +53,12 @@
       this.alarm = alarm
       alarm.alarmTime = getSearchLastDayTime()[1] || ''
       // 播放音效
-      this.playAudio()
-
+      if (!this.isHidden) {
+        this.playAudio()
+      }
+      else {
+        this.pauseAudio()
+      }
       setTimeout(() => {
         this.cancel()
       }, 1000 * 5)
@@ -70,7 +75,20 @@
       console.log('关闭报警弹窗')
       this.pauseAudio()
       this.dialogFormVisible = false
+    },
+    handleTabVisibility() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,alarmDialog')
+        this.isHidden = false
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,alarmDialog')
+        this.isHidden = true
+      }
     }
+  },
+  mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibility)
   }
 }
 </script>
diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue
index 4dee5e7..4d79cde 100644
--- a/src/layout/components/AppHeader.vue
+++ b/src/layout/components/AppHeader.vue
@@ -11,9 +11,9 @@
           <div>暂无报警信息</div>
         </el-dropdown-item>
         <template v-else>
-          <el-dropdown-item v-for="item in alarmList" :key="item.id" >
-          <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
-        </el-dropdown-item>
+          <el-dropdown-item v-for="item in alarmList" :key="item.id">
+            <div @click="alarmDetail">设备{{ item.devcode }} || {{ item.alarmMessage }} || {{ item.alarmTime }}</div>
+          </el-dropdown-item>
         </template>
       </el-dropdown-menu>
     </el-dropdown>
@@ -83,6 +83,7 @@
     }
   },
   mounted() {
+    document.addEventListener('visibilitychange', this.handleTabVisibilityChange)
     this.initWebSocket()
     // this.$refs.alarmRef.initDialog({
     //   message: '浓度超限',
@@ -92,7 +93,7 @@
     // })
     setInterval(() => {
       this.fetchAlarmList()
-    }, 1000*30)
+    }, 1000 * 30)
   },
   methods: {
     initWebSocket() {
@@ -108,7 +109,10 @@
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
-        location.reload() // 为了重新实例化vue-router对象 避免bug
+        this.$router.push({
+          path: '/login'
+        })
+        // location.reload() // 为了重新实例化vue-router对象 避免bug
       })
     },
     resetPwd() {
@@ -148,8 +152,8 @@
       })
     },
     fetchAlarmList() {
-      getAlarmList({offset:1, limit:99, status: '1'}).then((res) => {
-        console.log(res.data)
+      getAlarmList({ offset: 1, limit: 99, status: '1' }).then((res) => {
+        // console.log(res.data)
         this.alarmList = res.data.rows
       })
     },
@@ -157,6 +161,14 @@
       this.$router.push({
         path: '/alarmNow'
       })
+    },
+    handleTabVisibilityChange() {
+      if (document.visibilityState === 'visible') {
+        console.log('页面被切回来,appheader')
+        // 执行当Tab回到前台时的逻辑
+      } else if (document.visibilityState === 'hidden') {
+        console.log('页面被切走,appheader')
+      }
     }
   },
   watch: {
@@ -200,9 +212,11 @@
     }
   }
 }
+
 .alarm-icon {
   color: #F56C6C;
 }
+
 .dropdown-container {
   /*height: 50px;*/
   display: inline-block;
diff --git a/src/utils/request.js b/src/utils/request.js
index 7873e18..508ac28 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
 import { Message, MessageBox } from 'element-ui'
 import store from '../store'
 import { getToken } from '@/utils/auth'
-
+// import router from ''
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
@@ -50,7 +50,10 @@
             }
           ).then(() => {
             store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
+              location.reload(true) // 为了重新实例化vue-router对象 避免bug
+              // this.$router.push({
+              //   path: '/login'
+              // })
             })
           })
         }
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 223c280..d6d56eb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -57,6 +57,15 @@
   const re = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/
   return re.test(phone)
 }
+/**
+* @description 验证手机号码
+* @param phone 被验证手机号
+* @return Boolean
+*/
+export function validateisPhone(phone) {
+  const reg = /^[1][3-9]\d{9}$/
+  return reg.test(phone);
+}
 
 /**
  * 验证一定范围内的非负整数
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index b2c482e..8624e56 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -1,28 +1,13 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    append-to-body
-    title="取消报警"
-    width="30%"
-    @close="closeDialog"
-  >
+  <el-dialog :visible.sync="dialogVisible" append-to-body title="取消报警" width="30%" @close="closeDialog">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item label="报警取消原因" prop="jobStatus">
         <el-select v-model="formData.jobStatus" placeholder="请选择">
-          <el-option
-            v-for="item in closeReasons"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
+          <el-option v-for="item in closeReasons" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="handleMessage">
-        <el-input
-          v-model.trim="formData.handleMessage"
-          type="textarea"
-          placeholder="请输入详细的报警取消原因"
-        />
+        <el-input v-model.trim="formData.handleMessage" type="textarea" placeholder="请输入详细的报警取消原因" />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -61,14 +46,14 @@
       rules: {
         jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
         handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] },
-          { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+        { min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
       },
       value: ''
     }
   },
   methods: {
     // 初始化对话框
-    initDialog: function(dialogFormVisible, id, isBatch, params) {
+    initDialog: function (dialogFormVisible, id, isBatch, params) {
       this.dialogVisible = dialogFormVisible
       this.isBatch = isBatch
       if (isBatch) {
@@ -86,7 +71,7 @@
         .then(_ => {
           this.closeDialog()
         })
-        .catch(_ => {})
+        .catch(_ => { })
     },
     // 取消报警,调用结束工单接口
     cancelAlarm() {
@@ -132,10 +117,21 @@
         this.$refs['form'].clearValidate()
       })
     }
+  },
+  watch: {
+    'formData.jobStatus': {
+      handler(newVal) {
+        if (newVal) {
+          this.formData.handleMessage = this.closeReasons.filter((item) => item.value === newVal)[0]?.label || ''
+        }
+        else {
+          this.formData.handleMessage = ''
+        }
+      },
+      deep: true,
+    }
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 3434a09..1eedbd2 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,40 +6,28 @@
       </search-item>
       <search-item v-if="showAlarmType">
         <el-select v-model="listQuery.alarmType" size="small" placeholder="报警类型" clearable>
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
+          <el-option v-for="item in alarmTypeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
-<!--      <search-item>-->
-<!--        <el-select-->
-<!--          v-model="listQuery.alarmContentType"-->
-<!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
-<!--          placeholder="报警内容"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in alarmContentTypeList"-->
-<!--            :key="item.value"-->
-<!--            :label="item.name"-->
-<!--            :value="item.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </search-item>-->
+      <!--      <search-item>-->
+      <!--        <el-select-->
+      <!--          v-model="listQuery.alarmContentType"-->
+      <!--          :disabled="alarmContentTypeList.length > 0 ? false : true"-->
+      <!--          placeholder="报警内容"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--        >-->
+      <!--          <el-option-->
+      <!--            v-for="item in alarmContentTypeList"-->
+      <!--            :key="item.value"-->
+      <!--            :label="item.name"-->
+      <!--            :value="item.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </search-item>-->
       <search-item>
-        <el-date-picker
-          v-model="timeRange"
-          size="small"
-          type="datetimerange"
-          range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="报警开始时间"
-          end-placeholder="报警结束时间"
-        />
+        <el-date-picker v-model="timeRange" size="small" type="datetimerange" range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="报警开始时间" end-placeholder="报警结束时间" />
       </search-item>
     </search-area>
     <!--查询结果Table显示-->
@@ -59,7 +47,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border
+        size="small">
         <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
@@ -69,15 +58,8 @@
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          :formatter="column.formatFun"
-          show-overflow-tooltip
-        >
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+          :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
             <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
@@ -95,17 +77,9 @@
     </div>
     <!--分页-->
     <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination v-show="total > listQuery.limit" :current-page="listQuery.offset" :page-sizes="[20, 30, 50]"
+        :page-size="listQuery.limit" :total="total" align="center" layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
     <info-well v-show="wellShow" ref="wellInfo" mapid="alarm-now-map" />
     <handle-prompt ref="handlePrompt" @watchChild="fetchData" />
@@ -117,6 +91,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
+import { getToday } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmNow',
@@ -250,9 +225,12 @@
     }
   },
   created() {
-    console.log('now created')
-    this.fetchAlarmType()
-    this.fetchData()// 获取数据
+    this.timeRange = [`${new Date().getFullYear()}-${new Date().getMonth() + 1}-01 00:00:00`, getToday('yyyy-MM-dd hh:mm:ss')]
+    setTimeout(() => {
+      console.log('now created')
+      this.fetchAlarmType()
+      this.fetchData()// 获取数据
+    })
   },
   activated() {
     console.log('now activated')
@@ -390,46 +368,55 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
+$tableTitleHeight: 46px;
+
+.table {
+  margin-bottom: 20px;
+}
+
+.pagination-container {
+  margin-bottom: 50px;
+}
+
+.table-title {
+  background-color: rgba(243, 243, 243, 1);
+  height: $tableTitleHeight;
+
+  .title-header {
+    line-height: $tableTitleHeight;
+    color: #606266;
+    font-size: 15px;
+
+    i {
+      margin-left: 5px;
+      margin-right: 5px;
     }
   }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
+}
+
+.edit_btns {
+  .edit_btn {
+    float: right;
+    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
   }
-  .warning-state{
-    color:red
-  }
+}
+
+.warning-state {
+  color: red
+}
 </style>
 <style rel="stylesheet/scss" lang="scss">
-  .el-table {
-    .red-row{
-      background: #F9E9E8;
-    }
-    .orange-row{
-      background: #F9E7D1;
-    }
-    .yellow-row{
-      background: oldlace;
-    }
+.el-table {
+  .red-row {
+    background: #F9E9E8;
   }
+
+  .orange-row {
+    background: #F9E7D1;
+  }
+
+  .yellow-row {
+    background: oldlace;
+  }
+}
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 61b5183..a77d412 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -139,6 +139,9 @@
     var rightHeight = window.getComputedStyle(this.$refs.element).height
     document.getElementById('left-div').style.height = rightHeight
   },
+  created() {
+    location.reload(true)
+  },
   methods: {
     showPwd() { // 明文显示密码
       if (this.pwdType === 'password') {
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index af10dc5..2896a91 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -14,32 +14,33 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" />
+            <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow"
+              dept-type="03" placeholder="选择权属单位" />
           </el-form-item>
         </el-col>
       </el-row>
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="点位类型" prop="wellType">-->
-<!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in wellTypeList"-->
-<!--                :key="item.value"-->
-<!--                :label="item.name"-->
-<!--                :value="item.value"-->
-<!--              />-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="9">-->
-<!--          <el-form-item label="井深(m)" prop="deep">-->
-<!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-      <el-row :gutter="20">
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="点位类型" prop="wellType">-->
+      <!--            <el-select v-model="wellForm.wellType" placeholder="选择点位类型" clearable>-->
+      <!--              <el-option-->
+      <!--                v-for="item in wellTypeList"-->
+      <!--                :key="item.value"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.value"-->
+      <!--              />-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-row :gutter="20">-->
+      <!--        <el-col :span="9">-->
+      <!--          <el-form-item label="井深(m)" prop="deep">-->
+      <!--            <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-row :gutter="24">
         <el-col :span="8">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填">
@@ -47,31 +48,24 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" >
+        <el-col :span="8">
           <el-form-item label="纬度" prop="coordinateY">
             <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="短信手机号" prop="tel">
+            <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24">
           <el-form-item label="路标图片" prop="images">
-            <el-upload
-              ref="upload"
-              :before-upload="handleBeforeUpload"
-              :on-preview="handlePictureCardPreview"
-              :on-remove="handleRemove"
-              :on-exceed="handleExceed"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :limit="4"
-              :class="{hide:hideUpload}"
-              :http-request="uploadFile"
-              action="string"
-              multiple
-              accept=".jpg,.jpeg,.png "
-              list-type="picture-card"
-            >
+            <el-upload ref="upload" :before-upload="handleBeforeUpload" :on-preview="handlePictureCardPreview"
+              :on-remove="handleRemove" :on-exceed="handleExceed" :on-change="handleChange" :on-success="handleSuccess"
+              :limit="4" :class="{ hide: hideUpload }" :http-request="uploadFile" action="string" multiple
+              accept=".jpg,.jpeg,.png " list-type="picture-card">
               <i class="el-icon-plus" />
             </el-upload>
             <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
@@ -87,12 +81,7 @@
           <el-col :span="5">
             <el-form-item prop="qu">
               <el-select v-model="wellForm.qu" :disabled="showArea" placeholder="请选择所在区/县" clearable>
-                <el-option
-                  v-for="item in quList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in quList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -102,12 +91,7 @@
           <el-col :span="5">
             <el-form-item prop="area">
               <el-select v-model="wellForm.area" :disabled="showArea" placeholder="请选择所在街道/镇" clearable>
-                <el-option
-                  v-for="item in jiedaoList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+                <el-option v-for="item in jiedaoList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -137,13 +121,9 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位" clearable>
-              <el-option
-                v-for="item in secondDeptTreeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护机构，默认同权属单位"
+              clearable>
+              <el-option v-for="item in secondDeptTreeList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -172,6 +152,7 @@
 import { reverseLnglat, convertLnglat } from '@/components/Amap/utils/convert-helper'
 import DeptSelect from '@/components/DeptSelect'
 import detailMapLonLat from './detailMapLonLat'
+import { validateisPhone } from '@/utils/validate'
 
 export default {
   name: 'AddWell',
@@ -211,6 +192,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       dialogFormVisible: false, // 对话框是否显示
       dialogStatus: '', // 对话框类型：create,update
@@ -230,7 +232,8 @@
         qu: '', // 区
         area: '', // 街道
         road: '', // 道路
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: '',
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -257,12 +260,13 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
+      uploadPath: `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}imageUpload`, // 图片上传路径
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -316,7 +320,7 @@
       }
     }
   },
-  created: function() {
+  created: function () {
     this.fetchWellType()
     this.imageList = []
     this.fileList = []
@@ -357,7 +361,7 @@
       this.$refs.detailMap.initDialog()
     },
     // 加载组织机构树形下拉菜单
-    fetchSecondDeptTree: function() {
+    fetchSecondDeptTree: function () {
       const listQuery = {
         pid: this.wellForm.deptid,
         deptType: '04'
@@ -425,7 +429,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }
       // 清空上传图片
       this.$refs.upload.clearFiles()
@@ -438,7 +443,7 @@
       })
     },
     // 保存数据
-    saveData: function() {
+    saveData: function () {
       this.wellForm.photos = ''
       const count = this.fileList.length < 4 ? this.fileList.length : 4
       for (let i = 0; i < count; i++) {
@@ -531,7 +536,7 @@
     handleSuccess(response, file, fileList) {
       console.log('handleSuccess')
       // const base_url = this.baseConfig.baseUrl + '/static/'
-      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length-1] === '/' ? '' : '/'}static/`
+      const base_url = `${this.baseConfig.baseUrl}${this.baseConfig.baseUrl[this.baseConfig.baseUrl.length - 1] === '/' ? '' : '/'}static/`
       if (response.code === 200) {
         this.fileList.push({ name: file.file.name, url: base_url + response.data })
         this.handleChange()
@@ -543,29 +548,35 @@
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" >
-  .hide .el-upload--picture-card {
-    display: none;
-  }
-  .main-form{
-    margin: 20px 30px;
-    padding: 10px;
-  }
-  .el-dialog{
-    width:700px
-  }
-  .el-select{
-    width: 100%;
-  }
-  .line{
-    width: 50px;
-    margin-left: 5px;
-  }
-  .hide .el-upload-–picture-card{
-    display: none;
-  }
-  .imgBox{
-    width: 100%;
-    text-align: center;
-  }
+<style rel="stylesheet/scss" lang="scss">
+.hide .el-upload--picture-card {
+  display: none;
+}
+
+.main-form {
+  margin: 20px 30px;
+  padding: 10px;
+}
+
+.el-dialog {
+  width: 700px
+}
+
+.el-select {
+  width: 100%;
+}
+
+.line {
+  width: 50px;
+  margin-left: 5px;
+}
+
+.hide .el-upload-–picture-card {
+  display: none;
+}
+
+.imgBox {
+  width: 100%;
+  text-align: center;
+}
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 620e514..5656f8c 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -87,6 +87,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
@@ -113,7 +114,8 @@
         areaName: '',
         road: '',
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        tel: ''
       }, // 表单
       columns: [
         { text: '监控内容', value: 'watchType' },
@@ -159,7 +161,8 @@
         area: row.area, // 街道
         road: row.road,
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index be54ce8..4b21ecd 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -58,6 +58,11 @@
               <dept-select v-model="wellForm.deptid" size="normal" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="短信手机号" prop="tel">
+              <el-input v-model.trim="wellForm.tel" type="text" placeholder="多个用英文,隔开" />
+            </el-form-item>
+          </el-col>
           <el-col :span="14">
             <el-form-item label="路标图片" prop="images">
               <el-upload
@@ -222,6 +227,27 @@
         callback(new Error('纬度不能为空'))
       }
     }
+    const validateTel = (rule, value, callback) => {
+      if (value !== '') {
+        if (value.includes(',')) {
+          if (value.split(',').every((item) => validateisPhone(item))) {
+            callback()
+          }
+          else {
+            callback(new Error('请填写正确手机号或者检查拼接格式'))
+          }
+        }
+        else {
+          if (validateisPhone(value)) {
+            callback()
+          } else {
+            callback(new Error('请填写正确手机号'))
+          }
+        }
+      } else {
+        callback()
+      }
+    }
     return {
       map: null, // 地图对象
       baseLayer: 'gaode_vec', // 底图图层
@@ -249,7 +275,8 @@
         area: '', // 街道
         road: '', // 道路
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门
+        responsibleDeptName: '', // 维护人员部门
+        tel: ''
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -274,6 +301,7 @@
         deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        tel: [{ required: false, trigger: ['blur', 'change'], validator: validateTel }],
         deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
         wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }]
         // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
@@ -376,7 +404,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        tel: row.tel // 维护人员部门
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1(row.deptid)
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index 3f60c05..9e5de11 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -81,7 +81,8 @@
         qu: '',
         area: '', // 街道
         // road: '',
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        tel: ''
       }, // 表单
       formConfig: [
         { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
@@ -94,6 +95,7 @@
         { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
         { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
         { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '手机号', value: 'tel', placeholder: '未知', span: 5 },
         { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 },
         { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
         { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index db4efc6..94a72ea 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -131,8 +131,9 @@
         { text: '详细地址', value: 'position', align: 'center' },
         // { text: '点位类型', value: 'wellTypeName', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
-        { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button' },
-        { text: '布防状态', value: 'bfztName', align: 'center' }
+        { text: '设备数量', value: 'deviceCount', align: 'center', type: 'Button', width: '80' },
+        { text: '布防状态', value: 'bfztName', align: 'center', width: '110' },
+        { text: '手机号', value: 'tel', align: 'center' }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/zhangqiu/components/map3d.vue b/src/views/zhangqiu/components/map3d.vue
index 39f195e..f3dc524 100644
--- a/src/views/zhangqiu/components/map3d.vue
+++ b/src/views/zhangqiu/components/map3d.vue
@@ -204,7 +204,8 @@
       // window.map.basemap.opacity = this.alpha / 100
       // 崩溃后刷新
       map.on(mars3d.EventType.renderError, function(event) {
-        window.location.reload()
+        console.log('页面崩溃')
+        window.location.reload(true)
       })
       const that = this
       map.on(mars3d.EventType.load, function(event) {