diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
new file mode 100644
index 0000000..76ad5e6
--- /dev/null
+++ b/src/views/wellManage/editWell copy 2.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+export default {
+  components: { AMapContainer },
+  data() {
+    return {
+      dialogFormVisible: false,
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      map.on('click', function(e) {
+        console.log(e)
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible
+    }
+  }
+}
+</script>
+

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
new file mode 100644
index 0000000..76ad5e6
--- /dev/null
+++ b/src/views/wellManage/editWell copy 2.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+export default {
+  components: { AMapContainer },
+  data() {
+    return {
+      dialogFormVisible: false,
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      map.on('click', function(e) {
+        console.log(e)
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible
+    }
+  }
+}
+</script>
+
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
new file mode 100644
index 0000000..dd624c3
--- /dev/null
+++ b/src/views/wellManage/editWell copy.vue
@@ -0,0 +1,606 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井名称" prop="wellName">
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="井编号" prop="wellCode">
+              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+                <el-option
+                  v-for="item in wellTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="权属单位" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井深(m)" prop="deep">
+              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="经度" prop="coordinateX">
+              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="纬度" prop="coordinateY">
+              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="路标图片" prop="images">
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove"
+                :on-exceed="handleExceed"
+                :on-change="handleChange"
+                :http-request="uploadFile"
+                :file-list="imageList"
+                :limit="4"
+                :class="{hide:hideUpload}"
+                multiple
+                action="string"
+                accept=".jpg,.jpeg,.png "
+                list-type="picture-card"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <div class="imgBox">
+                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                </div>
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-form-item label="所在区域" required>
+            <el-col :span="5">
+              <el-form-item prop="qu">
+                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
+                  <el-option
+                    v-for="item in quList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              区/县
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="area">
+                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
+                  <el-option
+                    v-for="item in jiedaoList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              街道/镇
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="详细地址" prop="position">
+              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
+          <el-col :span="13">
+            <el-form-item label="井维护机构" prop="responsibleDept">
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+                <el-option
+                  v-for="item in secondDeptTreeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+            <el-button size="medium" @click="cancel">
+              取消
+            </el-button>
+            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
+              保存
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-scrollbar>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, updateWell } from '@/api/well/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+export default {
+  name: 'EditWell',
+  components: { DeptSelect, AMapContainer },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('经度不能为空'))
+      }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('纬度不能为空'))
+      }
+    }
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false, // 对话框是否显示
+      wellForm: {
+        id: null, // 井id
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '', // 维护人员部门
+        responsibleDeptName: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      },
+      hideUpload: false,
+      imageList: [],
+      secondDeptTreeList: [], // 二级组织树列表
+      wellTypeList: [],
+      quList: [],
+      jiedaoList: [],
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+      },
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      isEditMode: true,
+      deptShow: true
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    qu() { // 获取区
+      return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
+    }
+  },
+  watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
+      } else {
+        if (val !== '') {
+          this.fetchSecondDeptTree()
+          this.fetchArea1()
+        }
+      }
+    },
+    qu(val) { // 监控区变化
+      if (val !== '') {
+        this.fetchArea2()
+      }
+    }
+  },
+  mounted: function() {
+    this.fetchWellType()
+    this.imageList = []
+  },
+  methods: {
+    // 地图初始化放这里
+    mapReady(map) {
+      this.map = map
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      this.dialogFormVisible = dialogFormVisible
+      this.fetchWellType()
+      this.wellForm = {
+        id: row.id, // 井id
+        wellCode: row.wellCode, // 井编号
+        wellName: row.wellName, // 井名称
+        wellType: row.wellType, // 井类型
+        deptid: row.deptid, // 权属单位
+        deep: row.deep, // 井深，
+        position: row.position, // 位置描述
+        coordinateX: row.coordinateX, // 经度
+        coordinateY: row.coordinateY, // 纬度
+        photos: row.photos, // 照片路径
+        notes: row.notes, // 备注,
+        qu: row.qu,
+        area: row.area, // 街道
+        responsibleDept: row.responsibleDept, // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+      }
+      if (row.deptid && row.deptid !== '') {
+        this.fetchArea1(row.deptid)
+        this.fetchArea2()
+        this.fetchSecondDeptTree()
+        this.loading = false
+      }
+      // 处理图片
+      const base_url = process.env.BASE_API + '/static/'
+      const urls = row.photos.split(';')
+      for (const url of urls) {
+        if (url) {
+          this.imageList.push({ name: url, url: base_url + url })
+        }
+      }
+      this.handleChange(null, this.imageList)
+    },
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then(response => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取区域1
+    fetchArea1(deptid) {
+      getAreaByDept(this.wellForm.deptid).then(response => {
+        if (response.code === 200) {
+          const pid = response.data.area
+          getAreaList(pid).then(response => {
+            this.quList = response.data
+          })
+        }
+      })
+    },
+    // 改变权属单位选项时
+    deptChanged() {
+      console.log('deptChanged')
+      this.wellForm.responsibleDept = ''
+      this.wellForm.area = ''
+      this.wellForm.qu = ''
+    },
+    // 改变区选项时的操作
+    quChanged() {
+      this.wellForm.area = ''
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then(response => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.imageList = []
+      this.wellForm.deptid = ''
+      this.$emit('watchChild')
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      for (const image of this.imageList) {
+        let index = image.url.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.wellForm.photos += image.url.substring(index) + ';'
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWell(this.wellForm).then(response => {
+            console.log('修改井')
+            if (response.code === 200) {
+              this.$message.success('修改成功!')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.imageList = []
+            }
+            // 清除验证
+            this.$nextTick(() => {
+              this.$refs['dataForm'].clearValidate()
+            })
+          })
+        }
+      })
+    },
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+
+  .editDialog {
+    .el-dialog {
+      width: 900px;
+      margin-top: 10vh !important;
+      .el-scrollbar {
+        height: 410px;
+        width: 100%;
+      }
+      .el-scrollbar__wrap {
+        /*overflow: scroll;*/
+        overflow-x: auto;
+        overflow-y: auto;
+      }
+      .el-scrollbar__view {
+        width: 98%;
+      }
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .line {
+    width: 50px;
+    margin-left: 5px;
+  }
+
+  .hide .el-upload-–picture-card {
+    display: none;
+  }
+
+  .imgBox {
+    width: 100%;
+    text-align: center;
+  }
+</style>

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
new file mode 100644
index 0000000..76ad5e6
--- /dev/null
+++ b/src/views/wellManage/editWell copy 2.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+export default {
+  components: { AMapContainer },
+  data() {
+    return {
+      dialogFormVisible: false,
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      map.on('click', function(e) {
+        console.log(e)
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible
+    }
+  }
+}
+</script>
+
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
new file mode 100644
index 0000000..dd624c3
--- /dev/null
+++ b/src/views/wellManage/editWell copy.vue
@@ -0,0 +1,606 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井名称" prop="wellName">
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="井编号" prop="wellCode">
+              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+                <el-option
+                  v-for="item in wellTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="权属单位" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井深(m)" prop="deep">
+              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="经度" prop="coordinateX">
+              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="纬度" prop="coordinateY">
+              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="路标图片" prop="images">
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove"
+                :on-exceed="handleExceed"
+                :on-change="handleChange"
+                :http-request="uploadFile"
+                :file-list="imageList"
+                :limit="4"
+                :class="{hide:hideUpload}"
+                multiple
+                action="string"
+                accept=".jpg,.jpeg,.png "
+                list-type="picture-card"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <div class="imgBox">
+                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                </div>
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-form-item label="所在区域" required>
+            <el-col :span="5">
+              <el-form-item prop="qu">
+                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
+                  <el-option
+                    v-for="item in quList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              区/县
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="area">
+                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
+                  <el-option
+                    v-for="item in jiedaoList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              街道/镇
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="详细地址" prop="position">
+              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
+          <el-col :span="13">
+            <el-form-item label="井维护机构" prop="responsibleDept">
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+                <el-option
+                  v-for="item in secondDeptTreeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+            <el-button size="medium" @click="cancel">
+              取消
+            </el-button>
+            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
+              保存
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-scrollbar>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, updateWell } from '@/api/well/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+export default {
+  name: 'EditWell',
+  components: { DeptSelect, AMapContainer },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('经度不能为空'))
+      }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('纬度不能为空'))
+      }
+    }
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false, // 对话框是否显示
+      wellForm: {
+        id: null, // 井id
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '', // 维护人员部门
+        responsibleDeptName: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      },
+      hideUpload: false,
+      imageList: [],
+      secondDeptTreeList: [], // 二级组织树列表
+      wellTypeList: [],
+      quList: [],
+      jiedaoList: [],
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+      },
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      isEditMode: true,
+      deptShow: true
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    qu() { // 获取区
+      return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
+    }
+  },
+  watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
+      } else {
+        if (val !== '') {
+          this.fetchSecondDeptTree()
+          this.fetchArea1()
+        }
+      }
+    },
+    qu(val) { // 监控区变化
+      if (val !== '') {
+        this.fetchArea2()
+      }
+    }
+  },
+  mounted: function() {
+    this.fetchWellType()
+    this.imageList = []
+  },
+  methods: {
+    // 地图初始化放这里
+    mapReady(map) {
+      this.map = map
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      this.dialogFormVisible = dialogFormVisible
+      this.fetchWellType()
+      this.wellForm = {
+        id: row.id, // 井id
+        wellCode: row.wellCode, // 井编号
+        wellName: row.wellName, // 井名称
+        wellType: row.wellType, // 井类型
+        deptid: row.deptid, // 权属单位
+        deep: row.deep, // 井深，
+        position: row.position, // 位置描述
+        coordinateX: row.coordinateX, // 经度
+        coordinateY: row.coordinateY, // 纬度
+        photos: row.photos, // 照片路径
+        notes: row.notes, // 备注,
+        qu: row.qu,
+        area: row.area, // 街道
+        responsibleDept: row.responsibleDept, // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+      }
+      if (row.deptid && row.deptid !== '') {
+        this.fetchArea1(row.deptid)
+        this.fetchArea2()
+        this.fetchSecondDeptTree()
+        this.loading = false
+      }
+      // 处理图片
+      const base_url = process.env.BASE_API + '/static/'
+      const urls = row.photos.split(';')
+      for (const url of urls) {
+        if (url) {
+          this.imageList.push({ name: url, url: base_url + url })
+        }
+      }
+      this.handleChange(null, this.imageList)
+    },
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then(response => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取区域1
+    fetchArea1(deptid) {
+      getAreaByDept(this.wellForm.deptid).then(response => {
+        if (response.code === 200) {
+          const pid = response.data.area
+          getAreaList(pid).then(response => {
+            this.quList = response.data
+          })
+        }
+      })
+    },
+    // 改变权属单位选项时
+    deptChanged() {
+      console.log('deptChanged')
+      this.wellForm.responsibleDept = ''
+      this.wellForm.area = ''
+      this.wellForm.qu = ''
+    },
+    // 改变区选项时的操作
+    quChanged() {
+      this.wellForm.area = ''
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then(response => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.imageList = []
+      this.wellForm.deptid = ''
+      this.$emit('watchChild')
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      for (const image of this.imageList) {
+        let index = image.url.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.wellForm.photos += image.url.substring(index) + ';'
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWell(this.wellForm).then(response => {
+            console.log('修改井')
+            if (response.code === 200) {
+              this.$message.success('修改成功!')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.imageList = []
+            }
+            // 清除验证
+            this.$nextTick(() => {
+              this.$refs['dataForm'].clearValidate()
+            })
+          })
+        }
+      })
+    },
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+
+  .editDialog {
+    .el-dialog {
+      width: 900px;
+      margin-top: 10vh !important;
+      .el-scrollbar {
+        height: 410px;
+        width: 100%;
+      }
+      .el-scrollbar__wrap {
+        /*overflow: scroll;*/
+        overflow-x: auto;
+        overflow-y: auto;
+      }
+      .el-scrollbar__view {
+        width: 98%;
+      }
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .line {
+    width: 50px;
+    margin-left: 5px;
+  }
+
+  .hide .el-upload-–picture-card {
+    display: none;
+  }
+
+  .imgBox {
+    width: 100%;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 1ce6848..371b539 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -41,6 +41,20 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="10">
             <el-form-item label="经度" prop="coordinateX">
               <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
@@ -159,11 +173,13 @@
 import { getWellType, updateWell } from '@/api/well/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'EditWell',
-  components: { DeptSelect },
+  components: { DeptSelect, AMapContainer },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -204,6 +220,11 @@
       }
     }
     return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      postionlatlon: '',
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -260,6 +281,9 @@
     }
   },
   computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
     showResponseDept() {
       if (this.wellForm.deptid === '') {
         return true
@@ -278,7 +302,7 @@
     }
   },
   watch: {
-    lonLat(val) {
+    postionlatlon(val) {
       var _this = this
       window._AMapSecurityConfig = {
         securityJsCode: this.$store.getters.amapSecurityCode
@@ -332,10 +356,20 @@
     this.imageList = []
   },
   methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.wellForm.coordinateX = e.lnglat.lng
+        _this.wellForm.coordinateY = e.lnglat.lat
+        _this.postionlatlon = _this.wellForm.coordinateX + ',' + _this.wellForm.coordinateY
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
       this.imageList = []
-      if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
       this.dialogFormVisible = dialogFormVisible
       this.fetchWellType()
       this.wellForm = {

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
new file mode 100644
index 0000000..76ad5e6
--- /dev/null
+++ b/src/views/wellManage/editWell copy 2.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+export default {
+  components: { AMapContainer },
+  data() {
+    return {
+      dialogFormVisible: false,
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      map.on('click', function(e) {
+        console.log(e)
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible
+    }
+  }
+}
+</script>
+
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
new file mode 100644
index 0000000..dd624c3
--- /dev/null
+++ b/src/views/wellManage/editWell copy.vue
@@ -0,0 +1,606 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井名称" prop="wellName">
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="井编号" prop="wellCode">
+              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+                <el-option
+                  v-for="item in wellTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="权属单位" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井深(m)" prop="deep">
+              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="经度" prop="coordinateX">
+              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="纬度" prop="coordinateY">
+              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="路标图片" prop="images">
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove"
+                :on-exceed="handleExceed"
+                :on-change="handleChange"
+                :http-request="uploadFile"
+                :file-list="imageList"
+                :limit="4"
+                :class="{hide:hideUpload}"
+                multiple
+                action="string"
+                accept=".jpg,.jpeg,.png "
+                list-type="picture-card"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <div class="imgBox">
+                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                </div>
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-form-item label="所在区域" required>
+            <el-col :span="5">
+              <el-form-item prop="qu">
+                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
+                  <el-option
+                    v-for="item in quList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              区/县
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="area">
+                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
+                  <el-option
+                    v-for="item in jiedaoList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              街道/镇
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="详细地址" prop="position">
+              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
+          <el-col :span="13">
+            <el-form-item label="井维护机构" prop="responsibleDept">
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+                <el-option
+                  v-for="item in secondDeptTreeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+            <el-button size="medium" @click="cancel">
+              取消
+            </el-button>
+            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
+              保存
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-scrollbar>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, updateWell } from '@/api/well/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+export default {
+  name: 'EditWell',
+  components: { DeptSelect, AMapContainer },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('经度不能为空'))
+      }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('纬度不能为空'))
+      }
+    }
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false, // 对话框是否显示
+      wellForm: {
+        id: null, // 井id
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '', // 维护人员部门
+        responsibleDeptName: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      },
+      hideUpload: false,
+      imageList: [],
+      secondDeptTreeList: [], // 二级组织树列表
+      wellTypeList: [],
+      quList: [],
+      jiedaoList: [],
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+      },
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      isEditMode: true,
+      deptShow: true
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    qu() { // 获取区
+      return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
+    }
+  },
+  watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
+      } else {
+        if (val !== '') {
+          this.fetchSecondDeptTree()
+          this.fetchArea1()
+        }
+      }
+    },
+    qu(val) { // 监控区变化
+      if (val !== '') {
+        this.fetchArea2()
+      }
+    }
+  },
+  mounted: function() {
+    this.fetchWellType()
+    this.imageList = []
+  },
+  methods: {
+    // 地图初始化放这里
+    mapReady(map) {
+      this.map = map
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      this.dialogFormVisible = dialogFormVisible
+      this.fetchWellType()
+      this.wellForm = {
+        id: row.id, // 井id
+        wellCode: row.wellCode, // 井编号
+        wellName: row.wellName, // 井名称
+        wellType: row.wellType, // 井类型
+        deptid: row.deptid, // 权属单位
+        deep: row.deep, // 井深，
+        position: row.position, // 位置描述
+        coordinateX: row.coordinateX, // 经度
+        coordinateY: row.coordinateY, // 纬度
+        photos: row.photos, // 照片路径
+        notes: row.notes, // 备注,
+        qu: row.qu,
+        area: row.area, // 街道
+        responsibleDept: row.responsibleDept, // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+      }
+      if (row.deptid && row.deptid !== '') {
+        this.fetchArea1(row.deptid)
+        this.fetchArea2()
+        this.fetchSecondDeptTree()
+        this.loading = false
+      }
+      // 处理图片
+      const base_url = process.env.BASE_API + '/static/'
+      const urls = row.photos.split(';')
+      for (const url of urls) {
+        if (url) {
+          this.imageList.push({ name: url, url: base_url + url })
+        }
+      }
+      this.handleChange(null, this.imageList)
+    },
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then(response => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取区域1
+    fetchArea1(deptid) {
+      getAreaByDept(this.wellForm.deptid).then(response => {
+        if (response.code === 200) {
+          const pid = response.data.area
+          getAreaList(pid).then(response => {
+            this.quList = response.data
+          })
+        }
+      })
+    },
+    // 改变权属单位选项时
+    deptChanged() {
+      console.log('deptChanged')
+      this.wellForm.responsibleDept = ''
+      this.wellForm.area = ''
+      this.wellForm.qu = ''
+    },
+    // 改变区选项时的操作
+    quChanged() {
+      this.wellForm.area = ''
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then(response => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.imageList = []
+      this.wellForm.deptid = ''
+      this.$emit('watchChild')
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      for (const image of this.imageList) {
+        let index = image.url.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.wellForm.photos += image.url.substring(index) + ';'
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWell(this.wellForm).then(response => {
+            console.log('修改井')
+            if (response.code === 200) {
+              this.$message.success('修改成功!')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.imageList = []
+            }
+            // 清除验证
+            this.$nextTick(() => {
+              this.$refs['dataForm'].clearValidate()
+            })
+          })
+        }
+      })
+    },
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+
+  .editDialog {
+    .el-dialog {
+      width: 900px;
+      margin-top: 10vh !important;
+      .el-scrollbar {
+        height: 410px;
+        width: 100%;
+      }
+      .el-scrollbar__wrap {
+        /*overflow: scroll;*/
+        overflow-x: auto;
+        overflow-y: auto;
+      }
+      .el-scrollbar__view {
+        width: 98%;
+      }
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .line {
+    width: 50px;
+    margin-left: 5px;
+  }
+
+  .hide .el-upload-–picture-card {
+    display: none;
+  }
+
+  .imgBox {
+    width: 100%;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 1ce6848..371b539 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -41,6 +41,20 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="10">
             <el-form-item label="经度" prop="coordinateX">
               <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
@@ -159,11 +173,13 @@
 import { getWellType, updateWell } from '@/api/well/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'EditWell',
-  components: { DeptSelect },
+  components: { DeptSelect, AMapContainer },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -204,6 +220,11 @@
       }
     }
     return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      postionlatlon: '',
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -260,6 +281,9 @@
     }
   },
   computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
     showResponseDept() {
       if (this.wellForm.deptid === '') {
         return true
@@ -278,7 +302,7 @@
     }
   },
   watch: {
-    lonLat(val) {
+    postionlatlon(val) {
       var _this = this
       window._AMapSecurityConfig = {
         securityJsCode: this.$store.getters.amapSecurityCode
@@ -332,10 +356,20 @@
     this.imageList = []
   },
   methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.wellForm.coordinateX = e.lnglat.lng
+        _this.wellForm.coordinateY = e.lnglat.lat
+        _this.postionlatlon = _this.wellForm.coordinateX + ',' + _this.wellForm.coordinateY
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
       this.imageList = []
-      if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
       this.dialogFormVisible = dialogFormVisible
       this.fetchWellType()
       this.wellForm = {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index fd450b1..094f13f 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -146,7 +146,6 @@
         {
           text: '井编号',
           value: 'wellCode',
-          width: 130,
           align: 'center'
         },
         {
@@ -157,7 +156,6 @@
         {
           text: '井深(m)',
           value: 'deep',
-          width: 80,
           align: 'center'
         },
         {
@@ -168,7 +166,6 @@
         {
           text: '井类型',
           value: 'wellTypeName',
-          width: 70,
           align: 'center'
         },
         {
@@ -179,14 +176,12 @@
         {
           text: '设备数量',
           value: 'deviceCount',
-          width: 100,
           align: 'center',
           type: 'Button'
         },
         {
           text: '布防状态',
           value: 'bfztName',
-          width: 80,
           align: 'center'
         }
       ], // 显示列
@@ -246,6 +241,7 @@
     },
     // 编辑井信息
     edit(row) {
+      console.log(row, '===row====')
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.editwell.initDialog(this.dialogFormVisible, row)
@@ -454,6 +450,7 @@
         this.listQuery.offset = 1
       }
       getWellList(this.listQuery).then(response => {
+        console.log(response)
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false

diff --git a/mock/index.js b/mock/index.js
index 8c1410a..4c7f611 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -23,6 +23,7 @@
 const deptPermission = require('./systemConfig/deptPermission')
 const tenant = require('./system/tenant')
 const deviceStatics = require('./warning/deviceStatics')
+const wellList = require('./well/well')
 
 const mocks = [
   ...user,
@@ -46,6 +47,7 @@
   ...deptPermission,
   ...tenant,
   ...deviceStatics,
+  ...wellList,
   ...device
 ]
 
diff --git a/mock/system/tenant.js b/mock/system/tenant.js
index 41485e8..ab199e7 100644
--- a/mock/system/tenant.js
+++ b/mock/system/tenant.js
@@ -78,7 +78,7 @@
     }
   },
   {
-    url: '/system/tenant/list',
+    url: '/bus/tenant/list',
     type: 'get',
     response: _ => {
       return {
diff --git a/mock/well/well.js b/mock/well/well.js
new file mode 100644
index 0000000..e60b862
--- /dev/null
+++ b/mock/well/well.js
@@ -0,0 +1,280 @@
+const wellList = {
+  rows: [
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '开挖监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖状态监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '液位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能监测终端',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '噪声记录仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '有害气体监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '温湿度监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '井盖定位监测仪',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '燃气智能终端（一体化）',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    },
+    {
+      'bfzt': '0',
+      'bfztName': '撤防',
+      'communication': '3,4',
+      'concenCode': '',
+      'concenId': '',
+      'deptName': '燃气集团总公司',
+      'deptid': '24',
+      'installHeight': '123',
+      'devcode': '342021000001',
+      'deviceName': '',
+      'deviceType': '12',
+      'wellTypeName': '管盯',
+      'id': '1476131375777120257',
+      'installDate': '2021-12-29',
+      'modelId': '19',
+      'modelName': 'BIRMM-RTU100N',
+      'onlineState': '1',
+      'onlineStateName': '在线',
+      'position': 'test001位置',
+      'ts': '2021-12-29',
+      'valid': '1',
+      'watchType': '燃气泄漏',
+      'wellCode': 'test001',
+      'wellId': '4453'
+    }
+  ]
+}
+
+module.exports = [
+  // mock get all routes form server
+  {
+    url: '/well/list',
+    type: 'get',
+    response: _ => {
+      return {
+        code: 200,
+        data: wellList,
+        message: '请求成功',
+        success: true
+      }
+    }
+  }
+]
diff --git a/src/api/system/tenant.js b/src/api/system/tenant.js
index 84acb06..4bf3350 100644
--- a/src/api/system/tenant.js
+++ b/src/api/system/tenant.js
@@ -15,7 +15,7 @@
 // 项目管理绑定组织
 export function deptTenantSys(params) {
   return request({
-    url: 'system/dept/relateTenant',
+    url: 'bus/tenant/relateTenant',
     method: 'post',
     params
   })
@@ -24,7 +24,7 @@
 // 项目管理查询
 export function tenantSysList(params) {
   return request({
-    url: 'system/tenant/list',
+    url: 'bus/tenant/list',
     method: 'get',
     params
   })
@@ -33,7 +33,7 @@
 // 添加项目管理
 export function addTenantSys(params) {
   return request({
-    url: 'system/tenant/add',
+    url: 'sys/tenant/add',
     method: 'post',
     params
   })
@@ -41,7 +41,7 @@
 // 修改项目管理
 export function updateTenantSys(params) {
   return request({
-    url: 'system/tenant/update',
+    url: 'sys/tenant/update',
     method: 'post',
     params
   })
@@ -49,7 +49,7 @@
 // 删除项目管理
 export function delTenantSys(ids) {
   return request({
-    url: 'system/tenant/delete',
+    url: 'sys/tenant/delete',
     method: 'post',
     params: {
       ids: ids
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 17e54d5..ba278f3 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -41,6 +41,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item>
+            <el-button @click="mapSelect">
+              地图选择位置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="9">
           <el-form-item label="经度" prop="coordinateX">
             <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
           </el-form-item>
@@ -146,6 +155,7 @@
         </el-col>
       </el-row>
     </el-form>
+    <detail-map-lon-lat ref="detailMap" @getLonLat="getMapPostion" />
   </div>
 </template>
 
@@ -157,10 +167,11 @@
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
 import AMapLoader from '@amap/amap-jsapi-loader'
+import detailMapLonLat from './detailMapLonLat'
 
 export default {
   name: 'AddWell',
-  components: { DeptSelect },
+  components: { DeptSelect, detailMapLonLat },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -336,6 +347,13 @@
     this.fileList = []
   },
   methods: {
+    getMapPostion(val) {
+      this.wellForm.coordinateX = val.split(',')[0]
+      this.wellForm.coordinateY = val.split(',')[1]
+    },
+    mapSelect() {
+      this.$refs.detailMap.initDialog(true)
+    },
     // 加载组织机构树形下拉菜单
     fetchSecondDeptTree: function() {
       const listQuery = {
diff --git a/src/views/wellManage/components/listDigData.vue b/src/views/wellManage/components/listDigData.vue
new file mode 100644
index 0000000..7fb41b9
--- /dev/null
+++ b/src/views/wellManage/components/listDigData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="123开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { digdataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListDigData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        },
+        {
+          text: '开挖状态',
+          value: 'status',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      digdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listGasData.vue b/src/views/wellManage/components/listGasData.vue
new file mode 100644
index 0000000..6e2afc3
--- /dev/null
+++ b/src/views/wellManage/components/listGasData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { gasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      gasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listHarmfulData.vue b/src/views/wellManage/components/listHarmfulData.vue
new file mode 100644
index 0000000..540e216
--- /dev/null
+++ b/src/views/wellManage/components/listHarmfulData.vue
@@ -0,0 +1,155 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { harmfuldataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListHarmfulData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: 'CO浓度',
+          value: 'CO',
+          align: 'center'
+        },
+        {
+          text: 'CH4浓度',
+          value: 'CH4',
+          align: 'center'
+        },
+        {
+          text: 'H2S浓度',
+          value: 'H2S',
+          align: 'center'
+        },
+        {
+          text: 'O2浓度',
+          value: 'O2',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'CO': '一氧化碳浓度',
+          'CH4': '甲烷浓度',
+          'H2S': '硫化氢浓度',
+          'O2': '氧气浓度'
+        },
+        metrics: ['CO', 'CH4', 'H2S', 'O2'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'CO', 'CH4', 'H2S', 'O2'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      harmfuldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidData.vue b/src/views/wellManage/components/listLiquidData.vue
new file mode 100644
index 0000000..c821bd7
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquiddataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '液位值',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'liquiddata': '液位值'
+        },
+        metrics: ['liquiddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'liquiddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquiddataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listLiquidGasData.vue b/src/views/wellManage/components/listLiquidGasData.vue
new file mode 100644
index 0000000..8902be4
--- /dev/null
+++ b/src/views/wellManage/components/listLiquidGasData.vue
@@ -0,0 +1,215 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <search-area
+        type=""
+        size="small"
+      >
+        <!--一般查询条件-->
+        <search-item>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            @change="fetchDeviceType"
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.watchContent"
+            placeholder="监控指标"
+            size="small"
+            @change="watchContentChange"
+          >
+            <el-option
+              v-for="item in watchContentList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+    </el-col>
+    <el-col>
+      <el-col :span="12">
+        <ve-line
+          :data="chartData"
+          :settings="chartSettings"
+        />
+      </el-col>
+      <el-col :span="12">
+        <el-table
+          v-loading="listLoading"
+          class="tableStyle"
+          :data="list"
+          border
+        >
+          <el-table-column
+            v-for="column in columns"
+            :key="column.value"
+            :label="column.text"
+            :width="column.width"
+            :align="column.align"
+          >
+            <template slot-scope="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { liquidgasdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListLiquidGasData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: '',
+        watchContent: '0'
+      },
+      watchContentList: [
+        {
+          label: '液位',
+          value: '0'
+        },
+        {
+          label: '燃气',
+          value: '1'
+        }
+      ],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [],
+      list: [],
+      listLoading: false,
+      chartSettings: {},
+      chartData: {}
+    }
+  },
+  created() {
+    this.watchContentChange()
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      liquidgasdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    },
+    watchContentChange(val) {
+      console.log(val, '=====')
+      if (val === '0' || val === undefined) {
+        this.chartSettings = {
+          labelMap: {
+            'liquiddata': '液位值'
+          },
+          metrics: ['liquiddata'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'liquiddata'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '液位值',
+            value: 'liquiddata',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      } else if (val === '1') {
+        this.chartSettings = {
+          labelMap: {
+            'strength': '燃气浓度'
+          },
+          metrics: ['strength'],
+          dimension: ['uptime']
+        }
+        this.chartData = {
+          columns: ['uptime', 'strength'],
+          rows: []
+        }
+        this.columns = [
+          {
+            text: '燃气浓度',
+            value: 'strength',
+            align: 'center'
+          },
+          {
+            text: '上报时间',
+            value: 'uptime',
+            align: 'center'
+          }
+        ]
+      }
+      this.fetchDeviceType()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+.tableStyle {
+  margin-top: 60px;
+}
+</style>
diff --git a/src/views/wellManage/components/listNoiseData.vue b/src/views/wellManage/components/listNoiseData.vue
new file mode 100644
index 0000000..a4aa8dc
--- /dev/null
+++ b/src/views/wellManage/components/listNoiseData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { noisedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListNoiseData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '噪声值',
+          value: 'ddata',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'ddata': '噪声值'
+        },
+        metrics: ['ddata'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'ddata'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      noisedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTempData.vue b/src/views/wellManage/components/listTempData.vue
new file mode 100644
index 0000000..7b6b95c
--- /dev/null
+++ b/src/views/wellManage/components/listTempData.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tempdataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTempData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '温度',
+          value: 'temperature',
+          align: 'center'
+        },
+        {
+          text: '湿度',
+          value: 'humidity',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度',
+          'humidity': '湿度'
+        },
+        metrics: ['temperature', 'humidity'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'temperature', 'humidity'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tempdataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listTubeData.vue b/src/views/wellManage/components/listTubeData.vue
new file mode 100644
index 0000000..a0e0ba4
--- /dev/null
+++ b/src/views/wellManage/components/listTubeData.vue
@@ -0,0 +1,137 @@
+<template>
+  <el-row :gutter="10">
+    <el-col>
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </el-col>
+    <el-col :span="12">
+      <ve-line
+        :data="chartData"
+        :settings="chartSettings"
+      />
+    </el-col>
+    <el-col :span="12">
+      <normal-table
+        ref="normalTable"
+        :data="list"
+        :query="listQuery"
+        :columns="columns"
+        :list-loading="listLoading"
+        :options="options"
+        size="small"
+      />
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import { tubedataList } from '@/api/device/deviceTypeDetail'
+export default {
+  name: 'ListTubeData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '燃气浓度',
+          value: 'strength',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false,
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      },
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      tubedataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.chartData.rows = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
diff --git a/src/views/wellManage/components/listWellData.vue b/src/views/wellManage/components/listWellData.vue
new file mode 100644
index 0000000..9f0b42b
--- /dev/null
+++ b/src/views/wellManage/components/listWellData.vue
@@ -0,0 +1,118 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welldataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '井盖状态',
+          value: 'status',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'logtime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welldataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/components/listWellLocaData.vue b/src/views/wellManage/components/listWellLocaData.vue
new file mode 100644
index 0000000..af4581e
--- /dev/null
+++ b/src/views/wellManage/components/listWellLocaData.vue
@@ -0,0 +1,123 @@
+<template>
+  <normal-table
+    ref="normalTable"
+    :data="list"
+    :query="listQuery"
+    :columns="columns"
+    :list-loading="listLoading"
+    :options="options"
+    size="small"
+  >
+    <template slot="btns">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        size="small"
+        :picker-options="pickerOptions"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        @change="fetchDeviceType"
+      />
+    </template>
+  </normal-table>
+</template>
+
+<script>
+import { welllocadataList } from '@/api/device/deviceTypeDetail'
+
+export default {
+  name: 'ListWellLocaData',
+  data() {
+    return {
+      timeRange: '',
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      // 是否需要序号列
+      options: {
+        needIndex: false
+      },
+      columns: [
+        {
+          text: '纬度',
+          value: 'lat',
+          align: 'center'
+        },
+        {
+          text: '经度',
+          value: 'lng',
+          align: 'center'
+        },
+        {
+          text: '上报时间',
+          value: 'uptime',
+          align: 'center'
+        }
+      ], // 显示列
+      list: [],
+      listLoading: false
+    }
+  },
+  created() {
+    this.fetchDeviceType()
+  },
+  mounted() {
+    this.$refs.normalTable.initColumnsState(false)
+  },
+  methods: {
+    initData: function(row = null) {
+      this.listQuery.devcode = row.devcode
+    },
+    fetchDeviceType(val) {
+      this.listLoading = true
+      if (val !== undefined) {
+        this.listQuery.startTime = val[0]
+        this.listQuery.endTime = val[1]
+      }
+      welllocadataList(this.listQuery).then(response => {
+        this.list = response.data
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.el-date-editor--datetimerange.el-input,
+.el-date-editor--datetimerange.el-input__inner{
+  width: 340px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailMapLonLat.vue b/src/views/wellManage/detailMapLonLat.vue
new file mode 100644
index 0000000..3b7fdce
--- /dev/null
+++ b/src/views/wellManage/detailMapLonLat.vue
@@ -0,0 +1,140 @@
+<template>
+  <el-dialog
+    append-to-body
+    title="选择窨井所在位置"
+    :visible.sync="dialogFormVisible"
+  >
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+    <el-row :gutter="10">
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.longitude"
+          type="text"
+          placeholder="经度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="5">
+        <el-input
+          v-model.trim="postionForm.latitude"
+          type="text"
+          placeholder="纬度"
+          disabled
+        />
+      </el-col>
+      <el-col :span="14">
+        <el-input
+          v-model.trim="postionForm.postion"
+          type="text"
+          placeholder="详细地址"
+          disabled
+        />
+      </el-col>
+    </el-row>
+    <div
+      slot="footer"
+      class="dialog-footer"
+    >
+      <el-button type="primary" @click="saveData">
+        确定
+      </el-button>
+      <el-button @click="dialogFormVisible = false">
+        取消
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+export default {
+  name: 'DetailMapLonLat',
+  components: { AMapContainer },
+  data() {
+    return {
+      postionlatlon: '',
+      postionForm: {
+        longitude: '', // 经度
+        latitude: '', // 纬度
+        postion: '' // 详细地址
+      },
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false // 对话框是否显示
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  watch: {
+    postionlatlon(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.postionForm.postion = result.regeocode.formattedAddress
+            }
+          })
+        })
+      })
+    }
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.postionForm.longitude = e.lnglat.lng
+        _this.postionForm.latitude = e.lnglat.lat
+        _this.postionlatlon = e.lnglat.lng + ',' + e.lnglat.lat
+      })
+    },
+    initDialog(val) {
+      this.dialogFormVisible = val
+    },
+    saveData() {
+      this.$emit('getLonLat', this.postionlatlon)
+      this.dialogFormVisible = false
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+.el-row {
+  margin-bottom: 10px;
+}
+</style>
+
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index f1c1c72..3c81745 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -158,6 +158,7 @@
           </el-table-column>
         </el-table>
       </div>
+      <component :is="cmpName" ref="deviceTypeDialog" @watchChild="fetchDeviceList" />
     </el-scrollbar>
   </el-dialog>
 </template>
@@ -165,11 +166,34 @@
 <script>
 import { getAreaList, getAreaByDept } from '@/api/system/area'
 import { watchDataByWell } from '@/api/well/well'
+import listDigData from './components/listDigData'
+import listGasData from './components/listGasData'
+import listHarmfulData from './components/listHarmfulData'
+import listLiquidData from './components/listLiquidData'
+import listLiquidGasData from './components/listLiquidGasData'
+import listNoiseData from './components/listNoiseData'
+import listTempData from './components/listTempData'
+import listTubeData from './components/listTubeData'
+import listWellData from './components/listWellData'
+import listWellLocaData from './components/listWellLocaData'
 
 export default {
   name: 'DetailWell',
+  components: {
+    listDigData,
+    listGasData,
+    listHarmfulData,
+    listLiquidData,
+    listLiquidGasData,
+    listNoiseData,
+    listTempData,
+    listTubeData,
+    listWellData,
+    listWellLocaData
+  },
   data() {
     return {
+      cmpName: '', // 组件名称
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -269,6 +293,31 @@
         responsibleDept: row.responsibleDept, // 维护人员部门
         responsibleDeptName: row.responsibleDeptName // 维护人员部门
       }
+      // 展示相对应的设备列表组件
+      if (row.wellTypeName === '开挖监测仪') {
+        this.cmpName = 'list-dig-data'
+      } else if (row.wellTypeName === '井盖状态监测仪') {
+        this.cmpName = 'list-well-data'
+      } else if (row.wellTypeName === '液位监测仪') {
+        this.cmpName = 'list-liquid-data'
+      } else if (row.wellTypeName === '燃气智能监测终端') {
+        this.cmpName = 'list-gas-data'
+      } else if (row.wellTypeName === '噪声记录仪') {
+        this.cmpName = 'list-noise-data'
+      } else if (row.wellTypeName === '有害气体监测仪') {
+        this.cmpName = 'list-harmful-data'
+      } else if (row.wellTypeName === '温湿度监测仪') {
+        this.cmpName = 'list-temp-data'
+      } else if (row.wellTypeName === '井盖定位监测仪') {
+        this.cmpName = 'list-well-loca-data'
+      } else if (row.wellTypeName === '燃气智能终端（一体化）') {
+        this.cmpName = 'list-liquid-gas-data'
+      } else if (row.wellTypeName === '管盯') {
+        this.cmpName = 'list-tube-data'
+      }
+      setTimeout(() => {
+        this.$refs.deviceTypeDialog.initData(row)
+      }, 100)
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
         this.fetchArea2()
@@ -343,8 +392,6 @@
     .el-dialog {
       width: 900px;
       margin-top: 10vh !important;
-      .el-dialog__body{
-      }
       .el-scrollbar {
         height: 410px;
         width: 100%;
diff --git a/src/views/wellManage/editWell copy 2.vue b/src/views/wellManage/editWell copy 2.vue
new file mode 100644
index 0000000..76ad5e6
--- /dev/null
+++ b/src/views/wellManage/editWell copy 2.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" append-to-body>
+    <el-row>
+      <el-col class="overview-map-container">
+        <a-map-container
+          ref="map"
+          :center="center"
+          :zoom="zoom"
+          :base-layer="baseLayer"
+          :style="{height:(bodyHeight-200)+'px'}"
+          vid="overview"
+          class="map-demo"
+          @ready="mapReady"
+        />
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+export default {
+  components: { AMapContainer },
+  data() {
+    return {
+      dialogFormVisible: false,
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      map.on('click', function(e) {
+        console.log(e)
+      })
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.dialogFormVisible = dialogFormVisible
+    }
+  }
+}
+</script>
+
diff --git a/src/views/wellManage/editWell copy.vue b/src/views/wellManage/editWell copy.vue
new file mode 100644
index 0000000..dd624c3
--- /dev/null
+++ b/src/views/wellManage/editWell copy.vue
@@ -0,0 +1,606 @@
+<template>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="编辑井" append-to-body @close="cancel">
+    <el-scrollbar :native="false">
+      <el-form ref="dataForm" :label-position="labelPosition" :rules="rules" :model="wellForm" label-width="120px">
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井名称" prop="wellName">
+              <el-input v-model.trim="wellForm.wellName" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="井编号" prop="wellCode">
+              <el-input v-model.trim="wellForm.wellCode" :disabled="isEditMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井类型" prop="wellType">
+              <el-select v-model="wellForm.wellType" placeholder="点击选择井类型" clearable>
+                <el-option
+                  v-for="item in wellTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="权属单位" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位" @change="deptChanged" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="井深(m)" prop="deep">
+              <el-input v-model.trim="wellForm.deep" type="text" placeholder="需要装液位监测仪的井必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="经度" prop="coordinateX">
+              <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
+            <el-form-item label="纬度" prop="coordinateY">
+              <el-input v-model.trim="wellForm.coordinateY" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="路标图片" prop="images">
+              <el-upload
+                ref="upload"
+                :before-upload="handleBeforeUpload"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove"
+                :on-exceed="handleExceed"
+                :on-change="handleChange"
+                :http-request="uploadFile"
+                :file-list="imageList"
+                :limit="4"
+                :class="{hide:hideUpload}"
+                multiple
+                action="string"
+                accept=".jpg,.jpeg,.png "
+                list-type="picture-card"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+              <el-dialog :visible.sync="dialogVisible" title="图片预览" append-to-body>
+                <div class="imgBox">
+                  <img :src="dialogImageUrl" max-height="400px;" alt="" style="margin: 0 auto;">
+                </div>
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-form-item label="所在区域" required>
+            <el-col :span="5">
+              <el-form-item prop="qu">
+                <el-select v-model="wellForm.qu" :disabled="showResponseDept" placeholder="请选择所在区/县" clearable @change="quChanged">
+                  <el-option
+                    v-for="item in quList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              区/县
+            </el-col>
+            <el-col :span="5">
+              <el-form-item prop="area">
+                <el-select v-model="wellForm.area" :disabled="showResponseDept" placeholder="请选择所在街道/镇" clearable>
+                  <el-option
+                    v-for="item in jiedaoList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1" class="line">
+              街道/镇
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="详细地址" prop="position">
+              <el-input v-model.trim="wellForm.position" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="secondDeptTreeList.length>=1" :gutter="20">
+          <el-col :span="13">
+            <el-form-item label="井维护机构" prop="responsibleDept">
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+                <el-option
+                  v-for="item in secondDeptTreeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+              <el-input v-else v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="15" style="margin-left: 120px; margin-bottom: 40px;">
+            <el-button size="medium" @click="cancel">
+              取消
+            </el-button>
+            <el-button type="primary" size="medium" style="margin-left: 10px;" @click="saveData">
+              保存
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-scrollbar>
+  </el-dialog>
+</template>
+
+<script>
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getWellType, updateWell } from '@/api/well/well'
+import { Uploadimg } from '@/api/common'
+import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+import AMapLoader from '@amap/amap-jsapi-loader'
+
+export default {
+  name: 'EditWell',
+  components: { DeptSelect, AMapContainer },
+  data() {
+    const validateDeep = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          const deep = parseFloat(value)
+          if (deep > 10 || deep < 0) {
+            callback(new Error('请填写0到10数值'))
+          } else {
+            callback()
+          }
+        }
+      } else {
+        callback()
+      }
+    }
+    const validateLng = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('经度不能为空'))
+      }
+    }
+    const validateLat = (rule, value, callback) => {
+      if (value !== '') {
+        if ((/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/).test(value) === false) {
+          callback(new Error('请填写大于0的数字'))
+        } else {
+          callback()
+        }
+      } else {
+        callback(new Error('纬度不能为空'))
+      }
+    }
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      dialogFormVisible: false, // 对话框是否显示
+      wellForm: {
+        id: null, // 井id
+        wellCode: '', // 井编号
+        wellName: '', // 井名称
+        wellType: '', // 井类型
+        deptid: '', // 权属单位
+        deep: '', // 井深，
+        position: '', // 位置描述
+        coordinateX: '', // 经度
+        coordinateY: '', // 纬度
+        photos: '', // 照片路径
+        notes: '', // 备注,
+        qu: '',
+        area: '', // 街道
+        responsibleDept: '', // 维护人员部门
+        responsibleDeptName: '' // 维护人员部门
+      }, // 表单
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      },
+      hideUpload: false,
+      imageList: [],
+      secondDeptTreeList: [], // 二级组织树列表
+      wellTypeList: [],
+      quList: [],
+      jiedaoList: [],
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      }, // 表头显示标题
+      rules: {
+        wellCode: [{ required: true, message: '井编号不能为空', trigger: ['blur', 'change'] }],
+        wellName: [{ required: true, message: '井名称不能为空', trigger: ['blur', 'change'] }],
+        position: [{ required: true, message: '井详细地址不能为空', trigger: ['blur', 'change'] }],
+        deep: [{ required: false, trigger: ['blur', 'change'], validator: validateDeep }],
+        coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
+        coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
+        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        wellType: [{ required: true, message: '井类型必选', trigger: 'change' }],
+        qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
+        area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
+      },
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      dialogImageUrl: '',
+      dialogVisible: false,
+      labelPosition: 'right',
+      responseAssignShow: false,
+      isEditMode: true,
+      deptShow: true
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
+    showResponseDept() {
+      if (this.wellForm.deptid === '') {
+        return true
+      } else {
+        return false
+      }
+    },
+    qu() { // 获取区
+      return this.wellForm.qu
+    },
+    area() { // 获取街道
+      return this.wellForm.area
+    },
+    lonLat() {
+      return this.wellForm.coordinateX + ',' + this.wellForm.coordinateY
+    }
+  },
+  watch: {
+    lonLat(val) {
+      var _this = this
+      window._AMapSecurityConfig = {
+        securityJsCode: this.$store.getters.amapSecurityCode
+      }
+      AMapLoader.load({
+        key: this.$store.getters.amapKey // 秘钥，从store中取
+      }).then((AMap) => {
+        AMap.plugin('AMap.Geocoder', function() {
+          var geocoder = new AMap.Geocoder({
+            city: ''
+          })
+          var lnglat = val.split(',')
+          geocoder.getAddress(lnglat, function(status, result) {
+            if (status === 'complete' && result.info === 'OK') {
+              _this.wellForm.qu = result.regeocode.addressComponent.district
+              _this.wellForm.area = result.regeocode.addressComponent.township
+              _this.wellForm.position = result.regeocode.formattedAddress
+            // result为对应的地理位置详细信息
+            } else {
+              _this.wellForm.position = ''
+              _this.wellForm.qu = ''
+              _this.wellForm.area = ''
+            }
+          })
+        })
+      })
+    },
+    'wellForm.deptid'(val, oldVal) { // 监控权属单位变化
+      if (oldVal !== '' && val !== '') {
+        this.wellForm.responsibleDept = ''
+        this.wellForm.responsibleDeptName = ''
+        this.wellForm.area = ''
+        this.wellForm.qu = ''
+        this.fetchSecondDeptTree()
+        this.fetchArea1()
+      } else {
+        if (val !== '') {
+          this.fetchSecondDeptTree()
+          this.fetchArea1()
+        }
+      }
+    },
+    qu(val) { // 监控区变化
+      if (val !== '') {
+        this.fetchArea2()
+      }
+    }
+  },
+  mounted: function() {
+    this.fetchWellType()
+    this.imageList = []
+  },
+  methods: {
+    // 地图初始化放这里
+    mapReady(map) {
+      this.map = map
+    },
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, row = null) {
+      this.imageList = []
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      this.dialogFormVisible = dialogFormVisible
+      this.fetchWellType()
+      this.wellForm = {
+        id: row.id, // 井id
+        wellCode: row.wellCode, // 井编号
+        wellName: row.wellName, // 井名称
+        wellType: row.wellType, // 井类型
+        deptid: row.deptid, // 权属单位
+        deep: row.deep, // 井深，
+        position: row.position, // 位置描述
+        coordinateX: row.coordinateX, // 经度
+        coordinateY: row.coordinateY, // 纬度
+        photos: row.photos, // 照片路径
+        notes: row.notes, // 备注,
+        qu: row.qu,
+        area: row.area, // 街道
+        responsibleDept: row.responsibleDept, // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+      }
+      if (row.deptid && row.deptid !== '') {
+        this.fetchArea1(row.deptid)
+        this.fetchArea2()
+        this.fetchSecondDeptTree()
+        this.loading = false
+      }
+      // 处理图片
+      const base_url = process.env.BASE_API + '/static/'
+      const urls = row.photos.split(';')
+      for (const url of urls) {
+        if (url) {
+          this.imageList.push({ name: url, url: base_url + url })
+        }
+      }
+      this.handleChange(null, this.imageList)
+    },
+    // 加载组织机构树形下拉菜单
+    fetchSecondDeptTree: function() {
+      const listQuery = {
+        pid: this.wellForm.deptid,
+        deptType: '04'
+      }
+      getDeptTreeList(listQuery).then(response => {
+        console.log(response.data)
+        if (response.data.list) {
+          this.secondDeptTreeList = toTreeList(response.data.list, this.wellForm.deptid)
+        }
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then(response => {
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+      })
+    },
+    // 获取区域1
+    fetchArea1(deptid) {
+      getAreaByDept(this.wellForm.deptid).then(response => {
+        if (response.code === 200) {
+          const pid = response.data.area
+          getAreaList(pid).then(response => {
+            this.quList = response.data
+          })
+        }
+      })
+    },
+    // 改变权属单位选项时
+    deptChanged() {
+      console.log('deptChanged')
+      this.wellForm.responsibleDept = ''
+      this.wellForm.area = ''
+      this.wellForm.qu = ''
+    },
+    // 改变区选项时的操作
+    quChanged() {
+      this.wellForm.area = ''
+    },
+    // 获取区域2
+    fetchArea2() {
+      getAreaList(this.wellForm.qu).then(response => {
+        this.jiedaoList = response.data
+      })
+    },
+    // 取消
+    cancel() {
+      this.dialogFormVisible = false
+      this.imageList = []
+      this.wellForm.deptid = ''
+      this.$emit('watchChild')
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    // 保存数据
+    saveData: function() {
+      this.wellForm.photos = ''
+      if (this.wellForm.responsibleDept === '') {
+        if (this.secondDeptTreeList.length > 0) {
+          this.$message.warning('必须选择维护机构')
+          return
+        } else {
+          this.wellForm.responsibleDept = this.wellForm.deptid
+        }
+      }
+      for (const image of this.imageList) {
+        let index = image.url.indexOf('/static/')
+        if (index !== -1) {
+          index += 8
+        }
+        this.wellForm.photos += image.url.substring(index) + ';'
+      }
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          updateWell(this.wellForm).then(response => {
+            console.log('修改井')
+            if (response.code === 200) {
+              this.$message.success('修改成功!')
+              this.$emit('watchChild')
+              this.dialogFormVisible = false
+              this.imageList = []
+            }
+            // 清除验证
+            this.$nextTick(() => {
+              this.$refs['dataForm'].clearValidate()
+            })
+          })
+        }
+      })
+    },
+    uploadFile(file) {
+      console.log('uploadFile:' + file.file.name)
+      const base_url = process.env.BASE_API + '/static/'
+      Uploadimg(file).then(res => {
+        if (res.code === 200) {
+          this.imageList.push({ name: file.file.name, url: base_url + res.data })
+        }
+      })
+    },
+    handleBeforeUpload(file) {
+      const isJPG = (file.type === 'image/jpeg') || (file.type === 'image/png')
+      let res = true
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPG) {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        res = false
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5MB!')
+        res = false
+      }
+      for (const i in this.fileList) {
+        if (this.fileList[i].name === file.name) {
+          this.$message.error('该图片已上传过，请选择其他图片')
+          res = false
+        }
+      }
+      return res
+    },
+    // 文件列表移除文件时的钩子
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      for (const i in this.imageList) {
+        if (this.imageList[i].name === file.name) {
+          this.imageList.splice(i, 1)
+          this.hideUpload = this.imageList.length >= 4
+          return
+        }
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`限制选择 4 张图片，本次选择了 ${files.length} 张图片，共选择了 ${files.length + fileList.length} 张图片`)
+    },
+    // 点击文件列表中已上传的文件时的钩子
+    handlePictureCardPreview(file) {
+      console.log('handlePictureCardPreview')
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleChange(file, fileList) {
+      console.log('handleChange')
+      if (fileList) {
+        this.hideUpload = fileList.length >= 4
+      } else {
+        this.hideUpload = false
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .hide .el-upload--picture-card {
+    display: none;
+  }
+
+  .editDialog {
+    .el-dialog {
+      width: 900px;
+      margin-top: 10vh !important;
+      .el-scrollbar {
+        height: 410px;
+        width: 100%;
+      }
+      .el-scrollbar__wrap {
+        /*overflow: scroll;*/
+        overflow-x: auto;
+        overflow-y: auto;
+      }
+      .el-scrollbar__view {
+        width: 98%;
+      }
+    }
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .line {
+    width: 50px;
+    margin-left: 5px;
+  }
+
+  .hide .el-upload-–picture-card {
+    display: none;
+  }
+
+  .imgBox {
+    width: 100%;
+    text-align: center;
+  }
+</style>
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 1ce6848..371b539 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -41,6 +41,20 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col class="overview-map-container">
+            <a-map-container
+              ref="map"
+              :center="center"
+              :zoom="zoom"
+              :base-layer="baseLayer"
+              :style="{height:(bodyHeight-200)+'px'}"
+              vid="overview"
+              class="map-demo"
+              @ready="mapReady"
+            />
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="10">
             <el-form-item label="经度" prop="coordinateX">
               <el-input v-model.trim="wellForm.coordinateX" type="text" placeholder="必填" />
@@ -159,11 +173,13 @@
 import { getWellType, updateWell } from '@/api/well/well'
 import { Uploadimg } from '@/api/common'
 import DeptSelect from '@/components/DeptSelect'
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapLoader from '@amap/amap-jsapi-loader'
 
 export default {
   name: 'EditWell',
-  components: { DeptSelect },
+  components: { DeptSelect, AMapContainer },
   data() {
     const validateDeep = (rule, value, callback) => {
       if (value !== '') {
@@ -204,6 +220,11 @@
       }
     }
     return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12,
+      postionlatlon: '',
       dialogFormVisible: false, // 对话框是否显示
       wellForm: {
         id: null, // 井id
@@ -260,6 +281,9 @@
     }
   },
   computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ]),
     showResponseDept() {
       if (this.wellForm.deptid === '') {
         return true
@@ -278,7 +302,7 @@
     }
   },
   watch: {
-    lonLat(val) {
+    postionlatlon(val) {
       var _this = this
       window._AMapSecurityConfig = {
         securityJsCode: this.$store.getters.amapSecurityCode
@@ -332,10 +356,20 @@
     this.imageList = []
   },
   methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+      var _this = this
+      map.on('click', function(e) {
+        _this.wellForm.coordinateX = e.lnglat.lng
+        _this.wellForm.coordinateY = e.lnglat.lat
+        _this.postionlatlon = _this.wellForm.coordinateX + ',' + _this.wellForm.coordinateY
+      })
+    },
     // 初始化对话框
     initDialog: function(dialogFormVisible, row = null) {
       this.imageList = []
-      if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
+      // if (row.photos.length === 0 && this.$refs.upload) this.$refs.upload.clearFiles()
       this.dialogFormVisible = dialogFormVisible
       this.fetchWellType()
       this.wellForm = {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index fd450b1..094f13f 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -146,7 +146,6 @@
         {
           text: '井编号',
           value: 'wellCode',
-          width: 130,
           align: 'center'
         },
         {
@@ -157,7 +156,6 @@
         {
           text: '井深(m)',
           value: 'deep',
-          width: 80,
           align: 'center'
         },
         {
@@ -168,7 +166,6 @@
         {
           text: '井类型',
           value: 'wellTypeName',
-          width: 70,
           align: 'center'
         },
         {
@@ -179,14 +176,12 @@
         {
           text: '设备数量',
           value: 'deviceCount',
-          width: 100,
           align: 'center',
           type: 'Button'
         },
         {
           text: '布防状态',
           value: 'bfztName',
-          width: 80,
           align: 'center'
         }
       ], // 显示列
@@ -246,6 +241,7 @@
     },
     // 编辑井信息
     edit(row) {
+      console.log(row, '===row====')
       this.dialogFormVisible = true
       this.editShow = true
       this.$refs.editwell.initDialog(this.dialogFormVisible, row)
@@ -454,6 +450,7 @@
         this.listQuery.offset = 1
       }
       getWellList(this.listQuery).then(response => {
+        console.log(response)
         this.list = response.data.rows
         this.total = parseInt(response.data.total)
         this.listLoading = false
diff --git a/src/views/wellManage/mapLonLat.vue b/src/views/wellManage/mapLonLat.vue
new file mode 100644
index 0000000..7b5e409
--- /dev/null
+++ b/src/views/wellManage/mapLonLat.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div class="overview-map-container">
+      <a-map-container
+        ref="map"
+        :center="center"
+        :zoom="zoom"
+        :base-layer="baseLayer"
+        :style="{height:(bodyHeight-20)+'px'}"
+        vid="overview"
+        class="map-demo"
+        @ready="mapReady"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import AMapContainer from '@/components/Amap/AMapContainer'
+
+export default {
+  name: 'Overview',
+  components: { AMapContainer },
+  data() {
+    return {
+      map: null, // 地图对象
+      baseLayer: 'gaode_vec', // 底图图层
+      center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心
+      zoom: 12
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'bodyHeight'
+    ])
+  },
+  methods: {
+    // 初始化放这里
+    mapReady(map) {
+      this.map = map
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.overview-map-container{
+  width: 100%;
+}
+</style>