diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
new file mode 100644
index 0000000..1eeb915
--- /dev/null
+++ b/mock/deviceManage/device.js
@@ -0,0 +1,85 @@
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const deviceTableList = [
+  {
+    'id': '设备编号',
+    'typeName': '设备类型',
+    'typeDescription': '描述',
+    'valid': '开启',
+    'watchType': '监控内容'
+  },
+  {
+    'id': '设备编号2',
+    'typeName': '设备类型2',
+    'typeDescription': '描述2',
+    'valid': '关闭',
+    'watchType': '监控内容2'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  },
+  {
+    url: '/device/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  }
+]
\ No newline at end of file

diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
new file mode 100644
index 0000000..1eeb915
--- /dev/null
+++ b/mock/deviceManage/device.js
@@ -0,0 +1,85 @@
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const deviceTableList = [
+  {
+    'id': '设备编号',
+    'typeName': '设备类型',
+    'typeDescription': '描述',
+    'valid': '开启',
+    'watchType': '监控内容'
+  },
+  {
+    'id': '设备编号2',
+    'typeName': '设备类型2',
+    'typeDescription': '描述2',
+    'valid': '关闭',
+    'watchType': '监控内容2'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  },
+  {
+    url: '/device/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/mock/index.js b/mock/index.js
index e9fdb01..c84a737 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -11,6 +11,7 @@
 const config = require('./system/config')
 const dashboard = require('./biz/dashboard')
 const search = require('./remote-search')
+const device = require('./deviceManage/device')
 
 const mocks = [
   ...user,
@@ -22,7 +23,8 @@
   ...log,
   ...config,
   ...search,
-  ...dashboard
+  ...dashboard,
+  ...device
 ]
 
 // for front mock

diff --git a/mock/deviceManage/device.js b/mock/deviceManage/device.js
new file mode 100644
index 0000000..1eeb915
--- /dev/null
+++ b/mock/deviceManage/device.js
@@ -0,0 +1,85 @@
+const deviceTypeList = [
+  {
+    'name': '井盖状态检测仪',
+    'value': '10'
+  },
+  {
+    'name': '液位检测仪',
+    'value': '11'
+  },
+  {
+    'name': '有害气体检测仪',
+    'value': '12'
+  },
+  {
+    'name': '燃气智能检测终端',
+    'value': '13'
+  },
+  {
+    'name': '温湿度检测仪',
+    'value': '14'
+  },
+  {
+    'name': '开挖检测仪',
+    'value': '15'
+  },
+  {
+    'name': '井盖定位检测仪',
+    'value': '16'
+  },
+  {
+    'name': '噪声记录仪',
+    'value': '17'
+  },
+  {
+    'name': '燃气智能检测终端(一体化)',
+    'value': '18'
+  },
+  {
+    'name': '管盯',
+    'value': '19'
+  }
+]
+const deviceTableList = [
+  {
+    'id': '设备编号',
+    'typeName': '设备类型',
+    'typeDescription': '描述',
+    'valid': '开启',
+    'watchType': '监控内容'
+  },
+  {
+    'id': '设备编号2',
+    'typeName': '设备类型2',
+    'typeDescription': '描述2',
+    'valid': '关闭',
+    'watchType': '监控内容2'
+  }
+]
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/device/type',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTypeList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  },
+  {
+    url: '/device/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: deviceTableList,
+        'message': '请求成功',
+        'success': true
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/mock/index.js b/mock/index.js
index e9fdb01..c84a737 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -11,6 +11,7 @@
 const config = require('./system/config')
 const dashboard = require('./biz/dashboard')
 const search = require('./remote-search')
+const device = require('./deviceManage/device')
 
 const mocks = [
   ...user,
@@ -22,7 +23,8 @@
   ...log,
   ...config,
   ...search,
-  ...dashboard
+  ...dashboard,
+  ...device
 ]
 
 // for front mock
diff --git a/src/views/deviceManage/deviceType/deviceType.vue b/src/views/deviceManage/deviceType/deviceType.vue
index 9d5d58e..c06c85f 100644
--- a/src/views/deviceManage/deviceType/deviceType.vue
+++ b/src/views/deviceManage/deviceType/deviceType.vue
@@ -4,10 +4,7 @@
     <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-form-item class="selectForm-container-item">
             <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
               <el-option
                 v-for="item in deviceTypeList"
@@ -27,16 +24,6 @@
               />
             </el-select>
           </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,49 +39,26 @@
           </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"
-            :show-file-list="false"
-            :http-request="uploadFile"
-            :file-list="fileList"
-            action="string"
-            accept=".xls,.xlsx"
-            class="edit_btn"
-          >
-            <el-button slot="trigger" size="small">
-              批量导入
-            </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,53 +68,30 @@
         </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" />
   </div>
-  <!--       -->
 </template>
 
 <script>
 import editDevice from '@/views/deviceManage/deviceType/components/editDeviceType'
 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 { getDeviceList, getDeviceType, delDevice } from '@/api/device/device'
 
 export default {
   name: 'ListDevice',
-  components: { DownloadTemplate, editDevice, detailDevice, InfoWell },
+  components: { editDevice, detailDevice },
   data() {
     return {
       listQuery: {
-        keywords: '',
         deviceType: '',
-        isOnline: '',
+        isValid: '',
         offset: 1,
-        limit: 20,
         sort: 'id',
-        order: 'asc',
-        isValid: ''
-      }, // 筛选条件
+        order: 'asc'
+      }, // 查询条件
       isValidList: [
         {
           label: '是',
@@ -190,50 +131,39 @@
       ], // 显示列
       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, // 全屏加载动画
+      listLoading: true, // 加载动画
       editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示编辑框
-      filename: 'device_template.xlsx',
-      deptShowTop: false, // 是否显示顶级
-      onlineStates: [
-        { value: '1', name: '在线' },
-        { value: '0', name: '离线' }
-      ], // 在线情况
-      wellShow: false
+      detailShow: 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.fetchDeviceType()
+    this.fetchData()
   },
   methods: {
+    // 获取设备类型
+    fetchDeviceType() {
+      getDeviceType(this.listQuery).then(response => {
+        this.deviceTypeList = response.data
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 数据列表
+    fetchData() {
+      this.listLoading = true
+      getDeviceList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    },
+    // table表格每行多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
     // 检查选择情况
     checkSelection() {
       if (this.multipleSelection.length === 0) {
@@ -242,29 +172,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(
           '确定要删除所选设备吗？',
           '确认操作',
@@ -285,116 +201,20 @@
         this.$message.error('至少选中一项')
       }
     },
-    // 批量导入集中器
-    uploadFile(param) {
-      // 判断文件大小是否符合要求
-      const _file = param.file
-      const isLt5M = _file.size / 1024 / 1024 < 5
-      if (!isLt5M) {
-        this.$message.error('请上传5M以下的excel文件')
-        return false
-      }
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: '导入中,请稍后...',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      // 发起导入请求
-      batchImportDevice(_file).then(res => {
-        loading.close() // 关闭加载动画
-        if (res.code === 200) {
-          this.$message.success('导入成功')
-          this.fetchData()
-        } else {
-          this.$message.error(res.message)
-        }
-      }).catch(() => {
-        loading.close() // 关闭加载动画
-      })
-      this.fileList = []
+    // 新增设备
+    add() {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('create', this.dialogFormVisible)
     },
-    // 批量导出
-    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()
-      })
+    // 编辑设备信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editdevice.initDialog('update', this.dialogFormVisible, row)
     },
-    // 查询数据
-    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
+    detail(row) {
+      this.$refs.editdevice.initDialog('detail', true, row)
     }
   }
 }