diff --git a/src/api/models.js b/src/api/models.js
index bdb75dd..f910541 100644
--- a/src/api/models.js
+++ b/src/api/models.js
@@ -25,7 +25,7 @@
 const gitNewVls = (data) => {
   return request.get(`device/level/${data}`)
 }
-
+// 视频地址
 const getVideoUrl = (code) => {
   return request({
     url: '/hkvideo/getVideoUrl',
@@ -45,4 +45,11 @@
     }
   })
 }
-export { request, configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl }
+// 获取报警开关状态
+const getAlarmSwitchStatus = () => {
+  return request.get('alarm/push/query', { params: { scene: 'H2S' }})
+}
+const setAlarmSwitch = (params) => {
+  return request.get('alarm/push/config', { params})
+}
+export { configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl, getAlarmSwitchStatus, setAlarmSwitch }

diff --git a/src/api/models.js b/src/api/models.js
index bdb75dd..f910541 100644
--- a/src/api/models.js
+++ b/src/api/models.js
@@ -25,7 +25,7 @@
 const gitNewVls = (data) => {
   return request.get(`device/level/${data}`)
 }
-
+// 视频地址
 const getVideoUrl = (code) => {
   return request({
     url: '/hkvideo/getVideoUrl',
@@ -45,4 +45,11 @@
     }
   })
 }
-export { request, configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl }
+// 获取报警开关状态
+const getAlarmSwitchStatus = () => {
+  return request.get('alarm/push/query', { params: { scene: 'H2S' }})
+}
+const setAlarmSwitch = (params) => {
+  return request.get('alarm/push/config', { params})
+}
+export { configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl, getAlarmSwitchStatus, setAlarmSwitch }
diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index b54d0b6..c0b1c1e 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -110,7 +110,7 @@
           this.options.xAxis.data = newVal
           this.options.series[0].data = this.line
           const max = Math.floor(Math.max(...this.line) * 1.5)
-          this.options.yAxis.max = max > 10 ? max : 10
+          this.options.yAxis.max = max>1?max:1
           this.refreshChart()
         }
       },

diff --git a/src/api/models.js b/src/api/models.js
index bdb75dd..f910541 100644
--- a/src/api/models.js
+++ b/src/api/models.js
@@ -25,7 +25,7 @@
 const gitNewVls = (data) => {
   return request.get(`device/level/${data}`)
 }
-
+// 视频地址
 const getVideoUrl = (code) => {
   return request({
     url: '/hkvideo/getVideoUrl',
@@ -45,4 +45,11 @@
     }
   })
 }
-export { request, configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl }
+// 获取报警开关状态
+const getAlarmSwitchStatus = () => {
+  return request.get('alarm/push/query', { params: { scene: 'H2S' }})
+}
+const setAlarmSwitch = (params) => {
+  return request.get('alarm/push/config', { params})
+}
+export { configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl, getAlarmSwitchStatus, setAlarmSwitch }
diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index b54d0b6..c0b1c1e 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -110,7 +110,7 @@
           this.options.xAxis.data = newVal
           this.options.series[0].data = this.line
           const max = Math.floor(Math.max(...this.line) * 1.5)
-          this.options.yAxis.max = max > 10 ? max : 10
+          this.options.yAxis.max = max>1?max:1
           this.refreshChart()
         }
       },
diff --git a/src/components/homeComp/showConfig.vue b/src/components/homeComp/showConfig.vue
index 5503286..6a65695 100644
--- a/src/components/homeComp/showConfig.vue
+++ b/src/components/homeComp/showConfig.vue
@@ -14,12 +14,12 @@
         <el-form-item label="重传次数" prop="retryNum">
           <el-input-number v-model.number="Info.retryNum" />
         </el-form-item>
-        <el-form-item label="IP地址" prop="IP">
-          <el-input v-model="Info.IP" type="text" placeholder="非必填，格式：xxx.xxx.xxx.xxx" />
-        </el-form-item>
-        <el-form-item label="端口" prop="port">
-          <el-input v-model="Info.port" type="text" placeholder="非必填" />
-        </el-form-item>
+<!--        <el-form-item label="IP地址" prop="IP">-->
+<!--          <el-input v-model="Info.IP" type="text" placeholder="非必填，格式：xxx.xxx.xxx.xxx" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="端口" prop="port">-->
+<!--          <el-input v-model="Info.port" type="text" placeholder="非必填" />-->
+<!--        </el-form-item>-->
       </el-form>
     </div>
     <template slot="footer">

diff --git a/src/api/models.js b/src/api/models.js
index bdb75dd..f910541 100644
--- a/src/api/models.js
+++ b/src/api/models.js
@@ -25,7 +25,7 @@
 const gitNewVls = (data) => {
   return request.get(`device/level/${data}`)
 }
-
+// 视频地址
 const getVideoUrl = (code) => {
   return request({
     url: '/hkvideo/getVideoUrl',
@@ -45,4 +45,11 @@
     }
   })
 }
-export { request, configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl }
+// 获取报警开关状态
+const getAlarmSwitchStatus = () => {
+  return request.get('alarm/push/query', { params: { scene: 'H2S' }})
+}
+const setAlarmSwitch = (params) => {
+  return request.get('alarm/push/config', { params})
+}
+export { configWarn, listPage, warnList, batchCancelled, getDevInfo, gitNewVls, getVideoUrl, getAlarmSwitchStatus, setAlarmSwitch }
diff --git a/src/components/homeComp/curveTableCH4.vue b/src/components/homeComp/curveTableCH4.vue
index b54d0b6..c0b1c1e 100644
--- a/src/components/homeComp/curveTableCH4.vue
+++ b/src/components/homeComp/curveTableCH4.vue
@@ -110,7 +110,7 @@
           this.options.xAxis.data = newVal
           this.options.series[0].data = this.line
           const max = Math.floor(Math.max(...this.line) * 1.5)
