diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8559872..abba18b 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,39 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
-          </el-form-item> -->
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
-            <el-select v-model="listQuery.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-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
           </el-form-item>
-          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
-            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
-              <el-option
-                v-for="item in onlineStates"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
             搜索
           </el-button>
@@ -52,10 +22,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
-            导出记录
-          </el-button>
-          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -70,31 +36,26 @@
               批量导入
             </el-button>
           </el-upload>
-          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
             删除
           </el-button>
-          <el-button v-if="hasPerm('/device/add')" 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 v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <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 v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
+            <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="datalist(scope.row)">
-              历史数据
-            </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
             <el-button type="text" @click="detail(scope.row)">
@@ -104,135 +65,79 @@
         </el-table-column>
       </el-table>
     </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
-
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
-import DownloadTemplate from '@/components/DownloadTemplate'
-import InfoWell from '@/views/wellManage/infoWell'
-import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
-  name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  name: 'DeviceImei',
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
-        deviceType: '',
-        isOnline: '',
+        devcode: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
+        order: 'asc'
+      }, // 查询条件
       columns: [
         {
-          text: '设备编号',
+          text: 'id',
           value: 'id',
           align: 'center'
         },
         {
-          text: '设备类型',
-          value: 'typeName',
+          text: '	设备编号',
+          value: 'devcode',
           align: 'center'
         },
         {
-          text: '描述',
-          value: 'typeDescription',
+          text: 'IMEI',
+          value: 'imei',
           align: 'center'
         },
         {
-          text: '是否启用',
-          value: 'valid',
+          text: 'ICCID',
+          value: 'iccid',
           align: 'center'
         },
         {
-          text: '监控内容',
-          value: 'watchType',
+          text: '	记录时间',
+          value: 'logTime',
           align: 'center'
         }
       ], // 显示列
+      fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
-      fileList: [],
-      listLoading: false, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
     }
   },
