diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..07d3236 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,9 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.search-div{
+  margin-bottom: 10px;
+}
+.search-div .el-form-item {
+  margin-bottom:10px !important;
+}

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..07d3236 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,9 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.search-div{
+  margin-bottom: 10px;
+}
+.search-div .el-form-item {
+  margin-bottom:10px !important;
+}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index b58e9dc..d29d47a 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,14 +13,38 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='create'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="lng">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-select
+              v-model="alarmRuleForm.devcode"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.devcode"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型">
+            <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-else :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="lat">
+          <el-form-item label="设备类型">
             <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
@@ -28,9 +52,7 @@
       <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限" prop="highValue">
-            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填">
-              <template v-if="unit" slot="append">{{ unit }}</template>
-            </el-input>
+            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,7 +70,8 @@
 </template>
 
 <script>
-import { updateAlarmRule } from '@/api/alarmRule'
+import { addAlarmRule, updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/alarmRule'
 
 export default {
   name: 'EditRule',
@@ -61,7 +84,7 @@
           callback()
         }
       } else {
-        callback(new Error('报警上限不能为空'))
+        callback(new Error('告警上限不能为空'))
       }
     }
     const validateLowValue = (rule, value, callback) => {
@@ -85,7 +108,9 @@
         devcode: ''// 设备编号
       },
       alarmRuleForm: {
-        id: '', // 报警规则id
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,8 +118,11 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
-      unit: '',
+      devices: [], // 待选设备编号列表
+      loading: true,
+      // unit: '', // 单位
       rules: {
+        devcode: [{ required: true, message: '请选择设备', trigger: ['blur', 'change'] }],
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
       } // 前端校验规则
@@ -102,19 +130,48 @@
   },
   computed: {
     showHighValue() {
-      if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
-        return true
-      } else {
-        return false
-      }
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
+      //   return true
+      // } else {
+      //   return false
+      // }
+      return true
     },
     showLowValue() {
-      // if (this.baseInfo.deviceType === '2') {
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
       //   return false
       // } else {
       //   return true
       // }
       return false
+    },
+    unit() {
+      if (this.alarmRuleForm.deviceType === '2') {
+        return 'm'
+      } else if (this.alarmRuleForm.deviceType === '6') {
+        return 'mg'
+      }
+    }
+  },
+  watch: {
+    'alarmRuleForm.devcode'(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.devcode === newValue) {
+          debugger
+          this.baseInfo.deviceTypeName = device.deviceTypeName
+          this.baseInfo.deviceType = device.deviceType
+          this.alarmRuleForm.deviceType = device.deviceType
+          // if (device.deviceType === '2') {
+          //   this.unit = 'm'
+          // } else if (device.deviceType === '6') {
+          //   this.unit = 'mg'
+          // }
+          return
+        }
+      }
+    },
+    'baseInfo.devcode'(newValue, oldValue) {
+      this.alarmRuleForm.devcode = newValue
     }
   },
   methods: {
@@ -136,29 +193,70 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
-        if (row.deviceType === '2') {
-          this.unit = '(m)'
-        } else if (row.deviceType === '6') {
-          this.unit = ''
-        }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    // 获取可设置告警规则设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList().then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          this.devices = response.data
+        }
+      })
+    },
     // 重置表单
     resetForm() {
-      this.alarmRuleForm = {
-        id: '',
-        concencode: '',
-        simid: '',
-        pid: '',
-        pids: '',
-        num: '',
-        tips: '',
-        version: ''
+      this.baseInfo = {
+        wellCode: '', // 窨井编号
+        wellName: '', // 窨井名称
+        deep: '', // 井深
+        deviceType: '', // 设备类别
+        deviceTypeName: '', // 设备类别
+        devcode: ''// 设备编号
       }
+      this.alarmRuleForm = {
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
+        highValue: '', // 告警上限
+        lowValue: '0'// 告警下限
+      } // 表单
     },
     // 保存数据
     saveData: function() {
-      this.updateData()
+      if (this.dialogStatus === 'create') {
+        this.addData()
+      } else {
+        this.updateData()
+      }
+    },
+    // 新增数据
+    addData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          debugger
+          const alarmRuleForm = {
+            devcode: this.alarmRuleForm.devcode, // 设备编号
+            deviceType: this.alarmRuleForm.deviceType, // 设备类型
+            highValue: this.alarmRuleForm.highValue, // 告警上限
+            lowValue: this.alarmRuleForm.lowValue// 告警下限
+          }
+          addAlarmRule(alarmRuleForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
     },
     // 修改数据
     updateData: function() {

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..07d3236 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,9 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.search-div{
+  margin-bottom: 10px;
+}
+.search-div .el-form-item {
+  margin-bottom:10px !important;
+}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index b58e9dc..d29d47a 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,14 +13,38 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='create'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="lng">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-select
+              v-model="alarmRuleForm.devcode"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.devcode"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型">
+            <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-else :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="lat">
+          <el-form-item label="设备类型">
             <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
@@ -28,9 +52,7 @@
       <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限" prop="highValue">
-            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填">
-              <template v-if="unit" slot="append">{{ unit }}</template>
-            </el-input>
+            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,7 +70,8 @@
 </template>
 
 <script>
-import { updateAlarmRule } from '@/api/alarmRule'
+import { addAlarmRule, updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/alarmRule'
 
 export default {
   name: 'EditRule',
@@ -61,7 +84,7 @@
           callback()
         }
       } else {
-        callback(new Error('报警上限不能为空'))
+        callback(new Error('告警上限不能为空'))
       }
     }
     const validateLowValue = (rule, value, callback) => {
@@ -85,7 +108,9 @@
         devcode: ''// 设备编号
       },
       alarmRuleForm: {
-        id: '', // 报警规则id
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,8 +118,11 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
-      unit: '',
+      devices: [], // 待选设备编号列表
+      loading: true,
+      // unit: '', // 单位
       rules: {
+        devcode: [{ required: true, message: '请选择设备', trigger: ['blur', 'change'] }],
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
       } // 前端校验规则
@@ -102,19 +130,48 @@
   },
   computed: {
     showHighValue() {
-      if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
-        return true
-      } else {
-        return false
-      }
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
+      //   return true
+      // } else {
+      //   return false
+      // }
+      return true
     },
     showLowValue() {
-      // if (this.baseInfo.deviceType === '2') {
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
       //   return false
       // } else {
       //   return true
       // }
       return false
+    },
+    unit() {
+      if (this.alarmRuleForm.deviceType === '2') {
+        return 'm'
+      } else if (this.alarmRuleForm.deviceType === '6') {
+        return 'mg'
+      }
+    }
+  },
+  watch: {
+    'alarmRuleForm.devcode'(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.devcode === newValue) {
+          debugger
+          this.baseInfo.deviceTypeName = device.deviceTypeName
+          this.baseInfo.deviceType = device.deviceType
+          this.alarmRuleForm.deviceType = device.deviceType
+          // if (device.deviceType === '2') {
+          //   this.unit = 'm'
+          // } else if (device.deviceType === '6') {
+          //   this.unit = 'mg'
+          // }
+          return
+        }
+      }
+    },
+    'baseInfo.devcode'(newValue, oldValue) {
+      this.alarmRuleForm.devcode = newValue
     }
   },
   methods: {
@@ -136,29 +193,70 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
-        if (row.deviceType === '2') {
-          this.unit = '(m)'
-        } else if (row.deviceType === '6') {
-          this.unit = ''
-        }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    // 获取可设置告警规则设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList().then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          this.devices = response.data
+        }
+      })
+    },
     // 重置表单
     resetForm() {
-      this.alarmRuleForm = {
-        id: '',
-        concencode: '',
-        simid: '',
-        pid: '',
-        pids: '',
-        num: '',
-        tips: '',
-        version: ''
+      this.baseInfo = {
+        wellCode: '', // 窨井编号
+        wellName: '', // 窨井名称
+        deep: '', // 井深
+        deviceType: '', // 设备类别
+        deviceTypeName: '', // 设备类别
+        devcode: ''// 设备编号
       }
+      this.alarmRuleForm = {
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
+        highValue: '', // 告警上限
+        lowValue: '0'// 告警下限
+      } // 表单
     },
     // 保存数据
     saveData: function() {
-      this.updateData()
+      if (this.dialogStatus === 'create') {
+        this.addData()
+      } else {
+        this.updateData()
+      }
+    },
+    // 新增数据
+    addData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          debugger
+          const alarmRuleForm = {
+            devcode: this.alarmRuleForm.devcode, // 设备编号
+            deviceType: this.alarmRuleForm.deviceType, // 设备类型
+            highValue: this.alarmRuleForm.highValue, // 告警上限
+            lowValue: this.alarmRuleForm.lowValue// 告警下限
+          }
+          addAlarmRule(alarmRuleForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
     },
     // 修改数据
     updateData: function() {
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index f81a20e..d13e743 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -24,6 +24,9 @@
     <div>
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+        </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <!--<el-table-column align="center" type="selection" width="55"/>-->
@@ -34,9 +37,10 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="90">
           <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -65,7 +69,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList } from '@/api/alarmRule'
+import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
 
 export default {
   name: 'ListRule',
@@ -146,11 +150,35 @@
         return true
       }
     },
