diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 99ac3e7..805e850 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -55,6 +55,7 @@
               type="text"
               placeholder="未知"
               disabled
+              clearable
             />
           </el-form-item>
         </el-col>
@@ -64,11 +65,9 @@
           <el-form-item label="设备描述" prop="typeDescription">
             <el-input
               v-model.trim="deviceForm.typeDescription"
-              type="textarea"
+              type="text"
               placeholder="非必填"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              clearable
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
@@ -77,10 +76,8 @@
           <el-form-item label="监控内容" prop="watchType">
             <el-input
               v-model.trim="deviceForm.watchType"
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              type="text"
+              clearable
               placeholder="请输入监控内容"
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 99ac3e7..805e850 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -55,6 +55,7 @@
               type="text"
               placeholder="未知"
               disabled
+              clearable
             />
           </el-form-item>
         </el-col>
@@ -64,11 +65,9 @@
           <el-form-item label="设备描述" prop="typeDescription">
             <el-input
               v-model.trim="deviceForm.typeDescription"
-              type="textarea"
+              type="text"
               placeholder="非必填"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              clearable
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
@@ -77,10 +76,8 @@
           <el-form-item label="监控内容" prop="watchType">
             <el-input
               v-model.trim="deviceForm.watchType"
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              type="text"
+              clearable
               placeholder="请输入监控内容"
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8a98e89..f9dabd4 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-select
+              v-model="listQuery.deviceType"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+            <el-select
+              v-model="listQuery.isValid"
+              placeholder="是否启用"
+              clearable
+            >
               <el-option
                 v-for="item in isValidList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,18 +58,48 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
@@ -100,7 +148,7 @@
       ],
       columns: [
         {
-          text: '设备编号',
+          text: '设备类型编号',
           value: 'id',
           align: 'center'
         },

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 99ac3e7..805e850 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -55,6 +55,7 @@
               type="text"
               placeholder="未知"
               disabled
+              clearable
             />
           </el-form-item>
         </el-col>
@@ -64,11 +65,9 @@
           <el-form-item label="设备描述" prop="typeDescription">
             <el-input
               v-model.trim="deviceForm.typeDescription"
-              type="textarea"
+              type="text"
               placeholder="非必填"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              clearable
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
@@ -77,10 +76,8 @@
           <el-form-item label="监控内容" prop="watchType">
             <el-input
               v-model.trim="deviceForm.watchType"
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              type="text"
+              clearable
               placeholder="请输入监控内容"
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8a98e89..f9dabd4 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-select
+              v-model="listQuery.deviceType"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+            <el-select
+              v-model="listQuery.isValid"
+              placeholder="是否启用"
+              clearable
+            >
               <el-option
                 v-for="item in isValidList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,18 +58,48 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
@@ -100,7 +148,7 @@
       ],
       columns: [
         {
-          text: '设备编号',
+          text: '设备类型编号',
           value: 'id',
           align: 'center'
         },
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index db3388a..fb7867e 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -49,7 +49,7 @@
 </template>
 <script>
 import { getTenantList } from '@/api/base/tenant'
-import { getAlarmLevelList } from '@/api/alarm/alarmRule'
+import { getAlarmLevelList } from '@/api/systemConfig/alarmLevel'
 import infoWell from '@/views/wellManage/infoWell'
 import editLiquidLevel from './components/editLiquidLevel'
 import editDigLevel from './components/editDigLevel'
@@ -120,7 +120,7 @@
       total: 0, // 数据总数
       deviceTypeList: [], // 设备类型列表
       showDeviceType: true,
-      listLoading: true, // 加载动画
+      listLoading: false, // 加载动画
       editShow: false, // 是否显示编辑框
       wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
@@ -128,6 +128,7 @@
   },
   created() {
     this.fetchTenantList()
+    this.fetchData()
   },
   methods: {
     // 点击切换项目

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 99ac3e7..805e850 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -55,6 +55,7 @@
               type="text"
               placeholder="未知"
               disabled
+              clearable
             />
           </el-form-item>
         </el-col>
@@ -64,11 +65,9 @@
           <el-form-item label="设备描述" prop="typeDescription">
             <el-input
               v-model.trim="deviceForm.typeDescription"
-              type="textarea"
+              type="text"
               placeholder="非必填"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              clearable
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
@@ -77,10 +76,8 @@
           <el-form-item label="监控内容" prop="watchType">
             <el-input
               v-model.trim="deviceForm.watchType"
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              type="text"
+              clearable
               placeholder="请输入监控内容"
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8a98e89..f9dabd4 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-select
+              v-model="listQuery.deviceType"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+            <el-select
+              v-model="listQuery.isValid"
+              placeholder="是否启用"
+              clearable
+            >
               <el-option
                 v-for="item in isValidList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,18 +58,48 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
@@ -100,7 +148,7 @@
       ],
       columns: [
         {
-          text: '设备编号',
+          text: '设备类型编号',
           value: 'id',
           align: 'center'
         },
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index db3388a..fb7867e 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -49,7 +49,7 @@
 </template>
 <script>
 import { getTenantList } from '@/api/base/tenant'
-import { getAlarmLevelList } from '@/api/alarm/alarmRule'
+import { getAlarmLevelList } from '@/api/systemConfig/alarmLevel'
 import infoWell from '@/views/wellManage/infoWell'
 import editLiquidLevel from './components/editLiquidLevel'
 import editDigLevel from './components/editDigLevel'
@@ -120,7 +120,7 @@
       total: 0, // 数据总数
       deviceTypeList: [], // 设备类型列表
       showDeviceType: true,
-      listLoading: true, // 加载动画
+      listLoading: false, // 加载动画
       editShow: false, // 是否显示编辑框
       wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
@@ -128,6 +128,7 @@
   },
   created() {
     this.fetchTenantList()
+    this.fetchData()
   },
   methods: {
     // 点击切换项目
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
new file mode 100644
index 0000000..ad70b2f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
@@ -0,0 +1,240 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="型号名称" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="类型主键" prop="deviceType">
+            <el-input
+              v-model.trim="deviceForm.deviceType"
+              type="text"
+              clearable
+              placeholder="请输入类型主键"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceTypeName">
+            <el-input
+              v-model.trim="deviceForm.deviceTypeName"
+              type="text"
+              clearable
+              placeholder="请输入设备名称"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'DialogDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        deviceTypeName: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        deviceTypeName: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          modelName: row.modelName,
+          deviceType: row.deviceType,
+          communication: row.communication.split(','),
+          deviceTypeName: row.deviceTypeName,
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>

diff --git a/mock/deviceManage/deviceType.js b/mock/deviceManage/deviceType.js
index 1640c25..69e9100 100644
--- a/mock/deviceManage/deviceType.js
+++ b/mock/deviceManage/deviceType.js
@@ -45,14 +45,14 @@
     'id': '112343243242341',
     'typeName': '井盖状态检测仪',
     'typeDescription': '检测井盖状态',
-    'valid': '开启',
+    'valid': '是',
     'watchType': '监控检测井盖状态'
   },
   {
     'id': '112343243242986',
     'typeName': '有害气体检测仪',
     'typeDescription': '检测气体类型',
-    'valid': '关闭',
+    'valid': '否',
     'watchType': '监控气体类型'
   }
 ]
