diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-              </div>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +136,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+.sub-title{
+  line-height: 2;
+  font-weight: bold;
+  font-size: 16px;
+  padding: 5px 0px;
+}
+.sub-body +.sub-title{
+  margin-top: 20px;
+}
+.sub-body{
+  margin-left: 40px;
+  .config-title{
+    line-height: 2;
+    margin-right: 20px;
+    width: 120px;
+  }
+  .config-line{
+    display: flex;
+    margin: 10px;
+  }
+  .other{
+    margin-left: 20px;
+  }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
-  }
+}
 </style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-              </div>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +136,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+.sub-title{
+  line-height: 2;
+  font-weight: bold;
+  font-size: 16px;
+  padding: 5px 0px;
+}
+.sub-body +.sub-title{
+  margin-top: 20px;
+}
+.sub-body{
+  margin-left: 40px;
+  .config-title{
+    line-height: 2;
+    margin-right: 20px;
+    width: 120px;
+  }
+  .config-line{
+    display: flex;
+    margin: 10px;
+  }
+  .other{
+    margin-left: 20px;
+  }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
-  }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--浏览器页签-->
+      <div class="sub-title">
+        浏览器页签
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            页签Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+      </div>
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +173,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+  .sub-title{
+    line-height: 2;
+    font-weight: bold;
+    font-size: 16px;
+    padding: 5px 0px;
+  }
+  .sub-body +.sub-title{
+    margin-top: 20px;
+  }
+  .sub-body{
+    margin-left: 40px;
+    .config-title{
+      line-height: 2;
+      margin-right: 20px;
+      width: 120px;
+    }
+    .config-line{
+      display: flex;
+      margin: 10px;
+    }
+    .other{
+      margin-left: 20px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
+    }
   }
+}
 </style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-              </div>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +136,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+.sub-title{
+  line-height: 2;
+  font-weight: bold;
+  font-size: 16px;
+  padding: 5px 0px;
+}
+.sub-body +.sub-title{
+  margin-top: 20px;
+}
+.sub-body{
+  margin-left: 40px;
+  .config-title{
+    line-height: 2;
+    margin-right: 20px;
+    width: 120px;
+  }
+  .config-line{
+    display: flex;
+    margin: 10px;
+  }
+  .other{
+    margin-left: 20px;
+  }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
-  }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--浏览器页签-->
+      <div class="sub-title">
+        浏览器页签
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            页签Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+      </div>
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +173,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+  .sub-title{
+    line-height: 2;
+    font-weight: bold;
+    font-size: 16px;
+    padding: 5px 0px;
+  }
+  .sub-body +.sub-title{
+    margin-top: 20px;
+  }
+  .sub-body{
+    margin-left: 40px;
+    .config-title{
+      line-height: 2;
+      margin-right: 20px;
+      width: 120px;
+    }
+    .config-line{
+      display: flex;
+      margin: 10px;
+    }
+    .other{
+      margin-left: 20px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
+    }
   }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
 <template>
-  <app-container>
-    <el-tabs tab-position="left" class="user-dept-scroll">
+  <app-container style="padding: 10px 20px;">
+    <el-tabs>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-s-platform" />PC端</span>
         <pc-config />
@@ -23,8 +23,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-              </div>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +136,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+.sub-title{
+  line-height: 2;
+  font-weight: bold;
+  font-size: 16px;
+  padding: 5px 0px;
+}
+.sub-body +.sub-title{
+  margin-top: 20px;
+}
+.sub-body{
+  margin-left: 40px;
+  .config-title{
+    line-height: 2;
+    margin-right: 20px;
+    width: 120px;
+  }
+  .config-line{
+    display: flex;
+    margin: 10px;
+  }
+  .other{
+    margin-left: 20px;
+  }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
-  }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--浏览器页签-->
+      <div class="sub-title">
+        浏览器页签
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            页签Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+      </div>
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +173,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+  .sub-title{
+    line-height: 2;
+    font-weight: bold;
+    font-size: 16px;
+    padding: 5px 0px;
+  }
+  .sub-body +.sub-title{
+    margin-top: 20px;
+  }
+  .sub-body{
+    margin-left: 40px;
+    .config-title{
+      line-height: 2;
+      margin-right: 20px;
+      width: 120px;
+    }
+    .config-line{
+      display: flex;
+      margin: 10px;
+    }
+    .other{
+      margin-left: 20px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
+    }
   }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
 <template>
-  <app-container>
-    <el-tabs tab-position="left" class="user-dept-scroll">
+  <app-container style="padding: 10px 20px;">
+    <el-tabs>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-s-platform" />PC端</span>
         <pc-config />
@@ -23,8 +23,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 82c3334..1eaa10a 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -179,7 +179,6 @@
         this.dataList = response.data
       })
     },
-    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       const query = {

diff --git a/src/api/data/data.js b/src/api/data/data.js
index d87e74a..c437d7b 100644
--- a/src/api/data/data.js
+++ b/src/api/data/data.js
@@ -97,7 +97,7 @@
 // 管盯数据查询
 export function getTubeData(params) {
   return request({
-    url: 'tubedata/list',
+    url: 'tubedata/list-page',
     method: 'get',
     params
   })
diff --git a/src/router/modules/config.js b/src/router/modules/config.js
index c33329b..eccd5c6 100644
--- a/src/router/modules/config.js
+++ b/src/router/modules/config.js
@@ -13,10 +13,10 @@
   },
   children: [
     {
-      path: '/tenantConfig',
-      name: 'TenantConfig',
-      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
-      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
+      path: '/responsibleUser',
+      name: 'ResponsibleUser',
+      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
+      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
     },
     {
       path: '/alarmConfig',
@@ -31,28 +31,16 @@
       meta: { title: '外观配置', icon: 'function', permission: ['/viewsConfig'] }
     },
     {
-      path: '/responsibleUser',
-      name: 'ResponsibleUser',
-      component: () => import('@/views/systemConfig/responsibleUser/listResponsibleUser'),
-      meta: { title: '联系人配置', icon: 'function', permission: ['/responsibleUser'] }
-    },
-    {
-      path: '/alarmLevel',
-      name: 'AlarmLevel',
-      component: () => import('@/views/systemConfig/alarmLevel/listLevel'),
-      meta: { title: '告警等级配置', icon: 'function', permission: ['/alarmLevel'] }
-    },
-    {
-      path: '/alarmContent',
-      name: 'AlarmContent',
-      component: () => import('@/views/systemConfig/alarmContent/listContent'),
-      meta: { title: '告警内容配置', icon: 'function', permission: ['/alarmContent'] }
-    },
-    {
       path: '/deptPermission',
       name: 'DeptPermission',
       component: () => import('@/views/systemConfig/deptPermission/deptPermission'),
       meta: { title: '组织权限配置', icon: 'function', permission: ['/deptPermission/list'] }
+    },
+    {
+      path: '/tenantConfig',
+      name: 'TenantConfig',
+      component: () => import('@/views/systemConfig/tenantConfig/tenantConfig'),
+      meta: { title: '项目配置', icon: 'function', permission: ['/tenantConfig'] }
     }
   ]
 }]
diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index b4ecd07..f16815e 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,8 +86,8 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'strength', align: 'center', filter: true },
-        { text: '电量(%)', value: 'cell', width: 80, align: 'center', checkCell: true },
+        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
+        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
         // {text: '状态描述',value: 'descn', align: 'center'},
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue
index 1dbe14d..9eb7af5 100644
--- a/src/views/dataManage/deviceData/listH2SData.vue
+++ b/src/views/dataManage/deviceData/listH2SData.vue
@@ -71,8 +71,6 @@
   data() {
     return {
       listQuery: {
-        devcode: '', // 设备编号
-        wellCode: '', // 点位编号
         beginTime: '', // 开始时间
         endTime: '', // 结束时间
         keywords: '', // 关键字
diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue
index e0e6ab8..b56fb95 100644
--- a/src/views/dataManage/deviceData/listTubeData.vue
+++ b/src/views/dataManage/deviceData/listTubeData.vue
@@ -166,7 +166,7 @@
       this.handleDateTime()
       getTubeData(this.listQuery).then(response => {
         this.list = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.total = response.data.total
         this.listLoading = false
       })
     },
diff --git a/src/views/deviceManage/components/listDigData.vue b/src/views/deviceManage/components/listDigData.vue
index 1467b49..87e2b94 100644
--- a/src/views/deviceManage/components/listDigData.vue
+++ b/src/views/deviceManage/components/listDigData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasData.vue b/src/views/deviceManage/components/listGasData.vue
index 0cdbb7d..372ef0e 100644
--- a/src/views/deviceManage/components/listGasData.vue
+++ b/src/views/deviceManage/components/listGasData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listGasDetectorData.vue b/src/views/deviceManage/components/listGasDetectorData.vue
new file mode 100644
index 0000000..2f282a1
--- /dev/null
+++ b/src/views/deviceManage/components/listGasDetectorData.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getGasdectorDataSingle } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleGasDetectorData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartSettings: {
+        labelMap: {
+          'strength': '燃气浓度'
+        },
+        metrics: ['strength'],
+        dimension: ['uptime']
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'strength'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getGasdectorDataSingle(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listHydrantData.vue b/src/views/deviceManage/components/listHydrantData.vue
index 8ba6cee..823201e 100644
--- a/src/views/deviceManage/components/listHydrantData.vue
+++ b/src/views/deviceManage/components/listHydrantData.vue
@@ -63,13 +63,13 @@
         needIndex: false
       }, // 是否需要序号列
       columns: [
-        { text: '上报时间', value: 'logTime', align: 'center' },
+        { text: '上报时间', value: 'logtime', align: 'center' },
         { text: '消防栓状态', value: 'descn', align: 'center' }
       ], // 显示列
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listLiquidData.vue b/src/views/deviceManage/components/listLiquidData.vue
index 3b77db0..3bae830 100644
--- a/src/views/deviceManage/components/listLiquidData.vue
+++ b/src/views/deviceManage/components/listLiquidData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '液位值', value: 'liquiddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listNoiseData.vue b/src/views/deviceManage/components/listNoiseData.vue
index 1fb0f32..bc1024d 100644
--- a/src/views/deviceManage/components/listNoiseData.vue
+++ b/src/views/deviceManage/components/listNoiseData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '噪声值', value: 'ddata', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listTempData.vue b/src/views/deviceManage/components/listTempData.vue
index bf8136e..d2e6272 100644
--- a/src/views/deviceManage/components/listTempData.vue
+++ b/src/views/deviceManage/components/listTempData.vue
@@ -22,7 +22,15 @@
     </div>
     <el-row :gutter="10">
       <el-col :span="14">
-        <ve-line v-loading="listLoading" :data="chartData" :settings="chartSettings" />
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="humidity">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
       </el-col>
       <el-col :span="10">
         <normal-table
@@ -67,10 +75,10 @@
       }, // 是否需要序号列
       columns: [
         { text: '上报时间', value: 'uptime', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' },
-        { text: '温度', value: 'temp', align: 'center' }
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '湿度(%RH)', value: 'humidity', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
@@ -83,15 +91,25 @@
       headConfig: {
         show: false
       }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
       chartSettings: {
         labelMap: {
-          'strength': '燃气浓度'
-        },
-        metrics: ['strength'],
-        dimension: ['uptime']
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
       }, // 折线图配置
       chartData: {
-        columns: ['uptime', 'strength'],
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'humidity': '湿度(%RH)'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'humidity'],
         rows: []
       }
     }
@@ -119,6 +137,7 @@
         const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
         this.list = data
         this.chartData.rows = data
+        this.chartData2.rows = data
         this.listLoading = false
       }).catch(_ => this.listLoading = false)
     },