+    // 新增告警规则
+    add() {
+      this.editShow = true
+      this.$refs.editrule.initDialog('create', true)
+    },
     // 编辑告警规则信息
     edit(row) {
       this.editShow = true
       this.$refs.editrule.initDialog('update', true, row)
     },
+    // 删除告警规则信息
+    del(row) {
+      this.$confirm(
+        '确定要删除该告警规则吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..07d3236 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,9 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.search-div{
+  margin-bottom: 10px;
+}
+.search-div .el-form-item {
+  margin-bottom:10px !important;
+}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index b58e9dc..d29d47a 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,14 +13,38 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='create'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="lng">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-select
+              v-model="alarmRuleForm.devcode"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.devcode"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型">
+            <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-else :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="lat">
+          <el-form-item label="设备类型">
             <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
@@ -28,9 +52,7 @@
       <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限" prop="highValue">
-            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填">
-              <template v-if="unit" slot="append">{{ unit }}</template>
-            </el-input>
+            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,7 +70,8 @@
 </template>
 
 <script>
-import { updateAlarmRule } from '@/api/alarmRule'
+import { addAlarmRule, updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/alarmRule'
 
 export default {
   name: 'EditRule',
@@ -61,7 +84,7 @@
           callback()
         }
       } else {
-        callback(new Error('报警上限不能为空'))
+        callback(new Error('告警上限不能为空'))
       }
     }
     const validateLowValue = (rule, value, callback) => {
@@ -85,7 +108,9 @@
         devcode: ''// 设备编号
       },
       alarmRuleForm: {
-        id: '', // 报警规则id
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,8 +118,11 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
-      unit: '',
+      devices: [], // 待选设备编号列表
+      loading: true,
+      // unit: '', // 单位
       rules: {
+        devcode: [{ required: true, message: '请选择设备', trigger: ['blur', 'change'] }],
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
       } // 前端校验规则
@@ -102,19 +130,48 @@
   },
   computed: {
     showHighValue() {
-      if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
-        return true
-      } else {
-        return false
-      }
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
+      //   return true
+      // } else {
+      //   return false
+      // }
+      return true
     },
     showLowValue() {
-      // if (this.baseInfo.deviceType === '2') {
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
       //   return false
       // } else {
       //   return true
       // }
       return false
+    },
+    unit() {
+      if (this.alarmRuleForm.deviceType === '2') {
+        return 'm'
+      } else if (this.alarmRuleForm.deviceType === '6') {
+        return 'mg'
+      }
+    }
+  },
+  watch: {
+    'alarmRuleForm.devcode'(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.devcode === newValue) {
+          debugger
+          this.baseInfo.deviceTypeName = device.deviceTypeName
+          this.baseInfo.deviceType = device.deviceType
+          this.alarmRuleForm.deviceType = device.deviceType
+          // if (device.deviceType === '2') {
+          //   this.unit = 'm'
+          // } else if (device.deviceType === '6') {
+          //   this.unit = 'mg'
+          // }
+          return
+        }
+      }
+    },
+    'baseInfo.devcode'(newValue, oldValue) {
+      this.alarmRuleForm.devcode = newValue
     }
   },
   methods: {
@@ -136,29 +193,70 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
-        if (row.deviceType === '2') {
-          this.unit = '(m)'
-        } else if (row.deviceType === '6') {
-          this.unit = ''
-        }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    // 获取可设置告警规则设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList().then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          this.devices = response.data
+        }
+      })
+    },
     // 重置表单
     resetForm() {
-      this.alarmRuleForm = {
-        id: '',
-        concencode: '',
-        simid: '',
-        pid: '',
-        pids: '',
-        num: '',
-        tips: '',
-        version: ''
+      this.baseInfo = {
+        wellCode: '', // 窨井编号
+        wellName: '', // 窨井名称
+        deep: '', // 井深
+        deviceType: '', // 设备类别
+        deviceTypeName: '', // 设备类别
+        devcode: ''// 设备编号
       }
+      this.alarmRuleForm = {
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
+        highValue: '', // 告警上限
+        lowValue: '0'// 告警下限
+      } // 表单
     },
     // 保存数据
     saveData: function() {
-      this.updateData()
+      if (this.dialogStatus === 'create') {
+        this.addData()
+      } else {
+        this.updateData()
+      }
+    },
+    // 新增数据
+    addData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          debugger
+          const alarmRuleForm = {
+            devcode: this.alarmRuleForm.devcode, // 设备编号
+            deviceType: this.alarmRuleForm.deviceType, // 设备类型
+            highValue: this.alarmRuleForm.highValue, // 告警上限
+            lowValue: this.alarmRuleForm.lowValue// 告警下限
+          }
+          addAlarmRule(alarmRuleForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
     },
     // 修改数据
     updateData: function() {
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index f81a20e..d13e743 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -24,6 +24,9 @@
     <div>
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+        </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <!--<el-table-column align="center" type="selection" width="55"/>-->
@@ -34,9 +37,10 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="90">
           <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -65,7 +69,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList } from '@/api/alarmRule'
+import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
 
 export default {
   name: 'ListRule',
@@ -146,11 +150,35 @@
         return true
       }
     },
