diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
index 1eeb915..1640c25 100644
--- a/mock/deviceManage/device.js
+++ b/mock/deviceManage/device.js
@@ -42,18 +42,18 @@
 ]
 const deviceTableList = [
   {
-    'id': '设备编号',
-    'typeName': '设备类型',
-    'typeDescription': '描述',
+    'id': '112343243242341',
+    'typeName': '井盖状态检测仪',
+    'typeDescription': '检测井盖状态',
     'valid': '开启',
-    'watchType': '监控内容'
+    'watchType': '监控检测井盖状态'
   },
   {
-    'id': '设备编号2',
-    'typeName': '设备类型2',
-    'typeDescription': '描述2',
+    'id': '112343243242986',
+    'typeName': '有害气体检测仪',
+    'typeDescription': '检测气体类型',
     'valid': '关闭',
-    'watchType': '监控内容2'
+    'watchType': '监控气体类型'
   }
 ]
 module.exports = [
@@ -65,21 +65,21 @@
       return {
         code: 200,
         data: deviceTypeList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   },
   {
-    url: '/device/list',
+    url: '/deviceType/list',
     type: 'get',
     response: _ => {
       return {
         code: 200,
         data: deviceTableList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   }
-]
\ No newline at end of file
+]

diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
index 1eeb915..1640c25 100644
--- a/mock/deviceManage/device.js
+++ b/mock/deviceManage/device.js
@@ -42,18 +42,18 @@
 ]
 const deviceTableList = [
   {
-    'id': '设备编号',
-    'typeName': '设备类型',
-    'typeDescription': '描述',
+    'id': '112343243242341',
+    'typeName': '井盖状态检测仪',
+    'typeDescription': '检测井盖状态',
     'valid': '开启',
-    'watchType': '监控内容'
+    'watchType': '监控检测井盖状态'
   },
   {
-    'id': '设备编号2',
-    'typeName': '设备类型2',
-    'typeDescription': '描述2',
+    'id': '112343243242986',
+    'typeName': '有害气体检测仪',
+    'typeDescription': '检测气体类型',
     'valid': '关闭',
-    'watchType': '监控内容2'
+    'watchType': '监控气体类型'
   }
 ]
 module.exports = [
@@ -65,21 +65,21 @@
       return {
         code: 200,
         data: deviceTypeList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   },
   {
-    url: '/device/list',
+    url: '/deviceType/list',
     type: 'get',
     response: _ => {
       return {
         code: 200,
         data: deviceTableList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/api/device/deviceType.js b/src/api/device/deviceType.js
new file mode 100644
index 0000000..3c10883
--- /dev/null
+++ b/src/api/device/deviceType.js
@@ -0,0 +1,53 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+
+// 设备查询
+export function getDeviceList(params) {
+  return request({
+    url: 'deviceType/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceType(params) {
+  return request({
+    url: 'deviceType/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceType(params) {
+  return request({
+    url: 'deviceType/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDevice(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}

diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
index 1eeb915..1640c25 100644
--- a/mock/deviceManage/device.js
+++ b/mock/deviceManage/device.js
@@ -42,18 +42,18 @@
 ]
 const deviceTableList = [
   {
-    'id': '设备编号',
-    'typeName': '设备类型',
-    'typeDescription': '描述',
+    'id': '112343243242341',
+    'typeName': '井盖状态检测仪',
+    'typeDescription': '检测井盖状态',
     'valid': '开启',
-    'watchType': '监控内容'
+    'watchType': '监控检测井盖状态'
   },
   {
-    'id': '设备编号2',
-    'typeName': '设备类型2',
-    'typeDescription': '描述2',
+    'id': '112343243242986',
+    'typeName': '有害气体检测仪',
+    'typeDescription': '检测气体类型',
     'valid': '关闭',
-    'watchType': '监控内容2'
+    'watchType': '监控气体类型'
   }
 ]
 module.exports = [
@@ -65,21 +65,21 @@
       return {
         code: 200,
         data: deviceTypeList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   },
   {
-    url: '/device/list',
+    url: '/deviceType/list',
     type: 'get',
     response: _ => {
       return {
         code: 200,
         data: deviceTableList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/api/device/deviceType.js b/src/api/device/deviceType.js
new file mode 100644
index 0000000..3c10883
--- /dev/null
+++ b/src/api/device/deviceType.js
@@ -0,0 +1,53 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+
+// 设备查询
+export function getDeviceList(params) {
+  return request({
+    url: 'deviceType/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceType(params) {
+  return request({
+    url: 'deviceType/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceType(params) {
+  return request({
+    url: 'deviceType/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDevice(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
new file mode 100644
index 0000000..cc9b395
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -0,0 +1,242 @@
+<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="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :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"
+              placeholder="未知"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="textarea"
+              placeholder="非必填"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </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 { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'DetailDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      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') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(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) {
+          addDeviceType(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/device.js b/mock/deviceManage/device.js
index 1eeb915..1640c25 100644
--- a/mock/deviceManage/device.js
+++ b/mock/deviceManage/device.js
@@ -42,18 +42,18 @@
 ]
 const deviceTableList = [
   {
-    'id': '设备编号',
-    'typeName': '设备类型',
-    'typeDescription': '描述',
+    'id': '112343243242341',
+    'typeName': '井盖状态检测仪',
+    'typeDescription': '检测井盖状态',
     'valid': '开启',
-    'watchType': '监控内容'
+    'watchType': '监控检测井盖状态'
   },
   {
-    'id': '设备编号2',
-    'typeName': '设备类型2',
-    'typeDescription': '描述2',
+    'id': '112343243242986',
+    'typeName': '有害气体检测仪',
+    'typeDescription': '检测气体类型',
     'valid': '关闭',
-    'watchType': '监控内容2'
+    'watchType': '监控气体类型'
   }
 ]
 module.exports = [
@@ -65,21 +65,21 @@
       return {
         code: 200,
         data: deviceTypeList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   },
   {
-    url: '/device/list',
+    url: '/deviceType/list',
     type: 'get',
     response: _ => {
       return {
         code: 200,
         data: deviceTableList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/api/device/deviceType.js b/src/api/device/deviceType.js
new file mode 100644
index 0000000..3c10883
--- /dev/null
+++ b/src/api/device/deviceType.js
@@ -0,0 +1,53 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+
+// 设备查询
+export function getDeviceList(params) {
+  return request({
+    url: 'deviceType/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceType(params) {
+  return request({
+    url: 'deviceType/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceType(params) {
+  return request({
+    url: 'deviceType/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDevice(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
new file mode 100644
index 0000000..cc9b395
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -0,0 +1,242 @@
+<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="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :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"
+              placeholder="未知"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="textarea"
+              placeholder="非必填"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </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 { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'DetailDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      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') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(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) {
+          addDeviceType(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/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
-      <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              :disabled="isDetailMode"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <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="modelId">
-            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
-              <el-option
-                v-for="item in deviceModelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
-            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
-            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="cancel">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
-
-export default {
-  name: 'EditDevice',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceForm: {
-        id: '',
-        deviceName: '',
-        devcode: '',
-        deviceType: '',
-        wellCode: '',
-        modelId: '',
-        installDate: '',
-        concenCode: ''
-      }, // 表单
-      textMap: {
-        update: '编辑',
-        create: '新增啊啊啊啊啊啊',
-        detail: '详情'
-      }, // 表头显示标题
-      deviceTypeList: null, // 设备类型列表
-      deviceModelList: null, // 设备型号列表
-      showDeviceType: true, // 是否显示设备类型选项
-      showModelType: true, // 是否显示型号选项
-      rules: {
-        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
-        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
-      }, // 前端校验规则
-      isEditMode: false, // 编辑模式
-      isDetailMode: false // 详情模式
-    }
-  },
-  watch: {
-    'deviceForm.deviceType': function(val, oldval) {
-      this.fetchDeviceModel(val)
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()
-    // this.fetchDeviceModel()
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
-      if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.resetForm()
-        this.isEditMode = false
-        this.isDetailMode = false
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.deviceForm = {
-          id: row.id,
-          deviceName: row.deviceName,
-          devcode: row.devcode,
-          deviceType: row.deviceType,
-          modelId: row.modelId,
-          wellCode: row.wellCode,
-          concenCode: row.concenCode,
-          installDate: row.installDate
-        }
-        if (row.deviceType !== '') {
-          this.fetchDeviceModel(row.deviceType)
-        }
-        this.isEditMode = true
-        this.isDetailMode = false
-      } else {
-        this.deviceForm = {
-          id: row.id,
-          deviceName: row.deviceName,
-          devcode: row.devcode,
-          deviceType: row.deviceType,
-          modelId: row.modelId,
-          wellCode: row.wellCode,
-          concenCode: row.concenCode,
-          installDate: row.installDate
-        }
-        if (row.deviceType !== '') {
-          this.fetchDeviceModel(row.deviceType)
-        }
-        this.isEditMode = true
-        this.isDetailMode = true
-      }
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        id: '',
-        deviceName: '',
-        devcode: '',
-        deviceType: '',
-        wellCode: '',
-        modelId: '',
-        installDate: '',
-        concenCode: ''
-      }
-    },
-    // 保存数据
-    saveData: function() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDevice(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
-              })
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDevice(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 获取设备型号
-    fetchDeviceType() {
-      getDeviceType().then(response => {
-        this.deviceTypeList = []
-        // 过滤掉该单位不支持的设备类型
-        const deviceTypes = this.$store.getters.deviceTypes
-        for (const deviceType of response.data) {
-          if (deviceTypes.indexOf(deviceType.value) !== -1) {
-            this.deviceTypeList.push(deviceType)
-          }
-        }
-      })
-    },
-    typeChanged() {
-      this.deviceForm.modelId = ''
-    },
-    // 获取设备型号
-    fetchDeviceModel(val) {
-      getDeviceModel(val).then(response => {
-        this.deviceModelList = response.data
-        if (this.deviceModelList.length <= 1) {
-          this.showModelType = false
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-</style>

diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
index 1eeb915..1640c25 100644
--- a/mock/deviceManage/device.js
+++ b/mock/deviceManage/device.js
@@ -42,18 +42,18 @@
 ]
 const deviceTableList = [
   {
-    'id': '设备编号',
-    'typeName': '设备类型',
-    'typeDescription': '描述',
+    'id': '112343243242341',
+    'typeName': '井盖状态检测仪',
+    'typeDescription': '检测井盖状态',
     'valid': '开启',
-    'watchType': '监控内容'
+    'watchType': '监控检测井盖状态'
   },
   {
-    'id': '设备编号2',
-    'typeName': '设备类型2',
-    'typeDescription': '描述2',
+    'id': '112343243242986',
+    'typeName': '有害气体检测仪',
+    'typeDescription': '检测气体类型',
     'valid': '关闭',
-    'watchType': '监控内容2'
+    'watchType': '监控气体类型'
   }
 ]
 module.exports = [
@@ -65,21 +65,21 @@
       return {
         code: 200,
         data: deviceTypeList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   },
   {
-    url: '/device/list',
+    url: '/deviceType/list',
     type: 'get',
     response: _ => {
       return {
         code: 200,
         data: deviceTableList,
-        'message': '请求成功',
-        'success': true
+        message: '请求成功',
+        success: true
       }
     }
   }
-]
\ No newline at end of file
+]
diff --git a/src/api/device/deviceType.js b/src/api/device/deviceType.js
new file mode 100644
index 0000000..3c10883
--- /dev/null
+++ b/src/api/device/deviceType.js
@@ -0,0 +1,53 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备类别
+export function getDevice(params) {
+  return request({
+    url: 'device/type',
+    method: 'get',
+    params
+  })
+}
+
+// 设备查询
+export function getDeviceList(params) {
+  return request({
+    url: 'deviceType/list',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceType(params) {
+  return request({
+    url: 'deviceType/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceType(params) {
+  return request({
+    url: 'deviceType/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDevice(ids) {
+  return request({
+    url: 'device/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
new file mode 100644
index 0000000..cc9b395
--- /dev/null
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -0,0 +1,242 @@
+<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="typeName">
+            <el-select
+              v-model="deviceForm.typeName"
+              clearable
+              placeholder="请选择设备类型"
+              :disabled="dialogStatus === 'create' ? false : true"
+            >
+              <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="valid">
+            <el-select
+              v-model.trim="deviceForm.valid"
+              placeholder="请选择是否启用"
+              clearable
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            >
+              <el-option
+                v-for="item in isValidList"
+                :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"
+              placeholder="未知"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="设备描述" prop="typeDescription">
+            <el-input
+              v-model.trim="deviceForm.typeDescription"
+              type="textarea"
+              placeholder="非必填"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="监控内容" prop="watchType">
+            <el-input
+              v-model.trim="deviceForm.watchType"
+              type="textarea"
+              :rows="2"
+              maxlength="30"
+              show-word-limit
+              placeholder="请输入监控内容"
+              :disabled="dialogStatus === 'update' || dialogStatus === 'create' ? false : true"
+            />
+          </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 { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
+export default {
+  name: 'DetailDevice',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      deviceTypeList: [], // 设备类型
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 是否启用
+      isValidList: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ],
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      },
+      // 表单校验规则
+      rules: {
+        typeName: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
+        valid: [{ required: true, message: '是否启用必选', trigger: ['blur', 'change'] }],
+        watchType: [{ required: true, message: '监控内容不能为空', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDevice().then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        typeName: '',
+        typeDescription: '',
+        valid: '',
+        watchType: ''
+      }
+    },
+    // 父子组件通信
+    initDialog(dialogStatus, row = null) {
+      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') {
+        this.deviceForm = {
+          devcode: row.id,
+          typeName: row.typeName,
+          typeDescription: row.typeDescription,
+          valid: row.valid,
+          watchType: row.watchType
+        }
+      }
+    },
+    // 保存数据
+    saveData() {
+      if (this.dialogStatus === 'update') {
+        this.updateData()
+      } else if (this.dialogStatus === 'create') {
+        this.createData()
+      }
+    },
+    // 修改数据
+    updateData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateDeviceType(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) {
+          addDeviceType(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/deviceManage/deviceType/components/editDeviceType.vue b/src/views/deviceManage/deviceType/components/editDeviceType.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceType/components/editDeviceType.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-  <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
-    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
-      <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
-        <el-col :span="12">
-          <el-form-item label="设备编号" prop="devcode">
-            <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="安装日期" prop="installDate">
-            <el-date-picker
-              v-model.trim="deviceForm.installDate"
-              :disabled="isDetailMode"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <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="modelId">
-            <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
-              <el-option
-                v-for="item in deviceModelList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="井编号" prop="wellCode">
-            <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item v-show="!(isDetailMode&&deviceForm.concenCode=='')" label="集中器编号" prop="concenCode">
-            <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="saveData">
-        保存
-      </el-button>
-      <el-button @click="cancel">
-        取消
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { addDevice, updateDevice, getDeviceType, getDeviceModel } from '@/api/device/device'
-
-export default {
-  name: 'EditDevice',
-  data() {
-    return {
-      dialogFormVisible: false, // 对话框是否显示
-      dialogStatus: '', // 对话框类型：create,update,detail
-      deviceForm: {
-        id: '',
-        deviceName: '',
-        devcode: '',
-        deviceType: '',
-        wellCode: '',
-        modelId: '',
-        installDate: '',
-        concenCode: ''
-      }, // 表单
-      textMap: {
-        update: '编辑',
-        create: '新增啊啊啊啊啊啊',
-        detail: '详情'
-      }, // 表头显示标题
-      deviceTypeList: null, // 设备类型列表
-      deviceModelList: null, // 设备型号列表
-      showDeviceType: true, // 是否显示设备类型选项
-      showModelType: true, // 是否显示型号选项
-      rules: {
-        // deviceName: [{ required: true, message: '设备名称不能为空', trigger: ['blur', 'change'] }],
-        devcode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }],
-        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
-        deviceType: [{ required: true, message: '设备类型必选', trigger: ['blur', 'change'] }],
-        modelId: [{ required: true, message: '设备型号必选', trigger: ['blur', 'change'] }],
-        installDate: [{ required: true, message: '安装日期必选', trigger: ['blur', 'change'] }]
-      }, // 前端校验规则
-      isEditMode: false, // 编辑模式
-      isDetailMode: false // 详情模式
-    }
-  },
-  watch: {
-    'deviceForm.deviceType': function(val, oldval) {
-      this.fetchDeviceModel(val)
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()
-    // this.fetchDeviceModel()
-  },
-  methods: {
-    // 初始化对话框
-    initDialog: function(dialogStatus, dialogFormVisible, row = null) {
-      this.dialogStatus = dialogStatus
-      this.dialogFormVisible = dialogFormVisible
-      if (dialogStatus === 'create') { // 如果是新增，清除验证
-        this.resetForm()
-        this.isEditMode = false
-        this.isDetailMode = false
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      } else if (dialogStatus === 'update') { // 如果是修改，将row中数据填写到输入框中
-        this.deviceForm = {
-          id: row.id,
-          deviceName: row.deviceName,
-          devcode: row.devcode,
-          deviceType: row.deviceType,
-          modelId: row.modelId,
-          wellCode: row.wellCode,
-          concenCode: row.concenCode,
-          installDate: row.installDate
-        }
-        if (row.deviceType !== '') {
-          this.fetchDeviceModel(row.deviceType)
-        }
-        this.isEditMode = true
-        this.isDetailMode = false
-      } else {
-        this.deviceForm = {
-          id: row.id,
-          deviceName: row.deviceName,
-          devcode: row.devcode,
-          deviceType: row.deviceType,
-          modelId: row.modelId,
-          wellCode: row.wellCode,
-          concenCode: row.concenCode,
-          installDate: row.installDate
-        }
-        if (row.deviceType !== '') {
-          this.fetchDeviceModel(row.deviceType)
-        }
-        this.isEditMode = true
-        this.isDetailMode = true
-      }
-    },
-    // 重置表单
-    resetForm() {
-      this.deviceForm = {
-        id: '',
-        deviceName: '',
-        devcode: '',
-        deviceType: '',
-        wellCode: '',
-        modelId: '',
-        installDate: '',
-        concenCode: ''
-      }
-    },
-    // 保存数据
-    saveData: function() {
-      if (this.dialogStatus === 'update') {
-        this.updateData()
-      } else if (this.dialogStatus === 'create') {
-        this.createData()
-      }
-    },
-    // 新增数据
-    createData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
-        if (valid) {
-          addDevice(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
-              })
-            }
-          })
-        }
-      })
-    },
-    // 修改数据
-    updateData: function() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          updateDevice(this.deviceForm).then(response => {
-            if (response.code === 200) {
-              this.$message.success('修改成功')
-              this.$emit('watchChild')
-              this.dialogFormVisible = false
-            }
-          })
-        }
-      })
-    },
-    // 获取设备型号
-    fetchDeviceType() {
-      getDeviceType().then(response => {
-        this.deviceTypeList = []
-        // 过滤掉该单位不支持的设备类型
-        const deviceTypes = this.$store.getters.deviceTypes
-        for (const deviceType of response.data) {
-          if (deviceTypes.indexOf(deviceType.value) !== -1) {
-            this.deviceTypeList.push(deviceType)
-          }
-        }
-      })
-    },
-    typeChanged() {
-      this.deviceForm.modelId = ''
-    },
-    // 获取设备型号
-    fetchDeviceModel(val) {
-      getDeviceModel(val).then(response => {
-        this.deviceModelList = response.data
-        if (this.deviceModelList.length <= 1) {
-          this.showModelType = false
-        }
-      })
-    },
-    cancel: function() {
-      this.dialogFormVisible = false
-      this.$emit('watchChild')
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
-</style>
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index c06c85f..af8ff25 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -68,21 +68,17 @@
         </el-table-column>
       </el-table>
     </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice } from '@/api/device/device'
+import dialogDevice from '@/views/deviceManage/deviceType/components/dialogDeviceType'
+import { getDeviceList, getDevice, delDevice } from '@/api/device/deviceType'
 
 export default {
   name: 'ListDevice',
-  components: { editDevice, detailDevice },
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
@@ -133,8 +129,7 @@
       list: [], // 列表数据
       deviceTypeList: [], // 设备类型列表
       listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false // 是否显示编辑框
+      dialogShow: false // 是否显示对话框
     }
   },
   created() {
@@ -144,7 +139,7 @@
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
+      getDevice(this.listQuery).then(response => {
         this.deviceTypeList = response.data
       })
     },
@@ -201,20 +196,17 @@
         this.$message.error('至少选中一项')
       }
     },
+    // 详情
+    detail(row) {
+      this.$refs.dialogDevice.initDialog('detail', row)
+    },
     // 新增设备
     add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
+      this.$refs.dialogDevice.initDialog('create')
     },
     // 编辑设备信息
     edit(row) {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
-    },
-    detail(row) {
-      this.$refs.editdevice.initDialog('detail', true, row)
+      this.$refs.dialogDevice.initDialog('update', row)
     }
   }
 }