-          this.options.yAxis.max = max > 10 ? max : 10
+          this.options.yAxis.max = max>1?max:1
           this.refreshChart()
         }
       },
diff --git a/src/components/homeComp/showConfig.vue b/src/components/homeComp/showConfig.vue
index 5503286..6a65695 100644
--- a/src/components/homeComp/showConfig.vue
+++ b/src/components/homeComp/showConfig.vue
@@ -14,12 +14,12 @@
         <el-form-item label="重传次数" prop="retryNum">
           <el-input-number v-model.number="Info.retryNum" />
         </el-form-item>
-        <el-form-item label="IP地址" prop="IP">
-          <el-input v-model="Info.IP" type="text" placeholder="非必填，格式：xxx.xxx.xxx.xxx" />
-        </el-form-item>
-        <el-form-item label="端口" prop="port">
-          <el-input v-model="Info.port" type="text" placeholder="非必填" />
-        </el-form-item>
+<!--        <el-form-item label="IP地址" prop="IP">-->
+<!--          <el-input v-model="Info.IP" type="text" placeholder="非必填，格式：xxx.xxx.xxx.xxx" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="端口" prop="port">-->
+<!--          <el-input v-model="Info.port" type="text" placeholder="非必填" />-->
+<!--        </el-form-item>-->
       </el-form>
     </div>
     <template slot="footer">
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0dcdb37..c4d29df 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -2,6 +2,10 @@
   <div class="dashboard-container">
     <div class="platform">
       <div class="platform_content">
+        <div style="display: flex; justify-content: flex-end; padding-right: 30px;align-items: center">
+          <span style="margin-left: 10px;margin-right: 5px;">报警页面推送</span><el-switch v-model="alarmConfig.websocketAlarm" :active-value="1" :inactive-value="0" @change="setAlarmConfig" />
+          <span style="margin-left: 10px;margin-right: 5px;">报警短信推送</span><el-switch v-model="alarmConfig.shortMessageAlarm" :active-value="1" :inactive-value="0"  @change="setAlarmConfig" />
+        </div>
         <div style="padding: 20px 30px; margin-bottom: 10px">
           <el-row style="height:100%;" :gutter="30">
             <el-col :span="12">
@@ -70,15 +74,13 @@
 <script>
 import { mapGetters } from 'vuex'
 import VideoBox from '../../components/homeComp/VideoBox.vue'
-import curveTable from '../../components/homeComp/curveTable.vue'
 import curveTableCH4 from '../../components/homeComp/curveTableCH4.vue'
-import curveTableH2S from '../../components/homeComp/curveTableH2S.vue'
 import dataTable from '../../components/homeComp/dataTableCH4.vue'
 
 import {
-  configWarn,
   getDevInfo, getVideoUrl,
-  gitNewVls
+  gitNewVls,
+  getAlarmSwitchStatus, setAlarmSwitch
 } from '../../api/models'
 
 export default {
@@ -101,6 +103,13 @@
   },
   data() {
     return {
+      websocketUrl: 'ws://111.198.10.15:11315/websocket/123456',
+      socket: null,
+      alarmConfig: {
+        websocketAlarm: 0,
+        shortMessageAlarm: 0,
+        scene: 'H2S'
+      },
       url0: '',
       url1: '',
       AtmoTotal: 0,
@@ -180,7 +189,18 @@
       refreshInterval: 60
     }
   },
+  // watch: {
+  //   alarmConfig: {
+  //     handler(val) {
+  //       this.setAlarmConfig()
+  //     },
+  //     deep: true,
+  //     immediate: false
+  //   }
+  // },
   mounted() {
+    this.initWebSocket()
+    this.getAlarmSwitch()
     this.getVideoUrls()
     this.refreshCurve()
     this.clock = setInterval(() => {
@@ -194,6 +214,45 @@
     }
   },
   methods: {
+    // 初始化websocket
+    initWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        this.$message.warning('您的浏览器不支持socket')
+      } else {
+        // 实例化socket
+        this.socket = new WebSocket(this.websocketUrl)
+        // 监听socket连接
+        this.socket.onopen = ()=> {
+          console.log('websocket已打开')}
+        // 监听socket错误信息
+        this.socket.onerror = function() { console.log('websocket错误') }
+        // 监听socket消息
+        this.socket.onmessage = (msg) => {
+          console.log(msg)
+          const message = JSON.parse(msg)
+          this.$notify({
+            title: '警告',
+            message: message.message,
+            type: 'warning'
+          })
+        }
+      }
+    },
+    // 获取报警开关状态
+    getAlarmSwitch() {
+      getAlarmSwitchStatus().then(res => {
+        this.alarmConfig.websocketAlarm = res.data.websocketAlarm
+        this.alarmConfig.shortMessageAlarm = res.data.shortMessageAlarm
+      })
+    },
+    // 设置报警开关状态
+    setAlarmConfig() {
+      setAlarmSwitch(this.alarmConfig).then(res => {
+        if (res.code === 200) {
+          this.$message.success('设置成功')
+        }
+      })
+    },
     // 获取视频地址
     getVideoUrls() {
       const codes = ['a949833b73814e5aa13668082b3ccab3', 'a0e487c492b44dd8be79d2b0422fb64d']