+    // 新增告警规则
+    add() {
+      this.editShow = true
+      this.$refs.editrule.initDialog('create', true)
+    },
     // 编辑告警规则信息
     edit(row) {
       this.editShow = true
       this.$refs.editrule.initDialog('update', true, row)
     },
+    // 删除告警规则信息
+    del(row) {
+      this.$confirm(
+        '确定要删除该告警规则吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index dc61a71..e052117 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="100px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,7 +13,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="lng">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
@@ -26,6 +26,33 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="alarmRuleForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="alarmRuleForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限（m）" prop="highValue">
             <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
@@ -47,6 +74,7 @@
 
 <script>
 import { updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/liquidconfig'
 
 export default {
   name: 'EditRule',
@@ -86,6 +114,8 @@
       },
       alarmRuleForm: {
         id: '', // 报警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,6 +123,7 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
+      devices: [], // 待选设备编号列表
       rules: {
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
@@ -134,8 +165,28 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    fetchDevice() {
+      this.loading = true
+      this.devices = []
+      // 获取液位可选列表
+      getDeviceSimpleList('2', '0').then(response => {
+        this.loading = false
+        this.devices = [...this.device, ...response.data]
+        // 获取开挖可选列表
+        getDeviceSimpleList('6', '0').then(response => {
+          this.loading = false
+          this.devices = [...this.device, ...response.data]
+        })
+      })
+    },
     // 重置表单
     resetForm() {
       this.alarmRuleForm = {

diff --git a/src/api/alarmRule.js b/src/api/alarmRule.js
index 2e68297..e2bd6c8 100644
--- a/src/api/alarmRule.js
+++ b/src/api/alarmRule.js
@@ -18,6 +18,24 @@
     params
   })
 }
+// 新增告警规则
+export function addAlarmRule(params) {
+  return request({
+    url: 'alarmRule/add',
+    method: 'post',
+    params
+  })
+}
+// 删除告警规则
+export function delAlarmRule(id) {
+  return request({
+    url: 'alarmRule/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
 
 // 告警规则查询
 export function getAlarmLevelList(params) {
@@ -44,3 +62,11 @@
     data: params
   })
 }
+
+// 待配置告警规则的设备列表
+export function getDeviceSimpleList(deviceType, configStatus) {
+  return request({
+    url: 'alarmRule/getNoAlarmDevice',
+    method: 'get'
+  })
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9b6d2a6..07d3236 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -86,3 +86,9 @@
 .el-main{
   height: calc(100vh - 50px);
 }
+.search-div{
+  margin-bottom: 10px;
+}
+.search-div .el-form-item {
+  margin-bottom:10px !important;
+}
diff --git a/src/views/alarmRule/components/editRule.vue b/src/views/alarmRule/components/editRule.vue
index b58e9dc..d29d47a 100644
--- a/src/views/alarmRule/components/editRule.vue
+++ b/src/views/alarmRule/components/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,14 +13,38 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='create'" :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备编号" prop="lng">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-select
+              v-model="alarmRuleForm.devcode"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.devcode"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型">
+            <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-else :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="lat">
+          <el-form-item label="设备类型">
             <el-input v-model="baseInfo.deviceTypeName" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
@@ -28,9 +52,7 @@
       <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限" prop="highValue">
-            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填">
-              <template v-if="unit" slot="append">{{ unit }}</template>
-            </el-input>
+            <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -48,7 +70,8 @@
 </template>
 
 <script>
-import { updateAlarmRule } from '@/api/alarmRule'
+import { addAlarmRule, updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/alarmRule'
 
 export default {
   name: 'EditRule',
@@ -61,7 +84,7 @@
           callback()
         }
       } else {
-        callback(new Error('报警上限不能为空'))
+        callback(new Error('告警上限不能为空'))
       }
     }
     const validateLowValue = (rule, value, callback) => {
@@ -85,7 +108,9 @@
         devcode: ''// 设备编号
       },
       alarmRuleForm: {
-        id: '', // 报警规则id
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,8 +118,11 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
-      unit: '',
+      devices: [], // 待选设备编号列表
+      loading: true,
+      // unit: '', // 单位
       rules: {
+        devcode: [{ required: true, message: '请选择设备', trigger: ['blur', 'change'] }],
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
       } // 前端校验规则
@@ -102,19 +130,48 @@
   },
   computed: {
     showHighValue() {
-      if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
-        return true
-      } else {
-        return false
-      }
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
+      //   return true
+      // } else {
+      //   return false
+      // }
+      return true
     },
     showLowValue() {
-      // if (this.baseInfo.deviceType === '2') {
+      // if (this.baseInfo.deviceType === '2' || this.baseInfo.deviceType === '6') {
       //   return false
       // } else {
       //   return true
       // }
       return false
+    },
+    unit() {
+      if (this.alarmRuleForm.deviceType === '2') {
+        return 'm'
+      } else if (this.alarmRuleForm.deviceType === '6') {
+        return 'mg'
+      }
+    }
+  },
+  watch: {
+    'alarmRuleForm.devcode'(newValue, oldValue) {
+      for (const device of this.devices) {
+        if (device.devcode === newValue) {
+          debugger
+          this.baseInfo.deviceTypeName = device.deviceTypeName
+          this.baseInfo.deviceType = device.deviceType
+          this.alarmRuleForm.deviceType = device.deviceType
+          // if (device.deviceType === '2') {
+          //   this.unit = 'm'
+          // } else if (device.deviceType === '6') {
+          //   this.unit = 'mg'
+          // }
+          return
+        }
+      }
+    },
+    'baseInfo.devcode'(newValue, oldValue) {
+      this.alarmRuleForm.devcode = newValue
     }
   },
   methods: {
@@ -136,29 +193,70 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
-        if (row.deviceType === '2') {
-          this.unit = '(m)'
-        } else if (row.deviceType === '6') {
-          this.unit = ''
-        }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    // 获取可设置告警规则设备列表
+    fetchDevice() {
+      this.loading = true
+      getDeviceSimpleList().then(response => {
+        if (response.code === 200) {
+          this.loading = false
+          this.devices = response.data
+        }
+      })
+    },
     // 重置表单
     resetForm() {
-      this.alarmRuleForm = {
-        id: '',
-        concencode: '',
-        simid: '',
-        pid: '',
-        pids: '',
-        num: '',
-        tips: '',
-        version: ''
+      this.baseInfo = {
+        wellCode: '', // 窨井编号
+        wellName: '', // 窨井名称
+        deep: '', // 井深
+        deviceType: '', // 设备类别
+        deviceTypeName: '', // 设备类别
+        devcode: ''// 设备编号
       }
+      this.alarmRuleForm = {
+        id: '', // 告警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
+        highValue: '', // 告警上限
+        lowValue: '0'// 告警下限
+      } // 表单
     },
     // 保存数据
     saveData: function() {
-      this.updateData()
+      if (this.dialogStatus === 'create') {
+        this.addData()
+      } else {
+        this.updateData()
+      }
+    },
+    // 新增数据
+    addData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          debugger
+          const alarmRuleForm = {
+            devcode: this.alarmRuleForm.devcode, // 设备编号
+            deviceType: this.alarmRuleForm.deviceType, // 设备类型
+            highValue: this.alarmRuleForm.highValue, // 告警上限
+            lowValue: this.alarmRuleForm.lowValue// 告警下限
+          }
+          addAlarmRule(alarmRuleForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('新增成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
     },
     // 修改数据
     updateData: function() {
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index f81a20e..d13e743 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -24,6 +24,9 @@
     <div>
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+        </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <!--<el-table-column align="center" type="selection" width="55"/>-->
@@ -34,9 +37,10 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
+        <el-table-column label="操作" align="center" width="90">
           <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -65,7 +69,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import editRule from '@/views/alarmRule/components/editRule'
 import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList } from '@/api/alarmRule'
+import { getAlarmRuleList, delAlarmRule } from '@/api/alarmRule'
 
 export default {
   name: 'ListRule',
@@ -146,11 +150,35 @@
         return true
       }
     },
+    // 新增告警规则
+    add() {
+      this.editShow = true
+      this.$refs.editrule.initDialog('create', true)
+    },
     // 编辑告警规则信息
     edit(row) {
       this.editShow = true
       this.$refs.editrule.initDialog('update', true, row)
     },
+    // 删除告警规则信息
+    del(row) {
+      this.$confirm(
+        '确定要删除该告警规则吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delAlarmRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)
diff --git a/src/views/alarmRule/editRule.vue b/src/views/alarmRule/editRule.vue
index dc61a71..e052117 100644
--- a/src/views/alarmRule/editRule.vue
+++ b/src/views/alarmRule/editRule.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="alarmRuleForm" label-position="right" label-width="100px">
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="窨井编号" prop="concencode">
             <el-input v-model="baseInfo.wellCode" type="text" placeholder="未知" disabled/>
@@ -13,7 +13,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <el-row v-if="dialogStatus=='update'" :gutter="20">
         <el-col :span="12">
           <el-form-item label="设备编号" prop="lng">
             <el-input v-model="baseInfo.devcode" type="text" placeholder="未知" disabled/>
@@ -26,6 +26,33 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item v-if="dialogStatus=='create'" label="设备编号" prop="deviceId">
+            <el-select
+              v-model="configForm.deviceId"
+              :loading="loading"
+              :disabled="dialogStatus=='update'?true:false"
+              filterable
+              placeholder="请输入设备编号"
+            >
+              <el-option
+                v-for="item in devices"
+                :key="item.id"
+                :label="item.devcode"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="dialogStatus=='update'" label="设备编号">
+            <el-input v-model="alarmRuleForm.devcode" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="deviceForm.deviceTypeName!=''" label="设备类型" prop="deviceType">
+            <el-input v-model="alarmRuleForm.deviceTypeName" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col v-if="showHighValue" :span="12">
           <el-form-item label="告警上限（m）" prop="highValue">
             <el-input v-model.trim="alarmRuleForm.highValue" type="text" placeholder="必填"/>
@@ -47,6 +74,7 @@
 
 <script>
 import { updateAlarmRule } from '@/api/alarmRule'
+import { getDeviceSimpleList } from '@/api/liquidconfig'
 
 export default {
   name: 'EditRule',
@@ -86,6 +114,8 @@
       },
       alarmRuleForm: {
         id: '', // 报警规则id
+        devcode: '', // 设备编号
+        deviceType: '', // 设备类型
         highValue: '', // 告警上限
         lowValue: '0'// 告警下限
       }, // 表单
@@ -93,6 +123,7 @@
         update: '编辑',
         create: '新增'
       }, // 表头显示标题
+      devices: [], // 待选设备编号列表
       rules: {
         highValue: [{ required: true, trigger: ['blur', 'change'], validator: validateHighValue }],
         lowValue: [{ required: true, trigger: ['blur', 'change'], validator: validateLowValue }]
@@ -134,8 +165,28 @@
           deviceTypeName: row.deviceTypeName,
           devcode: row.devcode
         }
+      } else { // 如果是新增
+        this.resetForm()
+        this.fetchDevice()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
       }
     },
+    fetchDevice() {
+      this.loading = true
+      this.devices = []
+      // 获取液位可选列表
+      getDeviceSimpleList('2', '0').then(response => {
+        this.loading = false
+        this.devices = [...this.device, ...response.data]
+        // 获取开挖可选列表
+        getDeviceSimpleList('6', '0').then(response => {
+          this.loading = false
+          this.devices = [...this.device, ...response.data]
+        })
+      })
+    },
     // 重置表单
     resetForm() {
       this.alarmRuleForm = {
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
index 77ce5c9..e5fbb5d 100644
--- a/src/views/alarmRule/listRule.vue
+++ b/src/views/alarmRule/listRule.vue
@@ -24,6 +24,9 @@
     <div>
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
+        </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <!--<el-table-column align="center" type="selection" width="55"/>-->
@@ -36,7 +39,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
+            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -65,7 +69,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import editRule from '@/views/alarmRule/editRule'
 import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList } from '@/api/alarmRule'
+import { getAlarmRuleList, delRule } from '@/api/alarmRule'
 
 export default {
   name: 'ListRule',
@@ -151,6 +155,29 @@
       this.editShow = true
       this.$refs.editrule.initDialog('update', true, row)
     },
+    add() {
+      this.editShow = true
+      this.$refs.editrule.initDialog('create', true)
+    },
+    // 编辑告警规则信息
+    del(row) {
+      this.$confirm(
+        '确定要删除该报警规则吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        delRule(row.id).then(response => {
+          if (response.code === 200) {
+            this.$message.success('删除成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
     // 查询数据
     search() {
       this.fetchData(false)