diff --git a/src/views/deviceManage/components/listTempPressData.vue b/src/views/deviceManage/components/listTempPressData.vue
new file mode 100644
index 0000000..c41efa3
--- /dev/null
+++ b/src/views/deviceManage/components/listTempPressData.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="dialog-data-container">
+    <!--标题及查询条件-->
+    <div class="title-header">
+      <div class="title-left">
+        <i class="el-icon-menu" />设备数据情况
+      </div>
+      <div class="title-right">
+        <time-buttons ref="timeButtons" @change="changeTime" />
+        <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="fetchData"
+        />
+      </div>
+    </div>
+    <el-row :gutter="10">
+      <el-col :span="14">
+        <el-radio-group v-model="chartActive" style="margin-left: 10px;" size="small">
+          <el-radio-button label="temperature">
+            温度
+          </el-radio-button>
+          <el-radio-button label="press">
+            湿度
+          </el-radio-button>
+        </el-radio-group>
+        <ve-line v-loading="listLoading" :data="chartActive==='temperature'?chartData:chartData2" :settings="chartSettings" />
+      </el-col>
+      <el-col :span="10">
+        <normal-table
+          ref="normalTable"
+          :head="headConfig"
+          :data="list"
+          :height="350"
+          :query="listQuery"
+          :columns="columns"
+          :pagination="false"
+          :list-loading="listLoading"
+          :options="options"
+          size="small"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getTempDataSimple } from '@/api/data/data'
+import TimeButtons from '@/components/BigData/TimeButtons'
+export default {
+  name: 'SingleTempPressData',
+  components: { TimeButtons },
+  props: {
+    devcode: {
+      type: String,
+      require: true
+    } // 设备编号
+  },
+  data() {
+    return {
+      timeRange: [], // 时间范围
+      listQuery: {
+        devcode: '',
+        beginTime: '',
+        endTime: ''
+      }, // 查询条件
+      options: {
+        needIndex: false
+      }, // 是否需要序号列
+      columns: [
+        { text: '上报时间', value: 'uptime', align: 'center' },
+        { text: '温度(℃)', value: 'temperature', align: 'center' },
+        { text: '压力', value: 'press', align: 'center' }
+      ], // 显示列
+      list: [], // 列表数据
+      listLoading: false,
+      pickerOptions: {
+        disabledDate(time) { // 限制只能选100天内的时间
+          const curDate = (new Date()).getTime()
+          const three = 100 * 24 * 3600 * 1000
+          const threeMonths = curDate - three
+          return time.getTime() > Date.now() || time.getTime() < threeMonths
+        }
+      },
+      headConfig: {
+        show: false
+      }, // 表格头配置
+      chartActive: 'temperature', // 激活的图表样式
+      chartSettings: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData: {
+        columns: ['uptime', 'temperature'],
+        rows: []
+      },
+      chartSettings2: {
+        labelMap: {
+          'temperature': '温度(℃)',
+          'press': '压力'
+        }
+      }, // 折线图配置
+      chartData2: {
+        columns: ['uptime', 'press'],
+        rows: []
+      }
+    }
+  },
+  created() {
+  },
+  mounted() {
+  },
+  methods: {
+    init() {
+      this.$refs.timeButtons.initTime()
+    },
+    // 切换时间的时候
+    changeTime(timeRange) {
+      console.log('changeTime')
+      this.timeRange = timeRange
+      this.fetchData()
+    },
+    // 获取设备数据
+    fetchData() {
+      this.listLoading = true
+      this.listQuery.devcode = this.devcode
+      this.handleDateTime()
+      getTempDataSimple(this.listQuery).then(response => {
+        const data = response.data.sort((a, b) => a.uptime < b.uptime ? -1 : 1)
+        this.list = data
+        this.chartData.rows = data
+        this.chartData2.rows = data
+        this.listLoading = false
+      }).catch(_ => this.listLoading = false)
+    },
+    // 处理时间
+    handleDateTime() {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialog-data-container{
+  padding: 15px 0px;
+  .title-header {
+    display: flex;
+    justify-content: space-between;
+    height: 50px;
+    padding: 10px;
+    margin-bottom: 10px;
+    border-top: solid 2px #F3F3F3;
+    color: #606266;
+    .title-left{
+      //padding: 10px;
+      line-height: 30px;
+    }
+  }
+}
+</style>
diff --git a/src/views/deviceManage/components/listTubeData.vue b/src/views/deviceManage/components/listTubeData.vue
index 0bdd2bb..9cd3930 100644
--- a/src/views/deviceManage/components/listTubeData.vue
+++ b/src/views/deviceManage/components/listTubeData.vue
@@ -69,7 +69,7 @@
         { text: '上报时间', value: 'uptime', align: 'center' },
         { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' }
       ], // 显示列
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellLocaData.vue b/src/views/deviceManage/components/listWellLocaData.vue
index 12aa64d..f1dc9de 100644
--- a/src/views/deviceManage/components/listWellLocaData.vue
+++ b/src/views/deviceManage/components/listWellLocaData.vue
@@ -70,7 +70,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/components/listWellcoverData.vue b/src/views/deviceManage/components/listWellcoverData.vue
index a1d5ebc..5e3d69b 100644
--- a/src/views/deviceManage/components/listWellcoverData.vue
+++ b/src/views/deviceManage/components/listWellcoverData.vue
@@ -69,7 +69,7 @@
       headConfig: {
         show: false
       }, // 表格头配置
-      list: [], // 里诶博爱数据
+      list: [], // 列表数据
       listLoading: false,
       pickerOptions: {
         disabledDate(time) { // 限制只能选100天内的时间
diff --git a/src/views/deviceManage/detailDevice.vue b/src/views/deviceManage/detailDevice.vue
index f67d504..d51a8ce 100644
--- a/src/views/deviceManage/detailDevice.vue
+++ b/src/views/deviceManage/detailDevice.vue
@@ -20,6 +20,10 @@
         <span :style="{color:deviceForm.onlineState=='0'?'#909399':'#67C23A'}">{{ deviceForm.onlineStateName }}
         </span>
       </el-descriptions-item>
+      <el-descriptions-item label="电量">
+        <span :style="{color:deviceForm.cell<'20'?'#f62c45':'#67C23A'}">{{ deviceForm.cell }}
+        </span>
+      </el-descriptions-item>
       <el-descriptions-item label="安装高度">
         {{ deviceForm.installHeight?deviceForm.installHeight+' m':'--' }}
       </el-descriptions-item>
@@ -56,10 +60,12 @@
 import listHydrantData from './components/listHydrantData'
 import listWellLocaData from './components/listWellLocaData'
 import ListH2SData from './components/listH2SData'
+import SingleGasDetectorData from '@/views/deviceManage/components/listGasDetectorData'
 
 export default {
   name: 'EditDevice',
   components: {
+    SingleGasDetectorData,
     ListH2SData,
     listDigData,
     listGasData,
@@ -104,6 +110,7 @@
         '11': 'list-hydrant-data',
         '12': 'list-tube-data',
         '14': 'list-h2-s-data'
+        // '101': 'single-gas-detector-data'
       } // 组件对照表
     }
   },
diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index d87cf41..1dbb51b 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,17 +2,29 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
         <el-col :span="12">
           <el-form-item label="设备编号" prop="devcode">
             <el-input v-model.trim="deviceForm.devcode" :disabled="isEditMode" type="text" placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="非必填" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
+              <el-option
+                v-for="item in deviceTypeList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="安装日期" prop="installDate">
             <el-date-picker
               v-model.trim="deviceForm.installDate"
@@ -23,20 +35,6 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" :disabled="isEditMode" placeholder="请选择设备类型" @change="typeChanged">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="设备型号" prop="modelId">
             <el-select v-model="deviceForm.modelId" :disabled="isDetailMode" placeholder="请选择设备型号">
@@ -49,8 +47,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="点位编号" prop="wellCode">
             <el-input v-model.trim="deviceForm.wellCode" :disabled="isDetailMode" type="text" placeholder="必填" />
@@ -61,13 +57,13 @@
             <el-input v-model.trim="deviceForm.concenCode" :disabled="isDetailMode" type="text" placeholder="非必填" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="安装高度(m)" prop="installHeight">
-            <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
-          </el-form-item>
-        </el-col>
+        <el-row v-if="deviceForm.deviceType=='2'" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="安装高度(m)" prop="installHeight">
+              <el-input v-model.trim="deviceForm.installHeight" :disabled="isDetailMode" type="text" placeholder="必填" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-row>
     </el-form>
     <div v-show="!isDetailMode" slot="footer" class="dialog-footer">
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 138af7a..94cbe3f 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -138,11 +138,11 @@
           value: 'devcode',
           align: 'center'
         },
-        // {
-        //   text: '设备名称',
-        //   value: 'deviceName',
-        //   align: 'center'
-        // },
+        {
+          text: '设备名称',
+          value: 'deviceName',
+          align: 'center'
+        },
         {
           text: '设备类型',
           value: 'deviceTypeName',
diff --git a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
deleted file mode 100644
index 8fbaa64..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmContentConfig.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <app-container>
-    <!--筛选条件-->
-    <search-area size="small" @search="search">
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.alarmType"
-          size="small"
-          placeholder="报警类型"
-          clearable
-        >
-          <el-option
-            v-for="item in alarmTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-      <search-item>
-        <el-select
-          v-model.trim="listQuery.deviceType"
-          size="small"
-          placeholder="设备类型"
-          clearable
-        >
-          <el-option
-            v-for="item in deviceTypeList"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </search-item>
-    </search-area>
-     <div>
-      <el-row class="table-title">
-        <el-col :span="6">
-          <div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div>
-        </el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button class="edit_btn" size="small" @click="add">
-            新增
-          </el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
-        <el-table-column :index="indexMethod" align="center" type="index" />
-        <el-table-column
-          v-for="column in columns"
-          :key="column.value"
-          :label="column.text"
-          :width="column.width"
-          :align="column.align"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-              {{ scope.row[column.value] }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-              编辑
-            </el-button>
-            <el-button type="text" @click="detail(scope.row)">
-              详情
-            </el-button>
-            <el-button type="text" @click="datalist(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </app-container>
-</template>
-
-<script>
-import { alarmType } from '@/api/system/dict'
-export default {
-  data() {
-    return {
-      columns: [
-        {
-          text: '报警内容',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '报警类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '双倍类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      listQuery: {
-        alarmType: '',
-        deviceType: '',
-        offset: 1,
-        limit: 20
-      },
-      alarmTypeList: [],
-      deviceTypeList: []
-    }
-  },
-  mounted() {
-    this.getAlarmType()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 获取报警类型
-    getAlarmType() {
-      alarmType().then(response => {
-        console.log(response)
-      })
-    },
-    search() {}
-  }
-
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
deleted file mode 100644
index c7184f4..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmLevenConfig.vue
+++ /dev/null
@@ -1,234 +0,0 @@
-<template>
-  <app-container>
-    <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
-          </el-card>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <div>
-          <el-row class="table-title">
-            <el-col :span="6">
-              <div class="title-header">
-                <i class="el-icon-menu" />数据列表
-              </div>
-            </el-col>
-            <el-col :span="12" :offset="6" class="edit_btns">
-              <el-button class="edit_btn" size="small" @click="add">
-                新增
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-table v-loading="listLoading" :data="list" class="table" border>
-            <el-table-column :index="indexMethod" align="center" type="index" />
-            <el-table-column
-              v-for="column in columns"
-              :key="column.value"
-              :label="column.text"
-              :width="column.width"
-              :align="column.align"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-                <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">
-                  {{ scope.row[column.value] }}
-                </el-button>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
-              <template slot-scope="scope">
-                <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">
-                  编辑
-                </el-button>
-                <el-button type="text" @click="detail(scope.row)">
-                  详情
-                </el-button>
-                <el-button type="text" @click="datalist(scope.row)">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!--分页-->
-        <div class="pagination-container">
-          <el-pagination
-            v-show="total>listQuery.limit"
-            :current-page="listQuery.offset"
-            :page-sizes="[20,30,50]"
-            :page-size="listQuery.limit"
-            :total="total"
-            align="center"
-            layout="total, sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-col>
-    </el-row>
-  </app-container>
-</template>
-
-<script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
-export default {
-  data() {
-    return {
-      listQuery: {
-        offset: 1,
-        limit: 20
-      }, // 查询条件
-      columns: [
-        {
-          text: '监控指标',
-          value: 'id',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'modelName',
-          align: 'center'
-        },
-        {
-          text: '开启报警',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '开启工单',
-          value: 'communNameGroup',
-          align: 'center'
-        }
-      ], // 显示列
-      list: [], // 列表数据
-      listLoading: true, // 加载动画
-      treeLoading: false,
-      deptTree: null,
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false
-    }
-  },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  mounted() {
-    this.fetchDeptTree()
-  },
-  methods: {
-    // 序号计算
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
-      })
-    },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .titleHeadStyle{
-    font-weight: 600;
-    margin: 20px 0;
-  }
-  .titleStyle{
-    margin: 20px;
-    font-weight: 600;
-  }
-  .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 204px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
-    }
-  }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
deleted file mode 100644
index 543d944..0000000
--- a/src/views/systemConfig/alarmConfig/components/alarmPushCondig.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-well-code="right"
-      label-width="100px"
-    >
-      <div class="titleStyle">
-        报警推送方式
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="推送方式" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        WEB端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="服务地址" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div class="titleStyle">
-        APP端推送配置
-      </div>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appId" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appKey" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="appSecret" prop="devcode">
-            <el-input
-              v-model.trim="deviceForm.devcode"
-              clearable
-              size="small"
-              :disabled="dialogStatus"
-              type="text"
-              placeholder="必填"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div>
-      <el-button size="small" @click="updata">
-        修改
-      </el-button>
-      <el-button size="small" @click="saveData">
-        保存
-      </el-button>
-      <el-button size="small" @click="dialogStatus = true">
-        取消
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'AlarmPushCondig',
-  data() {
-    return {
-      dialogStatus: true,
-      // 表单内容
-      deviceForm: {
-        devcode: '',
-        imei: '',
-        iccid: ''
-      },
-      // 表单校验规则
-      rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }],
-        imei: [{ required: true, message: 'IMEI号必填', trigger: ['blur', 'change'] }],
-        iccid: [{ required: true, message: 'SIM卡号必填', trigger: ['blur', 'change'] }]
-      }
-    }
-  },
-  methods: {
-    updata() {},
-    saveData() {}
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-.titleStyle{
-    margin: 20px;
-}
-.el-row{
-    margin-left: 20px;
-}
-</style>
diff --git a/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
new file mode 100644
index 0000000..65e35a3
--- /dev/null
+++ b/src/views/systemConfig/alarmConfig/components/alarmPushConfig.vue
@@ -0,0 +1,144 @@
+<template>
+  <div>
+    <el-form
+      ref="dataForm"
+      :rules="rules"
+      :model="configForm"
+      label-well-code="right"
+      label-width="140px"
+    >
+      <div class="titleStyle">
+        报警推送方式
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="推送方式" prop="pushRule">
+            <el-select v-model="configForm.pushRule" size="small" placeholder="无" :disabled="!editMode" clearable>
+              <el-option
+                v-for="item in pushRuleList"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        WEB端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="服务地址" prop="websocketUrl">
+            <el-input
+              v-model.trim="configForm.websocketUrl"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <div class="titleStyle">
+        APP端推送配置
+      </div>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appId" prop="appId">
+            <el-input
+              v-model.trim="configForm.appId"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appKey" prop="appKey">
+            <el-input
+              v-model.trim="configForm.appKey"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="个推平台appSecret" prop="appSecret">
+            <el-input
+              v-model.trim="configForm.appSecret"
+              clearable
+              size="small"
+              :disabled="!editMode"
+              type="text"
+              placeholder="无"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin: 20px 220px;">
+      <el-button @click="updata">
+        修改
+      </el-button>
+      <el-button type="primary" @click="saveData">
+        保存
+      </el-button>
+      <el-button @click="editMode = false">
+        取消
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AlarmPushConfig',
+  data() {
+    return {
+      editMode: false,
+      pushRuleList: [
+        { name: '权属单位及其上级所有用户', value: '1' },
+        { name: '权属单位所有用户', value: '2' },
+        { name: '权属单位负责人', value: '3' },
+        { name: '指定人员', value: '4' }
+      ],
+      // 表单内容
+      configForm: {
+        pushRule: '权属单位及以其上级所有用户', // 报警推送规则
+        websocketUrl: 'ws://111.198.10.15:11309/websocket', // websocket地址
+        appId: 'qQqFtTBrUa7SGLjntUlpT4', // 个推appId
+        appKey: 'GNjHLiqJkD6OoeZbtbdfi5', // 个推appKey
+        appSecret: '7IuYlRuqWtAaZzVmJHunh7' // 个推appSecret
+      },
+      // 表单校验规则
+      rules: {
+        devcode: [{ required: true, message: '设备编号无', trigger: ['blur', 'change'] }],
+        imei: [{ required: true, message: 'IMEI号无', trigger: ['blur', 'change'] }],
+        iccid: [{ required: true, message: 'SIM卡号无', trigger: ['blur', 'change'] }]
+      }
+    }
+  },
+  methods: {
+    updata() {
+      this.editMode = true
+    },
+    saveData() {}
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.titleStyle{
+    margin: 20px;
+}
+</style>
diff --git a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
index 93e9c8e..91b12b0 100644
--- a/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
+++ b/src/views/systemConfig/alarmConfig/listAlarmConfig.vue
@@ -3,28 +3,28 @@
     <el-tabs tab-position="left" class="user-dept-scroll">
       <el-tab-pane>
         <span slot="label"><i class="el-icon-share" />报警推送配置</span>
-        <alarm-push-condig />
+        <alarm-push-config />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-upload" />报警等级配置</span>
-        <alarm-leven-config />
+        <list-level />
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-copy-document" />报警内容配置</span>
-        <alarm-content-config />
+        <list-alarm-content />
       </el-tab-pane>
     </el-tabs>
   </app-container>
 </template>
 
 <script>
-import alarmPushCondig from './components/alarmPushCondig'
-import alarmLevenConfig from './components/alarmLevenConfig'
-import alarmContentConfig from './components/alarmContentConfig'
+import alarmPushConfig from './components/alarmPushConfig'
+import ListLevel from '@/views/systemConfig/alarmLevel/listLevel'
+import ListAlarmContent from '@/views/systemConfig/alarmContent/listContent'
 
 export default {
   name: 'ListAlarmConfig',
-  components: { alarmPushCondig, alarmLevenConfig, alarmContentConfig },
+  components: { ListAlarmContent, ListLevel, alarmPushConfig },
   data() {
     return {
     }
@@ -37,8 +37,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/systemConfig/alarmContent/listContent.vue b/src/views/systemConfig/alarmContent/listContent.vue
index 0eb72bb..1b94ce3 100644
--- a/src/views/systemConfig/alarmContent/listContent.vue
+++ b/src/views/systemConfig/alarmContent/listContent.vue
@@ -74,7 +74,7 @@
 import { getAlarmType } from '@/api/alarm/alarm'
 
 export default {
-  name: 'ListContent',
+  name: 'ListAlarmContent',
   components: { editAlarmContent },
   data() {
     return {
diff --git a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
index d6b2a8b..0330806 100644
--- a/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
+++ b/src/views/systemConfig/responsibleUser/listResponsibleUser.vue
@@ -62,7 +62,7 @@
   },
   computed: {
     'showOperate': function() { // 判断是否显示操作列，如果编辑和删除的权限都没有则不显示操作列
-      return this.hasPerm('/dept/update') || this.hasPerm('/dept/delete')
+      return this.hasPerm('/sys/dept/update') || this.hasPerm('/sys/dept/delete')
     }
   },
   created() {
diff --git a/src/views/systemConfig/tenantConfig/tenantConfig.vue b/src/views/systemConfig/tenantConfig/tenantConfig.vue
index 898bf74..dcb4d6c 100644
--- a/src/views/systemConfig/tenantConfig/tenantConfig.vue
+++ b/src/views/systemConfig/tenantConfig/tenantConfig.vue
@@ -1,249 +1,251 @@
+<!--项目配置-->
 <template>
   <app-container>
     <el-row>
-      <!--左半部分-->
-      <el-col :span="5">
-        <div class="dept-div">
-          <el-card class="box-card" shadow="always">
-            <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-              <el-input
-                v-model="filterText"
-                clearable
-                placeholder="请输入项目名称"
-              />
-              <el-tree
-                ref="tree"
-                v-loading="treeLoading"
-                :filter-node-method="filterNode"
-                :data="deptTree"
-                :props="defaultProps"
-                :default-expand-all="expandAllNode"
-                :expand-on-click-node="expandNodeClick"
-                @node-click="handleNodeClick"
-              />
-            </el-scrollbar>
+      <el-col v-show="tenantList.length>1" :span="5">
+        <div style="width:95%;">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>项目</span>
+            </div>
+            <el-tree ref="tenantlist" :data="tenantList" :props="defaultProps" :highlight-current="true" :current-node-key="selectedTenant.id" :default-checked-keys="defaultCheckedKeys" node-key="id" @node-click="handleNodeClick" />
           </el-card>
         </div>
       </el-col>
       <!--右半部分-->
-      <el-col :span="19">
+      <el-col :span="tenantList.length>1?19:24">
         <el-form
           ref="dataForm"
           :rules="rules"
-          :model="listQuery"
+          :model="configForm"
           label-well-code="right"
-          label-width="100px"
+          label-width="140px"
         >
           <div class="titleHeadStyle">
-            <div>{{ headerValue }}</div>
+            <div>{{ selectedTenant.tenantName }}</div>
           </div>
           <div class="titleStyle">
             基础配置
           </div>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="经度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入经度"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="纬度" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入纬度"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="默认坐标系" prop="devcode">
+                <el-radio-group v-model="configForm.coordinateType">
+                  <el-radio label="wgs84">
+                    WGS84
+                  </el-radio>
+                  <el-radio label="gcj02">
+                    GCJ02
+                  </el-radio>
+                  <el-radio label="bd09">
+                    BD09
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心经度" prop="lng">
+                <el-input
+                  v-model.trim="configForm.lng"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入经度"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="默认中心纬度" prop="lat">
+                <el-input
+                  v-model.trim="configForm.lat"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入纬度"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="生产工单" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否生产工单"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APP推送" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请选择是否是否APP推送"
-                  />
-                </el-form-item>
-              </el-col>
+              <el-form-item label="支持通讯协议" prop="communication">
+                <el-checkbox-group v-model="configForm.communication">
+                  <el-checkbox v-for="item in commuList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-checkbox-group>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="通讯协议" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入通讯协议"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="默认坐标系" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入默认坐标系"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="产生工单" prop="isJobGenerate">
+                <el-switch
+                  v-model="configForm.isJobGenerate"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APP推送" prop="isAppPush">
+                <el-switch
+                  v-model="configForm.isAppPush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="短信推送" prop="isMessagePush">
+                <el-switch
+                  v-model="configForm.isMessagePush"
+                  active-value="1"
+                  inactive-value="0"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="titleStyle">
             NB平台配置
           </div>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="APPID" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPID"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="APPKEY" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入APPKEY"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPID" prop="appid">
+                <el-input
+                  v-model.trim="nbConfig.appid"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPID"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="APPKEY" prop="appkey">
+                <el-input
+                  v-model.trim="nbConfig.appkey"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入APPKEY"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
-            <el-col :span="20">
-              <el-col :span="10">
-                <el-form-item label="平台地址" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入平台地址"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="10">
-                <el-form-item label="应用名称" prop="devcode">
-                  <el-input
-                    v-model.trim="listQuery.devcode"
-                    clearable
-                    size="small"
-                    type="text"
-                    placeholder="请输入应用名称"
-                  />
-                </el-form-item>
-              </el-col>
+            <el-col :span="10">
+              <el-form-item label="平台地址" prop="baseUrl">
+                <el-input
+                  v-model.trim="nbConfig.baseUrl"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入平台地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应用名称" prop="appname">
+                <el-input
+                  v-model.trim="nbConfig.appname"
+                  clearable
+                  size="small"
+                  type="text"
+                  placeholder="请输入应用名称"
+                />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="buttonGroup">
-          <el-button size="small" @click="saveData">
-            保存
-          </el-button>
-          <el-button size="small" @click="cencel">
-            取消
-          </el-button>
-        </div>
+        <el-row>
+          <el-col :span="20">
+            <el-row type="flex" class="buttonGroup" justify="center">
+              <el-button type="primary" class="btn" @click="saveData">
+                保存
+              </el-button>
+              <el-button class="btn" @click="cancel">
+                取消
+              </el-button>
+            </el-row>
+          </el-col>
+        </el-row>
       </el-col>
     </el-row>
   </app-container>
 </template>
 
 <script>
-import { getDeptTreeList } from '@/api/system/dept'
-import { toTreeList } from '@/utils/structure'
+import { getTenantList } from '@/api/system/tenant'
+import { communicationType } from '@/api/well/well'
 // import { alarmTenantList, delAlarmTenant } from '@/api/systemConfig/tenantConfig'
 export default {
   name: 'TenantConfig',
   data() {
     return {
-      headerValue: null,
-      list: [],
+      selectedTenant: {
+        id: '1',
+        tenantName: ''
+      }, // 选中的项目
+      tenantList: [], // 项目列表
+      commuList: [], // 支持通讯方式
       treeLoading: false,
       deptTree: null,
       defaultProps: {
         children: 'children',
-        label: 'name'
+        label: 'tenantName'
       },
-      filterText: '',
-      expandAllNode: true,
-      expandNodeClick: false,
-      listQuery: {
-        devcode: ''
-      },
+      configForm: {
+        lng: '', // 经度
+        lat: '', // 纬度
+        communication: ['1', '2', '3', '4', '5'], // 通讯方式,
+        coordinateType: 'wgs84', // 坐标系
+        isJobGenerate: '1', // 是否生成工单
+        isAppPush: '0', // 是否开始app推送
+        isMessagePush: '0' // 是否开启短信推送
+      }, // 项目配置项
+      nbConfig: {
+        appid: '',
+        appkey: '',
+        baseUrl: '',
+        appname: ''
+      }, // NB配置
       // 表单校验规则
       rules: {
-        devcode: [{ required: true, message: '设备编号必填', trigger: ['blur', 'change'] }]
+        lng: [{ required: false, message: '设备编号必填', trigger: ['blur', 'change'] }]
       }
     }
   },
-  watch: {
-    filterText(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   mounted() {
-    this.fetchDeptTree()
+    this.fetchcommunType()
+    this.fetchTenantList()
     this.fetchData()
   },
   methods: {
-    filterNode(value, data) {
-      if (!value) return true
-      return data.name.indexOf(value) !== -1
-    },
-    search() {},
-    // 获取组织结构树
-    fetchDeptTree() {
-      this.treeLoading = true
-      getDeptTreeList(this.listQuery).then(response => {
-        this.deptTree = toTreeList(response.data, '0', true)
-        this.treeLoading = false
+    // 获取通讯方式
+    fetchcommunType() {
+      communicationType().then(response => {
+        console.log(response, '通讯方式')
+        this.commuList = response.data
       })
     },
-    // 点击左侧组织结构项触发
-    handleNodeClick(val) {
-      console.log(val)
-      this.headerValue = val.name
-      this.listQuery.deptId = val.id
+    // 获取项目列表
+    fetchTenantList() {
+      getTenantList().then(response => {
+        this.tenantList = response.data
+        if (this.tenantList.length > 0) {
+          this.selectedTenant = this.tenantList[0]
+          this.fetchData()
+        }
+      })
     },
+    // 点击切换项目
+    handleNodeClick(data) {
+      this.selectedTenant = {
+        id: data.id,
+        tenantName: data.tenantName
+      }
+      this.fetchData()
+    },
+    search() {},
     // 获取用户数据
     fetchData() {
     },
@@ -262,8 +264,7 @@
       })
     },
     // 取消
-    cencel() {
-    }
+    cancel() {}
   }
 }
 </script>
@@ -278,52 +279,9 @@
     font-weight: 600;
   }
   .buttonGroup{
-    margin: 20px;
-  }
-  .dept-div{
-    padding-right: 12px;
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 200px);
-      }
-      .el-input{
-        margin-bottom: 20px;
-      }
+    margin-top: 20px;
+    .btn +.btn{
+      margin-left: 20px;
     }
   }
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
-<style>
-  .dept-div .el-scrollbar__wrap{
-    overflow-x: auto;
-    background-color: #fff;
-    padding: 0px;
-  }
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/appConfig.vue b/src/views/systemConfig/viewsConfig/components/appConfig.vue
index cdc75c9..63084ba 100644
--- a/src/views/systemConfig/viewsConfig/components/appConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/appConfig.vue
@@ -1,152 +1,118 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
-              </div>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +136,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+.sub-title{
+  line-height: 2;
+  font-weight: bold;
+  font-size: 16px;
+  padding: 5px 0px;
+}
+.sub-body +.sub-title{
+  margin-top: 20px;
+}
+.sub-body{
+  margin-left: 40px;
+  .config-title{
+    line-height: 2;
+    margin-right: 20px;
+    width: 120px;
+  }
+  .config-line{
+    display: flex;
+    margin: 10px;
+  }
+  .other{
+    margin-left: 20px;
+  }
+}
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
-  }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/components/pcConfig.vue b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
index cdc75c9..82dae39 100644
--- a/src/views/systemConfig/viewsConfig/components/pcConfig.vue
+++ b/src/views/systemConfig/viewsConfig/components/pcConfig.vue
@@ -1,152 +1,155 @@
 <template>
   <div>
-    <div class="dept-div">
-      <el-card class="box-card" shadow="hover">
-        <el-scrollbar ref="deptScroll" class="user-dept-scroll">
-          <el-col :span="8">
-            <el-card>
-              <div>标题文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="titleValue" clearable :disabled="titleDisabled" />
+    <div class="">
+      <!--浏览器页签-->
+      <div class="sub-title">
+        浏览器页签
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            页签Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="titleUpData">
-                  修改
-                </el-button>
-                <el-button size="small" @click="titleSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="titleDisabled = true">
-                  取消
-                </el-button>
+            </el-dialog>
+          </div>
+        </div>
+      </div>
+      <!--标题-->
+      <div class="sub-title">
+        标题
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            系统Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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-card>
-            <el-card>
-              <div>登录页文字：</div>
-              <div class="inputUpDown">
-                <el-input v-model="loginTitleValue" clearable :disabled="loginDisabled" />
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            标题文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
+      <!--登录页-->
+      <div class="sub-title">
+        登录页
+      </div>
+      <div class="sub-body">
+        <div class="config-line">
+          <div class="config-title">
+            登录页Logo:
+          </div>
+          <div>
+            <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}"
+              class="small-upload"
+              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>
-              <div>
-                <el-button size="small" @click="loginUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="loginSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="loginDisabled = true">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-            <el-card>
-              <div>地图：</div>
-              <div class="inputUpDown">
-                <el-select v-model="mapValue" clearable :disabled="mapDisabled">
-                  <el-option label="高德地图" value="1" />
-                  <el-option label="百度地图" value="2" />
-                  <el-option label="天地图" value="3" />
-                  <el-option label="其他地图" value="4" />
-                </el-select>
-                <el-input v-if="otherMapShow" v-model="otherMapValue" placeholder="请输入地址" />
-              </div>
-              <div>
-                <el-button size="small" @click="mapUpdata">
-                  修改
-                </el-button>
-                <el-button size="small" @click="mapSure">
-                  保存
-                </el-button>
-                <el-button size="small" @click="mapCencel">
-                  取消
-                </el-button>
-              </div>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-            <el-col>
-              <el-card header="浏览器页签: 页签Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="标题: 系统Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-            <el-col>
-              <el-card header="登录页: 登录页Logo(图片不能超过200KB)">
-                <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-card>
-            </el-col>
-          </el-col>
-        </el-scrollbar>
-      </el-card>
+            </el-dialog>
+          </div>
+        </div>
+        <div class="config-line">
+          <div class="config-title">
+            登录页文字:
+          </div>
+          <div>
+            <el-input v-model="titleValue" clearable :disabled="titleDisabled" size="small" />
+          </div>
+          <div class="other">
+            <el-button size="small" @click="titleUpData">
+              修改
+            </el-button>
+            <el-button size="small" @click="titleSure">
+              保存
+            </el-button>
+            <el-button size="small" @click="titleDisabled = true">
+              取消
+            </el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -170,16 +173,40 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .dept-div{
-    .box-card{
-      width:100%;
-      .user-dept-scroll{
-        width:100%;
-        height: calc(100vh - 240px);
-      }
+  .sub-title{
+    line-height: 2;
+    font-weight: bold;
+    font-size: 16px;
+    padding: 5px 0px;
+  }
+  .sub-body +.sub-title{
+    margin-top: 20px;
+  }
+  .sub-body{
+    margin-left: 40px;
+    .config-title{
+      line-height: 2;
+      margin-right: 20px;
+      width: 120px;
+    }
+    .config-line{
+      display: flex;
+      margin: 10px;
+    }
+    .other{
+      margin-left: 20px;
     }
   }
-  .inputUpDown{
-    margin: 20px 0;
+
+</style>
+<style rel="stylesheet/scss" lang="scss">
+.small-upload{
+  .el-upload--picture-card{
+    width: 80px !important;
+    height: 80px !important;
+    .el-icon-plus{
+      line-height: 80px;
+    }
   }
+}
 </style>
diff --git a/src/views/systemConfig/viewsConfig/viewsConfig.vue b/src/views/systemConfig/viewsConfig/viewsConfig.vue
index 8b86590..cfb1921 100644
--- a/src/views/systemConfig/viewsConfig/viewsConfig.vue
+++ b/src/views/systemConfig/viewsConfig/viewsConfig.vue
@@ -1,6 +1,6 @@
 <template>
-  <app-container>
-    <el-tabs tab-position="left" class="user-dept-scroll">
+  <app-container style="padding: 10px 20px;">
+    <el-tabs>
       <el-tab-pane>
         <span slot="label"><i class="el-icon-s-platform" />PC端</span>
         <pc-config />
@@ -23,8 +23,4 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .user-dept-scroll{
-    width: 100%;
-    height: calc(100vh - 160px);
-  }
 </style>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 82c3334..1eaa10a 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -179,7 +179,6 @@
         this.dataList = response.data
       })
     },
-    fetchDeviceList() {},
     // 获取区域1
     fetchArea1() {
       const query = {
diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue
index a574a9d..7e2209e 100644
--- a/src/views/wellManage/infoWell.vue
+++ b/src/views/wellManage/infoWell.vue
@@ -1,79 +1,35 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" append-to-body>
-    <!--    <el-scrollbar height="500px" :native="false">-->
-    <el-form ref="dataForm" :label-position="labelPosition" :model="wellForm" :v-loading="loading" label-width="120px">
-      <el-row>
-        <el-col :span="7">
-          <el-form-item label="点位名称" prop="wellName">
-            <el-input v-model="wellForm.wellName" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="点位编号" prop="wellCode">
-            <el-input v-model="wellForm.wellCode" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="点位类型" prop="wellType">
-            <el-input v-model="wellForm.wellTypeName" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="7">
-          <el-form-item label="权属单位" prop="deptid">
-            <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="井深(m)" prop="deep">
-            <el-input v-model="wellForm.deep" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item label="布防状态" prop="coordinateX">
-            <el-input v-model="wellForm.bfztName" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="1">
-        <el-form-item label="所在区域" required>
-          <el-col :span="4">
-            <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-              <el-option
-                v-for="item in quList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-col>
-          <el-col :span="1" class="line">
-            区/县
-          </el-col>
-          <el-col :span="5">
-            <el-select v-model="wellForm.area" placeholder="未知" disabled>
-              <el-option
-                v-for="item in jiedaoList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-col>
-          <el-col :span="1" class="line">
-            街道/镇
-          </el-col>
-        </el-form-item>
-      </el-row>
-      <el-row>
-        <el-col :span="15">
-          <el-form-item label="详细地址" prop="position">
-            <el-input v-model="wellForm.position" type="text" placeholder="未知" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+  <el-dialog :visible.sync="dialogFormVisible" class="editDialog" title="井详情" width="70%" append-to-body>
+    <el-descriptions class="margin-top" title="" :column="2" border>
+      <el-descriptions-item v-for="config of formConfig" :key="config.value" :span="config.span">
+        <template slot="label">
+          {{ config.label }}
+        </template>
+        <template v-if="config.type=='text'">
+          {{ wellForm[config.value]?wellForm[config.value]:config.placeholder }}
+        </template>
+        <template v-if="config.type=='areaName'">
+          {{ areaName }}
+        </template>
+        <!--        <template v-if="config.type=='images'">-->
+        <!--          <div v-if="imageList.length==0">-->
+        <!--            无-->
+        <!--          </div>-->
+        <!--          <el-upload-->
+        <!--            v-else-->
+        <!--            ref="upload"-->
+        <!--            :file-list="imageList"-->
+        <!--            :on-preview="handlePictureCardPreview"-->
+        <!--            class="hide"-->
+        <!--            multiple-->
+        <!--            accept=".jpg,.jpeg,.png "-->
+        <!--            action="string"-->
+        <!--            list-type="picture-card"-->
+        <!--            disabled-->
+        <!--          />-->
+        <!--        </template>-->
+      </el-descriptions-item>
+    </el-descriptions>
     <div class="watch-div">
       <a-map-container
         ref="map"
@@ -92,7 +48,7 @@
 </template>
 
 <script>
-import { getAreaList, getAreaByDept } from '@/api/system/area'
+import { getAreaList, getAreaByDept, getAreaListPage } from '@/api/system/area'
 import { getWellInfo } from '@/api/well/well'
 import AMapContainer from '@/components/Amap/AMapContainer'
 import AMapMarker from '@/components/Amap/AMapMarker'
@@ -126,20 +82,39 @@
         area: '', // 街道
         responsibleDept: '' // 维护人员部门
       }, // 表单
+      formConfig: [
+        { type: 'text', label: '点位名称', value: 'wellName', placeholder: '未知' },
+        { type: 'text', label: '点位编号', value: 'wellCode', placeholder: '未知' },
+        { type: 'text', label: '点位类型', value: 'wellTypeName', placeholder: '未知' },
+        { type: 'text', label: '权属单位', value: 'deptName', placeholder: '未知' },
+        { type: 'text', label: '点位维护单位', value: 'responsibleDeptName', placeholder: '未知' },
+        { type: 'text', label: '井深(m)', value: 'deep', placeholder: '--' },
+        { type: 'text', label: '布防状态', value: 'bfztName', placeholder: '未知' },
+        { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 },
+        { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' },
+        { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' },
+        { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 },
+        { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 }
+      ], // 表单配置项
       center: [121.59996, 31.197646],
       zoom: 16,
       baseLayer: 'gaode_vec', // 底图图层
       markers: [],
+      imageList: [],
       icon: require('@/assets/overview/pure-position-icon.png'), // 报警图标
-      quList: null,
-      jiedaoList: null,
+      quList: [],
+      jiedaoList: [],
       labelPosition: 'right',
       loading: true
     }
   },
   computed: {
-    qu() { // 获取区
-      return this.wellForm.qu
+    areaName() {
+      if (this.wellForm.quName) {
+        return this.wellForm.quName + this.wellForm.areaName
+      } else {
+        return ''
+      }
     }
   },
   watch: {
@@ -191,28 +166,47 @@
         } else {
           this.loading = false
         }
+        // 处理图片
+        const urls = row.photos.split(';')
+        const base_url = this.baseConfig.baseUrl + '/static/'
+        for (const url of urls) {
+          if (url) {
+            this.imageList.push({ name: url, url: base_url + url })
+          }
+        }
       })
     },
     // 获取区域1
     fetchArea1() {
-      getAreaByDept(this.wellForm.deptid).then(response => {
-        if (response.code === 200) {
-          const pid = response.data.area
-          getAreaList(pid).then(response => {
-            this.quList = response.data
-          })
-        }
+      const query = {
+        keywords: this.wellForm.qu,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.quList = response.data.rows.filter(item => item.id === this.wellForm.qu)
+        this.wellForm.quName = this.quList.length > 0 ? this.quList[0].areaName : ''
       })
     },
     // 获取区域2
     fetchArea2() {
-      getAreaList(this.wellForm.qu).then(response => {
-        this.jiedaoList = response.data
-        this.loading = false
+      const query = {
+        keywords: this.wellForm.area,
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }
+      getAreaListPage(query).then(response => {
+        this.jiedaoList = response.data.rows
+        this.wellForm.areaName = this.jiedaoList.length > 0 ? this.jiedaoList[0].areaName : ''
       })
     },
     // 取消
     cancel() {
+      this.imageList = []
       this.dialogFormVisible = false
     }
   }
@@ -261,7 +255,7 @@
     text-align: center;
   }
   .watch-div {
-    margin: 0px 15px;
+    margin: 10px 0px;
     .map-demo{
       height: 250px;
     }