diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
deleted file mode 100644
index a0e0ba4..0000000
--- a/src/views/wellManage/components/listTubeData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tubedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTubeData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tubedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
deleted file mode 100644
index a0e0ba4..0000000
--- a/src/views/wellManage/components/listTubeData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tubedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTubeData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tubedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
deleted file mode 100644
index 7fc6a34..0000000
--- a/src/views/wellManage/components/listWellData.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :pagination="false"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welldataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '井盖状态',
-          value: 'status',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'logtime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    // this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
deleted file mode 100644
index a0e0ba4..0000000
--- a/src/views/wellManage/components/listTubeData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tubedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTubeData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tubedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
deleted file mode 100644
index 7fc6a34..0000000
--- a/src/views/wellManage/components/listWellData.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :pagination="false"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welldataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '井盖状态',
-          value: 'status',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'logtime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    // this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
deleted file mode 100644
index af4581e..0000000
--- a/src/views/wellManage/components/listWellLocaData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welllocadataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellLocaData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '纬度',
-          value: 'lat',
-          align: 'center'
-        },
-        {
-          text: '经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welllocadataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
deleted file mode 100644
index a0e0ba4..0000000
--- a/src/views/wellManage/components/listTubeData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tubedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTubeData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tubedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
deleted file mode 100644
index 7fc6a34..0000000
--- a/src/views/wellManage/components/listWellData.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :pagination="false"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welldataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '井盖状态',
-          value: 'status',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'logtime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    // this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
deleted file mode 100644
index af4581e..0000000
--- a/src/views/wellManage/components/listWellLocaData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welllocadataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellLocaData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '纬度',
-          value: 'lat',
-          align: 'center'
-        },
-        {
-          text: '经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welllocadataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 6b29e8d..6db57b1 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -1,139 +1,36 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" append-to-body @close="cancel">
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" append-to-body width="800" @close="cancel">
     <el-scrollbar :native="false">
-      <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="点位名称" prop="wellName">
-              <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="点位编号" prop="wellCode">
-              <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="点位类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model="wellForm.deep" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="布防状态" prop="coordinateX">
-              <el-input v-model="wellForm.bfztName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model="wellForm.coordinateX" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model="wellForm.coordinateY" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <div v-if="imageList.length==0">
-                无
-              </div>
-              <!--<el-image-->
-              <!--v-for="image in imageList"-->
-              <!--:src="image"-->
-              <!--:preview-src-list="imageList"-->
-              <!--:z-index="4000"-->
-              <!--style="width: 100px; height: 100px; margin-right:10px"/>-->
-              <el-upload
-                v-else
-                ref="upload"
-                :file-list="imageList"
-                :on-preview="handlePictureCardPreview"
-                class="hide"
-                multiple
-                accept=".jpg,.jpeg,.png "
-                action="string"
-                list-type="picture-card"
-                disabled
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <!--<img width="100%" :src="dialogImageUrl">-->
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              区/县
-            </el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              街道/镇
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="15">
-            <el-form-item label="详细地址" prop="position">
-              <el-input v-model="wellForm.position" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="井维护单位" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <el-descriptions class="margin-top" title="" :column="2" border>
+        <el-descriptions-item v-for="config of formConfig" :key="config.value" :span="config.span">
+          <template slot="label">
+            {{ config.label }}
+          </template>
+          <template v-if="config.type=='text'">
+            {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
+          </template>
+          <template v-if="config.type=='areaName'">
+            {{ areaName }}
+          </template>
+          <template v-if="config.type=='images'">
+            <div v-if="imageList.length==0">
+              无
+            </div>
+            <el-upload
+              v-else
+              ref="upload"
+              :file-list="imageList"
+              :on-preview="handlePictureCardPreview"
+              class="hide"
+              multiple
+              accept=".jpg,.jpeg,.png "
+              action="string"
+              list-type="picture-card"
+              disabled
+            />
+          </template>
+        </el-descriptions-item>
+      </el-descriptions>
       <div class="watch-div">
         <el-row class="table-title">
           <el-col :span="3">
@@ -158,43 +55,34 @@
           </el-table-column>
         </el-table>
       </div>
-      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
 
 <script>
-import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getAreaListPage } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
-import listDigData from './components/listDigData'
-import listGasData from './components/listGasData'
-import listHarmfulData from './components/listHarmfulData'
-import listLiquidData from './components/listLiquidData'
-import listLiquidGasData from './components/listLiquidGasData'
-import listNoiseData from './components/listNoiseData'
-import listTempData from './components/listTempData'
-import listTubeData from './components/listTubeData'
-import listWellData from './components/listWellData'
-import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
-  components: {
-    listDigData,
-    listGasData,
-    listHarmfulData,
-    listLiquidData,
-    listLiquidGasData,
-    listNoiseData,
-    listTempData,
-    listTubeData,
-    listWellData,
-    listWellLocaData
-  },
   data() {
     return {
       cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
+      formConfig: [
+        { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
+        { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' },
+        { type: 'text', label: '点位类型', value: 'wellTypeName', placeholder: '未知' },
+        { type: 'text', label: '权属单位', value: 'deptName', placeholder: '未知' },
+        { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
+        { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
+        { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
+        { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
+        { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
+      ], // 表单配置项
       wellForm: {
         id: null, // 井id
         wellCode: '', // 点位编号
@@ -211,62 +99,41 @@
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
+        quName: '',
         area: '', // 街道
+        areaName: '',
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门名称
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
       columns: [
-        {
-          text: '监控内容',
-          value: 'watchType'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode'
-        },
-        {
-          text: '设备安装日期',
-          value: 'installDate',
-          width: 110
-        },
-        {
-          text: '最新数据',
-          value: 'data',
-          width: 80
-        },
-        {
-          text: '设备状态',
-          value: 'onlineStateName',
-          width: 80
-        },
-        {
-          text: '最后上传时间',
-          value: 'logtime',
-          width: 170
-        }
+        { text: '监控内容', value: 'watchType' },
+        { text: '设备编号', value: 'devcode' },
+        { text: '设备安装日期', value: 'installDate', width: 110 },
+        { text: '最新数据', value: 'data', width: 80 },
+        { text: '设备状态', value: 'onlineStateName', width: 80 },
+        { text: '最后上传时间', value: 'logtime', width: 170 }
       ],
       hideUpload: false,
       imageList: [],
-      fileList: [],
-      deptTreeList: null, // 组织树列表数据
-      secondDeptTreeList: null, // 二级组织树列表
-      wellTypeList: null,
-      quList: null,
-      jiedaoList: null,
+      quList: [],
+      jiedaoList: [],
       dialogImageUrl: '',
       dialogVisible: false,
-      labelPosition: 'right',
       listLoading: false, // 监控数据加载动画
       dataList: [], // 监控数据
       loading: true
     }
   },
+  computed: {
+    areaName() {
+      debugger
+      if (this.wellForm.quName) {
+        return this.wellForm.quName + this.wellForm.areaName
+      } else {
+        return ''
+      }
+    }
+  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
@@ -293,37 +160,9 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
-      // 展示相对应的设备列表组件
-      if (row.wellTypeName === '开挖监测仪') {
-        this.cmpName = 'list-dig-data'
-      } else if (row.wellTypeName === '井盖状态监测仪') {
-        this.cmpName = 'list-well-data'
-      } else if (row.wellTypeName === '液位监测仪') {
-        this.cmpName = 'list-liquid-data'
-      } else if (row.wellTypeName === '燃气智能监测终端') {
-        this.cmpName = 'list-gas-data'
-      } else if (row.wellTypeName === '噪声记录仪') {
-        this.cmpName = 'list-noise-data'
-      } else if (row.wellTypeName === '有害气体监测仪') {
-        this.cmpName = 'list-harmful-data'
-      } else if (row.wellTypeName === '温湿度监测仪') {
-        this.cmpName = 'list-temp-data'
-      } else if (row.wellTypeName === '井盖定位监测仪') {
-        this.cmpName = 'list-well-loca-data'
-      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
-        this.cmpName = 'list-liquid-gas-data'
-      } else if (row.wellTypeName === '管盯') {
-        this.cmpName = 'list-tube-data'
-      }
-      setTimeout(() => {
-        this.$refs.deviceTypeDialog.initData(row)
-      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
-        this.loading = false
-      } else {
-        this.loading = false
       }
       // 处理图片
       const urls = row.photos.split(';')
@@ -344,20 +183,30 @@
     fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
-      getAreaByDept(this.wellForm.deptid).then(response => {
-        if (response.code === 200) {
-          const pid = response.data.area
-          getAreaList(pid).then(response => {
-            this.quList = response.data
-          })
-        }
+      const query = {
+        keywords: this.wellForm.qu,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
+        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
       })
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.wellForm.qu).then(response => {
-        this.jiedaoList = response.data
-        this.loading = false
+      const query = {
+        keywords: this.wellForm.area,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.jiedaoList = response.data.rows
+        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
       })
     },
     showData(row) {
@@ -369,7 +218,7 @@
         query: params,
         params: params
       })
-      window.open(routeData.href, '_blank')
+      window.open(routeData.href, '_blank') // 打开新窗口
       // this.$router.push({ name: 'DataManage', query: params })
     },
     // 取消
@@ -423,7 +272,7 @@
     text-align: center;
   }
   .watch-div {
-    margin: 15px;
+    margin-top: 15px;
     .table-title {
       margin-top: 10px;
       .title-header {
@@ -431,7 +280,7 @@
         padding: 10px;
         border-radius: 4px;
         border: solid 1px #F3F3F3;
-        background-color: #F5F7FA;
+        background-color: #fafafa;
         color: #606266;
       }
     }

diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
deleted file mode 100644
index 7fb41b9..0000000
--- a/src/views/wellManage/components/listDigData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="123开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { digdataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListDigData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        },
-        {
-          text: '开挖状态',
-          value: 'status',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      digdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
deleted file mode 100644
index 6e2afc3..0000000
--- a/src/views/wellManage/components/listGasData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { gasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      gasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
deleted file mode 100644
index 540e216..0000000
--- a/src/views/wellManage/components/listHarmfulData.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { harmfuldataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListHarmfulData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: 'CO浓度',
-          value: 'CO',
-          align: 'center'
-        },
-        {
-          text: 'CH4浓度',
-          value: 'CH4',
-          align: 'center'
-        },
-        {
-          text: 'H2S浓度',
-          value: 'H2S',
-          align: 'center'
-        },
-        {
-          text: 'O2浓度',
-          value: 'O2',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'CO': '一氧化碳浓度',
-          'CH4': '甲烷浓度',
-          'H2S': '硫化氢浓度',
-          'O2': '氧气浓度'
-        },
-        metrics: ['CO', 'CH4', 'H2S', 'O2'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      harmfuldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
deleted file mode 100644
index c821bd7..0000000
--- a/src/views/wellManage/components/listLiquidData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquiddataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '液位值',
-          value: 'liquiddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'liquiddata': '液位值'
-        },
-        metrics: ['liquiddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'liquiddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquiddataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
deleted file mode 100644
index 8902be4..0000000
--- a/src/views/wellManage/components/listLiquidGasData.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <search-area
-        type=""
-        size="small"
-      >
-        <!--一般查询条件-->
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            size="small"
-            :picker-options="pickerOptions"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="fetchDeviceType"
-          />
-        </search-item>
-        <search-item>
-          <el-select
-            v-model="listQuery.watchContent"
-            placeholder="监控指标"
-            size="small"
-            @change="watchContentChange"
-          >
-            <el-option
-              v-for="item in watchContentList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </search-item>
-      </search-area>
-    </el-col>
-    <el-col>
-      <el-col :span="12">
-        <ve-line
-          :data="chartData"
-          :settings="chartSettings"
-        />
-      </el-col>
-      <el-col :span="12">
-        <el-table
-          v-loading="listLoading"
-          class="tableStyle"
-          :data="list"
-          border
-        >
-          <el-table-column
-            v-for="column in columns"
-            :key="column.value"
-            :label="column.text"
-            :width="column.width"
-            :align="column.align"
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row[column.value] }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListLiquidGasData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: '',
-        watchContent: '0'
-      },
-      watchContentList: [
-        {
-          label: '液位',
-          value: '0'
-        },
-        {
-          label: '燃气',
-          value: '1'
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [],
-      list: [],
-      listLoading: false,
-      chartSettings: {},
-      chartData: {}
-    }
-  },
-  created() {
-    this.watchContentChange()
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      liquidgasdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    },
-    watchContentChange(val) {
-      console.log(val, '=====')
-      if (val === '0' || val === undefined) {
-        this.chartSettings = {
-          labelMap: {
-            'liquiddata': '液位值'
-          },
-          metrics: ['liquiddata'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'liquiddata'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '液位值',
-            value: 'liquiddata',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      } else if (val === '1') {
-        this.chartSettings = {
-          labelMap: {
-            'strength': '燃气浓度'
-          },
-          metrics: ['strength'],
-          dimension: ['uptime']
-        }
-        this.chartData = {
-          columns: ['uptime', 'strength'],
-          rows: []
-        }
-        this.columns = [
-          {
-            text: '燃气浓度',
-            value: 'strength',
-            align: 'center'
-          },
-          {
-            text: '上报时间',
-            value: 'uptime',
-            align: 'center'
-          }
-        ]
-      }
-      this.fetchDeviceType()
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-.tableStyle {
-  margin-top: 60px;
-}
-</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
deleted file mode 100644
index a4aa8dc..0000000
--- a/src/views/wellManage/components/listNoiseData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { noisedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListNoiseData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '噪声值',
-          value: 'ddata',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'ddata': '噪声值'
-        },
-        metrics: ['ddata'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'ddata'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      noisedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
deleted file mode 100644
index 7b6b95c..0000000
--- a/src/views/wellManage/components/listTempData.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tempdataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTempData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '温度',
-          value: 'temperature',
-          align: 'center'
-        },
-        {
-          text: '湿度',
-          value: 'humidity',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'temperature': '温度',
-          'humidity': '湿度'
-        },
-        metrics: ['temperature', 'humidity'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'temperature', 'humidity'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tempdataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
deleted file mode 100644
index a0e0ba4..0000000
--- a/src/views/wellManage/components/listTubeData.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <el-row :gutter="10">
-    <el-col>
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </el-col>
-    <el-col :span="12">
-      <ve-line
-        :data="chartData"
-        :settings="chartSettings"
-      />
-    </el-col>
-    <el-col :span="12">
-      <normal-table
-        ref="normalTable"
-        :data="list"
-        :query="listQuery"
-        :columns="columns"
-        :list-loading="listLoading"
-        :options="options"
-        size="small"
-      />
-    </el-col>
-  </el-row>
-</template>
-
-<script>
-import { tubedataList } from '@/api/device/deviceTypeDetail'
-export default {
-  name: 'ListTubeData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '燃气浓度',
-          value: 'strength',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false,
-      chartSettings: {
-        labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
-      },
-      chartData: {
-        columns: ['uptime', 'strength'],
-        rows: []
-      }
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      tubedataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.chartData.rows = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
deleted file mode 100644
index 7fc6a34..0000000
--- a/src/views/wellManage/components/listWellData.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :pagination="false"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welldataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '井盖状态',
-          value: 'status',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'logtime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    // this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welldataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
deleted file mode 100644
index af4581e..0000000
--- a/src/views/wellManage/components/listWellLocaData.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <normal-table
-    ref="normalTable"
-    :data="list"
-    :query="listQuery"
-    :columns="columns"
-    :list-loading="listLoading"
-    :options="options"
-    size="small"
-  >
-    <template slot="btns">
-      <el-date-picker
-        v-model="timeRange"
-        type="datetimerange"
-        range-separator="至"
-        size="small"
-        :picker-options="pickerOptions"
-        value-format="yyyy-MM-dd HH:mm:ss"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="fetchDeviceType"
-      />
-    </template>
-  </normal-table>
-</template>
-
-<script>
-import { welllocadataList } from '@/api/device/deviceTypeDetail'
-
-export default {
-  name: 'ListWellLocaData',
-  data() {
-    return {
-      timeRange: '',
-      listQuery: {
-        devcode: '',
-        beginTime: '',
-        endTime: ''
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      },
-      // 是否需要序号列
-      options: {
-        needIndex: false
-      },
-      columns: [
-        {
-          text: '纬度',
-          value: 'lat',
-          align: 'center'
-        },
-        {
-          text: '经度',
-          value: 'lng',
-          align: 'center'
-        },
-        {
-          text: '上报时间',
-          value: 'uptime',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [],
-      listLoading: false
-    }
-  },
-  created() {
-    this.fetchDeviceType()
-  },
-  mounted() {
-    this.$refs.normalTable.initColumnsState(false)
-  },
-  methods: {
-    initData: function(row = null) {
-      this.listQuery.devcode = row.devcode
-    },
-    fetchDeviceType(val) {
-      this.listLoading = true
-      if (val !== undefined) {
-        this.listQuery.startTime = val[0]
-        this.listQuery.endTime = val[1]
-      }
-      welllocadataList(this.listQuery).then(response => {
-        this.list = response.data
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el-date-editor--datetimerange.el-input,
-.el-date-editor--datetimerange.el-input__inner{
-  width: 340px;
-}
-</style>
-
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 6b29e8d..6db57b1 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -1,139 +1,36 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" append-to-body @close="cancel">
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" append-to-body width="800" @close="cancel">
     <el-scrollbar :native="false">
-      <el-form ref="dataForm" v-loading="loading" :label-position="labelPosition" :model="wellForm" label-width="120px">
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="点位名称" prop="wellName">
-              <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="点位编号" prop="wellCode">
-              <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="点位类型" prop="wellType">
-              <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="井深(m)" prop="deep">
-              <el-input v-model="wellForm.deep" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="布防状态" prop="coordinateX">
-              <el-input v-model="wellForm.bfztName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item label="经度" prop="coordinateX">
-              <el-input v-model="wellForm.coordinateX" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" :offset="1">
-            <el-form-item label="纬度" prop="coordinateY">
-              <el-input v-model="wellForm.coordinateY" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="路标图片" prop="images">
-              <div v-if="imageList.length==0">
-                无
-              </div>
-              <!--<el-image-->
-              <!--v-for="image in imageList"-->
-              <!--:src="image"-->
-              <!--:preview-src-list="imageList"-->
-              <!--:z-index="4000"-->
-              <!--style="width: 100px; height: 100px; margin-right:10px"/>-->
-              <el-upload
-                v-else
-                ref="upload"
-                :file-list="imageList"
-                :on-preview="handlePictureCardPreview"
-                class="hide"
-                multiple
-                accept=".jpg,.jpeg,.png "
-                action="string"
-                list-type="picture-card"
-                disabled
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
-                <!--<img width="100%" :src="dialogImageUrl">-->
-                <div class="imgBox">
-                  <img :src="dialogImageUrl" alt="" style="width:100%; margin: 0 auto;">
-                </div>
-              </el-dialog>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="1">
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              区/县
-            </el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">
-              街道/镇
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-col :span="15">
-            <el-form-item label="详细地址" prop="position">
-              <el-input v-model="wellForm.position" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="10">
-            <el-form-item label="井维护单位" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+      <el-descriptions class="margin-top" title="" :column="2" border>
+        <el-descriptions-item v-for="config of formConfig" :key="config.value" :span="config.span">
+          <template slot="label">
+            {{ config.label }}
+          </template>
+          <template v-if="config.type=='text'">
+            {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
+          </template>
+          <template v-if="config.type=='areaName'">
+            {{ areaName }}
+          </template>
+          <template v-if="config.type=='images'">
+            <div v-if="imageList.length==0">
+              无
+            </div>
+            <el-upload
+              v-else
+              ref="upload"
+              :file-list="imageList"
+              :on-preview="handlePictureCardPreview"
+              class="hide"
+              multiple
+              accept=".jpg,.jpeg,.png "
+              action="string"
+              list-type="picture-card"
+              disabled
+            />
+          </template>
+        </el-descriptions-item>
+      </el-descriptions>
       <div class="watch-div">
         <el-row class="table-title">
           <el-col :span="3">
@@ -158,43 +55,34 @@
           </el-table-column>
         </el-table>
       </div>
-      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
 
 <script>
-import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getAreaListPage } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
-import listDigData from './components/listDigData'
-import listGasData from './components/listGasData'
-import listHarmfulData from './components/listHarmfulData'
-import listLiquidData from './components/listLiquidData'
-import listLiquidGasData from './components/listLiquidGasData'
-import listNoiseData from './components/listNoiseData'
-import listTempData from './components/listTempData'
-import listTubeData from './components/listTubeData'
-import listWellData from './components/listWellData'
-import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
-  components: {
-    listDigData,
-    listGasData,
-    listHarmfulData,
-    listLiquidData,
-    listLiquidGasData,
-    listNoiseData,
-    listTempData,
-    listTubeData,
-    listWellData,
-    listWellLocaData
-  },
   data() {
     return {
       cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
+      formConfig: [
+        { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
+        { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' },
+        { type: 'text', label: '点位类型', value: 'wellTypeName', placeholder: '未知' },
+        { type: 'text', label: '权属单位', value: 'deptName', placeholder: '未知' },
+        { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
+        { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
+        { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
+        { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
+        { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
+      ], // 表单配置项
       wellForm: {
         id: null, // 井id
         wellCode: '', // 点位编号
@@ -211,62 +99,41 @@
         photos: '', // 照片路径
         notes: '', // 备注,
         qu: '',
+        quName: '',
         area: '', // 街道
+        areaName: '',
         responsibleDept: '', // 维护人员部门
         responsibleDeptName: '' // 维护人员部门名称
       }, // 表单
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      },
       columns: [
-        {
-          text: '监控内容',
-          value: 'watchType'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode'
-        },
-        {
-          text: '设备安装日期',
-          value: 'installDate',
-          width: 110
-        },
-        {
-          text: '最新数据',
-          value: 'data',
-          width: 80
-        },
-        {
-          text: '设备状态',
-          value: 'onlineStateName',
-          width: 80
-        },
-        {
-          text: '最后上传时间',
-          value: 'logtime',
-          width: 170
-        }
+        { text: '监控内容', value: 'watchType' },
+        { text: '设备编号', value: 'devcode' },
+        { text: '设备安装日期', value: 'installDate', width: 110 },
+        { text: '最新数据', value: 'data', width: 80 },
+        { text: '设备状态', value: 'onlineStateName', width: 80 },
+        { text: '最后上传时间', value: 'logtime', width: 170 }
       ],
       hideUpload: false,
       imageList: [],
-      fileList: [],
-      deptTreeList: null, // 组织树列表数据
-      secondDeptTreeList: null, // 二级组织树列表
-      wellTypeList: null,
-      quList: null,
-      jiedaoList: null,
+      quList: [],
+      jiedaoList: [],
       dialogImageUrl: '',
       dialogVisible: false,
-      labelPosition: 'right',
       listLoading: false, // 监控数据加载动画
       dataList: [], // 监控数据
       loading: true
     }
   },
+  computed: {
+    areaName() {
+      debugger
+      if (this.wellForm.quName) {
+        return this.wellForm.quName + this.wellForm.areaName
+      } else {
+        return ''
+      }
+    }
+  },
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
@@ -293,37 +160,9 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
-      // 展示相对应的设备列表组件
-      if (row.wellTypeName === '开挖监测仪') {
-        this.cmpName = 'list-dig-data'
-      } else if (row.wellTypeName === '井盖状态监测仪') {
-        this.cmpName = 'list-well-data'
-      } else if (row.wellTypeName === '液位监测仪') {
-        this.cmpName = 'list-liquid-data'
-      } else if (row.wellTypeName === '燃气智能监测终端') {
-        this.cmpName = 'list-gas-data'
-      } else if (row.wellTypeName === '噪声记录仪') {
-        this.cmpName = 'list-noise-data'
-      } else if (row.wellTypeName === '有害气体监测仪') {
-        this.cmpName = 'list-harmful-data'
-      } else if (row.wellTypeName === '温湿度监测仪') {
-        this.cmpName = 'list-temp-data'
-      } else if (row.wellTypeName === '井盖定位监测仪') {
-        this.cmpName = 'list-well-loca-data'
-      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
-        this.cmpName = 'list-liquid-gas-data'
-      } else if (row.wellTypeName === '管盯') {
-        this.cmpName = 'list-tube-data'
-      }
-      setTimeout(() => {
-        this.$refs.deviceTypeDialog.initData(row)
-      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
-        this.loading = false
-      } else {
-        this.loading = false
       }
       // 处理图片
       const urls = row.photos.split(';')
@@ -344,20 +183,30 @@
     fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
-      getAreaByDept(this.wellForm.deptid).then(response => {
-        if (response.code === 200) {
-          const pid = response.data.area
-          getAreaList(pid).then(response => {
-            this.quList = response.data
-          })
-        }
+      const query = {
+        keywords: this.wellForm.qu,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
+        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
       })
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.wellForm.qu).then(response => {
-        this.jiedaoList = response.data
-        this.loading = false
+      const query = {
+        keywords: this.wellForm.area,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.jiedaoList = response.data.rows
+        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
       })
     },
     showData(row) {
@@ -369,7 +218,7 @@
         query: params,
         params: params
       })
-      window.open(routeData.href, '_blank')
+      window.open(routeData.href, '_blank') // 打开新窗口
       // this.$router.push({ name: 'DataManage', query: params })
     },
     // 取消
@@ -423,7 +272,7 @@
     text-align: center;
   }
   .watch-div {
-    margin: 15px;
+    margin-top: 15px;
     .table-title {
       margin-top: 10px;
       .title-header {
@@ -431,7 +280,7 @@
         padding: 10px;
         border-radius: 4px;
         border: solid 1px #F3F3F3;
-        background-color: #F5F7FA;
+        background-color: #fafafa;
         color: #606266;
       }
     }
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 9c9e892..fdc37ac 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -143,6 +143,10 @@
       detailShow: false, // 是否显示详情框
       filename: 'sluicewell_template.xlsx',
       fileList: [],
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       btnNames: {
         '布防': '撤防',
         '撤防': '布防'