diff --git a/mock/index.js b/mock/index.js
index 3e2d293..8eef48b 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -15,6 +15,7 @@
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
 const deviceImei = require('./deviceManage/deviceImei')
+const alarmLevel = require('./systemConfig/alarmLevel')
 
 const mocks = [
   ...user,
@@ -30,7 +31,8 @@
   ...overview,
   ...deviceType,
   ...deviceModels,
-  ...deviceImei
+  ...deviceImei,
+  ...alarmLevel
 ]
 
 // for front mock
diff --git a/mock/systemConfig/alarmLevel.js b/mock/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..d46c2b9
--- /dev/null
+++ b/mock/systemConfig/alarmLevel.js
@@ -0,0 +1,32 @@
+const alarmLevelList = [
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/12/23'
+  },
+  {
+    'name': '3213',
+    'deviceTypeName': 'ffff',
+    'openAlarm': '开启',
+    'openJob': '开启',
+    'ts': '2022/02/13'
+  }
+]
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/alarm/level/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: alarmLevelList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/systemConfig/alarmLevel.js b/src/api/systemConfig/alarmLevel.js
new file mode 100644
index 0000000..f99e960
--- /dev/null
+++ b/src/api/systemConfig/alarmLevel.js
@@ -0,0 +1,13 @@
+/*
+ * 告警等级配置接口
+*/
+
+import request from '@/utils/request'
+// 告警等级列表查询
+export function getAlarmLevelList(params) {
+  return request({
+    url: 'alarm/level/list',
+    method: 'get',
+    params
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index abba18b..bc3d8c2 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -2,12 +2,27 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
+            <el-input
+              v-model="listQuery.devcode"
+              type="text"
+              placeholder="设备编号"
+              clearable
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -21,7 +36,11 @@
             <i class="el-icon-menu" />数据列表
           </div>
         </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
+        <el-col
+          :span="12"
+          :offset="6"
+          class="edit_btns"
+        >
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -37,30 +56,64 @@
             </el-button>
           </el-upload>
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
-            <el-button type="text" @click="detail(scope.row)">
+            <!-- <el-button type="text" @click="detail(scope.row)">
               详情
-            </el-button>
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -86,11 +139,6 @@
       }, // 查询条件
       columns: [
         {
-          text: 'id',
-          value: 'id',
-          align: 'center'
-        },
-        {
           text: '	设备编号',
           value: 'devcode',
           align: 'center'
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index ad70b2f..394b24c 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -13,6 +13,22 @@
     >
       <el-row :gutter="20">
         <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select
+              v-model="deviceForm.deviceType"
+              placeholder="请选择设备类型"
+              clearable
+            >
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="型号名称" prop="modelName">
             <el-input
               v-model.trim="deviceForm.modelName"
@@ -23,30 +39,8 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="类型主键" prop="deviceType">
-            <el-input
-              v-model.trim="deviceForm.deviceType"
-              type="text"
-              clearable
-              placeholder="请输入类型主键"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备名称" prop="deviceTypeName">
-            <el-input
-              v-model.trim="deviceForm.deviceTypeName"
-              type="text"
-              clearable
-              placeholder="请输入设备名称"
-              :disabled="dialogStatus === 'create' ? false : true"
-            />
-          </el-form-item>
-        </el-col>
+      <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="通信方式" prop="communication">
             <el-select
@@ -65,9 +59,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
-        <el-col :span="12">
+        <el-col v-show="dialogStatus === 'create' ? false : true" :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input
               v-model.trim="deviceForm.devcode"
@@ -96,13 +88,14 @@
 </template>
 
 <script>
-import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+import { getDevice, updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
   name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
       dialogStatus: '', // 对话框类型：create,update,detail
+      deviceTypeList: [],
       // 对话框标题
       textMap: {
         update: '编辑',
@@ -136,26 +129,32 @@
         modelName: '',
         deviceType: '',
         communication: [],
-        deviceTypeName: '',
         devcode: ''
       },
       // 表单校验规则
       rules: {
         modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
         deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
-        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
         communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
       }
     }
   },
+  created() {
+    this.fetchDeviceType()
+  },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
     // 重置表单
     resetForm() {
       this.deviceForm = {
         modelName: '',
         deviceType: '',
         communication: '',
-        deviceTypeName: '',
         devcode: ''
       }
     },
@@ -175,7 +174,6 @@
           modelName: row.modelName,
           deviceType: row.deviceType,
           communication: row.communication.split(','),
-          deviceTypeName: row.deviceTypeName,
           devcode: row.id
         }
       }
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7f04489..5099a0c 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+            <el-select
+              v-model="listQuery.modelName"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceModelList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+            <el-select
+              v-model="listQuery.communication"
+              placeholder="通信方式"
+              clearable
+            >
               <el-option
                 v-for="item in commuList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,23 +58,57 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+        >
           <template slot-scope="scope">
             <el-button type="text" @click="edit(scope.row)">
               编辑
@@ -122,11 +174,6 @@
           align: 'center'
         },
         {
-          text: '设备类型主键',
-          value: 'deviceType',
-          align: 'center'
-        },
-        {
           text: '设备类型名称',
           value: 'deviceTypeName',
           align: 'center'
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index 99ac3e7..805e850 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -55,6 +55,7 @@
               type="text"
               placeholder="未知"
               disabled
+              clearable
             />
           </el-form-item>
         </el-col>
@@ -64,11 +65,9 @@
           <el-form-item label="设备描述" prop="typeDescription">
             <el-input
               v-model.trim="deviceForm.typeDescription"
-              type="textarea"
+              type="text"
               placeholder="非必填"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              clearable
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
           </el-form-item>
@@ -77,10 +76,8 @@
           <el-form-item label="监控内容" prop="watchType">
             <el-input
               v-model.trim="deviceForm.watchType"
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              show-word-limit
+              type="text"
+              clearable
               placeholder="请输入监控内容"
               :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
             />
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 8a98e89..f9dabd4 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -2,10 +2,19 @@
   <div class="app-container">
     <!--筛选条件-->
     <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+      <el-form
+        ref="selectForm"
+        :inline="true"
+        :model="listQuery"
+        class="form-container"
+      >
         <el-row>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+            <el-select
+              v-model="listQuery.deviceType"
+              placeholder="设备类型"
+              clearable
+            >
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -15,7 +24,11 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
+            <el-select
+              v-model="listQuery.isValid"
+              placeholder="是否启用"
+              clearable
+            >
               <el-option
                 v-for="item in isValidList"
                 :key="item.value"
@@ -24,7 +37,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+          <el-button
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >
             搜索
           </el-button>
         </el-row>
@@ -40,18 +58,48 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <!-- v-if="hasPerm('/device/delete')" -->
-          <el-button class="edit_btn" size="small" @click="del">
+          <el-button
+            class="edit_btn"
+            size="small"
+            @click="del"
+          >
             删除
           </el-button>
-          <el-button class="edit_btn" size="small" @click="add">
+          <el-button
+            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" />
-        <el-table-column align="center" type="index" label="序号" width="55" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        class="table"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          type="index"
+          label="序号"
+          width="55"
+        />
+        <el-table-column
+          v-for="column in columns"
+          :key="column.value"
+          :label="column.text"
+          :width="column.width"
+          :align="column.align"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[column.value] }}</span>
           </template>