-  computed: {
-    isAdmin() {
-      return isAdministrator()
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()// 获取设备列表
-    if (!notContainConcentrator()) {
-      this.columns.splice(-1, 1)
-    }
-    // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
-      this.listQuery.keywords = this.$route.query.wellCode
-      this.fetchData(true)
-    } else {
-      this.fetchData()// 获取数据
-    }
+  created() {
+    this.fetchData()
   },
   methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceImeiList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -241,29 +146,15 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
-    },
-    // 编辑设备信息
-    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)
-    },
     // 删除设备
     del() {
       if (this.checkSelection()) {
         const deviceIds = []
+        const deviceIndex = []
         this.multipleSelection.forEach(function(value, index) {
           deviceIds.push(value.id)
+          deviceIndex.push(index)
         })
-        // wellNames = wellNames.slice(0, wellNames.length - 1)
         this.$confirm(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -273,7 +164,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delDevice(deviceIds).then(response => {
+          delDeviceImei(deviceIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -284,6 +175,18 @@
         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)
+    },
     // 批量导入集中器
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -313,87 +216,6 @@
         loading.close() // 关闭加载动画
       })
       this.fileList = []
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportDevice(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `设备列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      // this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getDeviceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).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)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    datalist(row) {
-      const params = { devcode: row.devcode, deviceType: row.deviceType }
-      this.$router.push({ name: 'DataManage', query: params })
-    },
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8559872..abba18b 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,39 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
-          </el-form-item> -->
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
-            <el-select v-model="listQuery.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-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
           </el-form-item>
-          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
-            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
-              <el-option
-                v-for="item in onlineStates"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
             搜索
           </el-button>
@@ -52,10 +22,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
-            导出记录
-          </el-button>
-          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -70,31 +36,26 @@
               批量导入
             </el-button>
           </el-upload>
-          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
             删除
           </el-button>
-          <el-button v-if="hasPerm('/device/add')" 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 v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <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 v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
+            <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="datalist(scope.row)">
-              历史数据
-            </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
             <el-button type="text" @click="detail(scope.row)">
@@ -104,135 +65,79 @@
         </el-table-column>
       </el-table>
     </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
-
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
-import DownloadTemplate from '@/components/DownloadTemplate'
-import InfoWell from '@/views/wellManage/infoWell'
-import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
-  name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  name: 'DeviceImei',
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
-        deviceType: '',
-        isOnline: '',
+        devcode: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
+        order: 'asc'
+      }, // 查询条件
       columns: [
         {
-          text: '设备编号',
+          text: 'id',
           value: 'id',
           align: 'center'
         },
         {
-          text: '设备类型',
-          value: 'typeName',
+          text: '	设备编号',
+          value: 'devcode',
           align: 'center'
         },
         {
-          text: '描述',
-          value: 'typeDescription',
+          text: 'IMEI',
+          value: 'imei',
           align: 'center'
         },
         {
-          text: '是否启用',
-          value: 'valid',
+          text: 'ICCID',
+          value: 'iccid',
           align: 'center'
         },
         {
-          text: '监控内容',
-          value: 'watchType',
+          text: '	记录时间',
+          value: 'logTime',
           align: 'center'
         }
       ], // 显示列
+      fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
-      fileList: [],
-      listLoading: false, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
     }
   },
-  computed: {
-    isAdmin() {
-      return isAdministrator()
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()// 获取设备列表
-    if (!notContainConcentrator()) {
-      this.columns.splice(-1, 1)
-    }
-    // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
-      this.listQuery.keywords = this.$route.query.wellCode
-      this.fetchData(true)
-    } else {
-      this.fetchData()// 获取数据
-    }
+  created() {
+    this.fetchData()
   },
   methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceImeiList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -241,29 +146,15 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
-    },
-    // 编辑设备信息
-    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)
-    },
     // 删除设备
     del() {
       if (this.checkSelection()) {
         const deviceIds = []
+        const deviceIndex = []
         this.multipleSelection.forEach(function(value, index) {
           deviceIds.push(value.id)
+          deviceIndex.push(index)
         })
-        // wellNames = wellNames.slice(0, wellNames.length - 1)
         this.$confirm(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -273,7 +164,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delDevice(deviceIds).then(response => {
+          delDeviceImei(deviceIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -284,6 +175,18 @@
         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)
+    },
     // 批量导入集中器
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -313,87 +216,6 @@
         loading.close() // 关闭加载动画
       })
       this.fileList = []
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportDevice(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `设备列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      // this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getDeviceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).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)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    datalist(row) {
-      const params = { devcode: row.devcode, deviceType: row.deviceType }
-      this.$router.push({ name: 'DataManage', query: params })
-    },
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index f6e68a3..ad70b2f 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -98,7 +98,7 @@
 <script>
 import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8559872..abba18b 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,39 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
-          </el-form-item> -->
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
-            <el-select v-model="listQuery.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-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
           </el-form-item>
-          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
-            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
-              <el-option
-                v-for="item in onlineStates"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
             搜索
           </el-button>
@@ -52,10 +22,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
-            导出记录
-          </el-button>
-          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -70,31 +36,26 @@
               批量导入
             </el-button>
           </el-upload>
-          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
             删除
           </el-button>
-          <el-button v-if="hasPerm('/device/add')" 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 v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <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 v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
+            <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="datalist(scope.row)">
-              历史数据
-            </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
             <el-button type="text" @click="detail(scope.row)">
@@ -104,135 +65,79 @@
         </el-table-column>
       </el-table>
     </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
-
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
-import DownloadTemplate from '@/components/DownloadTemplate'
-import InfoWell from '@/views/wellManage/infoWell'
-import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
-  name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  name: 'DeviceImei',
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
-        deviceType: '',
-        isOnline: '',
+        devcode: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
+        order: 'asc'
+      }, // 查询条件
       columns: [
         {
-          text: '设备编号',
+          text: 'id',
           value: 'id',
           align: 'center'
         },
         {
-          text: '设备类型',
-          value: 'typeName',
+          text: '	设备编号',
+          value: 'devcode',
           align: 'center'
         },
         {
-          text: '描述',
-          value: 'typeDescription',
+          text: 'IMEI',
+          value: 'imei',
           align: 'center'
         },
         {
-          text: '是否启用',
-          value: 'valid',
+          text: 'ICCID',
+          value: 'iccid',
           align: 'center'
         },
         {
-          text: '监控内容',
-          value: 'watchType',
+          text: '	记录时间',
+          value: 'logTime',
           align: 'center'
         }
       ], // 显示列
+      fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
-      fileList: [],
-      listLoading: false, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
     }
   },
