diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue
new file mode 100644
index 0000000..c2030da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listPantiltData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/pantilt/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getPantiltData, batchExportPantiltData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListPantiltData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '浓度值(ppm.m)', value: 'concentration', align: 'center' },
+        { text: '方位角', value: 'direction', width: 80, align: 'center' },
+        { text: '俯仰角', value: 'pitch', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPantiltData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getPantiltData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue
new file mode 100644
index 0000000..c2030da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listPantiltData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/pantilt/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getPantiltData, batchExportPantiltData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListPantiltData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '浓度值(ppm.m)', value: 'concentration', align: 'center' },
+        { text: '方位角', value: 'direction', width: 80, align: 'center' },
+        { text: '俯仰角', value: 'pitch', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPantiltData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getPantiltData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 91cae81..ceb3b61 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/tempdata//export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -71,11 +71,21 @@
 import { getTempData, batchExportTempData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -165,17 +175,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '5' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
-        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-        this.timeRange = [defaultBeginTime, defaultEndTime]
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue
new file mode 100644
index 0000000..c2030da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listPantiltData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/pantilt/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getPantiltData, batchExportPantiltData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListPantiltData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '浓度值(ppm.m)', value: 'concentration', align: 'center' },
+        { text: '方位角', value: 'direction', width: 80, align: 'center' },
+        { text: '俯仰角', value: 'pitch', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPantiltData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getPantiltData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 91cae81..ceb3b61 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/tempdata//export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -71,11 +71,21 @@
 import { getTempData, batchExportTempData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -165,17 +175,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '5' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
-        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-        this.timeRange = [defaultBeginTime, defaultEndTime]
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 8b62d97..a8c5267 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -66,10 +66,21 @@
 import { getTubeData, batchExportTubeData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTubeData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,11 +110,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        // {
-        //   text: '燃气浓度(%LEL)',
-        //   value: 'strength',
-        //   align: 'center'
-        // },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
         // {
         //   text: '电量(%)',
         //   value: 'cell',
@@ -159,14 +170,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue
new file mode 100644
index 0000000..c2030da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listPantiltData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/pantilt/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getPantiltData, batchExportPantiltData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListPantiltData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '浓度值(ppm.m)', value: 'concentration', align: 'center' },
+        { text: '方位角', value: 'direction', width: 80, align: 'center' },
+        { text: '俯仰角', value: 'pitch', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPantiltData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getPantiltData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 91cae81..ceb3b61 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/tempdata//export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -71,11 +71,21 @@
 import { getTempData, batchExportTempData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -165,17 +175,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '5' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
-        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-        this.timeRange = [defaultBeginTime, defaultEndTime]
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 8b62d97..a8c5267 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -66,10 +66,21 @@
 import { getTubeData, batchExportTubeData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTubeData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,11 +110,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        // {
-        //   text: '燃气浓度(%LEL)',
-        //   value: 'strength',
-        //   align: 'center'
-        // },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
         // {
         //   text: '电量(%)',
         //   value: 'cell',
@@ -159,14 +170,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 846b77f..c425a86 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -42,7 +42,7 @@
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
+          <template v-slot="scope">
             <span v-if="column.checkState" :class="checkState(scope.row)">{{ scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -75,6 +75,16 @@
 export default {
   name: 'ListWellCoverData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -142,15 +152,15 @@
       deptShowTop: false
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '1' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      this.timeRange = getSearchLastWeekTime()
-      this.fetchData()
     }
   },
   activated() {
@@ -207,7 +217,7 @@
       }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },

diff --git a/src/api/data/data.js b/src/api/data/data.js
index f6a6c14..d6b8f55 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -201,3 +201,42 @@
   })
 }
 
+// 可燃气体外协数据查询
+export function getGasdectorData(params) {
+  return request({
+    url: '/gasdector/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportGasdectorData(params) {
+  return request({
+    url: '/gasdector/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 可燃气体外协数据查询
+export function getPantiltData(params) {
+  return request({
+    url: '/pantilt/listpage',
+    method: 'get',
+    params
+  })
+}
+
+// 可燃气体外协批量导出燃气数据
+export function batchExportPantiltData(params) {
+  return request({
+    url: '/pantilt/export',
+    method: 'get',
+    timeout: 120000, // 120s，2分钟
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 9fbc62f..f24249e 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -16,6 +16,7 @@
 import { judgeTree, toTreeList } from '@/utils/structure'
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getDeptTreeList } from '@/api/system/dept'
+import { getConfig } from '@/api/login'
 export default {
   name: 'DeptSelect',
   components: {
@@ -83,37 +84,55 @@
   },
   methods: {
     // 加载父组织树形下拉菜单
-    fetchPcode: function() {
-      let listQuery = {}
-      if (this.deptType !== '') {
-        listQuery = {
-          deptType: this.deptType
+    fetchPcode() {
+      // 如果未指定部门类型
+      if (!this.deptType) {
+        if (this.$store.getters.allDeptList.length === 0) {
+          getDeptTreeList().then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'allDeptList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.allDeptList)
+        }
+      } else {
+        if (this.$store.getters.companyList.length === 0) {
+          getDeptTreeList({ deptType: this.deptType }).then(response => {
+            const list = response.data
+            this.$store.dispatch('dict/changeDict', { key: 'companyList', value: list }).then(() => {
+              this.refreshList(list)
+            })
+          })
+        } else {
+          this.refreshList(this.$store.getters.companyList)
         }
       }
-      getDeptTreeList(listQuery).then(response => {
-        const list = response.data
-        this.originList = [...response.data]
-        // 如果deptShow 为false 并且 列表的长度小于1 不显示
-        if (!this.deptShow && list.length <= 1) {
-          this.showDeptSelect = false
-        } else {
-          // 如果有数据
-          if (list) {
-            // 如果有必要转树,使用selectTree控件
-            if (judgeTree(list)) {
-              this.multiData = true
-              this.deptTreeList = toTreeList(response.data, '0', this.needTop)
-              // 如果不需要顶级,将顶级去掉
-              if (!this.needTop && this.deptTreeList.length === 1) {
-                this.deptTreeList = this.deptTreeList[0].children
-              }
-            } else { // 否则不需要转树，直接使用el-select控件
-              this.deptTreeList = list
-              this.multiData = false
+    },
+    // 刷新列表
+    refreshList(list) {
+      this.originList = [...list]
+      // 如果deptShow 为false 并且 列表的长度小于1 不显示
+      if (!this.deptShow && list.length <= 1) {
+        this.showDeptSelect = false
+      } else {
+        // 如果有数据
+        if (list) {
+          // 如果有必要转树,使用selectTree控件
+          if (judgeTree(list)) {
+            this.multiData = true
+            this.deptTreeList = toTreeList(list, '0', this.needTop)
+            // 如果不需要顶级,将顶级去掉
+            if (!this.needTop && this.deptTreeList.length === 1) {
+              this.deptTreeList = this.deptTreeList[0].children
             }
+          } else { // 否则不需要转树，直接使用el-select控件
+            this.deptTreeList = list
+            this.multiData = false
           }
         }
-      })
+      }
     },
     // 获取列表
     fetchDeptTree() {
diff --git a/src/directive/resize/resize.js b/src/directive/resize/resize.js
index 1dd8507..eaaf0dd 100644
--- a/src/directive/resize/resize.js
+++ b/src/directive/resize/resize.js
@@ -8,7 +8,6 @@
     function documentHandler() {
       const bodyHeight = window.innerHeight
       const bodyWidth = window.innerWidth
-      console.log('window resize:', bodyHeight, bodyWidth)
       callback(bodyHeight, bodyWidth)
     }
     el.__vueWindowResize__ = documentHandler
diff --git a/src/store/getters.js b/src/store/getters.js
index b6442ae..168bba2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,8 @@
   websocket: state => state.websocket.websocket, // websocket对象
   wsStatus: state => state.websocket.wsStatus, // websocket连接状态
   needRefresh: state => state.websocket.needRefresh, // 是否需要刷新
-  sexList: state => state.dict.sexList // 性别列表
+  sexList: state => state.dict.sexList, // 性别列表
+  allDeptList: state => state.dict.allDeptList, // 部门列表
+  companyList: state => state.dict.companyList // 公司列表
 }
 export default getters
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 8f5de49..18a427b 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,11 +1,27 @@
+/**
+ * 字典store
+ */
 const state = {
-  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }]
+  sexList: [{ label: '男', value: '0' }, { label: '女', value: '1' }], // 性别列表
+  allDeptList: [], // 全部部门列表
+  companyList: [] // 公司列表
 }
 
 const mutations = {
+  CHANGE_DICT: (state, { key, value }) => {
+    if (Object.prototype.hasOwnProperty.call(state, 'key')) {
+      state[key] = value
+    }
+  }
 }
 
 const actions = {
+  changeDict({ commit }, data) {
+    return new Promise((resolve, reject) => {
+      commit('CHANGE_DICT', data)
+      resolve(data)
+    })
+  }
 }
 
 export default {
diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 17cfdb9..ece1818 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -30,12 +30,6 @@
   return date.Format(fmt)
 }
 
-export function getSearchLastWeekTime() { // 默认7天内
-  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-  const endTime = getToday().Format('yyyy-MM-dd hh:mm:ss')
-  return [startTime, endTime]
-}
-
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
@@ -60,3 +54,13 @@
   return fmt
 }
 
+/**
+ * 获取上周日志范围
+ * @returns {*[]}
+ */
+export function getSearchLastWeekTime() { // 默认7天内
+  const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+  const endTime = getToday('yyyy-MM-dd hh:mm:ss')
+  return [startTime, endTime]
+}
+
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 5eb6ca7..4971eff 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -1,35 +1,8 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/welldata/list')" label="井盖状态监测仪" name="wellcover">
-        <list-well-cover-data ref="welldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquiddata/list')" label="液位监测仪" name="liquid">
-        <list-liquid-data ref="liquiddatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/gasdata/list')" label="燃气智能监测终端" name="gas">
-        <list-gas-data ref="gasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/digdata/list')" label="开挖监测仪" name="dig">
-        <list-dig-data ref="digdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/noisedata/list')" label="噪声记录仪" name="noise">
-        <list-noise-data ref="noisedatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/harmfuldata/list')" label="有害气体监测仪" name="harmful">
-        <list-harmful-data ref="harmfuldatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tempdata/list')" label="温湿度监测仪" name="temp">
-        <list-temp-data ref="tempdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
-        <list-well-loca-data ref="welllocadatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/liquidGasData/list')" label="燃气智能终端(一体化)" name="liquidgas">
-        <list-liquid-gas-data ref="liquidgasdatacomp"/>
-      </el-tab-pane>
-      <el-tab-pane v-if="hasPerm('/tubedata/list')" label="管盯" name="tube">
-        <list-tube-data ref="tubedatacomp"/>
+      <el-tab-pane v-for="tab of showTabList" :key="tab.name" :label="tab.label" :name="tab.name">
+        <component :is="tab.comp" :ref="tab.name" :name="tab.label" :type="tab.type" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -44,17 +17,39 @@
 import ListTempData from './deviceData/listTempData'
 import ListWellLocaData from './deviceData/listWellLocaData'
 import ListLiquidGasData from './deviceData/listLiquidGasData'
-import { parseUrl } from '@/utils/parseutils'
-import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
 import ListTubeData from './deviceData/listTubeData'
+import ListGasdectorData from '@/views/dataManage/deviceData/listGasdectorData'
+import ListPantiltData from '@/views/dataManage/deviceData/listPantiltData'
+import { parseUrl } from '@/utils/parseutils'
 
 export default {
   name: 'DataManage',
-  components: { ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
+  components: { ListPantiltData, ListGasdectorData, ListTubeData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData, ListLiquidGasData },
   data() {
     return {
-      activeName: 'wellcover'
+      activeName: 'wellcover',
+      tabList: [
+        { permission: '/welldata/list', label: '井盖状态监测仪', name: 'wellcover', type: '1', comp: 'list-well-cover-data' },
+        { permission: '/liquiddata/list', label: '液位监测仪', name: 'liquid', type: '2', comp: 'list-liquid-data' },
+        { permission: '/gasdata/list', label: '燃气智能监测终端', name: 'gas', type: '4', comp: 'list-gas-data' },
+        { permission: '/digdata/list', label: '开挖监测仪', name: 'dig', type: '6', comp: 'list-dig-data' },
+        { permission: '/noisedata/list', label: '噪声记录仪', name: 'noise', type: '8', comp: 'list-noise-data' },
+        { permission: '/harmfuldata/list', label: '有害气体监测仪', name: 'harmful', type: '3', comp: 'list-harmful-data' },
+        { permission: '/tempdata/list', label: '温湿度监测仪', name: 'temp', type: '5', comp: 'list-temp-data' },
+        { permission: '/welllocadata/list', label: '井盖定位监测仪', name: 'wellloca', type: '7', comp: 'list-well-loca-data' },
+        { permission: '/liquidGasData/list', label: '燃气智能终端(一体化)', name: 'liquidgas', type: '10', comp: 'list-liquid-gas-data' },
+        { permission: '/tubedata/list', label: '管盯', name: 'tube', type: '12', comp: 'list-tube-data' },
+        { permission: '/gasdector/listPage', label: '可燃气体智能监测终端', name: 'gasdector', type: '1', comp: 'list-gasdector-data' },
+        { permission: '/pantilt/listPage', label: '激光甲烷遥测云台', name: 'pantilt', type: '1', comp: 'list-pantilt-data' }
+      ] // 所有tab列表
+    }
+  },
+  computed: {
+    showTabList() { // 根据权限获取可见tab
+      return this.tabList.filter(item => {
+        return this.hasPerm(item.permission)
+      })
     }
   },
   created() {
@@ -78,74 +73,22 @@
   methods: {
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
-      if (tab.name === 'wellcover') {
-        this.$refs.welldatacomp.fetchData()
-      } else if (tab.name === 'liquid') {
-        this.$refs.liquiddatacomp.fetchData()
-      } else if (tab.name === 'harmful') {
-        this.$refs.harmfuldatacomp.fetchData()
-      } else if (tab.name === 'gas') {
-        this.$refs.gasdatacomp.fetchData()
-      } else if (tab.name === 'noise') {
-        this.$refs.noisedatacomp.fetchData()
-      } else if (tab.name === 'temp') {
-        this.$refs.tempdatacomp.fetchData()
-      } else if (tab.name === 'dig') {
-        this.$refs.digdatacomp.fetchData()
-      } else if (tab.name === 'wellloca') {
-        this.$refs.welllocadatacomp.fetchData()
-      } else if (tab.name === 'liquidgas') {
-        this.$refs.liquidgasdatacomp.fetchData()
-      } else if (tab.name === 'tube') {
-        this.$refs.tubedatacomp.fetchData()
-      }
+      const tabname = tab.name
+      const comp = this.$refs[tabname][0]
+      comp.fetchData()
     },
+    // 切换tab
     changeTab(deviceType) {
-      if (deviceType === '1') {
-        this.activeName = 'wellcover'
-      } else if (deviceType === '2') {
-        this.activeName = 'liquid'
-      } else if (deviceType === '3') {
-        this.activeName = 'harmful'
-      } else if (deviceType === '4') {
-        this.activeName = 'gas'
-      } else if (deviceType === '5') {
-        this.activeName = 'temp'
-      } else if (deviceType === '6') {
-        this.activeName = 'dig'
-      } else if (deviceType === '7') {
-        this.activeName = 'wellloca'
-      } else if (deviceType === '8') {
-        this.activeName = 'noise'
-      } else if (deviceType === '10') {
-        this.activeName = 'liquidgas'
-      } else if (deviceType === '12') {
-        this.activeName = 'tube'
+      const res = this.showTabList.filter(item => item.type === deviceType)
+      if (res.length > 0) {
+        this.activeName = res[0].name
+      } else {
+        this.activeName = this.showTabList[0].name
       }
     },
     // 计算那个是当前第一个tab
     caclActive() {
-      if (hasPermission('/welldata/list')) {
-        this.activeName = 'wellcover'
-      } else if (hasPermission('/liquiddata/list')) {
-        this.activeName = 'liquid'
-      } else if (hasPermission('/gasdata/list')) {
-        this.activeName = 'gas'
-      } else if (hasPermission('/digdata/list')) {
-        this.activeName = 'dig'
-      } else if (hasPermission('/harmfuldata/list')) {
-        this.activeName = 'harmful'
-      } else if (hasPermission('/tempdata/list')) {
-        this.activeName = 'temp'
-      } else if (hasPermission('/welllocadata/list')) {
-        this.activeName = 'wellloca'
-      } else if (hasPermission('/noisedata/list')) {
-        this.activeName = 'noise'
-      } else if (hasPermission('/liquidGasData/list')) {
-        this.activeName = 'liquidgas'
-      } else if (hasPermission('/tubedata/list')) {
-        this.activeName = 'tube'
-      }
+      this.activeName = this.showTabList[0].name
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index 815c715..fa4bbc7 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/digdata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -76,6 +76,16 @@
 export default {
   name: 'ListDigData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 5ffe71b..2a0b33e 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -6,13 +6,7 @@
         <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
       </search-item>
       <search-item>
-        <dept-select
-          v-model="listQuery.deptid"
-          size="small"
-          :need-top="deptShowTop"
-          dept-type="03"
-          placeholder="选择权属单位"
-        />
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
       </search-item>
       <search-item>
         <el-date-picker
@@ -28,42 +22,29 @@
     </search-area>
     <!--查询结果Table显示-->
     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdata/export')" size="small" @click="batchExport">
             导出记录
           </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
-            <span v-else>{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
     </div>
   </app-container>
 </template>
@@ -73,6 +54,7 @@
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
 
 export default {
   name: 'ListGasData',
@@ -86,6 +68,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,94 +91,37 @@
         order: ''
       }, // 筛选条件
       timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
       columns: [
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '点位编号',
-          value: 'wellCode',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '燃气浓度(%LEL)',
-          value: 'strength',
-          align: 'center',
-          filter: true
-        },
-        {
-          text: '电量(%)',
-          value: 'cell',
-          width: 80,
-          align: 'center',
-          checkCell: true
-        },
-        // {
-        //   text: '状态描述',
-        //   value: 'descn',
-        //   align: 'center'
-        // },
-        {
-          text: '权属单位',
-          value: 'deptName',
-          align: 'center'
-        },
-        {
-          text: '上传时间',
-          value: 'uptime',
-          width: 170,
-          align: 'center'
-        }
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
       ], // 显示列
-      multipleSelection: [], // 多选选中项
       list: [], // 列表数据
       total: 0, // 数据总数
-      deviceTypeList: [], // 燃气配置类型列表
-      deptProps: {
-        parent: 'pid',
-        value: 'id',
-        label: 'name',
-        children: 'children'
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      showDeptTree: 0, // 是否显示权属单位下拉
-      showDeviceType: true, // 是否显示设备类型下拉
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
@@ -201,6 +136,7 @@
   methods: {
     // 批量导出
     batchExport() {
+      this.handleDateTime()
       // 全屏加载动画
       const loading = this.$loading({
         lock: true,
@@ -210,15 +146,10 @@
       })
       batchExportGasData(this.listQuery).then(res => {
         loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
         const blob = new Blob([res.data])
-        const downloadElement = document.createElement('a')
-        const href = window.URL.createObjectURL(blob) // 创建下载的链接
-        downloadElement.href = href
-        downloadElement.download = `有害气体监测仪数据.xlsx` // 下载后文件名
-        document.body.appendChild(downloadElement)
-        downloadElement.click() // 点击下载
-        document.body.removeChild(downloadElement) // 下载完成移除元素
-        window.URL.revokeObjectURL(href) // 释放blob对象
+        exportFile(blob, fileName)
       }).catch((res) => {
         loading.close()
       })
@@ -227,15 +158,26 @@
     search() {
       this.fetchData(false)
     },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
     // 获取燃气配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1
       }
+      this.handleDateTime()
       getGasData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
@@ -245,22 +187,15 @@
         return 'warning-state'
       }
     },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
       this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
new file mode 100644
index 0000000..a78b8da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/gasdector/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListGasdectorData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
+        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportGasdectorData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getGasdectorData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index 68af2bd..dde92b4 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -35,7 +35,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/harmfuldata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -77,6 +77,16 @@
 export default {
   name: 'ListHarmfulData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -179,17 +189,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '3' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 9453fad..96f28f6 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -77,6 +77,16 @@
 export default {
   name: 'ListLiquidData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -161,17 +171,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '2' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue
index 8240a44..160edde 100644
--- a/src/views/dataManage/deviceData/listLiquidGasData.vue
+++ b/src/views/dataManage/deviceData/listLiquidGasData.vue
@@ -79,7 +79,7 @@
 import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidGasData',
@@ -97,6 +97,16 @@
       }
     }
   },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -188,32 +198,26 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '10' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
     if (this.$route.query && this.$route.query.devcode) {
       this.listQuery.keywords = this.$route.query.devcode
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       this.fetchData(false)// 获取数据
     } else {
       // if (this.timeRange.length === 0) {
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
+      this.timeRange = getSearchLastWeekTime()
       // }
       this.fetchData()
     }
diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue
index 1565ba4..5e31021 100644
--- a/src/views/dataManage/deviceData/listNoiseData.vue
+++ b/src/views/dataManage/deviceData/listNoiseData.vue
@@ -71,11 +71,21 @@
 import { getNoiseData, batchExportNoiseData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListNoiseData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -167,17 +177,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '6' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue
new file mode 100644
index 0000000..c2030da
--- /dev/null
+++ b/src/views/dataManage/deviceData/listPantiltData.vue
@@ -0,0 +1,229 @@
+<!--可燃气体监测设备-->
+<template>
+  <app-container>
+    <!--筛选条件-->
+    <search-area size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="点位编号/设备编号" clearable />
+      </search-item>
+      <search-item>
+        <dept-select v-model="listQuery.deptid" size="small" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位" />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          size="small"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        />
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div>
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :total="total"
+        :query="listQuery"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      >
+        <template slot="btns">
+          <el-button v-if="hasPerm('/pantilt/export')" size="small" @click="batchExport">
+            导出记录
+          </el-button>
+        </template>
+        <template slot="columns">
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+              <span v-else>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+  </app-container>
+</template>
+
+<script>
+import { getPantiltData, batchExportPantiltData } from '@/api/data/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
+import { exportFile } from '@/utils/exportutils'
+
+export default {
+  name: 'ListPantiltData',
+  components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      options: {
+        needIndex: true, // 是否需要序号列
+        border: true // 是否需要上方边框
+      },
+      columns: [
+        { text: '设备编号', value: 'devcode', align: 'center' },
+        { text: '点位编号', value: 'wellCode', align: 'center' },
+        { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+        { text: '浓度值(ppm.m)', value: 'concentration', align: 'center' },
+        { text: '方位角', value: 'direction', width: 80, align: 'center' },
+        { text: '俯仰角', value: 'pitch', align: 'center' },
+        { text: '权属单位', value: 'deptName', align: 'center' },
+        { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  mounted() {
+    // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === this.type && params.devcode) {
+        this.listQuery.keywords = params.devcode
+        this.fetchData()
+      }
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      this.handleDateTime()
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportPantiltData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        let fileName = `${this.name}数据_${this.listQuery.beginTime}_${this.listQuery.endTime}.xlsx`
+        fileName = fileName.replace(/-|:| /g, '')
+        const blob = new Blob([res.data])
+        exportFile(blob, fileName)
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    },
+    // 获取燃气配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      this.handleDateTime()
+      getPantiltData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+    changePage(val) {
+      if (val && val.size) {
+        this.listQuery.limit = val.size
+      }
+      if (val && val.page) {
+        this.listQuery.offset = val.page
+      }
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 10px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 91cae81..ceb3b61 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/tempdata//export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -71,11 +71,21 @@
 import { getTempData, batchExportTempData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -165,17 +175,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '5' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
-        const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-        const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-        this.timeRange = [defaultBeginTime, defaultEndTime]
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index 8b62d97..a8c5267 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -66,10 +66,21 @@
 import { getTubeData, batchExportTubeData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListTubeData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -99,11 +110,11 @@
           value: 'deviceTypeName',
           align: 'center'
         },
-        // {
-        //   text: '燃气浓度(%LEL)',
-        //   value: 'strength',
-        //   align: 'center'
-        // },
+        {
+          text: '燃气浓度(%LEL)',
+          value: 'strength',
+          align: 'center'
+        },
         // {
         //   text: '电量(%)',
         //   value: 'cell',
@@ -159,14 +170,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '4' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      this.fetchData()
     }
   },
   activated() {
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 846b77f..c425a86 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -42,7 +42,7 @@
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
+          <template v-slot="scope">
             <span v-if="column.checkState" :class="checkState(scope.row)">{{ scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -75,6 +75,16 @@
 export default {
   name: 'ListWellCoverData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -142,15 +152,15 @@
       deptShowTop: false
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '1' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      this.timeRange = getSearchLastWeekTime()
-      this.fetchData()
     }
   },
   activated() {
@@ -207,7 +217,7 @@
       }
       getWellData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 6e12a50..66722a2 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -34,7 +34,7 @@
           </div>
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">
+          <el-button v-if="hasPerm('/welllocadata/export')" class="edit_btn" size="small" @click="batchExport">
             导出记录
           </el-button>
         </el-col>
@@ -71,11 +71,21 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
-import { getDayTime } from '@/utils/dateutils'
+import { getSearchLastWeekTime } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
   components: { DeptSelect },
+  props: {
+    type: {
+      type: String,
+      required: true
+    }, // 设备类型
+    name: {
+      type: String,
+      default: '激光甲烷遥测云台'
+    } // 设备名称
+  },
   data() {
     return {
       listQuery: {
@@ -158,17 +168,15 @@
       }
     }
   },
-  created() {
+  mounted() {
     // 如果路径里带参数，解析devcode参数
+    this.timeRange = getSearchLastWeekTime()
     if (window.location.href) {
       const params = parseUrl(window.location.href)
-      if (params && params.deviceType === '7' && params.devcode) {
+      if (params && params.deviceType === this.type && params.devcode) {
         this.listQuery.keywords = params.devcode
+        this.fetchData()
       }
-      const defaultBeginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      const defaultEndTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      this.timeRange = [defaultBeginTime, defaultEndTime]
-      this.fetchData()
     }
   },
   activated() {