@@ -100,7 +148,7 @@
       ],
       columns: [
         {
-          text: '设备编号',
+          text: '设备类型编号',
           value: 'id',
           align: 'center'
         },
diff --git a/src/views/systemConfig/alarmLevel/listLevel.vue b/src/views/systemConfig/alarmLevel/listLevel.vue
index db3388a..fb7867e 100644
--- a/src/views/systemConfig/alarmLevel/listLevel.vue
+++ b/src/views/systemConfig/alarmLevel/listLevel.vue
@@ -49,7 +49,7 @@
 </template>
 <script>
 import { getTenantList } from '@/api/base/tenant'
-import { getAlarmLevelList } from '@/api/alarm/alarmRule'
+import { getAlarmLevelList } from '@/api/systemConfig/alarmLevel'
 import infoWell from '@/views/wellManage/infoWell'
 import editLiquidLevel from './components/editLiquidLevel'
 import editDigLevel from './components/editDigLevel'
@@ -120,7 +120,7 @@
       total: 0, // 数据总数
       deviceTypeList: [], // 设备类型列表
       showDeviceType: true,
-      listLoading: true, // 加载动画
+      listLoading: false, // 加载动画
       editShow: false, // 是否显示编辑框
       wellShow: false, // 是否显示井详情
       cmpName: '' // 组件名称
@@ -128,6 +128,7 @@
   },
   created() {
     this.fetchTenantList()
+    this.fetchData()
   },
   methods: {
     // 点击切换项目
diff --git a/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
new file mode 100644
index 0000000..ad70b2f
--- /dev/null
+++ b/src/views/systemConfig/deptPermission/components/dialogDeviceModel.vue
@@ -0,0 +1,240 @@
+<template>
+  <el-dialog
+    append-to-body
+    :title="textMap[dialogStatus]"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="deviceForm"
+      label-width="100px"
+      label-well-code="right"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="型号名称" prop="modelName">
+            <el-input
+              v-model.trim="deviceForm.modelName"
+              type="text"
+              :disabled="dialogStatus === 'create' ? false : true"
+              clearable
+              placeholder="请输入型号名称"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="类型主键" prop="deviceType">
+            <el-input
+              v-model.trim="deviceForm.deviceType"
+              type="text"
+              clearable
+              placeholder="请输入类型主键"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceTypeName">
+            <el-input
+              v-model.trim="deviceForm.deviceTypeName"
+              type="text"
+              clearable
+              placeholder="请输入设备名称"
+              :disabled="dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="通信方式" prop="communication">
+            <el-select
+              v-model="deviceForm.communication"
+              clearable
+              multiple
+              placeholder="请选择通信方式"
+              :disabled="dialogStatus === 'detail' ? true : false"
+            >
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-show="dialogStatus === 'create' ? false : true" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备编号" prop="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              type="text"
+              clearable
+              devcode
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div
+      v-show="dialogStatus === 'detail' ? false : true"
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
+export default {
+  name: 'DialogDeviceModel',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        modelName: '',
+        deviceType: '',
+        communication: [],
+        deviceTypeName: '',
+        devcode: ''
+      },
+      // 表单校验规则
+      rules: {
+        modelName: [{ required: true, message: '型号名称必填', trigger: ['blur', 'change'] }],
+        deviceType: [{ required: true, message: '设备主键必填', trigger: ['blur', 'change'] }],
+        deviceTypeName: [{ required: true, message: '设备名称必填', trigger: ['blur', 'change'] }],
+        communication: [{ required: true, message: '通讯方式必选', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        modelName: '',
+        deviceType: '',
+        communication: '',
+        deviceTypeName: '',
+        devcode: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      console.log(row, '====21==')
+      this.dialogFormVisible = true
+      this.dialogStatus = dialogStatus
+      if (this.dialogStatus === 'create') {
+        this.resetForm()
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
+        console.log(typeof row.communication)
+        this.deviceForm = {
+          modelName: row.modelName,
+          deviceType: row.deviceType,
+          communication: row.communication.split(','),
+          deviceTypeName: row.deviceTypeName,
+          devcode: row.id
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          updateDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$message.success('修改成功')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+            }
+          })
+        }
+      })
+    },
+    // 新增数据
+    createData: function() {
+      this.$refs['dataForm'].validate((valid) => {
+        console.log(this.deviceForm)
+        if (valid) {
+          this.deviceForm.communication = this.deviceForm.communication.toString()
+          addDeviceModel(this.deviceForm).then(response => {
+            if (response.code === 200) {
+              this.$confirm('新增成功，是否继续新增?', '提示', {
+                confirmButtonText: '是',
+                cancelButtonText: '否',
+                type: 'info'
+              }).then(() => {
+                this.resetForm()
+                this.$nextTick(() => {
+                  this.$refs['dataForm'].clearValidate()
+                })
+              }).catch(() => {
+                this.$emit('watchChild') // 刷新父组件数据列表
+                this.dialogFormVisible = false
+              })
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .el-select{
+    width: 100%;
+  }
+</style>
diff --git a/src/views/systemConfig/deptPermission/listDept.vue b/src/views/systemConfig/deptPermission/listDept.vue
index 919918c..37d3277 100644
--- a/src/views/systemConfig/deptPermission/listDept.vue
+++ b/src/views/systemConfig/deptPermission/listDept.vue
@@ -1,9 +1,254 @@
 <template>
-  <div>组织权限配置</div>
+  <div class="app-container">
+    <!--筛选条件-->
+    <div class="search-div">
+      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
+        <el-row>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.modelName" placeholder="设备型号" clearable>
+              <el-option
+                v-for="item in deviceModelList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="selectForm-container-item">
+            <el-select v-model="listQuery.communication" placeholder="通信方式" clearable>
+              <el-option
+                v-for="item in commuList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
+        </el-row>
+      </el-form>
+    </div>
+    <!--查询结果Table显示-->
+    <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">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
+            删除
+          </el-button>
+          <el-button 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" />
+        <el-table-column align="center" type="index" label="序号" width="55" />
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button type="text" @click="edit(scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="detail(scope.row)">
+              详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
+  </div>
 </template>
 
 <script>
-export default {
+import dialogDevice from '@/views/deviceManage/deviceModel/components/dialogDeviceModel'
+import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
+export default {
+  name: 'ListDept',
+  components: { dialogDevice },
+  data() {
+    return {
+      listQuery: {
+        modelName: '',
+        communication: '',
+        offset: 1,
+        sort: 'id',
+        order: 'asc'
+      }, // 查询条件
+      commuList: [
+        {
+          label: 'LORA',
+          value: '0'
+        },
+        {
+          label: '3G',
+          value: '1'
+        },
+        {
+          label: '4G',
+          value: '2'
+        },
+        {
+          label: '联通移动NB',
+          value: '3'
+        },
+        {
+          label: '电信NB',
+          value: '4'
+        }
+      ],
+      columns: [
+        {
+          text: '设备型号编号',
+          value: 'id',
+          align: 'center'
+        },
+        {
+          text: '型号名称',
+          value: 'modelName',
+          align: 'center'
+        },
+        {
+          text: '设备类型主键',
+          value: 'deviceType',
+          align: 'center'
+        },
+        {
+          text: '设备类型名称',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '通信方式',
+          value: 'communication',
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      deviceModelList: [], // 设备类型列表
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+    this.fetchData()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice(this.listQuery).then(response => {
+        this.deviceModelList = response.data
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceModelList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    // 检查选择情况
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 删除设备
+    del() {
+      if (this.checkSelection()) {
+        const deviceIds = []
+        const deviceIndex = []
+        this.multipleSelection.forEach(function(value, index) {
+          deviceIds.push(value.id)
+          deviceIndex.push(index)
+        })
+        this.$confirm(
+          '确定要删除所选设备吗？',
+          '确认操作',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        ).then(() => {
+          delDeviceModel(deviceIds).then(response => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
+    },
+    // 详情
+    detail(row) {
+      this.$refs.dialogDevice.initDialog('detail', row)
+    },
+    // 新增设备
+    add() {
+      this.$refs.dialogDevice.initDialog('create')
+    },
+    // 编辑设备信息
+    edit(row) {
+      this.$refs.dialogDevice.initDialog('update', row)
+    }
+  }
 }
 </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;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+</style>