-  computed: {
-    isAdmin() {
-      return isAdministrator()
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()// 获取设备列表
-    if (!notContainConcentrator()) {
-      this.columns.splice(-1, 1)
-    }
-    // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
-      this.listQuery.keywords = this.$route.query.wellCode
-      this.fetchData(true)
-    } else {
-      this.fetchData()// 获取数据
-    }
+  created() {
+    this.fetchData()
   },
   methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceImeiList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -241,29 +146,15 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
-    },
-    // 编辑设备信息
-    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)
-    },
     // 删除设备
     del() {
       if (this.checkSelection()) {
         const deviceIds = []
+        const deviceIndex = []
         this.multipleSelection.forEach(function(value, index) {
           deviceIds.push(value.id)
+          deviceIndex.push(index)
         })
-        // wellNames = wellNames.slice(0, wellNames.length - 1)
         this.$confirm(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -273,7 +164,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delDevice(deviceIds).then(response => {
+          delDeviceImei(deviceIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -284,6 +175,18 @@
         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)
+    },
     // 批量导入集中器
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -313,87 +216,6 @@
         loading.close() // 关闭加载动画
       })
       this.fileList = []
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportDevice(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `设备列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      // this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getDeviceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).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)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    datalist(row) {
-      const params = { devcode: row.devcode, deviceType: row.deviceType }
-      this.$router.push({ name: 'DataManage', query: params })
-    },
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index f6e68a3..ad70b2f 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -98,7 +98,7 @@
 <script>
 import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7119c0d..7f04489 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -77,7 +77,7 @@
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
-  name: 'ListDevice',
+  name: 'DeviceModel',
   components: { dialogDevice },
   data() {
     return {

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8559872..abba18b 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,39 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
-          </el-form-item> -->
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
-            <el-select v-model="listQuery.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-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
           </el-form-item>
-          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
-            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
-              <el-option
-                v-for="item in onlineStates"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
             搜索
           </el-button>
@@ -52,10 +22,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
-            导出记录
-          </el-button>
-          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -70,31 +36,26 @@
               批量导入
             </el-button>
           </el-upload>
-          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
             删除
           </el-button>
-          <el-button v-if="hasPerm('/device/add')" 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 v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <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 v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
+            <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="datalist(scope.row)">
-              历史数据
-            </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
             <el-button type="text" @click="detail(scope.row)">
@@ -104,135 +65,79 @@
         </el-table-column>
       </el-table>
     </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
-
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
-import DownloadTemplate from '@/components/DownloadTemplate'
-import InfoWell from '@/views/wellManage/infoWell'
-import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
-  name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  name: 'DeviceImei',
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
-        deviceType: '',
-        isOnline: '',
+        devcode: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
+        order: 'asc'
+      }, // 查询条件
       columns: [
         {
-          text: '设备编号',
+          text: 'id',
           value: 'id',
           align: 'center'
         },
         {
-          text: '设备类型',
-          value: 'typeName',
+          text: '	设备编号',
+          value: 'devcode',
           align: 'center'
         },
         {
-          text: '描述',
-          value: 'typeDescription',
+          text: 'IMEI',
+          value: 'imei',
           align: 'center'
         },
         {
-          text: '是否启用',
-          value: 'valid',
+          text: 'ICCID',
+          value: 'iccid',
           align: 'center'
         },
         {
-          text: '监控内容',
-          value: 'watchType',
+          text: '	记录时间',
+          value: 'logTime',
           align: 'center'
         }
       ], // 显示列
+      fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
-      fileList: [],
-      listLoading: false, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
     }
   },
-  computed: {
-    isAdmin() {
-      return isAdministrator()
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()// 获取设备列表
-    if (!notContainConcentrator()) {
-      this.columns.splice(-1, 1)
-    }
-    // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
-      this.listQuery.keywords = this.$route.query.wellCode
-      this.fetchData(true)
-    } else {
-      this.fetchData()// 获取数据
-    }
+  created() {
+    this.fetchData()
   },
   methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceImeiList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -241,29 +146,15 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
-    },
-    // 编辑设备信息
-    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)
-    },
     // 删除设备
     del() {
       if (this.checkSelection()) {
         const deviceIds = []
+        const deviceIndex = []
         this.multipleSelection.forEach(function(value, index) {
           deviceIds.push(value.id)
+          deviceIndex.push(index)
         })
-        // wellNames = wellNames.slice(0, wellNames.length - 1)
         this.$confirm(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -273,7 +164,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delDevice(deviceIds).then(response => {
+          delDeviceImei(deviceIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -284,6 +175,18 @@
         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)
+    },
     // 批量导入集中器
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -313,87 +216,6 @@
         loading.close() // 关闭加载动画
       })
       this.fileList = []
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportDevice(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `设备列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      // this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getDeviceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).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)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    datalist(row) {
-      const params = { devcode: row.devcode, deviceType: row.deviceType }
-      this.$router.push({ name: 'DataManage', query: params })
-    },
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index f6e68a3..ad70b2f 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -98,7 +98,7 @@
 <script>
 import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7119c0d..7f04489 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -77,7 +77,7 @@
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
-  name: 'ListDevice',
+  name: 'DeviceModel',
   components: { dialogDevice },
   data() {
     return {
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index cc9b395..99ac3e7 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -106,7 +106,7 @@
 <script>
 import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceType',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏

diff --git a/mock/deviceManage/deviceImei.js b/mock/deviceManage/deviceImei.js
new file mode 100644
index 0000000..d4c96d5
--- /dev/null
+++ b/mock/deviceManage/deviceImei.js
@@ -0,0 +1,32 @@
+
+const deviceTableList = [
+  {
+    'id': '112243242341',
+    'devcode': '12431423',
+    'imei': 'D4789',
+    'iccid': '5623423',
+    'logTime': '2022/03/22 21:32:45'
+  },
+  {
+    'id': '112278942341',
+    'devcode': '12431423',
+    'imei': 'D4324',
+    'iccid': '3423423',
+    'logTime': '2022/04/11 21:32:45'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/simManage/listPage',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/mock/index.js b/mock/index.js
index 3f21e52..3e2d293 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -14,6 +14,7 @@
 const overview = require('./biz/overview')
 const deviceType = require('./deviceManage/deviceType')
 const deviceModels = require('./deviceManage/deviceModels')
+const deviceImei = require('./deviceManage/deviceImei')
 
 const mocks = [
   ...user,
@@ -28,7 +29,8 @@
   ...dashboard,
   ...overview,
   ...deviceType,
-  ...deviceModels
+  ...deviceModels,
+  ...deviceImei
 ]
 
 // for front mock
diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js
new file mode 100644
index 0000000..a816d0b
--- /dev/null
+++ b/src/api/device/deviceImei.js
@@ -0,0 +1,56 @@
+/**
+ * 设备管理接口
+ */
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 设备查询
+export function getDeviceImeiList(params) {
+  return request({
+    url: 'device/simManage/listPage',
+    method: 'get',
+    params
+  })
+}
+
+// 添加设备
+export function addDeviceImei(params) {
+  return request({
+    url: 'device/simManage/add',
+    method: 'post',
+    params
+  })
+}
+// 修改设备
+export function updateDeviceImei(params) {
+  return request({
+    url: 'device/simManage/update',
+    method: 'post',
+    params
+  })
+}
+// 删除设备
+export function delDeviceImei(ids) {
+  return request({
+    url: 'device/simManage/delete',
+    method: 'post',
+    params: {
+      ids: ids
+    },
+    paramsSerializer: params => {
+      return qs.stringify(params, { indices: false })
+    }
+  })
+}
+// 批量导入
+export function batchImportDevice(fileobj) {
+  const param = new FormData()
+  param.append('file', fileobj)
+  return request({
+    url: 'device/simManage/batchImport',
+    method: 'post',
+    timeout: 240000,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: param
+  })
+}
diff --git a/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
new file mode 100644
index 0000000..8594fd0
--- /dev/null
+++ b/src/views/deviceManage/deviceImei/components/dialogDeviceImei.vue
@@ -0,0 +1,180 @@
+<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="devcode">
+            <el-input
+              v-model.trim="deviceForm.devcode"
+              clearable
+              :disabled="dialogStatus === 'create' ? false : true"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="IMEI号" prop="imei">
+            <el-input
+              v-model.trim="deviceForm.imei"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="SIM卡号" prop="iccid">
+            <el-input
+              v-model.trim="deviceForm.iccid"
+              clearable
+              :disabled="dialogStatus === 'detail' ? true : false"
+              type="text"
+              placeholder="必填"
+            />
+          </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 { addDeviceImei, updateDeviceImei } from '@/api/device/deviceImei'
+export default {
+  name: 'DialogDeviceImei',
+  data() {
+    return {
+      dialogFormVisible: false, // 对话框显示隐藏
+      dialogStatus: '', // 对话框类型：create,update,detail
+      // 对话框标题
+      textMap: {
+        update: '编辑',
+        create: '新增',
+        detail: '详情'
+      },
+      // 表单内容
+      deviceForm: {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    // 重置表单
+    resetForm() {
+      this.deviceForm = {
+        devcode: '',
+        imei: '',
+        iccid: ''
+      }
+    },
+    // 父子组件通信
+    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 = {
+          devcode: row.devcode,
+          imei: row.imei,
+          iccid: row.iccid
+        }
+      }
+    },
+    // 保存数据
+    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()
+          updateDeviceImei(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()
+          addDeviceImei(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/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue
deleted file mode 100644
index b22e406..0000000
--- a/src/views/deviceManage/deviceImei/components/editDeviceImei.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/deviceImei/deviceImei.vue b/src/views/deviceManage/deviceImei/deviceImei.vue
index 8559872..abba18b 100644
--- a/src/views/deviceManage/deviceImei/deviceImei.vue
+++ b/src/views/deviceManage/deviceImei/deviceImei.vue
@@ -4,39 +4,9 @@
     <div class="search-div">
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <!-- <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable />
-          </el-form-item> -->
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item">
-            <el-select v-model="listQuery.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-form-item class="selectForm-container-item">
-            <el-select v-model="listQuery.isValid" placeholder="是否启用" clearable>
-              <el-option
-                v-for="item in isValidList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
+            <el-input v-model="listQuery.devcode" placeholder="设备编号" clearable />
           </el-form-item>
-          <!-- <el-form-item v-if="isAdmin" class="selectForm-container-item">
-            <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
-              <el-option
-                v-for="item in onlineStates"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item> -->
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
             搜索
           </el-button>
@@ -52,10 +22,6 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/device/batchExport')" :disabled="total===0" class="edit_btn" size="small" @click="batchExport">
-            导出记录
-          </el-button>
-          <download-template v-if="hasPerm('/device/batchImport')" :filename="filename" />
           <el-upload
             v-if="hasPerm('/device/batchImport')"
             :limit="1"
@@ -70,31 +36,26 @@
               批量导入
             </el-button>
           </el-upload>
-          <el-button v-if="hasPerm('/device/delete')" class="edit_btn" size="small" @click="del">
+          <!-- v-if="hasPerm('/device/delete')" -->
+          <el-button class="edit_btn" size="small" @click="del">
             删除
           </el-button>
-          <el-button v-if="hasPerm('/device/add')" 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 v-if="hasPerm('/device/delete')" align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
+        <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 v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
+            <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="datalist(scope.row)">
-              历史数据
-            </el-button>
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
+            <el-button type="text" @click="edit(scope.row)">
               编辑
             </el-button>
             <el-button type="text" @click="detail(scope.row)">
@@ -104,135 +65,79 @@
         </el-table-column>
       </el-table>
     </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-
-    <edit-device v-show="editShow" ref="editdevice" @watchChild="fetchData" />
-
-    <detail-device v-show="detailShow" ref="detaildevice" />
-
-    <info-well v-show="wellShow" ref="wellInfo" />
+    <dialog-device ref="dialogDevice" @watchChild="fetchData" />
   </div>
 </template>
 
 <script>
-import editDevice from '@/views/deviceManage/deviceImei/components/editDeviceImei'
-import detailDevice from '@/views/deviceManage/detailDevice'
-import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device/device'
-import DownloadTemplate from '@/components/DownloadTemplate'
-import InfoWell from '@/views/wellManage/infoWell'
-import { isAdministrator, notContainConcentrator } from '@/utils/permission'
+import dialogDevice from '@/views/deviceManage/deviceImei/components/dialogDeviceImei'
+import { getDeviceImeiList, delDeviceImei, batchImportDevice } from '@/api/device/deviceImei'
 
 export default {
-  name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  name: 'DeviceImei',
+  components: { dialogDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
-        deviceType: '',
-        isOnline: '',
+        devcode: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
-      isValidList: [
-        {
-          label: '是',
-          value: '1'
-        },
-        {
-          label: '否',
-          value: '0'
-        }
-      ],
+        order: 'asc'
+      }, // 查询条件
       columns: [
         {
-          text: '设备编号',
+          text: 'id',
           value: 'id',
           align: 'center'
         },
         {
-          text: '设备类型',
-          value: 'typeName',
+          text: '	设备编号',
+          value: 'devcode',
           align: 'center'
         },
         {
-          text: '描述',
-          value: 'typeDescription',
+          text: 'IMEI',
+          value: 'imei',
           align: 'center'
         },
         {
-          text: '是否启用',
-          value: 'valid',
+          text: 'ICCID',
+          value: 'iccid',
           align: 'center'
         },
         {
-          text: '监控内容',
-          value: 'watchType',
+          text: '	记录时间',
+          value: 'logTime',
           align: 'center'
         }
       ], // 显示列
+      fileList: [],
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
-      fileList: [],
-      listLoading: false, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      listLoading: true, // 加载动画
+      dialogShow: false // 是否显示对话框
     }
   },
-  computed: {
-    isAdmin() {
-      return isAdministrator()
-    }
-  },
-  mounted() {
-    this.fetchDeviceType()// 获取设备列表
-    if (!notContainConcentrator()) {
-      this.columns.splice(-1, 1)
-    }
-    // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
-      this.listQuery.keywords = this.$route.query.wellCode
-      this.fetchData(true)
-    } else {
-      this.fetchData()// 获取数据
-    }
+  created() {
+    this.fetchData()
   },
   methods: {
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceImeiList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -241,29 +146,15 @@
         return true
       }
     },
-    // 新增设备
-    add() {
-      this.dialogFormVisible = true
-      this.editShow = true
-      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
-    },
-    // 编辑设备信息
-    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)
-    },
     // 删除设备
     del() {
       if (this.checkSelection()) {
         const deviceIds = []
+        const deviceIndex = []
         this.multipleSelection.forEach(function(value, index) {
           deviceIds.push(value.id)
+          deviceIndex.push(index)
         })
-        // wellNames = wellNames.slice(0, wellNames.length - 1)
         this.$confirm(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -273,7 +164,7 @@
             type: 'warning'
           }
         ).then(() => {
-          delDevice(deviceIds).then(response => {
+          delDeviceImei(deviceIds).then(response => {
             if (response.code === 200) {
               this.$message.success('删除成功')
               this.fetchData()
@@ -284,6 +175,18 @@
         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)
+    },
     // 批量导入集中器
     uploadFile(param) {
       // 判断文件大小是否符合要求
@@ -313,87 +216,6 @@
         loading.close() // 关闭加载动画
       })
       this.fileList = []
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '数据处理中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      batchExportDevice(this.listQuery).then(res => {
-        loading.close() // 关闭加载动画
-        const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `设备列表.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
-      }).catch((res) => {
-        loading.close()
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取集中器数据
-    fetchData(isNowPage = true) {
-      // this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getDeviceList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).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)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    datalist(row) {
-      const params = { devcode: row.devcode, deviceType: row.deviceType }
-      this.$router.push({ name: 'DataManage', query: params })
-    },
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
index f6e68a3..ad70b2f 100644
--- a/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
+++ b/src/views/deviceManage/deviceModel/components/dialogDeviceModel.vue
@@ -98,7 +98,7 @@
 <script>
 import { updateDeviceModel, addDeviceModel } from '@/api/device/deviceModel'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceModel',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
diff --git a/src/views/deviceManage/deviceModel/deviceModel.vue b/src/views/deviceManage/deviceModel/deviceModel.vue
index 7119c0d..7f04489 100644
--- a/src/views/deviceManage/deviceModel/deviceModel.vue
+++ b/src/views/deviceManage/deviceModel/deviceModel.vue
@@ -77,7 +77,7 @@
 import { getDeviceModelList, getDevice, delDeviceModel } from '@/api/device/deviceModel'
 
 export default {
-  name: 'ListDevice',
+  name: 'DeviceModel',
   components: { dialogDevice },
   data() {
     return {
diff --git a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
index cc9b395..99ac3e7 100644
--- a/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
+++ b/src/views/deviceManage/deviceType/components/dialogDeviceType.vue
@@ -106,7 +106,7 @@
 <script>
 import { getDevice, updateDeviceType, addDeviceType } from '@/api/device/deviceType'
 export default {
-  name: 'DetailDevice',
+  name: 'DialogDeviceType',
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 1a2dfde..8a98e89 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -77,7 +77,7 @@
 import { getDeviceTypeList, getDevice, delDeviceType } from '@/api/device/deviceType'
 
 export default {
-  name: 'ListDevice',
+  name: 'DeviceType',
   components: { dialogDevice },
   data() {
     return {